From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D0E321D45E8 for ; Sat, 11 Jul 2026 11:38:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783769887; cv=none; b=nZxPpnI8SftxAbxUt/qDQuPIOZOcxwdKaxdCt4AzosjdSy5VtjPFDfaW60AyuQaSibaH6t71DADUzaZ6G08E0kfQ9Yx9stwAgUcdgYvjfEC67RUWc7NcyReuDY2uaKlcQOVnaAhUucJbZMdL+ZdRlGJcJl9I1qGCp6oC/A3fL/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783769887; c=relaxed/simple; bh=6h1CeNqB9j8GqRu4FsHtIR15MzcID/7pL6a5v8GIIR0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=QwxHyUjFKlDPl8oM2lGin+pWDkc7FPIY5KX+Ham9vMVO2UVl3AnZw0Kem9cg6wPigXyuhYR9h2IHMirH+Eg1iPhC5MT45rzGaPR/aEZvBtHjZGrB2qY28Ovdt4AjD0BpmrFLHJwf8rmsfG2Ftf2Ec7NE96RHH+HerUiFdyKee+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YT+ba/Su; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YT+ba/Su" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7A681F000E9; Sat, 11 Jul 2026 11:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783769885; bh=YAfttrARYOMBlw1ycJv8Psp1cwvLlHD5jzn2hZ4+064=; h=Date:From:To:Cc:Subject; b=YT+ba/SuVcIgLr3LvwPAL5RIT5k2icbvM1ujSJxguFT2uTfaRs8iEOfWIQciO/4iR nh4YMxTb+1UUU5Tu5/4mEPWuF8pp8EsMiESihwIynjZ6+1z5PH3oLPV71DaLJI3r+r abcua7Bf1rGUltaQGolBd2n0LTpGVB1taP5kHqxm00DdlWLYuty6IDryygiU7ZOCY+ RB/Z0MO8gOM2p3PpgfqdAJe/j6IvpUfHWREqkg3orxVrKUHaoNp1eDcjhfyfY83XUg km6XMt7mYNGcGScETCzYFoR5UYZSeASGI+Yz7wn9/of4SU7E/oJkcMZtJ/Pybtm5Nx rRImkn3jnjZBw== Date: Sat, 11 Jul 2026 13:38:01 +0200 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , Alexander Shishkin , Mark Rutland , Namhyung Kim Subject: [GIT PULL] perf events fixes Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Linus, Please pull the latest perf/urgent Git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2026-07-11 for you to fetch changes up to 47915e855fb38b42133e31ba917d99565f862154: Misc perf events fixes: - Fix SVM #GP on AMD CPUs that LBR but not BRS (Sandipan Das) - Fix UAF bug in the perf AUX code (Lee Jia Jie) - Fix address leakage in the AMD LBR code (Sandipan Das) - Fix address leakage in the AMD BRS code (Sandipan Das) Thanks, Ingo ------------------> Lee Jia Jie (1): perf/aux: Fix page UAF in map_range() Sandipan Das (3): perf/x86/amd/core: Avoid enabling BRS from the SVM reload path perf/x86/amd/lbr: Fix kernel address leakage perf/x86/amd/brs: Fix kernel address leakage arch/x86/events/amd/brs.c | 10 +++++----- arch/x86/events/amd/core.c | 12 ++++++++---- arch/x86/events/amd/lbr.c | 3 ++- kernel/events/core.c | 2 ++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/arch/x86/events/amd/brs.c b/arch/x86/events/amd/brs.c index 06f35a6b58a5..dc564688f3d7 100644 --- a/arch/x86/events/amd/brs.c +++ b/arch/x86/events/amd/brs.c @@ -259,13 +259,13 @@ void amd_brs_disable_all(void) amd_brs_disable(); } -static bool amd_brs_match_plm(struct perf_event *event, u64 to) +static bool amd_brs_match_plm(struct perf_event *event, u64 from, u64 to) { int type = event->attr.branch_sample_type; int plm_k = PERF_SAMPLE_BRANCH_KERNEL | PERF_SAMPLE_BRANCH_HV; int plm_u = PERF_SAMPLE_BRANCH_USER; - if (!(type & plm_k) && kernel_ip(to)) + if (!(type & plm_k) && (kernel_ip(to) || kernel_ip(from))) return 0; if (!(type & plm_u) && !kernel_ip(to)) @@ -338,11 +338,11 @@ void amd_brs_drain(void) */ to = (u64)(((s64)to << shift) >> shift); - if (!amd_brs_match_plm(event, to)) - continue; - rdmsrq(brs_from(brs_idx), from); + if (!amd_brs_match_plm(event, from, to)) + continue; + perf_clear_branch_entry_bitfields(br+nr); br[nr].from = from; diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c index 6569048a8c1c..a787409f5a62 100644 --- a/arch/x86/events/amd/core.c +++ b/arch/x86/events/amd/core.c @@ -754,13 +754,11 @@ static void amd_pmu_enable_event(struct perf_event *event) x86_pmu_enable_event(event); } -static void amd_pmu_enable_all(int added) +static void __amd_pmu_enable_all(void) { struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events); int idx; - amd_brs_enable_all(); - for_each_set_bit(idx, x86_pmu.cntr_mask, X86_PMC_IDX_MAX) { /* only activate events which are marked as active */ if (!test_bit(idx, cpuc->active_mask)) @@ -775,6 +773,12 @@ static void amd_pmu_enable_all(int added) } } +static void amd_pmu_enable_all(int added) +{ + amd_brs_enable_all(); + __amd_pmu_enable_all(); +} + static void amd_pmu_v2_enable_event(struct perf_event *event) { struct hw_perf_event *hwc = &event->hw; @@ -1561,7 +1565,7 @@ static inline void amd_pmu_reload_virt(void) * set global enable bits once again */ amd_pmu_v2_disable_all(); - amd_pmu_enable_all(0); + __amd_pmu_enable_all(); amd_pmu_v2_enable_all(0); return; } diff --git a/arch/x86/events/amd/lbr.c b/arch/x86/events/amd/lbr.c index 5b437dc8e4ce..9d9c961989d5 100644 --- a/arch/x86/events/amd/lbr.c +++ b/arch/x86/events/amd/lbr.c @@ -127,7 +127,8 @@ static void amd_pmu_lbr_filter(void) } /* If type does not correspond, then discard */ - if (type == X86_BR_NONE || (br_sel & type) != type) { + if (type == X86_BR_NONE || (br_sel & type) != type || + (!(br_sel & X86_BR_KERNEL) && kernel_ip(cpuc->lbr_entries[i].from))) { cpuc->lbr_entries[i].from = 0; /* mark invalid */ compress = true; } diff --git a/kernel/events/core.c b/kernel/events/core.c index d7f3e2c2ecb1..ba5bd6a78fe7 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7150,6 +7150,8 @@ static int map_range(struct perf_buffer *rb, struct vm_area_struct *vma) int err = 0; unsigned long pagenum; + guard(mutex)(&rb->aux_mutex); + /* * We map this as a VM_PFNMAP VMA. *