From patchwork Tue Jun 25 17:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13711720 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 71938C2BBCA for ; Tue, 25 Jun 2024 17:27:17 +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=wBo69axQkbOZgJr5FTyptlmTaQ XxwhdBYA898G+GlA4n/ZcQwraDBODAkHKWAR9DaMnFgkE+i5eb22fdG7baaEiuxzZmE6aGUmLmy5e TAYx9aX4ykt9mEIe9nI21+Dt69Kr0WXzBRa+AP8sLLIoKSsVmtbhrgFiCtd1RXs3lLQLQrD6nGXG+ kpMdIjYSk8Aui1omLh23bUiOriX99H8tSwRWG1afU9+LO/4OftxjfWVFgZfvVc9D5ys2UZjcr9CqM FjEb6vYqMVlRtfQs9o+JZvBD/eRLwg3h6Wmudl7LicTyAO5aqghAuyuzn0U2PKnWLdygkV2Q8FH8P KG3fhmug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sM9wc-00000003szD-40MN; Tue, 25 Jun 2024 17:27:02 +0000 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sM9w2-00000003sWT-24RM for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2024 17:26:27 +0000 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-1f99cbb8898so61553615ad.2 for ; Tue, 25 Jun 2024 10:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336385; x=1719941185; 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=1VVIxjKh0morUEyP4ZwP1vLWxm79VTj/hQU4KUrj6DypognKFG3JCKnOZFuJ7aZ4cD shBvNAaNiExNp3Eeo9hLZXKJf41mvM2YMuresfPHfMzxim4xvIB+2ASe10cnQwRYo8TL 9vc+GNIi7WXebvinSCVBK3cJjB+QatxFojSGwqQkSrPl1lracmdDdWYpzyWS7MlpRrAc 7zfedjBR7b3Cwuquz9oM1S7ztGhIX1lLgS8LwWeFlYHIPpfdaZyw1f8P1Gz6nnQojHT/ CYhdFE2ozSKoaE27IxD56THFhPh5SMeDEAwL5By5EUmv0vBoHdOcwgl7nDCcPtf7GVlO JAqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336385; x=1719941185; 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=mujtnL+IbR4SLQwLccL8Y4snGJ53vMvHONLtqC/dDB2hHr2ZbvAM8ovrdIjCfbXcRj qco16+aL0N67UCysenV+jKc0SHY45OAF7wU4pD0bO+ESoey/FH5vMKRfjFBqpwPpNWMd 6p6gnr7kJA/Fc6wHFtl7qkCpGwh0Bpiv/Y9zcaLg++eXG6afvxlNSeUNE1NCQGBig0Bh UG4hN6xEeR2/vVthgd75O9Tq8FUnTH7LlISIJODsCRTxGCOizqYGUICtkBw0VKyfsMsd E7lN8XM0+k3oER7I0qBHyYNwV8cTmVtWLXCu3aq50PReHnPghFfNSAJeCgNs7MFJclWB 6jZw== X-Forwarded-Encrypted: i=1; AJvYcCUI5Eu+AiEePJtAJ7y9/L5HomOMQgmvf3PaNHUEvbXqtvBXm4BbiZr6xuZxhHZnoXhPDcveCNWPjJ3tvWug/iJrlbJdHpDtCQVLJas176FCk8qyVqE= X-Gm-Message-State: AOJu0YyYD5A66pzlRM6B8V38JYIhBeLvqqSG+WuFQ1vGl/3kzdWjn4c1 NqMDnwHMt5U9brcd62FTwGJBeQhf4YjlP50SGIvHL4lK8oRkSd61/4+pg+09WB1MAAkROIHh14R Djchcqw== X-Google-Smtp-Source: AGHT+IHOTIs1TEWUF2nY5PaBtklSJ7BTMufz9SMTvG0c7ZGwua7i2kerndcI2mz9IJ9qz0PZ44pVysp4aUve X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a17:902:ea11:b0:1f7:2f46:8bfa with SMTP id d9443c01a7336-1fa23f00860mr2545505ad.9.1719336384865; Tue, 25 Jun 2024 10:26:24 -0700 (PDT) Date: Tue, 25 Jun 2024 10:25:44 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-8-irogers@google.com> Mime-Version: 1.0 References: <20240625172603.900667-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v1 07/26] 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-20240625_102626_587103_6F447E5E X-CRM114-Status: GOOD ( 13.67 ) 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");