Skip to content

Commit a98c071

Browse files
committed
tools headers svm: Sync svm headers with the kernel sources
To pick the changes in: 8c29f01 ("x86/sev: Add SEV-SNP guest feature negotiation support") That triggers: CC /tmp/build/perf-tools/arch/x86/util/kvm-stat.o CC /tmp/build/perf-tools/util/header.o LD /tmp/build/perf-tools/arch/x86/util/perf-in.o LD /tmp/build/perf-tools/arch/x86/perf-in.o LD /tmp/build/perf-tools/arch/perf-in.o LD /tmp/build/perf-tools/util/perf-in.o LD /tmp/build/perf-tools/perf-in.o LINK /tmp/build/perf-tools/perf But this time causes no changes in tooling results, as the introduced SVM_VMGEXIT_TERM_REQUEST exit reason wasn't added to SVM_EXIT_REASONS, that is used in kvm-stat.c. And addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/svm.h' differs from latest version at 'arch/x86/include/uapi/asm/svm.h' diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.h Cc: Adrian Hunter <[email protected]> Cc: Borislav Petkov (AMD) <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Nikunj A Dadhania <[email protected]> Link: http://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 3de34f8 commit a98c071

File tree

1 file changed

+6
-0
lines changed
  • tools/arch/x86/include/uapi/asm

1 file changed

+6
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@
116116
#define SVM_VMGEXIT_AP_CREATE 1
117117
#define SVM_VMGEXIT_AP_DESTROY 2
118118
#define SVM_VMGEXIT_HV_FEATURES 0x8000fffd
119+
#define SVM_VMGEXIT_TERM_REQUEST 0x8000fffe
120+
#define SVM_VMGEXIT_TERM_REASON(reason_set, reason_code) \
121+
/* SW_EXITINFO1[3:0] */ \
122+
(((((u64)reason_set) & 0xf)) | \
123+
/* SW_EXITINFO1[11:4] */ \
124+
((((u64)reason_code) & 0xff) << 4))
119125
#define SVM_VMGEXIT_UNSUPPORTED_EVENT 0x8000ffff
120126

121127
/* Exit code reserved for hypervisor/software use */

0 commit comments

Comments
 (0)