UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/coco: Mark cc_platform_has() and descendants noinstr 

Those will be used in code regions where instrumentation is not allowed
so mark them as such.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20230328201712.25852-2-bp@alien8.de
This commit is contained in:
Borislav Petkov (AMD) 2023-03-28 22:17:11 +02:00
parent ac9a78681b
commit 1eaf282e2c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/coco/core.c
View File

@ -16,7 +16,7 @@
enum cc_vendor cc_vendor __ro_after_init; enum cc_vendor cc_vendor __ro_after_init;
static u64 cc_mask __ro_after_init; static u64 cc_mask __ro_after_init;
static bool intel_cc_platform_has(enum cc_attr attr) static bool noinstr intel_cc_platform_has(enum cc_attr attr)
{ {
switch (attr) { switch (attr) {
case CC_ATTR_GUEST_UNROLL_STRING_IO: case CC_ATTR_GUEST_UNROLL_STRING_IO:
@ -34,7 +34,7 @@ static bool intel_cc_platform_has(enum cc_attr attr)
* the other levels of SME/SEV functionality, including C-bit * the other levels of SME/SEV functionality, including C-bit
* based SEV-SNP, are not enabled. * based SEV-SNP, are not enabled.
*/ */
static __maybe_unused bool amd_cc_platform_vtom(enum cc_attr attr) static __maybe_unused __always_inline bool amd_cc_platform_vtom(enum cc_attr attr)
{ {
switch (attr) { switch (attr) {
case CC_ATTR_GUEST_MEM_ENCRYPT: case CC_ATTR_GUEST_MEM_ENCRYPT:
@ -58,7 +58,7 @@ static __maybe_unused bool amd_cc_platform_vtom(enum cc_attr attr)
* the trampoline area must be encrypted. * the trampoline area must be encrypted.
*/ */
static bool amd_cc_platform_has(enum cc_attr attr) static bool noinstr amd_cc_platform_has(enum cc_attr attr)
{ {
#ifdef CONFIG_AMD_MEM_ENCRYPT #ifdef CONFIG_AMD_MEM_ENCRYPT
@ -97,7 +97,7 @@ static bool amd_cc_platform_has(enum cc_attr attr)
#endif #endif
} }
bool cc_platform_has(enum cc_attr attr) bool noinstr cc_platform_has(enum cc_attr attr)
{ {
switch (cc_vendor) { switch (cc_vendor) {
case CC_VENDOR_AMD: case CC_VENDOR_AMD: