From nobody Sun Dec 14 21:33:55 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E453E22A4CB; Wed, 5 Feb 2025 09:38:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738748332; cv=none; b=hfw394DBNZNsYd3nZUxU25HdAPSZBPGaB8NcHeWLjTADPfv5NMkSawOi0m/FNZqZv3kWdoBKKcjuoyTDrAGOmDoTswXsRXDeFpm9+Pgm6R7eJDh30Dt4I36ieRn9DAwxi0UKa1rmy8t53HxLxAtMjr1JKzbEI7wbBiZYHd1hKGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738748332; c=relaxed/simple; bh=0b5mcI3yeJ75R8RDJ6x2Nov//44hQ+llYC7WJeEYQLo=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=VgzFQbMkeHgCinrxIBMm5cjsfiTWdDG1jp8rnsWByAjqFRrSBudlUYqeyTG2M6ZUsUgK3WgOemOoLDiRMdzgyguBTZ1enEgSxla/Wg/FVRhowdYppsRHnVm0KpDCDWeICLZsS5FC9km/x6owb6HqPDqcDwBY26MJ4ct6wYoQLIY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=2DRZ5iqj; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Kbyg+++d; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2DRZ5iqj"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Kbyg+++d" Date: Wed, 05 Feb 2025 09:38:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1738748329; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/KQZ8804CMtE6Pk3lRhbfIVMIhwYpLY8YRjtIlBu528=; b=2DRZ5iqjtd3eehdVEVG1YJFkkWg1FIwzQZ6gHkabrDaIF+LXPEMtV3F5wPwQgb1rOibzBW E+q0fhvx+RpVb25xMJ2maAyICzWJALpphKZq4ZWLmpeTC2/lP4eHMiBDapBJKFMA47tSuD vHfkQuqDYyacFXp3hBWRyVnwtmUDJjzkSk9a58cLVsFpbAbsVUBg2YQ8sKSmZHteUh36jn UE5Ol60QoBGS/KBBDmeIhKlEIK4jqUKW2YNiR1Ic/2QFnXOZR0GTyVnH6dXxooSfXQu2Fp Oaqz3GSqZsZh4lvmdQogdwS+Q5Zd0iJLvOgKIGim4hI0eltIYa5zDOClWnrZdw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1738748329; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/KQZ8804CMtE6Pk3lRhbfIVMIhwYpLY8YRjtIlBu528=; b=Kbyg+++d7Mm/mewFxSdoihUinyyJkfDgtpdDgCJpud42vdT37bJH7naUy/ojbc40PXu1vU HiyyZIYrMy0cRSAQ== From: "tip-bot2 for Peter Zijlstra (Intel)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf: Avoid the read if the count is already updated Cc: "Peter Zijlstra (Intel)" , Kan Liang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250121152303.3128733-3-kan.liang@linux.intel.com> References: <20250121152303.3128733-3-kan.liang@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <173874832869.10177.12492425394645250452.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: 8ce939a0fa194939cc1f92dbd8bc1a7806e7d40a Gitweb: https://git.kernel.org/tip/8ce939a0fa194939cc1f92dbd8bc1a780= 6e7d40a Author: Peter Zijlstra (Intel) AuthorDate: Tue, 21 Jan 2025 07:23:02 -08:00 Committer: Peter Zijlstra CommitterDate: Wed, 05 Feb 2025 10:29:45 +01:00 perf: Avoid the read if the count is already updated The event may have been updated in the PMU-specific implementation, e.g., Intel PEBS counters snapshotting. The common code should not read and overwrite the value. The PERF_SAMPLE_READ in the data->sample_type can be used to detect whether the PMU-specific value is available. If yes, avoid the pmu->read() in the common code. Add a new flag, skip_read, to track the case. Factor out a perf_pmu_read() to clean up the code. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20250121152303.3128733-3-kan.liang@linux.in= tel.com --- include/linux/perf_event.h | 8 +++++++- kernel/events/core.c | 33 ++++++++++++++++----------------- kernel/events/ring_buffer.c | 1 + 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 8333f13..2d07bc1 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1062,7 +1062,13 @@ struct perf_output_handle { struct perf_buffer *rb; unsigned long wakeup; unsigned long size; - u64 aux_flags; + union { + u64 flags; /* perf_output*() */ + u64 aux_flags; /* perf_aux_output*() */ + struct { + u64 skip_read : 1; + }; + }; union { void *addr; unsigned long head; diff --git a/kernel/events/core.c b/kernel/events/core.c index bcb09e0..0f8c559 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -1191,6 +1191,12 @@ static void perf_assert_pmu_disabled(struct pmu *pmu) WARN_ON_ONCE(*this_cpu_ptr(pmu->pmu_disable_count) =3D=3D 0); } =20 +static inline void perf_pmu_read(struct perf_event *event) +{ + if (event->state =3D=3D PERF_EVENT_STATE_ACTIVE) + event->pmu->read(event); +} + static void get_ctx(struct perf_event_context *ctx) { refcount_inc(&ctx->refcount); @@ -3473,8 +3479,7 @@ static void __perf_event_sync_stat(struct perf_event = *event, * we know the event must be on the current CPU, therefore we * don't need to use it. */ - if (event->state =3D=3D PERF_EVENT_STATE_ACTIVE) - event->pmu->read(event); + perf_pmu_read(event); =20 perf_event_update_time(event); =20 @@ -4618,15 +4623,8 @@ static void __perf_event_read(void *info) =20 pmu->read(event); =20 - for_each_sibling_event(sub, event) { - if (sub->state =3D=3D PERF_EVENT_STATE_ACTIVE) { - /* - * Use sibling's PMU rather than @event's since - * sibling could be on different (eg: software) PMU. - */ - sub->pmu->read(sub); - } - } + for_each_sibling_event(sub, event) + perf_pmu_read(sub); =20 data->ret =3D pmu->commit_txn(pmu); =20 @@ -7444,9 +7442,8 @@ static void perf_output_read_group(struct perf_output= _handle *handle, if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) values[n++] =3D running; =20 - if ((leader !=3D event) && - (leader->state =3D=3D PERF_EVENT_STATE_ACTIVE)) - leader->pmu->read(leader); + if ((leader !=3D event) && !handle->skip_read) + perf_pmu_read(leader); =20 values[n++] =3D perf_event_count(leader, self); if (read_format & PERF_FORMAT_ID) @@ -7459,9 +7456,8 @@ static void perf_output_read_group(struct perf_output= _handle *handle, for_each_sibling_event(sub, leader) { n =3D 0; =20 - if ((sub !=3D event) && - (sub->state =3D=3D PERF_EVENT_STATE_ACTIVE)) - sub->pmu->read(sub); + if ((sub !=3D event) && !handle->skip_read) + perf_pmu_read(sub); =20 values[n++] =3D perf_event_count(sub, self); if (read_format & PERF_FORMAT_ID) @@ -7520,6 +7516,9 @@ void perf_output_sample(struct perf_output_handle *ha= ndle, { u64 sample_type =3D data->type; =20 + if (data->sample_flags & PERF_SAMPLE_READ) + handle->skip_read =3D 1; + perf_output_put(handle, *header); =20 if (sample_type & PERF_SAMPLE_IDENTIFIER) diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 1805091..59a52b1 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -185,6 +185,7 @@ __perf_output_begin(struct perf_output_handle *handle, =20 handle->rb =3D rb; handle->event =3D event; + handle->flags =3D 0; =20 have_lost =3D local_read(&rb->lost); if (unlikely(have_lost)) {