linux-kernel - [PATCH] [STABLE] 6.12.23: arch/x86/coco/tdx/tdx.c build error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <eb5a1df4-95f8-2784-8f4e-8460f33f8f4d@absolutedigital.net>
Date: Sat, 12 Apr 2025 16:48:22 -0400 (EDT)
From: Cal Peake <cp@...olutedigital.net>
To: Kernel Mailing List <linux-kernel@...r.kernel.org>
cc: Vishal Annapurve <vannapurve@...gle.com>,
        "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: [PATCH] [STABLE] 6.12.23: arch/x86/coco/tdx/tdx.c build error

Hi,

6.12.23 fails to build for me with the error:

  CC      arch/x86/coco/tdx/tdx.o
arch/x86/coco/tdx/tdx.c: In function ‘tdx_early_init’:
arch/x86/coco/tdx/tdx.c:1080:19: error: ‘struct pv_irq_ops’ has no member named ‘safe_halt’
 1080 |         pv_ops.irq.safe_halt = tdx_safe_halt;
      |                   ^
arch/x86/coco/tdx/tdx.c:1081:19: error: ‘struct pv_irq_ops’ has no member named ‘halt’
 1081 |         pv_ops.irq.halt = tdx_halt;
      |                   ^
make[5]: *** [scripts/Makefile.build:229: arch/x86/coco/tdx/tdx.o] Error 1
make[4]: *** [scripts/Makefile.build:478: arch/x86/coco/tdx] Error 2
make[3]: *** [scripts/Makefile.build:478: arch/x86/coco] Error 2
make[2]: *** [scripts/Makefile.build:478: arch/x86] Error 2
make[1]: *** [/home/cal/tmp/volatile/linux-6.12.23/Makefile:1944: .] Error 2
make: *** [Makefile:224: __sub-make] Error 2

Those struct members are only available when CONFIG_PARAVIRT_XXL is 
defined.

The below patch adds a check for that macro and gets the build to 
completion.

My config is attached for reference.

-- 
Cal Peake

Signed-off-by: Cal Peake <cp@...olutedigital.net>

--- ./arch/x86/coco/tdx/tdx.c	2025-04-10 08:39:41.000000000 -0400
+++ ./arch/x86/coco/tdx/tdx.c	2025-04-12 15:42:35.275284746 -0400
@@ -1066,7 +1066,7 @@
 
 	x86_platform.guest.enc_kexec_begin	     = tdx_kexec_begin;
 	x86_platform.guest.enc_kexec_finish	     = tdx_kexec_finish;
-
+#ifdef CONFIG_PARAVIRT_XXL
 	/*
 	 * Avoid "sti;hlt" execution in TDX guests as HLT induces a #VE that
 	 * will enable interrupts before HLT TDCALL invocation if executed
@@ -1079,7 +1079,7 @@
 	 */
 	pv_ops.irq.safe_halt = tdx_safe_halt;
 	pv_ops.irq.halt = tdx_halt;
-
+#endif
 	/*
 	 * TDX intercepts the RDMSR to read the X2APIC ID in the parallel
 	 * bringup low level code. That raises #VE which cannot be handled
Download attachment "config-6.12.23.gz" of type "application/octet-stream" (64546 bytes)