Commit 26a01984 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v7.0-2-2026-03-23' of... 

Merge tag 'perf-tools-fixes-for-v7.0-2-2026-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix parsing 'overwrite' in command line event definitions in
   big-endian machines by writing correct union member

 - Fix finding default metric in 'perf stat'

 - Fix relative paths for including headers in 'perf kvm stat'

 - Sync header copies with the kernel sources: msr-index.h, kvm,
   build_bug.h

* tag 'perf-tools-fixes-for-v7.0-2-2026-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
  tools headers: Synchronize linux/build_bug.h with the kernel sources
  tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  tools arch x86: Sync the msr-index.h copy with the kernel sources
  perf kvm stat: Fix relative paths for including headers
  perf parse-events: Fix big-endian 'overwrite' by writing correct union member
  perf metricgroup: Fix metricgroup__has_metric_or_groups()
  tools headers: Skip arm64 cputype.h check
parents 97a48d1a 493ad070

tools/arch/x86/include/asm/msr-index.h

+4 −1
Original line number Diff line number Diff line
@@ -740,7 +740,10 @@ 
#define MSR_AMD64_SNP_SMT_PROT		BIT_ULL(MSR_AMD64_SNP_SMT_PROT_BIT)

#define MSR_AMD64_SNP_SECURE_AVIC_BIT	18

#define MSR_AMD64_SNP_SECURE_AVIC	BIT_ULL(MSR_AMD64_SNP_SECURE_AVIC_BIT)

#define MSR_AMD64_SNP_RESV_BIT		19

#define MSR_AMD64_SNP_RESERVED_BITS19_22 GENMASK_ULL(22, 19)

#define MSR_AMD64_SNP_IBPB_ON_ENTRY_BIT	23

#define MSR_AMD64_SNP_IBPB_ON_ENTRY	BIT_ULL(MSR_AMD64_SNP_IBPB_ON_ENTRY_BIT)

#define MSR_AMD64_SNP_RESV_BIT		24

#define MSR_AMD64_SNP_RESERVED_MASK	GENMASK_ULL(63, MSR_AMD64_SNP_RESV_BIT)

#define MSR_AMD64_SAVIC_CONTROL		0xc0010138

#define MSR_AMD64_SAVIC_EN_BIT		0

tools/arch/x86/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_SLOT_ZAP_ALL		(1 << 7)

#define KVM_X86_QUIRK_STUFF_FEATURE_MSRS	(1 << 8)

#define KVM_X86_QUIRK_IGNORE_GUEST_PAT		(1 << 9)

#define KVM_X86_QUIRK_VMCS12_ALLOW_FREEZE_IN_SMM (1 << 10)



#define KVM_STATE_NESTED_FORMAT_VMX	0

#define KVM_STATE_NESTED_FORMAT_SVM	1

tools/include/linux/build_bug.h

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 
/**

 * BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied

 *		      error message.

 * @condition: the condition which the compiler should know is false.

 * @cond: the condition which the compiler should know is false.

 * @msg: build-time error message

 *

 * See BUILD_BUG_ON for description.

 */
@@ -60,6 +61,7 @@ 


/**

 * static_assert - check integer constant expression at build time

 * @expr: expression to be checked

 *

 * static_assert() is a wrapper for the C11 _Static_assert, with a

 * little macro magic to make the message optional (defaulting to the

tools/include/uapi/linux/kvm.h

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#include <linux/ioctl.h>

#include <asm/kvm.h>



#ifdef __KERNEL__

#include <linux/kvm_types.h>

#endif



#define KVM_API_VERSION 12



/*
@@ -1601,7 +1605,11 @@ struct kvm_stats_desc { 
	__u16 size;

	__u32 offset;

	__u32 bucket_size;

#ifdef __KERNEL__

	char name[KVM_STATS_NAME_SIZE];

#else

	char name[];

#endif

};



#define KVM_GET_STATS_FD  _IO(KVMIO,  0xce)

tools/perf/check-headers.sh

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ done 
check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"'

check arch/x86/lib/memset_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'

check arch/x86/include/asm/amd/ibs.h  '-I "^#include .*/msr-index.h"'

check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"'

check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"'

check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'

check include/uapi/linux/mman.h       '-I "^#include <\(uapi/\)*asm/mman.h>"'