Skip to contentSkip to conversation

x86/sev: Minor updates for SEV guest support

PATCH Applied Joerg Roedel 6 participants 13 messages Jun 22, 2021 – Jun 23, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover x86/sev: Minor updates for SEV guest support

From: Joerg Roedel <[email protected]>

Hi,

here are three small patches to update SEV-ES guest support in Linux. It would be great to have at least patch 3 merged for v5.14 to avoid future merge conflicts. It contains defines needed by KVM and X86 patches under development.

Thanks,

Joerg

Brijesh Singh (1):
x86/sev: Add defines for GHCB version 2 MSR protocol requests

Joerg Roedel (2):
x86/sev: Add Comments to existing GHCB MSR protocol defines x86/sev: Use "SEV: " prefix for messages from sev.c

 arch/x86/include/asm/sev-common.h | 17 +++++++++++++++++
 arch/x86/kernel/sev.c             |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

base-commit: be1a5408868af341f61f93c191b5e346ee88c82a

Signature · 1 line
2.31.1
#1 lore raw

PATCH 1/3 x86/sev: Add Comments to existing GHCB MSR protocol defines

From: Joerg Roedel <[email protected]>

Add comments to the defines for SEV Info and CPUID MSR protocol defines to document to which protocol part they belong.

---
 arch/x86/include/asm/sev-common.h | 2 ++
 1 file changed, 2 insertions(+)
arch/x86/include/asm/sev-common.h +2 -0
index 629c3df243f0..1cc9e7dd8107 100644
@@ -11,6 +11,7 @@
 #define GHCB_MSR_INFO_POS		0
 #define GHCB_MSR_INFO_MASK		(BIT_ULL(12) - 1)
 
+/* SEV Information Request/Response */
 #define GHCB_MSR_SEV_INFO_RESP		0x001
 #define GHCB_MSR_SEV_INFO_REQ		0x002
 #define GHCB_MSR_VER_MAX_POS		48
@@ -28,6 +29,7 @@
 #define GHCB_MSR_PROTO_MAX(v)		(((v) >> GHCB_MSR_VER_MAX_POS) & GHCB_MSR_VER_MAX_MASK)
 #define GHCB_MSR_PROTO_MIN(v)		(((v) >> GHCB_MSR_VER_MIN_POS) & GHCB_MSR_VER_MIN_MASK)
 
+/* CPUID Request/Response */
 #define GHCB_MSR_CPUID_REQ		0x004
 #define GHCB_MSR_CPUID_RESP		0x005
 #define GHCB_MSR_CPUID_FUNC_POS		32
Signature · 1 line
2.31.1
#2 lore raw

PATCH 2/3 x86/sev: Add defines for GHCB version 2 MSR protocol requests

In reply to Joerg Roedel

From: Brijesh Singh <[email protected]>

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support, so they are submitted as an individual patch without users yet to avoid merge conflicts in the future.

---
 arch/x86/include/asm/sev-common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/x86/include/asm/sev-common.h +15 -0
index 1cc9e7dd8107..4e6c4c7cb294 100644
@@ -47,6 +47,21 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_POS	12
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_MASK	GENMASK_ULL(51, 0)
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+#define GHCB_MSR_HV_FT_POS			12
+#define GHCB_MSR_HV_FT_MASK			GENMASK_ULL(51, 0)
+
+#define GHCB_MSR_HV_FT_RESP_VAL(v)		\
+	(((unsigned long)((v) & GHCB_MSR_HV_FT_MASK) >> GHCB_MSR_HV_FT_POS))
+
 #define GHCB_MSR_TERM_REQ		0x100
 #define GHCB_MSR_TERM_REASON_SET_POS	12
 #define GHCB_MSR_TERM_REASON_SET_MASK	0xf
Signature · 1 line
2.31.1
#3 lore raw

Re: [PATCH 2/3] x86/sev: Add defines for GHCB version 2 MSR protocol requests

Quoted 36 lines · Joerg Roedel

From: Brijesh Singh <[email protected]>

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support, so they are submitted as an individual patch without users yet to avoid merge conflicts in the future.

---
 arch/x86/include/asm/sev-common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/x86/include/asm/sev-common.h +4 -0
index 1cc9e7dd8107..4e6c4c7cb294 100644
@@ -47,6 +47,21 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_POS	12

arch/x86/include/asm/sev-common.h line 63

Quoted 10 lines
arch/x86/include/asm/sev-common.h +10 -0
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_MASK	GENMASK_ULL(51, 0)
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+#define GHCB_MSR_HV_FT_POS			12
+#define GHCB_MSR_HV_FT_MASK			GENMASK_ULL(51, 0)
+
+#define GHCB_MSR_HV_FT_RESP_VAL(v)		\
+	(((unsigned long)((v) & GHCB_MSR_HV_FT_MASK) >> GHCB_MSR_HV_FT_POS))

This should shift down first and then mask or else the mask should be from 12 to 63.

Thanks,
Tom

Quoted 5 lines
arch/x86/include/asm/sev-common.h +1 -0
+
 #define GHCB_MSR_TERM_REQ		0x100
 #define GHCB_MSR_TERM_REASON_SET_POS	12
 #define GHCB_MSR_TERM_REASON_SET_MASK	0xf
#4 lore raw

Re: [PATCH 2/3] x86/sev: Add defines for GHCB version 2 MSR protocol requests

Quoted 42 lines · Tom Lendacky
Quoted 41 lines · Joerg Roedel

From: Brijesh Singh <[email protected]>

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support, so they are submitted as an individual patch without users yet to avoid merge conflicts in the future.

---
 arch/x86/include/asm/sev-common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/x86/include/asm/sev-common.h +9 -0
index 1cc9e7dd8107..4e6c4c7cb294 100644
@@ -47,6 +47,21 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_POS	12
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_MASK	GENMASK_ULL(51, 0)
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
Quoted 9 lines

arch/x86/include/asm/sev-common.h line 63

Quoted 5 lines
arch/x86/include/asm/sev-common.h +5 -0
+#define GHCB_MSR_HV_FT_POS			12
+#define GHCB_MSR_HV_FT_MASK			GENMASK_ULL(51, 0)
+
+#define GHCB_MSR_HV_FT_RESP_VAL(v)		\
+	(((unsigned long)((v) & GHCB_MSR_HV_FT_MASK) >> GHCB_MSR_HV_FT_POS))

This should shift down first and then mask or else the mask should be from 12 to 63.

Ah, that's good catch.

Joerg,

Please let me know if you want me to send the updated patch or you will take care in your next revision.

thanks

#5 lore raw

PATCH 2/3 x86/sev: Add defines for GHCB version 2 MSR protocol requests

In reply to Joerg Roedel

From: Brijesh Singh <[email protected]>

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support, so they are submitted as an individual patch without users yet to avoid merge conflicts in the future.

---
 arch/x86/include/asm/sev-common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/x86/include/asm/sev-common.h +15 -0
index 1cc9e7dd8107..9aa2f29b4c97 100644
@@ -47,6 +47,21 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_POS	12
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_MASK	GENMASK_ULL(51, 0)
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+#define GHCB_MSR_HV_FT_POS			12
+#define GHCB_MSR_HV_FT_MASK			GENMASK_ULL(51, 0)
+
+#define GHCB_MSR_HV_FT_RESP_VAL(v)		\
+	((unsigned long)((v) >> GHCB_MSR_HV_FT_POS) & GHCB_MSR_HV_FT_MASK)
+
 #define GHCB_MSR_TERM_REQ		0x100
 #define GHCB_MSR_TERM_REASON_SET_POS	12
 #define GHCB_MSR_TERM_REASON_SET_MASK	0xf
Signature · 1 line
2.31.1
maintainer
#6 lore raw

Re: [PATCH 2/3] x86/sev: Add defines for GHCB version 2 MSR protocol requests

Quoted 37 lines · Joerg Roedel

From: Brijesh Singh <[email protected]>

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support, so they are submitted as an individual patch without users yet to avoid merge conflicts in the future.

---
 arch/x86/include/asm/sev-common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/x86/include/asm/sev-common.h +5 -0
index 1cc9e7dd8107..9aa2f29b4c97 100644
@@ -47,6 +47,21 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_POS	12
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_MASK	GENMASK_ULL(51, 0)

arch/x86/include/asm/sev-common.h line 64

Quoted 10 lines
arch/x86/include/asm/sev-common.h +10 -0
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+#define GHCB_MSR_HV_FT_POS			12
+#define GHCB_MSR_HV_FT_MASK			GENMASK_ULL(51, 0)
+
+#define GHCB_MSR_HV_FT_RESP_VAL(v)		\
+	((unsigned long)((v) >> GHCB_MSR_HV_FT_POS) & GHCB_MSR_HV_FT_MASK)
+

Ok, so I took a critical look at this and it doesn't make sense to have a differently named define each time you need the [63:12] slice of GHCBData. So you can simply use GHCB_DATA(msr_value) instead, see below.

Complaints?

---
From: Brijesh Singh <[email protected]>
Date: Wed, 23 Jun 2021 08:40:00 +0200
Subject: [PATCH] x86/sev: Add defines for GHCB version 2 MSR protocol requests

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support.

[ bp: Fold in https://lkml.kernel.org/r/[email protected] too.
Simplify the brewing macro maze into readability. ]

---
 arch/x86/include/asm/sev-common.h | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
arch/x86/include/asm/sev-common.h +15 -1
index 629c3df243f0..2cef6c5a52c2 100644
@@ -9,8 +9,13 @@
 #define __ASM_X86_SEV_COMMON_H
 
 #define GHCB_MSR_INFO_POS		0
-#define GHCB_MSR_INFO_MASK		(BIT_ULL(12) - 1)
+#define GHCB_DATA_LOW			12
+#define GHCB_MSR_INFO_MASK		(BIT_ULL(GHCB_DATA_LOW) - 1)
 
+#define GHCB_DATA(v)			\
+	(((unsigned long)(v) & ~GHCB_MSR_INFO_MASK) >> GHCB_DATA_LOW)
+
+/* SEV Information Request/Response */
 #define GHCB_MSR_SEV_INFO_RESP		0x001
 #define GHCB_MSR_SEV_INFO_REQ		0x002
 #define GHCB_MSR_VER_MAX_POS		48
@@ -28,6 +33,7 @@
 #define GHCB_MSR_PROTO_MAX(v)		(((v) >> GHCB_MSR_VER_MAX_POS) & GHCB_MSR_VER_MAX_MASK)
 #define GHCB_MSR_PROTO_MIN(v)		(((v) >> GHCB_MSR_VER_MIN_POS) & GHCB_MSR_VER_MIN_MASK)
 
+/* CPUID Request/Response */
 #define GHCB_MSR_CPUID_REQ		0x004
 #define GHCB_MSR_CPUID_RESP		0x005
 #define GHCB_MSR_CPUID_FUNC_POS		32
@@ -45,6 +51,14 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+
 #define GHCB_MSR_TERM_REQ		0x100
 #define GHCB_MSR_TERM_REASON_SET_POS	12
 #define GHCB_MSR_TERM_REASON_SET_MASK	0xf
Signature · 7 lines
2.29.2

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#7 lore raw

Re: [PATCH 2/3] x86/sev: Add defines for GHCB version 2 MSR protocol requests

Quoted 5 lines · Borislav Petkov

Ok, so I took a critical look at this and it doesn't make sense to have a differently named define each time you need the [63:12] slice of GHCBData. So you can simply use GHCB_DATA(msr_value) instead, see below.

Complaints?

Looks good to me.

#8 lore raw

Re: [PATCH 2/3] x86/sev: Add defines for GHCB version 2 MSR protocol requests

In reply to Borislav Petkov
Quoted 52 lines · Borislav Petkov
Quoted 37 lines · Joerg Roedel

From: Brijesh Singh <[email protected]>

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support, so they are submitted as an individual patch without users yet to avoid merge conflicts in the future.

---
 arch/x86/include/asm/sev-common.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/x86/include/asm/sev-common.h +5 -0
index 1cc9e7dd8107..9aa2f29b4c97 100644
@@ -47,6 +47,21 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_POS	12
+#define GHCB_MSR_AP_RESET_HOLD_RESULT_MASK	GENMASK_ULL(51, 0)

arch/x86/include/asm/sev-common.h line 64

Quoted 10 lines
arch/x86/include/asm/sev-common.h +10 -0
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+#define GHCB_MSR_HV_FT_POS			12
+#define GHCB_MSR_HV_FT_MASK			GENMASK_ULL(51, 0)
+
+#define GHCB_MSR_HV_FT_RESP_VAL(v)		\
+	((unsigned long)((v) >> GHCB_MSR_HV_FT_POS) & GHCB_MSR_HV_FT_MASK)
+

Ok, so I took a critical look at this and it doesn't make sense to have a differently named define each time you need the [63:12] slice of GHCBData. So you can simply use GHCB_DATA(msr_value) instead, see below.

Quoted 1 line

Complaints?

Looks good to me.

#9 lore raw

Re: [PATCH 2/3] x86/sev: Add defines for GHCB version 2 MSR protocol requests

In reply to Borislav Petkov
Quoted 9 lines · Borislav Petkov
Quoted 2 lines · Joerg Roedel

From: Brijesh Singh <[email protected]>

Ok, so I took a critical look at this and it doesn't make sense to have a differently named define each time you need the [63:12] slice of GHCBData. So you can simply use GHCB_DATA(msr_value) instead, see below.

Complaints?

None from me.

Thanks,
Tom

merge bot Applied
#10 lore raw

[tip: x86/sev] x86/sev: Add defines for GHCB version 2 MSR protocol requests

In reply to Joerg Roedel
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:     310f134ed41fcaa03eff302b1e69f1ce1ee21841
Gitweb:        https://git.kernel.org/tip/310f134ed41fcaa03eff302b1e69f1ce1ee21841
Author:        Brijesh Singh <[email protected]>
AuthorDate:    Wed, 23 Jun 2021 08:40:00 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 23 Jun 2021 11:25:17 +02:00

x86/sev: Add defines for GHCB version 2 MSR protocol requests

Add the necessary defines for supporting the GHCB version 2 protocol. This includes defines for:

- MSR-based AP hlt request/response
- Hypervisor Feature request/response

This is the bare minimum of requests that need to be supported by a GHCB version 2 implementation. There are more requests in the specification, but those depend on Secure Nested Paging support being available.

These defines are shared between SEV host and guest support.

[ bp: Fold in https://lkml.kernel.org/r/[email protected] too.
Simplify the brewing macro maze into readability. ]

---
 arch/x86/include/asm/sev-common.h | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
arch/x86/include/asm/sev-common.h +15 -1
index 629c3df..2cef6c5 100644
@@ -9,8 +9,13 @@
 #define __ASM_X86_SEV_COMMON_H
 
 #define GHCB_MSR_INFO_POS		0
-#define GHCB_MSR_INFO_MASK		(BIT_ULL(12) - 1)
+#define GHCB_DATA_LOW			12
+#define GHCB_MSR_INFO_MASK		(BIT_ULL(GHCB_DATA_LOW) - 1)
 
+#define GHCB_DATA(v)			\
+	(((unsigned long)(v) & ~GHCB_MSR_INFO_MASK) >> GHCB_DATA_LOW)
+
+/* SEV Information Request/Response */
 #define GHCB_MSR_SEV_INFO_RESP		0x001
 #define GHCB_MSR_SEV_INFO_REQ		0x002
 #define GHCB_MSR_VER_MAX_POS		48
