Message ID | 20231127220902.1315692-8-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3498461vqx; Mon, 27 Nov 2023 14:10:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOUt9v3Akab+FkCA7HCH9nwQbjgS/uFA8E4+unZCtjJdyKr+SuxdpFv+Jt0rd8lIDpth/y X-Received: by 2002:a05:6a20:da93:b0:187:ce9f:e1ab with SMTP id iy19-20020a056a20da9300b00187ce9fe1abmr14533506pzb.33.1701123002978; Mon, 27 Nov 2023 14:10:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701123002; cv=none; d=google.com; s=arc-20160816; b=kkIA74Owcb0dbn4Te+ZZ3DSArt0SSxq1EfYNI2inrSL+BKVhM81RhySE8CuIzDsdzF RSkRZOk1SBtCbN+FilCniVVwAF+x/Z9DCUt2RClLiji9iuM38DuUeCiForKgFjuFk5v/ 4GGobt1LpYB8IP7zETbKZTOdB5K5iCMEuP83adQgGdzJsee7pKJ5IWVgd2GT0AKsUQKc Q61QF/nBeR4QOSEiVGTrTSAqukKpi9ppu84l92wSoH2mJnXgsXwrvClVk2eT17lmPEPp SUV/dc5t3AjuzSjA6eiefqpzj7JB8yT8XtJI45oP8lgx2MDikW6H+ZaJBhnZ6qQoIZfm 9gyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=wM9qRu2sJgUV9aoPmw3JmrGSGiE8RlVBwZZnO/fs3Sw=; fh=Io7x3OacpefNRRNKoYAzVE0aWTDwD7FRzyCdD1e3AN4=; b=ACzS+MsJc2AFcs2XW3Zi4/K6ykj5GXDNLNUARGruoI7/FxKOlJHtMkaF0yVcl7xe83 tBp95imns39rQUpoErDKY2GQ615KH9URMRw1HlN0QsT6F7P4/xTw2phK7y/dShCb6YS+ zKjHL3036a2Se/vBUMvCXuOVp4A+zaStRrI7dJM7LDj2UV1ezP1XwTtlZzu1RWX0bYKM gF2l98ig3TyIsacTSW2G+XS8a83Cgx4n90p8yd/6kNw3doTUm1Z66FyuuL/KZg81AIal +gF/Nqv/bON88D6xcSRo0ffUUSNxvrFoItNnld4Y92KwqVmhwiiZ+Qn27Oak6sCImC22 H+3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="mH3v/Qqj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id q11-20020a17090a9f4b00b00277e0d7163asi11065808pjv.32.2023.11.27.14.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 14:10:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="mH3v/Qqj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 491668096BB6; Mon, 27 Nov 2023 14:09:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233734AbjK0WJm (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Mon, 27 Nov 2023 17:09:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233647AbjK0WJg (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 27 Nov 2023 17:09:36 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A152D10D8 for <linux-kernel@vger.kernel.org>; Mon, 27 Nov 2023 14:09:37 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5cd0a4fba39so57333847b3.1 for <linux-kernel@vger.kernel.org>; Mon, 27 Nov 2023 14:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701122977; x=1701727777; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=wM9qRu2sJgUV9aoPmw3JmrGSGiE8RlVBwZZnO/fs3Sw=; b=mH3v/Qqjie6fqp3leZ6/BKCvdQ9WA35tC4OSxj/W9KXpTZYvF+O9xM4gPzMGcqjMnj +CN1knZQbxLIfdL+oYOGACc7sKJ7K64f7qXQQ45eFJuITH4w3IBHoSojc/Z3Ef/yDZiA iB/3fVgrlX+ADF7YG0wu2gwb0Jruub3eH/xyJ6dTcP6ul7FHfJ0RaphX1E8ewyjQLjVu ibYL3Vv8gpGf37rrw4y38iS2UEe7Jwi8iVh8WGHto5gdZbO5RzCKj3gOy8QzlsfvaeyN r2NCuQJJurAoT897Hu59zoMC3JeyfCvvlFgAKMar6Becl94PvOqyagPbsSuu1cp+YfcR W35A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701122977; x=1701727777; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wM9qRu2sJgUV9aoPmw3JmrGSGiE8RlVBwZZnO/fs3Sw=; b=O8/bSCZzK31CFzPnQhJG1p9eBdzDJS+qzM81BT2ZTeclkQx1oAjBDtgCbOfKnYBKaL si9tIGmbuX4oCIfl+UkvTZeAPqdtN9ucQTEHP8U+PCtOQDKgWRqTRw9W4gLmPXdrgAP+ Rzw8VUzf0QjucAi6Y0irE9H+ZKOghhZaZerOpPmEcfqHWq6pAfgkKxwmRixHnTAC4UkE rAex3pB6l4CTYXtJ9vZPhpb2t7bAhg3LUkWurUdyiYZh+e9OYuVeN8MLj+ksdUMO5NT/ o+zhgQzIgXL5qTUIYlhK6czUpXez2A1dOfDE01Nlt8BFVOCQYyFGf0ZZTBrFwmPOP1Mk gm9w== X-Gm-Message-State: AOJu0YyiXDM6U8LNob6NrPR/LB9RbbWTsELkllfkVrdE5mB9Sg5bGQST 7rfHNSfgFcner2/RDnzXbFL9/iVASWgt X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:829:6e77:9093:f39b]) (user=irogers job=sendgmr) by 2002:a05:690c:f84:b0:5ca:ad72:2d78 with SMTP id df4-20020a05690c0f8400b005caad722d78mr503568ywb.8.1701122976902; Mon, 27 Nov 2023 14:09:36 -0800 (PST) Date: Mon, 27 Nov 2023 14:08:19 -0800 In-Reply-To: <20231127220902.1315692-1-irogers@google.com> Message-Id: <20231127220902.1315692-8-irogers@google.com> Mime-Version: 1.0 References: <20231127220902.1315692-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Subject: [PATCH v5 07/50] perf maps: Switch modules tree walk to io_dir__readdir From: Ian Rogers <irogers@google.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, Nick Terrell <terrelln@fb.com>, Kan Liang <kan.liang@linux.intel.com>, Andi Kleen <ak@linux.intel.com>, Kajol Jain <kjain@linux.ibm.com>, Athira Rajeev <atrajeev@linux.vnet.ibm.com>, Huacai Chen <chenhuacai@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, Vincent Whitchurch <vincent.whitchurch@axis.com>, "Steinar H. Gunderson" <sesse@google.com>, Liam Howlett <liam.howlett@oracle.com>, Miguel Ojeda <ojeda@kernel.org>, Colin Ian King <colin.i.king@gmail.com>, Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong <yangjihong1@huawei.com>, Ming Wang <wangming01@loongson.cn>, James Clark <james.clark@arm.com>, K Prateek Nayak <kprateek.nayak@amd.com>, Sean Christopherson <seanjc@google.com>, Leo Yan <leo.yan@linaro.org>, Ravi Bangoria <ravi.bangoria@amd.com>, German Gomez <german.gomez@arm.com>, Changbin Du <changbin.du@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>, Li Dong <lidong@vivo.com>, Sandipan Das <sandipan.das@amd.com>, liuwenyu <liuwenyu7@huawei.com>, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio <amadio@gentoo.org> Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 14:09:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783756754090424717 X-GMAIL-MSGID: 1783756754090424717 |
Series |
Improvements to memory use
|
|
Commit Message
Ian Rogers
Nov. 27, 2023, 10:08 p.m. UTC
Compared to glibc's opendir/readdir this lowers the max RSS of perf
record by 1.8MB on a Debian machine.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/machine.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
Comments
On Mon, Nov 27, 2023 at 2:09 PM Ian Rogers <irogers@google.com> wrote: > > Compared to glibc's opendir/readdir this lowers the max RSS of perf > record by 1.8MB on a Debian machine. > > Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Thanks, Namhyung
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index a985d004aa8d..be3dab9d5253 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -36,6 +36,7 @@ #include <internal/lib.h> // page_size #include "cgroup.h" #include "arm64-frame-pointer-unwind-support.h" +#include <api/io_dir.h> #include <linux/ctype.h> #include <symbol/kallsyms.h> @@ -1552,25 +1553,21 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmo static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, int depth) { - struct dirent *dent; - DIR *dir = opendir(dir_name); + struct io_dirent64 *dent; + struct io_dir iod; int ret = 0; - if (!dir) { + io_dir__init(&iod, open(dir_name, O_CLOEXEC | O_DIRECTORY | O_RDONLY)); + if (iod.dirfd < 0) { pr_debug("%s: cannot open %s dir\n", __func__, dir_name); return -1; } - while ((dent = readdir(dir)) != NULL) { + while ((dent = io_dir__readdir(&iod)) != NULL) { char path[PATH_MAX]; - struct stat st; - /*sshfs might return bad dent->d_type, so we have to stat*/ path__join(path, sizeof(path), dir_name, dent->d_name); - if (stat(path, &st)) - continue; - - if (S_ISDIR(st.st_mode)) { + if (io_dir__is_dir(&iod, dent)) { if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, "..")) continue; @@ -1603,7 +1600,7 @@ static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, i } out: - closedir(dir); + close(iod.dirfd); return ret; }