From patchwork Wed Jun 26 20:36:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13713401 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 D435BC30653 for ; Wed, 26 Jun 2024 20:38:36 +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=W+G0HGMTQoy+2+TKDBA5eg+niEy3wMk5iRiA3dPthGE=; b=1swmSXkzW33suuL4IIW1bHs6zy cHUrGvx2WSnJDdenE2kc2PiS6i1eEgju1PGn6Bs5bfxZTF3PYpWhY1DyCCAS/F2lA5a4UnuHWrxIg nW/+6MQtxJpJJTlCGKDqtW0V2gsU0cKwumKpApcu/Xa2fbdtzHmFAEkkjuwX2tLWOWX2iTdOgmlsQ C4JKV6vW+ki/K21CfShtCi8d8HcQVCkFYAkr00UhbBmEaiS1zqemy9J7qyKPUAcJvcqXHXQqwbGmc Wj01cfufkYL12MOFMAzsKMZkhP2dMV3x1NaPXbLKxUhVPqPmoJ286JVQf3481Twc6PYlADvleRR5G Qg2eiBKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZPM-00000008FzU-2pis; Wed, 26 Jun 2024 20:38:24 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZO1-00000008FE1-2DfA for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:37:03 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-e02bb412435so14996341276.1 for ; Wed, 26 Jun 2024 13:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434220; x=1720039020; 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=W+G0HGMTQoy+2+TKDBA5eg+niEy3wMk5iRiA3dPthGE=; b=i+/WRgFYCK6fVGF6IPPE3pVFZzbCqsz/GbmAUwO0IGS1A40Y17+o6sVQXe/+jqshGY K0l7N6YBtyr48DyMuMOSvoKlVIv//qqGT2H1VpkQYTW5e7AILdevJh2pg0vvX9DFzDUX DYbqsZbebqizzDLogumOhEWftvFkHWfXbjIuqc9bOSxxKolcKVSOZchRPQZbv1nQ7BKB QcJ6aJ/n08+L1UdvxmO2jN6apAOVjAs1+7waxmLqppgux0290kAAf3cS/GRAh+zOQqdz 4ejhmTKOMjFLQh7CLtT7iqfbSw1FuJZXEtLtViTILWpsCjkxHVfIrWkPyX1NoPC2tABm 5kNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434220; x=1720039020; 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=W+G0HGMTQoy+2+TKDBA5eg+niEy3wMk5iRiA3dPthGE=; b=gTpoGKFELJMHmJUU8GTUY5F0y/aGNMEvoafZsbZVeMwzznhlfxgW3IzlA3wMHQQpgq PVCBdLUr4htlVzvWoEsbeC4vkYk338QQkObLyQ7nqHTrt88RXLVxYGRF53h+eA1iJ5Li Ebm4w90HGqvxFg32MTxNiExFerh8xKfv7P995tIWzVqptdcpVCMblF761Jdo+Zb4GRkF RK23FokDClF3QqqqJIibOwCM1qUObiZ61ss1YDWTclgdIT7amrIwIxeA8pQPwPd1gBKt K6ZO7uCEOlyOrIjiEuXTryOz34ABbCiSLvEN3bphsS6YaiIvKrtZoh9773I3iLSkZDZi POew== X-Forwarded-Encrypted: i=1; AJvYcCWeD+sZ9A9c/rmgB/OjaigP2X1HtL3o9m2gm20EPwGJFSWa/A/PNxgrfHHDXkSpmSsPG5zx5LGDj4P3VkhwaV9xLBjFOY6AZ+YJAEkrX/gbWEfbsV8= X-Gm-Message-State: AOJu0YwCVF5Zaj2+a8LQWMpU8klAXlEa0myY7q2YnVFGwk3UVUDnm3Tz 024rmS7bSjbFZMwVXrcRa30PcxBFw1APTk41F6hb6jj0jw7wh8AqgRA8pYx0lNCSs0uZ7bkzs6A ufSUAog== X-Google-Smtp-Source: AGHT+IGFNPE1mTzElJCJfk3y8lPhljBftC9JeXwX2Xh4efoZ4u/33kjM0V9SfLs8rKr6O0JpSXmbu4IU89Bx X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a25:c591:0:b0:e02:d71e:87b5 with SMTP id 3f1490d57ef6-e0304009b41mr375405276.6.1719434219631; Wed, 26 Jun 2024 13:36:59 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:11 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-10-irogers@google.com> Mime-Version: 1.0 References: <20240626203630.1194748-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v2 09/27] perf lock: 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 , 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-20240626_133701_797651_15AA0C89 X-CRM114-Status: GOOD ( 13.57 ) 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 Use perf_tool__init so that more uses of struct perf_tool can be const and not relying on perf_tool__fill_defaults. Signed-off-by: Ian Rogers --- tools/perf/builtin-lock.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 6efa9d646637..2c216427e929 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1933,22 +1933,21 @@ static bool force; static int __cmd_report(bool display_info) { int err = -EINVAL; - struct perf_tool eops = { - .attr = perf_event__process_attr, - .event_update = process_event_update, - .sample = process_sample_event, - .comm = perf_event__process_comm, - .mmap = perf_event__process_mmap, - .namespaces = perf_event__process_namespaces, - .tracing_data = perf_event__process_tracing_data, - .ordered_events = true, - }; + struct perf_tool eops; struct perf_data data = { .path = input_name, .mode = PERF_DATA_MODE_READ, .force = force, }; + perf_tool__init(&eops, /*ordered_events=*/true); + eops.attr = perf_event__process_attr; + eops.event_update = process_event_update; + eops.sample = process_sample_event; + eops.comm = perf_event__process_comm; + eops.mmap = perf_event__process_mmap; + eops.namespaces = perf_event__process_namespaces; + eops.tracing_data = perf_event__process_tracing_data; session = perf_session__new(&data, &eops); if (IS_ERR(session)) { pr_err("Initializing perf session failed\n"); @@ -2069,15 +2068,7 @@ static int check_lock_contention_options(const struct option *options, static int __cmd_contention(int argc, const char **argv) { int err = -EINVAL; - struct perf_tool eops = { - .attr = perf_event__process_attr, - .event_update = process_event_update, - .sample = process_sample_event, - .comm = perf_event__process_comm, - .mmap = perf_event__process_mmap, - .tracing_data = perf_event__process_tracing_data, - .ordered_events = true, - }; + struct perf_tool eops; struct perf_data data = { .path = input_name, .mode = PERF_DATA_MODE_READ, @@ -2100,6 +2091,14 @@ static int __cmd_contention(int argc, const char **argv) con.result = &lockhash_table[0]; + perf_tool__init(&eops, /*ordered_events=*/true); + eops.attr = perf_event__process_attr; + eops.event_update = process_event_update; + eops.sample = process_sample_event; + eops.comm = perf_event__process_comm; + eops.mmap = perf_event__process_mmap; + eops.tracing_data = perf_event__process_tracing_data; + session = perf_session__new(use_bpf ? NULL : &data, &eops); if (IS_ERR(session)) { pr_err("Initializing perf session failed\n");