From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794815125; b=3lTg4lRy8YlngDeZg167xAJkt7xKp2qdZZmCUoskDJgMbu8AeIolRiMaI29RT2YPX6l5 4C18omscBnXc+Mv5FktZQ40lm3bPxuILMFaJjdYwvCUSTNy7uoQJiDoPOE5et5UOftGNq e252ASL2L4Mq768qShIkwBBM+8IZfnO/Dm+dolzlfFxG7gXtVFTjTtjRc3qlChEp4dDVf JAPbGQHrnD+bUzRiGZTiod/EIdlP6uO7zcmKym967qgd38GddZE9331ai9/4erjupCHDp 8//l9NyTedV+Iae1fSr6+CNkrnVLdcQBvEh+unmedzgrxQIoV89ctYUM6ZGrYA1zj7g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794815125; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=ELM+ldKFg07MdAwKjJM6ffNXJeeGbV9sau9472qQZwk=; b=e/Vbe+5ecdV/v7DpnCoHwhECMztOX1yjeGsP2pgGVxNKjWsN6dsZff0SRXiRfGqTwz9f YJtHSOJniNOOyFAgAmPuzhC0jXanfec6ULe9pPX3QPkjf8FTW+XQVckTODC/bdqqzxkcV SspHNJW8Ni8b9qh+Ugj/SfkORNkUKunrlNfeRZL50o25nuF8eS8Lg1BAUEiirT+g2wMcI CZYFzEWjDBEGDXi11uudqNnqNsMboTWKMl97tTucYvHHDLDWkUeLZlzH015DT/WGxyIkx wPeb8HUZCYXBxsv+jq22/9EurnRx0iJVhEXKCSeEBsQ7aQBUUh3XSJesiQEDi0v50kw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=e19h0CQA; arc=none smtp.remote-ip=74.125.82.70 Received: from mail-dl1-f70.google.com (mail-dl1-f70.google.com [74.125.82.70]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8217606A88F for ; Mon, 16 Nov 2026 07:45:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A8217606A88F 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.a=rsa-sha256 header.s=20260707 header.b=e19h0CQA Received: by mail-dl1-f70.google.com with SMTP id a92af1059eb24-1b25d977b91so29837c88.1 for ; Sun, 15 Nov 2026 23:45:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794815124; x=1795419924; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ELM+ldKFg07MdAwKjJM6ffNXJeeGbV9sau9472qQZwk=; b=e19h0CQAFKmnMVHL7ZHFhC7ienGqeEUU9iIKhUBJOLk1mVCF2roKqy+0iLLzvZvRwf /2N7ih8sthLJbLikP1gDxdqIAvd1IcKJ/Kzb44ADff9xeio1VjIp+Pi7Ccf21ibovm7X T5kOeqdiRZcQ5Iz6xMoPf0AKlLEMSW30xxZyEmDWi+J5mnpj1hN+P0UbSsakyP8dLwnJ 572FtGiaxgQb4fM81N38uYCEm7XdMkGqMITp8bzmXuiLfH4xQiVP4qbuimIO96zkJa/Y 6aDY1/edXHUBDaC/3YOEpBvK0O1gcjKDTai+ySIchJAPqtJRoot7HAN3cXdC5+i5vJQp biKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794815124; x=1795419924; h=content-type: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:content-type; bh=ELM+ldKFg07MdAwKjJM6ffNXJeeGbV9sau9472qQZwk=; b=e9DA7xDyOvnhoYlh7zGsZ6ARnN940GBKeOXtpM7uR4c9fNsDhw6gRFJdINK4jAtUuZ vbOsz78RkacFvgkBOZ0HmaYEitBVup98G3DMxnPvvtbG7nlnDKjM6QMgbK64UFKgc7Rx Faa1u8mSBw3EPWfZwTpKDqinMXooFdqrPk6F+7wOA0FusiLnGc/aSuDi++XbbNxd3pCQ BrZQ0WgJ/lla8v+RBvPPrR+zYncVg7Y7fNmSLZVkair7+qqpgdLbyfh9En3o/j19Xw/c 1+WAFsbJ3qd7oA5VYiRmyzByj3f2ktkeJHbi0DJhfqQ2odXoVUmEAwKg419lThfNmX95 0nJw== X-Forwarded-Encrypted: i=1; AL+hErEmMLK2cpqWn2w6B7xuOpFTp363sZD1PRa61X4gxNidLeKZjp7sY1z5KsXbVDgB1nH4hXtj47yDCNgOPqAp5zwc@vger.kernel.org X-Gm-Message-State: APuU4Z+MO/fHcuEDHRaMp2/JfNupXWp4+Ds2872FjiyEtolF/dy5mjHe VsXgdD7aaWWYh2MBtbeHXq0NktnZJpfgitifZXJBoP3ntfzMv3zkdGNhcBgjX/FWNDW9/7hEMnC LARw0phTcEg== X-Received: from dlbvv19.prod.google.com ([2002:a05:7022:5f13:b0:143:7311:4b88]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:4508:10b0:1b3:ac23:611f with SMTP id a92af1059eb24-1b50311d310mr9543019c88.28.1794815123285; Sun, 15 Nov 2026 23:45:23 -0800 (PST) Date: Sun, 15 Nov 2026 23:44:03 -0800 In-Reply-To: <20261116074414.3174737-1-irogers@google.com> X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261116074414.3174737-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.703.gf848ed807c-goog Message-ID: <20261116074414.3174737-9-irogers@google.com> Subject: [PATCH v3 08/19] perf session: Avoid double byte-swapping re-parsed deferred samples From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , Ihor Solodrai , Leo Yan , Dmitry Vyukov , "Steinar H . Gunderson" , Stephen Brennan , Thomas Falcon , linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" When perf_session__deliver_event() processes a cross-endian sample, __evsel__parse_sample() is invoked with needs_swap=true and byte-swaps payload regions such as PERF_SAMPLE_RAW, PERF_SAMPLE_BRANCH_STACK, and PERF_SAMPLE_AUX in-place in the event buffer. If the sample has a deferred callchain and merge_deferred_callchains is enabled, machines__deliver_event() copies that already-parsed event into de->event. Later, evlist__deliver_deferred_callchain() (potentially on multiple iterations before finding a matching tid) and session__flush_deferred_samples() re-parse de->event via evlist__parse_sample(), which runs __evsel__parse_sample() again with evsel->needs_swap still true, double-swapping in-place fields. Meanwhile, pyrf_event__copy() re-parses copied events with needs_swap=false, which misses PERF_SAMPLE_TID, PERF_SAMPLE_CPU, and PERF_SAMPLE_RAW's size word because they were only unswapped into local variables. Finish unswapping PERF_SAMPLE_TID, PERF_SAMPLE_CPU, and PERF_SAMPLE_RAW's size prefix in-place during the initial cross-endian parse so the entire sample buffer is in host layout afterwards, filter deferred samples by stored tid before re-parsing, and re-parse de->event via evlist__parse_sample_unswapped(). Fixes: 9b4525fd089d ("perf tools: Merge deferred user callchains") Signed-off-by: Ian Rogers --- tools/perf/util/evlist.c | 38 +++++++++++++++++++++++++++++--------- tools/perf/util/evlist.h | 2 ++ tools/perf/util/evsel.c | 10 +++++++++- tools/perf/util/session.c | 14 +++++++------- 4 files changed, 47 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index c2402e4791b6..ec665828d4e3 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1935,17 +1935,12 @@ void evlist__cancel_workload(struct evlist *evlist) } } -int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample) +static int __evlist__parse_sample(struct evlist *evlist, struct evsel *evsel, + union perf_event *event, + struct perf_sample *sample, bool needs_swap) { - struct evsel *evsel = evlist__event2evsel(evlist, event); - int ret; + int ret = __evsel__parse_sample(evsel, event, sample, needs_swap); - if (!evsel) { - /* Ensure the sample is okay for perf_sample__exit. */ - perf_sample__init(sample, /*all=*/false); - return -EFAULT; - } - ret = evsel__parse_sample(evsel, event, sample); if (ret) return ret; if (perf_guest && sample->id) { @@ -1959,6 +1954,31 @@ int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct return 0; } +int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample) +{ + struct evsel *evsel = evlist__event2evsel(evlist, event); + + if (!evsel) { + /* Ensure the sample is okay for perf_sample__exit. */ + perf_sample__init(sample, /*all=*/false); + return -EFAULT; + } + return __evlist__parse_sample(evlist, evsel, event, sample, evsel->needs_swap); +} + +int evlist__parse_sample_unswapped(struct evlist *evlist, union perf_event *event, + struct perf_sample *sample) +{ + struct evsel *evsel = evlist__event2evsel(evlist, event); + + if (!evsel) { + /* Ensure the sample is okay for perf_sample__exit. */ + perf_sample__init(sample, /*all=*/false); + return -EFAULT; + } + return __evlist__parse_sample(evlist, evsel, event, sample, /*needs_swap=*/false); +} + int evlist__parse_sample_timestamp(struct evlist *evlist, union perf_event *event, u64 *timestamp) { struct evsel *evsel = evlist__event2evsel(evlist, event); diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 0f380421e03d..e42d590d4732 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -450,6 +450,8 @@ bool evlist__sample_id_all(struct evlist *evlist); u16 evlist__id_hdr_size(struct evlist *evlist); int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample); +int evlist__parse_sample_unswapped(struct evlist *evlist, union perf_event *event, + struct perf_sample *sample); int evlist__parse_sample_timestamp(struct evlist *evlist, union perf_event *event, u64 *timestamp); bool evlist__valid_sample_type(struct evlist *evlist); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 737a8680aaae..322582bb4f40 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3520,6 +3520,7 @@ int __evsel__parse_sample(struct evsel *evsel, union perf_event *event, u.val64 = bswap_64(u.val64); u.val32[0] = bswap_32(u.val32[0]); u.val32[1] = bswap_32(u.val32[1]); + *(__u64 *)array = u.val64; } data->pid = u.val32[0]; @@ -3554,6 +3555,8 @@ int __evsel__parse_sample(struct evsel *evsel, union perf_event *event, /* undo swap of u64, then swap on individual u32s */ u.val64 = bswap_64(u.val64); u.val32[0] = bswap_32(u.val32[0]); + u.val32[1] = bswap_32(u.val32[1]); + *(__u64 *)array = u.val64; } data->cpu = u.val32[0]; @@ -3665,7 +3668,12 @@ int __evsel__parse_sample(struct evsel *evsel, union perf_event *event, /* mem_bswap_64() accesses complete 64-bit words. */ sz = roundup((u64)data->raw_size, sizeof(u64)); OVERFLOW_CHECK(raw, sz, max_size); - mem_bswap_64((void *)raw, data->raw_size); + if (data->raw_size) { + mem_bswap_64((void *)raw, data->raw_size); + *(u32 *)raw = data->raw_size; + } else { + *(__u64 *)raw = u.val64; + } } data->raw_data = (void *)array; array = (void *)array + data->raw_size; diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index a58b4fe44b62..ec1ea510ae61 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1933,6 +1933,7 @@ struct deferred_event { struct list_head list; union perf_event *event; u64 file_offset; + u32 tid; }; /* @@ -1964,8 +1965,11 @@ static int evlist__deliver_deferred_callchain(struct evlist *evlist, struct perf_sample orig_sample; struct evsel *new_evsel; + if (sample->tid != de->tid) + continue; + perf_sample__init(&orig_sample, /*all=*/false); - ret = evlist__parse_sample(evlist, de->event, &orig_sample); + ret = evlist__parse_sample_unswapped(evlist, de->event, &orig_sample); if (ret < 0) { pr_err("failed to parse original sample\n"); perf_sample__exit(&orig_sample); @@ -1973,11 +1977,6 @@ static int evlist__deliver_deferred_callchain(struct evlist *evlist, } orig_sample.file_offset = de->file_offset; - if (sample->tid != orig_sample.tid) { - perf_sample__exit(&orig_sample); - continue; - } - if (event->callchain_deferred.cookie == orig_sample.deferred_cookie) sample__merge_deferred_callchain(&orig_sample, sample); else @@ -2027,7 +2026,7 @@ static int session__flush_deferred_samples(struct perf_session *session, } perf_sample__init(&sample, /*all=*/false); - ret = evlist__parse_sample(evlist, de->event, &sample); + ret = evlist__parse_sample_unswapped(evlist, de->event, &sample); if (ret < 0) { pr_err("failed to parse original sample\n"); perf_sample__exit(&sample); @@ -2120,6 +2119,7 @@ static int machines__deliver_event(struct machines *machines, } memcpy(de->event, event, sz); de->file_offset = sample->file_offset; + de->tid = sample->tid; list_add_tail(&de->list, evlist__deferred_samples(evlist)); return 0; } -- 2.56.1.703.gf848ed807c-goog