Re: [PATCH v2 2/3] perf/amd/ibs: Fix kernel address leak via REGS_USER and REGS_INTR

[Mi, Dapeng]

LGTM. Thanks.

Reviewed-by: Dapeng Mi <dapeng1.mi@xxxxxxxxxxxxxxx>

On 10/26/2026 12:18 PM, Ravi Bangoria wrote:
> IBS hardware captures a sample and raises an NMI. Since the NMI can be
> delivered with a delay, a privilege change may occur between sample
> capture and NMI delivery. Because IBS only provides the sample RIP, the
> kernel records GPRs from the NMI pt_regs, which may reflect kernel mode
> if a privilege switch occurred in the interim. This can leak kernel
> addresses to unprivileged users through PERF_SAMPLE_REGS_USER and/or
> PERF_SAMPLE_REGS_INTR.
>
> Fix this by using interrupt regs while preparing PERF_SAMPLE_REGS_USER
> and PERF_SAMPLE_REGS_INTR. With the change, when IBS samples a user mode
> instruction but the NMI is delivered in kernel mode, PERF_SAMPLE_REGS_USER
> will source its register state from task_pt_regs(current) and
> PERF_SAMPLE_REGS_INTR will be omitted from the data sent to userspace.
>
> In addition to fixing the kernel address leak, this change also ensures
> GPR snapshot consistency, which resolves the DWARF unwinding issue with
> IBS.
>
> Reported-by: Gennady Kupava <gennady.kupava@xxxxxxxxx>
> Closes: https://lore.kernel.org/r/CAPu-DQqF0aF6=GS8Z6KKWeeX_V5LiXeKU_rJQZC+uGg8zuTPNw@xxxxxxxxxxxxxx
> Reported-by: Jayapal Ashwin Nair <janair@xxxxxxx>
> Fixes: d29e744c7167 ("perf/x86: Relax privilege filter restriction on AMD IBS")
> Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxx>
> ---
>  arch/x86/events/amd/ibs.c  | 50 ++++++++++++++++++++++++++++++++++++++
>  include/linux/perf_event.h |  6 +++++
>  kernel/events/core.c       | 10 ++++----
>  3 files changed, 61 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
> index bfb51f8e184f..78a36ebf2d23 100644
> --- a/arch/x86/events/amd/ibs.c
> +++ b/arch/x86/events/amd/ibs.c
> @@ -1533,6 +1533,56 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
>  		throttle = perf_event_account_interrupt(event);
>  		goto out;
>  	}
> +
> +	/*
> +	 * IBS captured RIP is out of sync with NMI pt_regs due to NMI
> +	 * delivery latency. Use NMI pt_regs for PERF_SAMPLE_REGS_USER.
> +	 *
> +	 * Note: Valid user regs are required for PERF_SAMPLE_STACK_USER.
> +	 */
> +	if (event->attr.sample_type & (PERF_SAMPLE_REGS_USER |
> +				       PERF_SAMPLE_STACK_USER)) {
> +		perf_sample_regs_user(&data.regs_user, iregs);
> +
> +		/*
> +		 * Don't update dyn_size if user has not requrested for
> +		 * PERF_SAMPLE_REGS_USER.
> +		 */
> +		if (event->attr.sample_type & PERF_SAMPLE_REGS_USER) {
> +			/* regs dump ABI info */
> +			int size = sizeof(u64);
> +
> +			if (data.regs_user.regs) {
> +				u64 mask = event->attr.sample_regs_user;
> +				size += hweight64(mask) * sizeof(u64);
> +			}
> +
> +			data.dyn_size += size;
> +		}
> +
> +		data.sample_flags |= PERF_SAMPLE_REGS_USER;
> +	}
> +
> +	/*
> +	 * IBS captured RIP is out of sync with NMI pt_regs due to NMI
> +	 * delivery latency. Use NMI pt_regs for PERF_SAMPLE_REGS_INTR.
> +	 */
> +	if (event->attr.sample_type & PERF_SAMPLE_REGS_INTR) {
> +		/* regs dump ABI info */
> +		int size = sizeof(u64);
> +
> +		perf_sample_regs_intr(&data.regs_intr, iregs,
> +				      event->attr.exclude_kernel);
> +
> +		if (data.regs_intr.regs) {
> +			u64 mask = event->attr.sample_regs_intr;
> +			size += hweight64(mask) * sizeof(u64);
> +		}
> +
> +		data.dyn_size += size;
> +		data.sample_flags |= PERF_SAMPLE_REGS_INTR;
> +	}
> +
>  	/*
>  	 * Prevent leaking physical addresses to unprivileged users. Skip
>  	 * PERF_SAMPLE_PHYS_ADDR check since generic code prevents it for
> diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
> index 2d5e7687875b..ca495f6b03c4 100644
> --- a/include/linux/perf_event.h
> +++ b/include/linux/perf_event.h
> @@ -1791,6 +1791,12 @@ extern unsigned long perf_misc_flags(struct perf_event *event, struct pt_regs *r
>  extern unsigned long perf_instruction_pointer(struct perf_event *event,
>  					      struct pt_regs *regs);
>  
> +extern void perf_sample_regs_user(struct perf_regs *regs_user,
> +				  struct pt_regs *regs);
> +extern void perf_sample_regs_intr(struct perf_regs *regs_intr,
> +				  struct pt_regs *regs,
> +				  bool exclude_kernel);
> +
>  #ifndef perf_arch_misc_flags
>  # define perf_arch_misc_flags(regs) \
>  		(user_mode(regs) ? PERF_RECORD_MISC_USER : PERF_RECORD_MISC_KERNEL)
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 7846d70be57f..69b767ace309 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -7846,8 +7846,8 @@ perf_output_sample_regs(struct perf_output_handle *handle,
>  	}
>  }
>  
> -static void perf_sample_regs_user(struct perf_regs *regs_user,
> -				  struct pt_regs *regs)
> +void perf_sample_regs_user(struct perf_regs *regs_user,
> +			   struct pt_regs *regs)
>  {
>  	if (user_mode(regs)) {
>  		regs_user->abi = perf_reg_abi(current);
> @@ -7860,9 +7860,9 @@ static void perf_sample_regs_user(struct perf_regs *regs_user,
>  	}
>  }
>  
> -static void perf_sample_regs_intr(struct perf_regs *regs_intr,
> -				  struct pt_regs *regs,
> -				  bool exclude_kernel)
> +void perf_sample_regs_intr(struct perf_regs *regs_intr,
> +			   struct pt_regs *regs,
> +			   bool exclude_kernel)
>  {
>  	/*
>  	 * Hardware skid can lead to a scenario where a PMI is