Re: [GIT PULL] First batch of KVM changes for Linux 6.13 merge window

[Nathan Chancellor]

On Thu, Nov 21, 2024 at 07:56:23AM -0500, Sasha Levin wrote:
> Hi Paolo,
> 
> On Wed, Nov 20, 2024 at 08:58:42AM -0500, Paolo Bonzini wrote:
> >      riscv: perf: add guest vs host distinction
> 
> When merging this PR into linus-next, I've started seeing build errors:
> 
> In file included from /builds/linux/arch/riscv/kernel/asm-offsets.c:12:
> In file included from /builds/linux/arch/riscv/include/asm/kvm_host.h:23:
> In file included from /builds/linux/arch/riscv/include/asm/kvm_vcpu_pmu.h:12:
> In file included from /builds/linux/include/linux/perf/riscv_pmu.h:12:
> /builds/linux/include/linux/perf_event.h:1679:64: error: too many arguments provided to function-like macro invocation
>  1679 | extern unsigned long perf_misc_flags(struct perf_event *event, struct pt_regs *regs);
>       |                                                                ^
> /builds/linux/arch/riscv/include/asm/perf_event.h:15:9: note: macro 'perf_misc_flags' defined here
>    15 | #define perf_misc_flags(regs) perf_misc_flags(regs)
>       |         ^
> 
> Looks like this is due to 2c47e7a74f44 ("perf/core: Correct perf
> sampling with guest VMs") which went in couple of days ago through
> Ingo's perf tree and changed the number of parameters for
> perf_misc_flags().

There is a patch out to fix this but it seems like it needs to be
applied during this merge?

https://lore.kernel.org/20241116160506.5324-1-prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx/
https://lore.kernel.org/ZzxDvLKGz1ouWzgX@xxxxxxxxx/

Cheers,
Nathan