diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-20 21:27:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-20 21:27:52 +0300 |
| commit | 07fa9cad54609df3eea00cd5b167df6088ce01a6 (patch) | |
| tree | 12ef8d6cc24557342f09992acf2103db6902fd4a | |
| parent | 92329d578d60fe944e30da287ee28f5c154a5802 (diff) | |
| parent | 6b995d01683feae619aa3263d18a6aa19bface16 (diff) | |
| download | linux-07fa9cad54609df3eea00cd5b167df6088ce01a6.tar.xz | |
Merge tag 'x86-urgent-2025-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 bug fix from Thomas Gleixner:
"A single fix for a GCC wreckage, which emits a KCSAN instrumentation
call in __sev_es_nmi_complete() despite the function being annotated
with 'noinstr'.
As all functions in that source file are noinstr, exclude the whole
file from KCSAN in the Makefile to cure it"
* tag 'x86-urgent-2025-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sev: Work around broken noinstr on GCC
| -rw-r--r-- | arch/x86/coco/sev/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/coco/sev/Makefile b/arch/x86/coco/sev/Makefile index db3255b979bd..342d79f0ab6a 100644 --- a/arch/x86/coco/sev/Makefile +++ b/arch/x86/coco/sev/Makefile @@ -5,5 +5,6 @@ obj-y += core.o sev-nmi.o vc-handle.o # Clang 14 and older may fail to respect __no_sanitize_undefined when inlining UBSAN_SANITIZE_sev-nmi.o := n -# GCC may fail to respect __no_sanitize_address when inlining +# GCC may fail to respect __no_sanitize_address or __no_kcsan when inlining KASAN_SANITIZE_sev-nmi.o := n +KCSAN_SANITIZE_sev-nmi.o := n |