From patchwork Sat Jun 29 04:53:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716790 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 D0A14C27C4F for ; Sat, 29 Jun 2024 04:56:18 +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=SJsf6c3nLHtNKwj8s9NHyYgKgE50TTB53CM1nmVFjJs=; b=tSLtMwYdGr9jkgug0QaBYIsce+ FGDrhCxxgXNHrX8/iljL+gZPUv/sB/RZVLa895xXt1LmhdRjvwV4MWCTfvLZDb1z4lln2i8BvBFI+ oA7qzhLQ6Yamb/u8gVbkkUGFnf/SV2MbTb6V/p0y7LxrZZ8qElPXlkp29rLQrNsgIkl51Nm9e0vF1 8shAhEl6GZAgzcl1bZ6rZMPG9M/xsxTmPCHYj64PRjorQ+LwNbyzMFQow1D+k5ksMoc8R3ZTY3gc8 g8lHwMkgUq7wtPA6S+8G8xal6NasWzl4E8EMciABnzoA6NsnRzKgqLSg+b7uJTLytMtHx0TCHjRRw YYKh2IlQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ86-0000000Frzb-26z4; Sat, 29 Jun 2024 04:56:06 +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 1sNQ6Z-0000000Fr84-2VoT for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:33 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-e036440617fso1827434276.1 for ; Fri, 28 Jun 2024 21:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636870; x=1720241670; 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=SJsf6c3nLHtNKwj8s9NHyYgKgE50TTB53CM1nmVFjJs=; b=ZRDa63oIbPsxY+s6Y+LgwKXD/KacflpHU3HeMVOSJ9uyJMVBjl1uk1NQzC/u25qh20 /5rF16sEIE6CXSve3metAPH4Bd6DlEEayIzqiZ1VJxG9xwn/OyjCsz35H6MYg1WLXY/6 X02mknopty8fpS8AHk6CzF/0Hzfy7GB8GQUui8sDP7dsvda8rNdS4NpD+SSpkL20kvYd wG/zGzFkoFCWKW80c5pgOFEgVdBVTK3qq4W2gf49DlzDePq4a+L0RD43iALAp95msRee 1sbxmgdMLDW3t3Jfq6EfYV6QwqR3igAhoawaOsG76ijTyky2wM3ClJBFLnPY5Jnz+ab3 7TMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636870; x=1720241670; 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=SJsf6c3nLHtNKwj8s9NHyYgKgE50TTB53CM1nmVFjJs=; b=SdK+b6NOFQs2L3tbctWAJKWDtiRcR8cgNiznQLVDOnuCnazzvqe5pfDsisBOhdADVh bA5FoRfkDT4eDZidBDgOPlhn59visv4vvKvpZm2VZVOYzq31n7+Zu1Ae45s4DBJZWJuv pjQTaZHQo4dIOt0ZLCAmztP2M8HgGuzsedbE97xMOlIuV0GogKcFU3kTyta2X2U716+s skOv630vuH7rMo02Dvp1rVpU8gWiP4n7VQnwp3Dx7PjjoSay9kOfFIAijFt+4rn5NNLL 4rKPdH6PSSfUmH5ls8QSdCd/OWtoR+fQV1LqfMO8tvGWBZlyF/BbVOQiZRv3QLECcTrq apYQ== X-Forwarded-Encrypted: i=1; AJvYcCU3JpAxmMaLu/4/LiSgl1o/FoYoL3DIVUwnP1lQDoccavx9Na6hRz343TuR12X1FyXctat0wOv1Fo5kS7wvRlYdMngrwCg3ZWgyESOZRKSC3ezgwr4= X-Gm-Message-State: AOJu0YzNkuCfl8u7FIRvpPFyOi6Iwv1cpL5OLFn+7xX0RvQOOsoX4AEc 5WpUlXlxH8tX/U7yYdoSATWvEGBxMhzJL/QX+dlhU7gB9FyXtGlhuxAYvnF3kDYX7s+g9Xf+uSH NOlQkcA== X-Google-Smtp-Source: AGHT+IHBuals/aehTdAhZ4NXFT1QkYgIb3fJfqmnR2TQzmGp3twPbjHBFtlF3mFyTyEe1cQ2t21rdGyN49BP X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a25:db85:0:b0:e03:572c:30d8 with SMTP id 3f1490d57ef6-e036ec5d6e6mr568276.11.1719636870256; Fri, 28 Jun 2024 21:54:30 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:32 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-11-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 10/28] 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 , 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_215431_736700_E3E2EB88 X-CRM114-Status: GOOD ( 13.76 ) 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");