From: Vasant Karasulli <vsntk18@gmail.com>
To: x86@kernel.org
Cc: joro@8bytes.org, cfir@google.com, dan.j.williams@intel.com,
dave.hansen@linux.intel.com, ebiederm@xmission.com,
erdemaktas@google.com, hpa@zytor.com, jgross@suse.com,
jslaby@suse.cz, keescook@chromium.org, kexec@lists.infradead.org,
kvm@vger.kernel.org, linux-coco@lists.linux.dev,
linux-kernel@vger.kernel.org, luto@kernel.org,
martin.b.radev@gmail.com, mhiramat@kernel.org,
mstunes@vmware.com, nivedita@alum.mit.edu, peterz@infradead.org,
rientjes@google.com, seanjc@google.com, stable@vger.kernel.org,
thomas.lendacky@amd.com,
virtualization@lists.linux-foundation.org,
Joerg Roedel <jroedel@suse.de>,
Vasant Karasulli <vkarasulli@suse.de>
Subject: [PATCH v4 3/9] x86/sev: Set GHCB data structure version
Date: Mon, 11 Mar 2024 17:17:21 +0100 [thread overview]
Message-ID: <20240311161727.14916-4-vsntk18@gmail.com> (raw)
In-Reply-To: <20240311161727.14916-1-vsntk18@gmail.com>
From: Joerg Roedel <jroedel@suse.de>
It turned out that the GHCB->protocol field does not declare the
version of the guest-hypervisor communication protocol, but rather the
version of the GHCB data structure. Reflect that in the define used to
set the protocol field.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Vasant Karasulli <vkarasulli@suse.de>
---
arch/x86/include/asm/sev.h | 3 +++
arch/x86/kernel/sev-shared.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h
index 5b4a1ce3d368..c48db0bfb707 100644
--- a/arch/x86/include/asm/sev.h
+++ b/arch/x86/include/asm/sev.h
@@ -20,6 +20,9 @@
#define GHCB_PROTOCOL_MAX 2ULL
#define GHCB_DEFAULT_USAGE 0ULL
+/* Version of the GHCB data structure */
+#define GHCB_VERSION 1
+
#define VMGEXIT() { asm volatile("rep; vmmcall\n\r"); }
enum es_result {
diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
index c02a087c7945..6adae48c501f 100644
--- a/arch/x86/kernel/sev-shared.c
+++ b/arch/x86/kernel/sev-shared.c
@@ -257,7 +257,7 @@ static enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,
u64 exit_info_2)
{
/* Fill in protocol and format specifiers */
- ghcb->protocol_version = ghcb_version;
+ ghcb->protocol_version = GHCB_VERSION;
ghcb->ghcb_usage = GHCB_DEFAULT_USAGE;
ghcb_set_sw_exit_code(ghcb, exit_code);
--
2.34.1
next prev parent reply other threads:[~2024-03-11 16:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 16:17 [PATCH v4 0/9] x86/sev: KEXEC/KDUMP support for SEV-ES guests Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 1/9] x86/kexec/64: Disable kexec when SEV-ES is active Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 2/9] x86/sev: Save and print negotiated GHCB protocol version Vasant Karasulli
2024-03-11 16:17 ` Vasant Karasulli [this message]
2024-03-11 16:17 ` [PATCH v4 4/9] x86/sev: Setup code to park APs in the AP Jump Table Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 5/9] x86/sev: Park APs on AP Jump Table with GHCB protocol version 2 Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 6/9] x86/sev: Use AP Jump Table blob to stop CPU Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 7/9] x86/sev: Add MMIO handling support to boot/compressed/ code Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 8/9] x86/sev: Handle CLFLUSH MMIO events Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 9/9] x86/kexec/64: Support kexec under SEV-ES with AP Jump Table Blob Vasant Karasulli
2024-03-11 19:19 ` [PATCH v4 0/9] x86/sev: KEXEC/KDUMP support for SEV-ES guests Tom Lendacky
[not found] ` <CAF2zH5qZKEmECy=9vG4sLmdDt5k7nC=MwjKvJLyVfPyFzt+0hA@mail.gmail.com>
2024-03-12 14:04 ` Tom Lendacky
2024-03-12 15:16 ` Vasant Karasulli
2024-03-12 16:13 ` Tom Lendacky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240311161727.14916-4-vsntk18@gmail.com \
--to=vsntk18@gmail.com \
--cc=cfir@google.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ebiederm@xmission.com \
--cc=erdemaktas@google.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=jslaby@suse.cz \
--cc=keescook@chromium.org \
--cc=kexec@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=martin.b.radev@gmail.com \
--cc=mhiramat@kernel.org \
--cc=mstunes@vmware.com \
--cc=nivedita@alum.mit.edu \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=seanjc@google.com \
--cc=stable@vger.kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vkarasulli@suse.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).