From patchwork Sat Jun 29 04:53:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716805 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 294BCC27C4F for ; Sat, 29 Jun 2024 04:58: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=rpdjN8s5wB9rzl2Ip7o2ZK0FxU3Lu7ldCcmvQXtJM2M=; b=jfrzKD2I/CJTfZ4cvesb70z8R2 jKMDdPrlrhYkPwYDUrXPPw8HSJUDbF1gQzTrFJ8cKbOhdbqDbRQ3qBbP6BS2dXSCydU8rcPpG9SbS Pqwdh+YxuDHol7WfzN2ua+dAktoDKxITp02HWca3o/f9/OUFldp115driffOdmt37bve41jtAZcJN pWf+gQTk0zUekPAEgbv2d9MVppKg6sq0owp4GE/6vc3TO4PROvL84lJI9pHOFwSZNgegwXH+6KXQu Kz5cRmB0KqSAI9iFAh9FJwht/WF+uA6N4FdVUW4Z/bZDyqL5YIkysc1TWaSgxg/pkVAP9Z3mG+qiM mBUWEPiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQA6-0000000Ft3O-0ugK; Sat, 29 Jun 2024 04:58:10 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ6X-0000000Fr6t-2ZvA for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:32 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-632588b1bdeso27924717b3.2 for ; Fri, 28 Jun 2024 21:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636868; x=1720241668; 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=rpdjN8s5wB9rzl2Ip7o2ZK0FxU3Lu7ldCcmvQXtJM2M=; b=VC9QVP0iz/rFYnD0OC/RFv1+g/4s+tiO8Y1uObg0h7oAcNGjgvQAjWg0wJP2lJTYmp EU/DUCslTOfy/I2/yqGEGDx4WIKClgLcRKPZkqG2iG0Q9BvyPDR7TvSEmA4Evv8vjjO5 tiXB/g0RnyHg7/fn56P/Uw1K/ZNtfMOa87dYAO6bcTJppDs4/flZyFYNJuAZE1vXXJ8J cEZZ5KXYNSIEfSAcy6rPJlvcAy9tlUUKioc/Zsb2v68UXK02eeN0NWrT5SsRCxKAXPVS 3nP0t9ERZCKYV20JddZnVnM+ngUNxXWwYnC2WVXajpXuCU3Od2suOu26pV1N84E+q50A IDWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636868; x=1720241668; 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=rpdjN8s5wB9rzl2Ip7o2ZK0FxU3Lu7ldCcmvQXtJM2M=; b=p9SYMlw4cml6V+XRvjvX3XmzyE9tZcPf90i5cFs8CMqgZCe4d8hJtT+LhkDvSvEFrq J0inc5W3/BeoNrdKT58ijNtDiblZ2B5i3fcbGJyeRqkBCB3rzwQfuBaZRcBU14R3zN3X jItBgrtJ7hCz/hYkdMYuzLs58X/bI6tA7gOoSXzBn+1CJ6BqZYgunsu6Jyem08aSg4BU E2eQc80ufND7lkdt3khFbaViegin2Z+VIQa9K4dOrJN7HTJm213rje+nCe/ZCaBOT890 dBTMsiRhGBg9rlmbusG6WYwh0ZjNaWT1AC7CAI3ix7xlgvtqoQj9/4iMBJMPSYeXYSgx WbaA== X-Forwarded-Encrypted: i=1; AJvYcCVysP8Nls4JQAu4JhlCp/U240kYTnc1KI0SvmdSCpGnyRk52hNi+MahfM8RWXhy2U1R8i0/goKFlegzvfZfK3bKrkkorE0PFBDBV8SeI41rQDDGDdY= X-Gm-Message-State: AOJu0YxV2Y9qAWNgzbYwf/lE54fnwsdhU1elBady+LJlfd+gzQmYawru ml6gh1I3OjgZIq0yPUxk6rBf8bHBCWA0s5AEjySy+xxz8w0ZSbDSPhtNkBavsl1FgBqUMwcBXOp Jtr8sFg== X-Google-Smtp-Source: AGHT+IGOKM+g4XrnJTUAvGw3TmUrRS3o4+KVzhyYtt6vHOujwVUTKi9JPoVkhRp1pYVkidwItBHibGKxyLKg X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a0d:ea54:0:b0:62a:4932:68de with SMTP id 00721157ae682-64c7360704dmr34117b3.8.1719636868301; Fri, 28 Jun 2024 21:54:28 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:31 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-10-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 09/28] perf kvm: 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_215429_821771_43D47965 X-CRM114-Status: GOOD ( 13.16 ) 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-kvm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index a3b903cf4311..692267b1b7e8 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -1603,19 +1603,17 @@ static int read_events(struct perf_kvm_stat *kvm) { int ret; - struct perf_tool eops = { - .sample = process_sample_event, - .comm = perf_event__process_comm, - .namespaces = perf_event__process_namespaces, - .ordered_events = true, - }; struct perf_data file = { .path = kvm->file_name, .mode = PERF_DATA_MODE_READ, .force = kvm->force, }; - kvm->tool = eops; + perf_tool__init(&kvm->tool, /*ordered_events=*/true); + kvm->tool.sample = process_sample_event; + kvm->tool.comm = perf_event__process_comm; + kvm->tool.namespaces = perf_event__process_namespaces; + kvm->session = perf_session__new(&file, &kvm->tool); if (IS_ERR(kvm->session)) { pr_err("Initializing perf session failed\n"); @@ -1919,14 +1917,13 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, /* event handling */ + perf_tool__init(&kvm->tool, /*ordered_events=*/true); kvm->tool.sample = process_sample_event; kvm->tool.comm = perf_event__process_comm; kvm->tool.exit = perf_event__process_exit; kvm->tool.fork = perf_event__process_fork; kvm->tool.lost = process_lost_event; kvm->tool.namespaces = perf_event__process_namespaces; - kvm->tool.ordered_events = true; - perf_tool__fill_defaults(&kvm->tool); /* set defaults */ kvm->display_time = 1;