Re: [PATCH v2 06/12] tools arch x86: Sync the msr-index.h copy with the kernel sources

[sashiko-bot@kernel.org]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] tools arch x86: msr-index.h sync reverts ARCH_PEBS_VECR_* macros
--

commit 78affd0f60ae68f3b52a636d7f03411361f2bbe0
Author: Arnaldo Carvalho de Melo <acme@redhat.com>

tools arch x86: Sync the msr-index.h copy with the kernel sources

This commit synchronizes tools/arch/x86/include/asm/msr-index.h with the
kernel header to pick up thermal interrupt bit definitions from commit
ac5cc691eb4a ("x86/thermal: Add bit definitions for Intel Directed Package
Thermal Interrupt").

> diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h
> index 9c26d4075c5f4..3a8e51a0c9e88 100644
> --- a/tools/arch/x86/include/asm/msr-index.h
> +++ b/tools/arch/x86/include/asm/msr-index.h
> @@ -350,13 +350,6 @@
>  #define ARCH_PEBS_LBR_SHIFT		40
>  #define ARCH_PEBS_LBR			(0x3ull << ARCH_PEBS_LBR_SHIFT)
>  #define ARCH_PEBS_VECR_XMM		BIT_ULL(49)
> -#define ARCH_PEBS_VECR_YMMH		BIT_ULL(50)
> -#define ARCH_PEBS_VECR_EGPRS		BIT_ULL(51)
> -#define ARCH_PEBS_VECR_OPMASK		BIT_ULL(53)
> -#define ARCH_PEBS_VECR_ZMMH		BIT_ULL(54)
> -#define ARCH_PEBS_VECR_H16ZMM		BIT_ULL(55)
> -#define ARCH_PEBS_VECR_EXT_SHIFT	49
> -#define ARCH_PEBS_VECR_EXT		(0x7full << ARCH_PEBS_VECR_EXT_SHIFT)
>  #define ARCH_PEBS_GPR			BIT_ULL(61)
>  #define ARCH_PEBS_AUX			BIT_ULL(62)
>  #define ARCH_PEBS_EN			BIT_ULL(63)

[Severity: Medium]
Does syncing tools/arch/x86/include/asm/msr-index.h by overwriting it with
arch/x86/include/asm/msr-index.h unintentionally revert commit 7846bf499da3fe
("tools headers: Sync x86 headers with kernel sources")?

Commit 7846bf499da3fe added ARCH_PEBS_VECR_YMMH, ARCH_PEBS_VECR_EGPRS,
ARCH_PEBS_VECR_OPMASK, ARCH_PEBS_VECR_ZMMH, ARCH_PEBS_VECR_H16ZMM,
ARCH_PEBS_VECR_EXT_SHIFT, and ARCH_PEBS_VECR_EXT to
tools/arch/x86/include/asm/msr-index.h alongside commit eb89aef367e470 before
those kernel changes landed in arch/x86/include/asm/msr-index.h in this tree.

In tools/perf/scripts/sync-headers.sh, kernel_matches_previous_tools_state()
checks whether the kernel header's current blob exists in the history of the
tools header:

tools/perf/scripts/sync-headers.sh:kernel_matches_previous_tools_state() {
	local kernel_path="$1"
	local tools_path="$2"
	local kernel_blob

	kernel_blob=$(git hash-object "$kernel_path" 2>/dev/null) || return 1
	[[ -n "$(git log --format=%h -1 --find-object="$kernel_blob" -- "$tools_path" 2>/dev/null)" ]]
}

Because arch/x86/include/asm/msr-index.h and
tools/arch/x86/include/asm/msr-index.h both diverged with independent commits
(ac5cc691eb4a and 7846bf499da3fe) since their last common sync point
(369e91bd201d15), kernel_matches_previous_tools_state() returns false and
process_header() overwrites the tools copy with the kernel copy.

While the commit message states this only picks up commit ac5cc691eb4a
("x86/thermal: Add bit definitions for Intel Directed Package Thermal
Interrupt"), should the ARCH_PEBS_VECR_* definitions from commit
7846bf499da3fe be preserved here?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261021223555.28372-1-acme@kernel.org?part=6