@@ -28,6 +33,7 @@
 #define GHCB_MSR_PROTO_MAX(v)		(((v) >> GHCB_MSR_VER_MAX_POS) & GHCB_MSR_VER_MAX_MASK)
 #define GHCB_MSR_PROTO_MIN(v)		(((v) >> GHCB_MSR_VER_MIN_POS) & GHCB_MSR_VER_MIN_MASK)
 
+/* CPUID Request/Response */
 #define GHCB_MSR_CPUID_REQ		0x004
 #define GHCB_MSR_CPUID_RESP		0x005
 #define GHCB_MSR_CPUID_FUNC_POS		32
@@ -45,6 +51,14 @@
 		(((unsigned long)reg & GHCB_MSR_CPUID_REG_MASK) << GHCB_MSR_CPUID_REG_POS) | \
 		(((unsigned long)fn) << GHCB_MSR_CPUID_FUNC_POS))
 
+/* AP Reset Hold */
+#define GHCB_MSR_AP_RESET_HOLD_REQ		0x006
+#define GHCB_MSR_AP_RESET_HOLD_RESP		0x007
+
+/* GHCB Hypervisor Feature Request/Response */
+#define GHCB_MSR_HV_FT_REQ			0x080
+#define GHCB_MSR_HV_FT_RESP			0x081
+
 #define GHCB_MSR_TERM_REQ		0x100
 #define GHCB_MSR_TERM_REASON_SET_POS	12
 #define GHCB_MSR_TERM_REASON_SET_MASK	0xf
#11 lore raw

PATCH 3/3 x86/sev: Use "SEV: " prefix for messages from sev.c

In reply to Joerg Roedel

From: Joerg Roedel <[email protected]>

The source file has been renamed froms sev-es.c to sev.c, but the messages are still prefixed with "SEV-ES: ". Change that to "SEV: " to make it consistent.

Fixes e759959fe3b8 ("x86/sev-es: Rename sev-es.{ch} to sev.{ch}")
---
 arch/x86/kernel/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/sev.c +1 -1
index 87a4b00f028e..a6895e440bc3 100644
@@ -7,7 +7,7 @@
  * Author: Joerg Roedel <[email protected]>
  */
 
-#define pr_fmt(fmt)	"SEV-ES: " fmt
+#define pr_fmt(fmt)	"SEV: " fmt
 
 #include <linux/sched/debug.h>	/* For show_regs() */
 #include <linux/percpu-defs.h>
Signature · 1 line
2.31.1
merge bot Applied
#12 lore raw

[tip: x86/sev] x86/sev: Use "SEV: " prefix for messages from sev.c

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:     8d9d46bbf3b6b7ff8edcac33603ab45c29e0e07f
Gitweb:        https://git.kernel.org/tip/8d9d46bbf3b6b7ff8edcac33603ab45c29e0e07f
Author:        Joerg Roedel <[email protected]>
AuthorDate:    Tue, 22 Jun 2021 16:48:25 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 23 Jun 2021 11:56:18 +02:00

x86/sev: Use "SEV: " prefix for messages from sev.c

The source file has been renamed froms sev-es.c to sev.c, but the messages are still prefixed with "SEV-ES: ". Change that to "SEV: " to make it consistent.

Fixes e759959fe3b8 ("x86/sev-es: Rename sev-es.{ch} to sev.{ch}")
---
 arch/x86/kernel/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/sev.c +1 -1
index 87a4b00..a6895e4 100644
@@ -7,7 +7,7 @@
  * Author: Joerg Roedel <[email protected]>
  */
 
-#define pr_fmt(fmt)	"SEV-ES: " fmt
+#define pr_fmt(fmt)	"SEV: " fmt
 
 #include <linux/sched/debug.h>	/* For show_regs() */
 #include <linux/percpu-defs.h>