x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM.
Subsystems (3)
RFC 1/1 x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM.
From: Tianyu Lan <[email protected]>
Hyper-V Isolation VM code uses sev_es_ghcb_hv_call() to read/write MSR via ghcb page. The SEV-ES guest should call the sev_es_negotiate_protocol() to negotiate the GHCB protocol version before establishing the GHCB. Call sev_es_negotiate_protocol() in the hyperv_init_ghcb().
---
This patch based on the "Add AMD Secure Nested Paging (SEV-SNP) Guest Support" patchset. https://lore.kernel.org/lkml/[email protected]/
arch/x86/hyperv/hv_init.c | 6 ++++++ arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/sev-shared.c | 2 +- arch/x86/kernel/sev.c | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-)
arch/x86/hyperv/hv_init.c +6 -0
@@ -28,6 +28,7 @@#include <linux/syscore_ops.h> #include <clocksource/hyperv_timer.h> #include <linux/highmem.h> +#include <asm/sev.h> int hyperv_init_cpuhp;u64 hv_current_partition_id = ~0ull ;
@@ -69,6 +70,11 @@ static int hyperv_init_ghcb(void) ghcb_base = (void **)this_cpu_ptr (hv_ghcb_pg); *ghcb_base = ghcb_va; +sev_es_negotiate_protocol (); + +/* Write ghcb page back after negotiating protocol. */ +wrmsrl (MSR_AMD64_SEV_ES_GHCB , ghcb_gpa); +VMGEXIT ();return 0 ; }
arch/x86/include/asm/sev.h +2 -0
@@ -120,6 +120,8 @@ extern enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,struct es_em_ctxt *ctxt, u64 exit_code, u64 exit_info_1, u64 exit_info_2); +extern bool sev_es_negotiate_protocol (void ); +static inline int rmpadjust (unsigned long vaddr,bool rmp_psize,unsigned long attrs) {int rc;
arch/x86/kernel/sev-shared.c +1 -1
@@ -145,7 +145,7 @@ static void snp_register_ghcb_early(unsigned long paddr)sev_es_terminate (SEV_TERM_SET_LINUX ,GHCB_TERM_REGISTER ); } -static bool sev_es_negotiate_protocol (void ) +bool sev_es_negotiate_protocol (void ) {u64 val;
arch/x86/kernel/sev.c +2 -2
@@ -167,12 +167,12 @@ void noinstr __sev_es_ist_exit(void)this_cpu_write (cpu_tss_rw.x86_tss.ist[IST_INDEX_VC ], *(unsigned long *)ist); } -static inline u64 sev_es_rd_ghcb_msr (void ) +inline u64 sev_es_rd_ghcb_msr (void ) {return __rdmsr (MSR_AMD64_SEV_ES_GHCB ); } -static __always_inline void sev_es_wr_ghcb_msr(u64 val) +__always_inline void sev_es_wr_ghcb_msr(u64 val) {u32 low, high;
Signature · 1 line
2.25.1
Wei Liu
maintainerQuoted 31 lines · Tianyu Lan
From: Tianyu Lan <[email protected]>
Hyper-V Isolation VM code uses
sev_es_ghcb_hv_call()to read/write MSR via ghcb page. The SEV-ES guest should call thesev_es_negotiate_protocol()to negotiate the GHCB protocol version before establishing the GHCB. Callsev_es_negotiate_protocol()in thehyperv_init_ghcb().Signed-off-by Tianyu Lan <[email protected]>---
This patch based on the "Add AMD Secure Nested Paging (SEV-SNP) Guest Support" patchset. https://lore.kernel.org/lkml/[email protected]/arch/x86/hyperv/hv_init.c | 6 ++++++ arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/sev-shared.c | 2 +- arch/x86/kernel/sev.c | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-)arch/x86/hyperv/hv_init.c +1
-0@@ -28,6 +28,7 @@#include <linux/syscore_ops.h> #include <clocksource/hyperv_timer.h> #include <linux/highmem.h> +#include <asm/sev.h> int hyperv_init_cpuhp;u64 hv_current_partition_id = ~0ull ;
arch/x86/hyperv/hv_init.c static int hyperv_init_ghcb(void) · line 73
Quoted 4 lines
arch/x86/hyperv/hv_init.c +1
-0@@ -69,6 +70,11 @@ static int hyperv_init_ghcb(void) ghcb_base = (void **)this_cpu_ptr (hv_ghcb_pg); *ghcb_base = ghcb_va; +sev_es_negotiate_protocol ();
The return value should be checked, right?
There is no logical connection between this function call and the wrmsrl below. Is there new information available after calling sev_es_negotiate_protocol?
Quoted 7 lines
arch/x86/hyperv/hv_init.c +4
-0+ +/* Write ghcb page back after negotiating protocol. */ +wrmsrl (MSR_AMD64_SEV_ES_GHCB , ghcb_gpa); +VMGEXIT ();return 0 ; }
[...]
Quoted 6 lines
arch/x86/kernel/sev.c +0
-0@@ -167,12 +167,12 @@ void noinstr __sev_es_ist_exit(void)this_cpu_write (cpu_tss_rw.x86_tss.ist[IST_INDEX_VC ], *(unsigned long *)ist);
arch/x86/kernel/sev.c void noinstr __sev_es_ist_exit(void) · line 175
Quoted 10 lines
arch/x86/kernel/sev.c +2
-2} -static inline u64 sev_es_rd_ghcb_msr (void ) +inline u64 sev_es_rd_ghcb_msr (void ) {return __rdmsr (MSR_AMD64_SEV_ES_GHCB ); } -static __always_inline void sev_es_wr_ghcb_msr(u64 val) +__always_inline void sev_es_wr_ghcb_msr(u64 val)
Why are these needed? They are not used anywhere in this patch.
Thanks,
Wei.
Quoted 6 lines
arch/x86/kernel/sev.c +0
-0{u32 low, high;Signature · 1 line
2.25.1
Nits:
Quoted 2 lines
Hyper-V Isolation VM code uses
sev_es_ghcb_hv_call()to read/write MSR via ghcb page. The SEV-ES guest should call thesev_es_negotiate_protocol()
ghcb page -> GHCB page
call the sev_es_negotiate_protocol() -> call sev_es_negotiate_protocol()
(or -- call the sev_es_negotiate_protocol() function)
Quoted 2 lines
to negotiate the GHCB protocol version before establishing the GHCB. Call
sev_es_negotiate_protocol()in thehyperv_init_ghcb().
in the hyperv_init_ghcb() -> in hyperv_init_ghcb()
(similarly elsewhere).
Andrea