From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE9C924E4AF for ; Mon, 13 Apr 2026 01:23:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776043399; cv=none; b=TLFeT/YnbG/f/hX9JIWRZQe55keFCWVJeVfuKzCfs3K/HP6ibN6DePjB3HlMqT5Xq2eol6EyMS0DhpWnFjtqSdzlb0Zk3fMWQFzDxbh32O6A7gud4N4IbXJGrwdG5CKn5X9Sz3ueILBz3JL9eBqCx7OlekgJPrN7a+1o+2VjiSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776043399; c=relaxed/simple; bh=p3zEoq/bmQlpgAQt3/UAgTTaA4JyI4UO/QfGKpe/qI0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lem/vF3zQPweSwEPOhPe8GgWfKu1WiYPakzUuDcpQnEWBB+OCEhJToa7hYjdjX/wLTlnsuG8Lm5rSomxlrCVptObtwQn3Y7sMVvMr6NpOhzlNxQe0AhowssxRIX3JsF58FySgZW/378h45QecXb7ieqokI2oOxR9pyYMTakXT0o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vBepE8bQ; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vBepE8bQ" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12c20d5d7f4so13204318c88.1 for ; Sun, 12 Apr 2026 18:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776043398; x=1776648198; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=f8QqzSuQNDbhCu1T3qPBkA3LFLyljNgjUWQeDCGZhEI=; b=vBepE8bQhfwC7goW+EbUo6hG8YrCCma/Bt1L0fkcsFTUkd3onVvuE3FggwEG1M3zEw C+oZZXF5qux2HyzC+y+5RNF4UIqjxWsp2VajA7Sj6ZU4q9D5vnzXc7hHtu66u8uNvxKZ eMOGtU4j4zMo741NXyhMjXIF8nKYdDWqxKgfk44QXpRyKvB9FNByrrMH/9MYYGO2Hv4T bDEm/Ulru3KEMTZzLoc7+ZBCvR7Y1a6Wk/9zGXCAEJ/9TNSbK2IurDKt0579vm1UPxet FrVNvsLM4TGPw4RyS1TP8p83iZRuArBHwunU+vimJZ4yni+/a8ETKijfW7zCIDf8Njfi wp8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776043398; x=1776648198; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f8QqzSuQNDbhCu1T3qPBkA3LFLyljNgjUWQeDCGZhEI=; b=NiGwXzOkOo7gQu7TO2QTKHQieiNl7Jlyf3W+X/da7HDuqGB9MGoR9ROurUObMk3F6x m5aQeYFLfdJkpuKjcX38xy7DZxKdMRCjH9nBx8he6sN55lC6EHBZvq4Ci0L+92fVURy4 sazQs/G4vvWM9E5JzERm1/+/PuFP7sw10XU52hZ34V1iWJDbAwZLod0JgVmnRlAG0RbL ILVkRoD73NzwTidxJYT+l/08/5jWI3WyzU/z7z+unOrnnRs7dDAXUCAmmbyjsDH6OYvD lL5Tn24ijXFWXt/jJV2QsDnH31zR5jEpy/Z+7juB0ip1SN6oH1z/FC9aQOwNEtmQ2/JQ h3iA== X-Forwarded-Encrypted: i=1; AFNElJ8EdEDUDdttTwMys+M2yLENmepxiUZgasoEbF/1wkh6W1Nx43rBEAVHfYJbQ/c8OU4mw+D0eZ4um7aNsuY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1VCFThUyKaOFheTHmPTx0ZsOqVvfh/B7ftrev5wSpR0jojTb1 rYUkMNKMdZqK1dVJiXKRySS+afDKTv0bQlgm/RNpE8jUKbQWawXGFKLtLUDG9dbXXoQx6uWXkCU jEpp/PAhtWA== X-Received: from dyji40.prod.google.com ([2002:a05:7300:7a28:b0:2d8:dd18:baee]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:8c85:b0:2c5:50fe:c782 with SMTP id 5a478bee46e88-2d5871bc6b9mr6192275eec.3.1776043397595; Sun, 12 Apr 2026 18:23:17 -0700 (PDT) Date: Sun, 12 Apr 2026 18:22:15 -0700 In-Reply-To: <20260413012227.1089445-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260412020833.641177-1-irogers@google.com> <20260413012227.1089445-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260413012227.1089445-22-irogers@google.com> Subject: [PATCH v11 21/33] perf s390-sample-raw: Don't pass evsel or its PMU with sample From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, ajones@ventanamicro.com, ak@linux.intel.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, anup@brainfault.org, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, blakejones@google.com, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dvyukov@google.com, howardchu95@gmail.com, hrishikesh123s@gmail.com, james.clark@linaro.org, jolsa@kernel.org, krzysztof.m.lopatowski@gmail.com, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux@treblig.org, mingo@redhat.com, nichen@iscas.ac.cn, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, ravi.bangoria@amd.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, thomas.falcon@intel.com, tianyou.li@intel.com, yujie.liu@intel.com, zhouquan@iscas.ac.cn Content-Type: text/plain; charset="UTF-8" The sample contains the evsel and its PMU so it is unnecessary to pass the evsel as well. Signed-off-by: Ian Rogers --- tools/perf/util/s390-sample-raw.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sample-raw.c index c6ae0ae8d86a..52bbca5c56c8 100644 --- a/tools/perf/util/s390-sample-raw.c +++ b/tools/perf/util/s390-sample-raw.c @@ -222,8 +222,9 @@ static char *get_counter_name(int set, int nr, struct perf_pmu *pmu) return result; } -static void s390_cpumcfdg_dump(struct perf_pmu *pmu, struct perf_sample *sample) +static void s390_cpumcfdg_dump(struct perf_sample *sample) { + struct perf_pmu *pmu = sample->evsel->pmu; size_t i, len = sample->raw_size, offset = 0; unsigned char *buf = sample->raw_data; const char *color = PERF_COLOR_BLUE; @@ -284,8 +285,9 @@ static bool s390_pai_all_test(struct perf_sample *sample) return true; } -static void s390_pai_all_dump(struct evsel *evsel, struct perf_sample *sample) +static void s390_pai_all_dump(struct perf_sample *sample) { + struct evsel *evsel = sample->evsel; size_t len = sample->raw_size, offset = 0; unsigned char *p = sample->raw_data; const char *color = PERF_COLOR_BLUE; @@ -332,31 +334,32 @@ void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample) { const char *pai_name; - struct evsel *evsel; if (event->header.type != PERF_RECORD_SAMPLE) return; - evsel = evlist__event2evsel(evlist, event); - if (!evsel) - return; + if (!sample->evsel) { + sample->evsel = evlist__event2evsel(evlist, event); + if (!sample->evsel) + return; + } /* Check for raw data in sample */ if (!sample->raw_size || !sample->raw_data) return; /* Display raw data on screen */ - if (evsel->core.attr.config == PERF_EVENT_CPUM_CF_DIAG) { - if (!evsel->pmu) - evsel->pmu = perf_pmus__find("cpum_cf"); + if (sample->evsel->core.attr.config == PERF_EVENT_CPUM_CF_DIAG) { + if (!sample->evsel->pmu) + sample->evsel->pmu = perf_pmus__find("cpum_cf"); if (!s390_cpumcfdg_testctr(sample)) pr_err("Invalid counter set data encountered\n"); else - s390_cpumcfdg_dump(evsel->pmu, sample); + s390_cpumcfdg_dump(sample); return; } - switch (evsel->core.attr.config) { + switch (sample->evsel->core.attr.config) { case PERF_EVENT_PAI_NNPA_ALL: pai_name = "NNPA_ALL"; break; @@ -370,8 +373,8 @@ void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, if (!s390_pai_all_test(sample)) { pr_err("Invalid %s raw data encountered\n", pai_name); } else { - if (!evsel->pmu) - evsel->pmu = perf_pmus__find_by_type(evsel->core.attr.type); - s390_pai_all_dump(evsel, sample); + if (!sample->evsel->pmu) + sample->evsel->pmu = perf_pmus__find_by_type(sample->evsel->core.attr.type); + s390_pai_all_dump(sample); } } -- 2.53.0.1213.gd9a14994de-goog