From patchwork Sat Jun 29 04:53:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01A1BC27C4F for ; Sat, 29 Jun 2024 04:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/qFahSvtYCgkWsqqCp3yfdkhC2VqGdDus+43H+4umnY=; b=wA9h2OM/DYiafOvXZPZyqeDkjU sGaygABWa4TYp3Uwka/4iX4ntY7yG+fqUSn5C1IjAaalUoW71RAKVRJw+pbFObHQGZIzKXVHlRXfS hh9Sl4HxOuBpUGewrLhIqUQYXAuBSSM+Wpa/TOYUNtcwo0aGNGW5qdcbEEZxs335nZIMy66FjeMOz NyDgQA5M2Im+1QUmcM5DPpPL6Qpq9sVV74Wb8HdaUQwHjmNrOYNun4/J1kSEeJnV3qsaL3djlbiB8 KsVgR3pv27lAOdsjcJd1UMjj+3Nx8asXAORY/VqBdnvdVtygDuuEDrTLz3ATwYL1C2zajrUgNkQVL SLOW6iCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ9q-0000000Fsvd-3sQq; Sat, 29 Jun 2024 04:57:54 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ6T-0000000Fr40-1o0O for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:30 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-dfab38b7f6bso2194020276.0 for ; Fri, 28 Jun 2024 21:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636864; x=1720241664; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=/qFahSvtYCgkWsqqCp3yfdkhC2VqGdDus+43H+4umnY=; b=iWGVHKAgWs4h8ZshY/XI/adgGQR4u7Qv54GGmYOK93AZuusmQlS98N6zu5259wYpZN 33G07VV0gtushJQW1rRf9ye5ktrurW7xFimWxq2HTtPB8eVU9t7Ygu/w5892F/qqHioP 1YYd1qJIzSZDY/x37Wz2joGN4xbIsV16f2Et+OguPvqxAlpkfeQ174m25f2QFNxsyfjk LDanzAdrGrPt/CMRrg+N3MIqF/wM2B6GK7oexyqQeHUIaPyvxlLBiKnz1FyuuSbug8nK 5bugje6lHy99WGLn5LRwWthH97dARdM/B3eQbV9J1O6hW6k1J3uXtKQR/WNBOxiXjDE3 A5wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636864; x=1720241664; 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=/qFahSvtYCgkWsqqCp3yfdkhC2VqGdDus+43H+4umnY=; b=pQ1D5ZCZgc7FpL/A3R2mAcVsc28HEEC0ORpySUKS+mzvQiPFc2AT0aIrjTo6abTBdf CJFFP1joMeCZR6CnnoBaTMzR49x8uLL/uyfYAbhIpXr10rSdl2Obn6k7O8IAFacwsgdt tiKqPvkifGdAB4re6PEzZUgaRE/oZYo61erbb9TXxfcaQRzrn12ewdvmHQs6BUTXI8Zz P9108GPpUXpZUJNDTdPi3triKdulhU8UL5jCTn/nNufyb55kFLWLeD45kUHoZQg6Drso MqsHZHM0uKPN2h/PH0b3mNDIjIRGUcCF2ZDZFGH94I5xnuru6P/CFbtqIsP9IOVd0Y12 KQkA== X-Forwarded-Encrypted: i=1; AJvYcCVA0qRZlc9fp9Ig42cNVpWxa7BFBsfo3sWT+lMgVeqAE+ihY4VLSiK5RBxFp/oZJRAt1esxsDkBmJcYji2Qv69jw5Ydrnfwi9FKlTFAjrN27FxzlpI= X-Gm-Message-State: AOJu0YwLTZIWxN8fljPKffi2k7eW6dhaNeCY0dRAItp3XccMl17TTG3D aQ399IoozX88ofmI0pxMUfaacmP1BlWUU6dnoDrW9EB6QDscub+jfHcosE49vZnMPreWYJSTRET +Qwb9pg== X-Google-Smtp-Source: AGHT+IGyYt+Ug4wKE7CF+0lD3txU6miVuOCyb94wJamUB8cYnxGDHnmXcKWlP4cbadWy9xXjx9f2PM3zPXp9 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a05:6902:2b89:b0:dff:83e:b259 with SMTP id 3f1490d57ef6-e036eb4a8cemr995276.6.1719636863723; Fri, 28 Jun 2024 21:54:23 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:29 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-8-irogers@google.com> Mime-Version: 1.0 References: <20240629045350.285243-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Subject: [PATCH v3 07/28] perf kmem: Use perf_tool__init From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Nick Terrell , Nick Desaulniers , Oliver Upton , Anshuman Khandual , Song Liu , Ilkka Koskinen , Athira Rajeev , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240628_215425_635512_C86610A5 X-CRM114-Status: GOOD ( 15.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Reduce the scope of the tool from global/static to just that of the cmd_kmem function where the session is scoped. Use the perf_tool__init to initialize default values. Signed-off-by: Ian Rogers --- tools/perf/builtin-kmem.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 859ff018eace..b3cbac40b8c7 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -986,15 +986,6 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, return err; } -static struct perf_tool perf_kmem = { - .sample = process_sample_event, - .comm = perf_event__process_comm, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .namespaces = perf_event__process_namespaces, - .ordered_events = true, -}; - static double fragmentation(unsigned long n_req, unsigned long n_alloc) { if (n_alloc == 0) @@ -1971,6 +1962,7 @@ int cmd_kmem(int argc, const char **argv) NULL }; struct perf_session *session; + struct perf_tool perf_kmem; static const char errmsg[] = "No %s allocation events found. Have you run 'perf kmem record --%s'?\n"; int ret = perf_config(kmem_config, NULL); @@ -1998,6 +1990,13 @@ int cmd_kmem(int argc, const char **argv) data.path = input_name; + perf_tool__init(&perf_kmem, /*ordered_events=*/true); + perf_kmem.sample = process_sample_event; + perf_kmem.comm = perf_event__process_comm; + perf_kmem.mmap = perf_event__process_mmap; + perf_kmem.mmap2 = perf_event__process_mmap2; + perf_kmem.namespaces = perf_event__process_namespaces; + kmem_session = session = perf_session__new(&data, &perf_kmem); if (IS_ERR(session)) return PTR_ERR(session);