From nobody Thu Dec 18 19:06:15 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 5467D143C45; Mon, 29 Jul 2024 10:24:49 +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=1722248690; cv=none; b=kEu76J+FUOKxDQMXG1OWA+4dakE6hJZ1qjsLLWAdUuBUVCbUipyM8/v8leb241/L0HPTr5lhTP6zBakpsXPfTJl8zsKUFGgNuC6/zrjEXTdLoaCoCrxgrHiTrF8gU2zgCzL7JNz8rDFTDVL6AlMON/GinnNw4y9UOv81UaGofIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722248690; c=relaxed/simple; bh=GyEabJ/PhR1HqjJhUhqj2yEPrP805lsfbFuQ6FRqidc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=LL1cA3p4Pd9EXHAso2Hfu89EnWvBPkkgnyDVLzeHui9HzNsjB5L8HiUeaY9iQGoqRQNT/pFzhbM6kUk84DGGi2htY2zB8Jh8jGXaydq7YKFYlt4wvk6JQOcUxqZkyu6wmIIYhwh7VOrY5pzwHAt/rOAVU22QHiHpJrrMEAtaRmo= 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=Kt68cBox; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=jvS2qykC; 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="Kt68cBox"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="jvS2qykC" Date: Mon, 29 Jul 2024 10:24:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1722248687; 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=8BsM0yB6pC5LEnh16wgLhfO7O6M713vInT5ihipDKCs=; b=Kt68cBoxj6/9HLJoZSIeSjnEjSHEGT9Gjc2dyK2i+yfiYrt+wMXba483iBQtxSkliiVCEy z6LzUYeI1++7+ktYkzc86aHvom7/ZXOJqcX//M3Ip4r/oPz2Zon3ot6F5TZLWgAPXpmmjR A9hlZtySVfqm7YHaXhVpk0OCvehE8r4z8ERDg0w47uNEpFc0VVoxDrKcShixvMcnvbDrkb dwyAjGLN5F0jJ+3NJr1lhrvEStbpuXYCBzMfvIj1v3y6fzTHESFwb/SLzBVZmyhkHX3sSi GqV6sCU7kEOCr/ISgTAPt4Zne4aSrOFoS1fn16CCQ4JrRUxydA1F3dgkmBimXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1722248687; 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=8BsM0yB6pC5LEnh16wgLhfO7O6M713vInT5ihipDKCs=; b=jvS2qykCEU/BRvN07qmQm8guC1SGsl7oHtAklL7p+Dpe4Mxl7KblYNdpepnFbXkE6b6e02 4JhZhdnCMPJSx0Ag== From: "tip-bot2 for Adrian Hunter" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/x86/intel: Do not enable large PEBS for events with aux actions or aux sampling Cc: Adrian Hunter , "Peter Zijlstra (Intel)" , Andi Kleen , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240715160712.127117-5-adrian.hunter@intel.com> References: <20240715160712.127117-5-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <172224868735.2215.3187465377441491823.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: 6763ebdb4983f55ac1ded291d170046d029a7539 Gitweb: https://git.kernel.org/tip/6763ebdb4983f55ac1ded291d170046d0= 29a7539 Author: Adrian Hunter AuthorDate: Mon, 15 Jul 2024 19:07:03 +03:00 Committer: Peter Zijlstra CommitterDate: Mon, 29 Jul 2024 12:16:24 +02:00 perf/x86/intel: Do not enable large PEBS for events with aux actions or aux= sampling Events with aux actions or aux sampling expect the PMI to coincide with the event, which does not happen for large PEBS, so do not enable large PEBS in that case. Signed-off-by: Adrian Hunter Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Andi Kleen Link: https://lkml.kernel.org/r/20240715160712.127117-5-adrian.hunter@intel= .com --- arch/x86/events/intel/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 0c9c270..3d3b841 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3962,8 +3962,8 @@ static int intel_pmu_hw_config(struct perf_event *eve= nt) =20 if (!(event->attr.freq || (event->attr.wakeup_events && !event->attr.wat= ermark))) { event->hw.flags |=3D PERF_X86_EVENT_AUTO_RELOAD; - if (!(event->attr.sample_type & - ~intel_pmu_large_pebs_flags(event))) { + if (!(event->attr.sample_type & ~intel_pmu_large_pebs_flags(event)) && + !has_aux_action(event)) { event->hw.flags |=3D PERF_X86_EVENT_LARGE_PEBS; event->attach_state |=3D PERF_ATTACH_SCHED_CB; }