From: vsntk18@gmail.com
To: vsntk18@gmail.com
Cc: x86@kernel.org, Borislav.Petkov@amd.com, Dhaval.Giani@amd.com,
ashish.kalra@amd.com, 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,
jroedel@suse.de, 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,
michael.roth@amd.com, 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, vkarasulli@suse.de
Subject: [PATCH v6 03/10] x86/sev: Set GHCB data structure version
Date: Mon, 10 Jun 2024 12:21:06 +0200 [thread overview]
Message-ID: <20240610102113.20969-4-vsntk18@gmail.com> (raw)
In-Reply-To: <20240610102113.20969-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 ca20cc4e5826..963d51dcf0e6 100644
--- a/arch/x86/include/asm/sev.h
+++ b/arch/x86/include/asm/sev.h
@@ -19,6 +19,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"); }
struct boot_params;
diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
index f5717eddf75b..f63262a9c2a5 100644
--- a/arch/x86/kernel/sev-shared.c
+++ b/arch/x86/kernel/sev-shared.c
@@ -264,7 +264,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-06-10 10:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 10:21 [PATCH v6 00/10] x86/sev: KEXEC/KDUMP support for SEV-ES guests vsntk18
2024-06-10 10:21 ` [PATCH v6 01/10] x86/kexec/64: Disable kexec when SEV-ES is active vsntk18
2024-06-10 10:21 ` [PATCH v6 02/10] x86/sev: Save and print negotiated GHCB protocol version vsntk18
2024-06-10 10:21 ` vsntk18 [this message]
2024-06-10 10:21 ` [PATCH v6 04/10] x86/sev: Setup code to park APs in the AP Jump Table vsntk18
2024-06-10 10:21 ` [PATCH v6 05/10] x86/sev: Park APs on AP Jump Table with GHCB protocol version 2 vsntk18
2024-06-10 10:21 ` [PATCH v6 06/10] x86/sev: Use AP Jump Table blob to stop CPU vsntk18
2024-06-10 10:21 ` [PATCH v6 07/10] x86/sev: Add MMIO handling support to boot/compressed/ code vsntk18
2024-06-10 10:21 ` [PATCH v6 08/10] x86/sev: Handle CLFLUSH MMIO events vsntk18
2024-06-10 10:21 ` [PATCH v6 09/10] x86/kexec/64: Support kexec under SEV-ES with AP Jump Table Blob vsntk18
2024-06-10 10:21 ` [PATCH v6 10/10] x86/sev: Exclude AP jump table related code for SEV-SNP guests vsntk18
2024-06-10 10:30 ` [PATCH v6 00/10] x86/sev: KEXEC/KDUMP support for SEV-ES guests Greg KH
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=20240610102113.20969-4-vsntk18@gmail.com \
--to=vsntk18@gmail.com \
--cc=Borislav.Petkov@amd.com \
--cc=Dhaval.Giani@amd.com \
--cc=ashish.kalra@amd.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=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=michael.roth@amd.com \
--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).