x86/sev: Rename sev_es_ghcb_handle_msr() to __vc_handle_msr()
PATCH 1/1 x86/sev: Rename sev_es_ghcb_handle_msr() to __vc_handle_msr()
From: "Borislav Petkov (AMD)" <[email protected]>
Forgot to do that during the Secure AVIC review. :-\
No functional changes.
Signed-off-by Borislav Petkov (AMD) <[email protected]>
--- arch/x86/coco/sev/core.c | 4 ++-- arch/x86/coco/sev/internal.h | 2 +- arch/x86/coco/sev/vc-handle.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/coco/sev/core.c +2 -2
@@ -989,7 +989,7 @@ u64 savic_ghcb_msr_read(u32 reg) ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); - res =sev_es_ghcb_handle_msr (ghcb, &ctxt, false); + res =__vc_handle_msr (ghcb, &ctxt, false);if (res !=ES_OK ) {pr_err ("Secure AVIC MSR (0x%llx) read returned error (%d)\n" , msr, res);/* MSR read failures are treated as fatal errors */
@@ -1019,7 +1019,7 @@ void savic_ghcb_msr_write(u32 reg, u64 value) ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); - res =sev_es_ghcb_handle_msr (ghcb, &ctxt, true); + res =__vc_handle_msr (ghcb, &ctxt, true);if (res !=ES_OK ) {pr_err ("Secure AVIC MSR (0x%llx) write returned error (%d)\n" , msr, res);/* MSR writes should never fail. Any failure is fatal error for SNP guest */
arch/x86/coco/sev/internal.h +1 -1
@@ -85,7 +85,7 @@ static __always_inline void sev_es_wr_ghcb_msr(u64 val)native_wrmsr (MSR_AMD64_SEV_ES_GHCB , low, high); } -enum es_result sev_es_ghcb_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write); +enum es_result __vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write);u64 get_hv_features (void );
arch/x86/coco/sev/vc-handle.c +2 -2
@@ -404,7 +404,7 @@ static enum es_result __vc_handle_secure_tsc_msrs(struct es_em_ctxt *ctxt, boolreturn ES_OK ; } -enum es_result sev_es_ghcb_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write) +enum es_result __vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write) {struct pt_regs *regs = ctxt->regs;enum es_result ret;
@@ -448,7 +448,7 @@ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxtstatic enum es_result vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt) { -return sev_es_ghcb_handle_msr (ghcb, ctxt, ctxt->insn.opcode.bytes[1 ] ==0x30 ); +return __vc_handle_msr (ghcb, ctxt, ctxt->insn.opcode.bytes[1 ] ==0x30 ); }static void __init vc_early_forward_exception (struct es_em_ctxt *ctxt)
Signature · 1 line
2.51.0
Quoted 7 lines · Borislav Petkov
From: "Borislav Petkov (AMD)" <[email protected]>
Forgot to do that during the Secure AVIC review. :-\
No functional changes.
Signed-off-by Borislav Petkov (AMD) <[email protected]>
Reviewed-by Tom Lendacky <[email protected]>
Quoted 63 lines
--- arch/x86/coco/sev/core.c | 4 ++-- arch/x86/coco/sev/internal.h | 2 +- arch/x86/coco/sev/vc-handle.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)arch/x86/coco/sev/core.c +2
-2@@ -989,7 +989,7 @@ u64 savic_ghcb_msr_read(u32 reg) ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); - res =sev_es_ghcb_handle_msr (ghcb, &ctxt, false); + res =__vc_handle_msr (ghcb, &ctxt, false);if (res !=ES_OK ) {pr_err ("Secure AVIC MSR (0x%llx) read returned error (%d)\n" , msr, res);/* MSR read failures are treated as fatal errors */ @@ -1019,7 +1019,7 @@ void savic_ghcb_msr_write(u32 reg, u64 value) ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); - res =sev_es_ghcb_handle_msr (ghcb, &ctxt, true); + res =__vc_handle_msr (ghcb, &ctxt, true);if (res !=ES_OK ) {pr_err ("Secure AVIC MSR (0x%llx) write returned error (%d)\n" , msr, res);/* MSR writes should never fail. Any failure is fatal error for SNP guest */ arch/x86/coco/sev/internal.h +1
-1@@ -85,7 +85,7 @@ static __always_inline void sev_es_wr_ghcb_msr(u64 val)native_wrmsr (MSR_AMD64_SEV_ES_GHCB , low, high); } -enum es_result sev_es_ghcb_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write); +enum es_result __vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write);u64 get_hv_features (void );arch/x86/coco/sev/vc-handle.c +2
-2@@ -404,7 +404,7 @@ static enum es_result __vc_handle_secure_tsc_msrs(struct es_em_ctxt *ctxt, boolreturn ES_OK ; } -enum es_result sev_es_ghcb_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write) +enum es_result __vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write) {struct pt_regs *regs = ctxt->regs;enum es_result ret;@@ -448,7 +448,7 @@ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxtstatic enum es_result vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt) { -return sev_es_ghcb_handle_msr (ghcb, ctxt, ctxt->insn.opcode.bytes[1 ] ==0x30 ); +return __vc_handle_msr (ghcb, ctxt, ctxt->insn.opcode.bytes[1 ] ==0x30 ); }static void __init vc_early_forward_exception (struct es_em_ctxt *ctxt)
The following commit has been merged into the x86/sev branch of tip:
The following commit has been merged into the x86/sev branch of tip:
Commit-ID: 9183c97e7e22591cfd258b5131493d5afcab4b08 Gitweb: https://git.kernel.org/tip/9183c97e7e22591cfd258b5131493d5afcab4b08 Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Mon, 19 Jan 2026 14:49:13 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 19 Jan 2026 15:23:48 +01:00
x86/sev: Rename sev_es_ghcb_handle_msr() to __vc_handle_msr()
Forgot to do that during the Secure AVIC review. :-\
No functional changes.
Signed-off-by Borislav Petkov (AMD) <[email protected]>
Reviewed-by Tom Lendacky <[email protected]>
--- arch/x86/coco/sev/core.c | 4 ++-- arch/x86/coco/sev/internal.h | 2 +- arch/x86/coco/sev/vc-handle.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/coco/sev/core.c +2 -2
@@ -989,7 +989,7 @@ u64 savic_ghcb_msr_read(u32 reg) ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); - res =sev_es_ghcb_handle_msr (ghcb, &ctxt, false); + res =__vc_handle_msr (ghcb, &ctxt, false);if (res !=ES_OK ) {pr_err ("Secure AVIC MSR (0x%llx) read returned error (%d)\n" , msr, res);/* MSR read failures are treated as fatal errors */
@@ -1019,7 +1019,7 @@ void savic_ghcb_msr_write(u32 reg, u64 value) ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); - res =sev_es_ghcb_handle_msr (ghcb, &ctxt, true); + res =__vc_handle_msr (ghcb, &ctxt, true);if (res !=ES_OK ) {pr_err ("Secure AVIC MSR (0x%llx) write returned error (%d)\n" , msr, res);/* MSR writes should never fail. Any failure is fatal error for SNP guest */
arch/x86/coco/sev/internal.h +1 -1
@@ -85,7 +85,7 @@ static __always_inline void sev_es_wr_ghcb_msr(u64 val)native_wrmsr (MSR_AMD64_SEV_ES_GHCB , low, high); } -enum es_result sev_es_ghcb_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write); +enum es_result __vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write);u64 get_hv_features (void );
arch/x86/coco/sev/vc-handle.c +2 -2
@@ -404,7 +404,7 @@ static enum es_result __vc_handle_secure_tsc_msrs(struct es_em_ctxt *ctxt, boolreturn ES_OK ; } -enum es_result sev_es_ghcb_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write) +enum es_result __vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt,bool write) {struct pt_regs *regs = ctxt->regs;enum es_result ret;
@@ -448,7 +448,7 @@ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxtstatic enum es_result vc_handle_msr (struct ghcb *ghcb,struct es_em_ctxt *ctxt) { -return sev_es_ghcb_handle_msr (ghcb, ctxt, ctxt->insn.opcode.bytes[1 ] ==0x30 ); +return __vc_handle_msr (ghcb, ctxt, ctxt->insn.opcode.bytes[1 ] ==0x30 ); }static void __init vc_early_forward_exception (struct es_em_ctxt *ctxt)