* [PATCH] crypto: ccp - Have it depend on AMD_IOMMU
@ 2024-02-07 20:47 Borislav Petkov
2024-02-09 17:51 ` Tom Lendacky
2024-02-13 11:30 ` [tip: x86/sev] " tip-bot2 for Borislav Petkov (AMD)
0 siblings, 2 replies; 4+ messages in thread
From: Borislav Petkov @ 2024-02-07 20:47 UTC (permalink / raw)
To: Ashish Kalra, Michael Roth, Tom Lendacky; +Cc: LKML
From: "Borislav Petkov (AMD)" <bp@alien8.de>
sev-dev.c calls code in the AMD IOMMU now but that can't really work if
latter is not enabled in Kconfig:
ld: vmlinux.o: in function `__sev_firmware_shutdown.isra.0':
sev-dev.c:(.text+0x2501f0e): undefined reference to `amd_iommu_snp_disable'
ld: vmlinux.o: in function `snp_rmptable_init':
sev.c:(.init.text+0x26260): undefined reference to `amd_iommu_snp_en'
make[2]: *** [scripts/Makefile.vmlinux:37: vmlinux] Error 1
make: *** [Makefile:240: __sub-make] Error 2
Fix those deps.
Fixes: f366a8dac1b8 ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
---
drivers/crypto/ccp/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig
index 32268e239bf1..f394e45e11ab 100644
--- a/drivers/crypto/ccp/Kconfig
+++ b/drivers/crypto/ccp/Kconfig
@@ -38,7 +38,7 @@ config CRYPTO_DEV_CCP_CRYPTO
config CRYPTO_DEV_SP_PSP
bool "Platform Security Processor (PSP) device"
default y
- depends on CRYPTO_DEV_CCP_DD && X86_64
+ depends on CRYPTO_DEV_CCP_DD && X86_64 && AMD_IOMMU
help
Provide support for the AMD Platform Security Processor (PSP).
The PSP is a dedicated processor that provides support for key
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: ccp - Have it depend on AMD_IOMMU
2024-02-07 20:47 [PATCH] crypto: ccp - Have it depend on AMD_IOMMU Borislav Petkov
@ 2024-02-09 17:51 ` Tom Lendacky
2024-02-11 20:18 ` Borislav Petkov
2024-02-13 11:30 ` [tip: x86/sev] " tip-bot2 for Borislav Petkov (AMD)
1 sibling, 1 reply; 4+ messages in thread
From: Tom Lendacky @ 2024-02-09 17:51 UTC (permalink / raw)
To: Borislav Petkov, Ashish Kalra, Michael Roth; +Cc: LKML
On 2/7/24 14:47, Borislav Petkov wrote:
> From: "Borislav Petkov (AMD)" <bp@alien8.de>
>
> sev-dev.c calls code in the AMD IOMMU now but that can't really work if
> latter is not enabled in Kconfig:
>
> ld: vmlinux.o: in function `__sev_firmware_shutdown.isra.0':
> sev-dev.c:(.text+0x2501f0e): undefined reference to `amd_iommu_snp_disable'
> ld: vmlinux.o: in function `snp_rmptable_init':
> sev.c:(.init.text+0x26260): undefined reference to `amd_iommu_snp_en'
> make[2]: *** [scripts/Makefile.vmlinux:37: vmlinux] Error 1
> make: *** [Makefile:240: __sub-make] Error 2
>
> Fix those deps.
>
> Fixes: f366a8dac1b8 ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> ---
> drivers/crypto/ccp/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig
> index 32268e239bf1..f394e45e11ab 100644
> --- a/drivers/crypto/ccp/Kconfig
> +++ b/drivers/crypto/ccp/Kconfig
> @@ -38,7 +38,7 @@ config CRYPTO_DEV_CCP_CRYPTO
> config CRYPTO_DEV_SP_PSP
> bool "Platform Security Processor (PSP) device"
> default y
> - depends on CRYPTO_DEV_CCP_DD && X86_64
> + depends on CRYPTO_DEV_CCP_DD && X86_64 && AMD_IOMMU
Or should the ifdef around amd_iommu_snp_disable() in
include/linux/amd-iommu.h instead be:
#if defined(CONFIG_AMD_IOMMU) && defined(CONFIG_KVM_AMD_SEV)
and amd_iommu_snp_en be protected in arch/x86/include/asm/iommu.h as:
#ifdef CONFIG_AMD_IOMMU
extern bool amd_iommu_snp_en;
#else
#define amd_iommu_snp_en false
#endif
I think this would be better in case these should be referenced elsewhere
in the future.
Thanks,
Tom
> help
> Provide support for the AMD Platform Security Processor (PSP).
> The PSP is a dedicated processor that provides support for key
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] crypto: ccp - Have it depend on AMD_IOMMU
2024-02-09 17:51 ` Tom Lendacky
@ 2024-02-11 20:18 ` Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: Borislav Petkov @ 2024-02-11 20:18 UTC (permalink / raw)
To: Tom Lendacky; +Cc: Ashish Kalra, Michael Roth, LKML
On Fri, Feb 09, 2024 at 11:51:37AM -0600, Tom Lendacky wrote:
> Or should the ifdef around amd_iommu_snp_disable() in
> include/linux/amd-iommu.h instead be:
>
> #if defined(CONFIG_AMD_IOMMU) && defined(CONFIG_KVM_AMD_SEV)
Pretty much, except the thunk should say that it is the thunk that gets
called:
#if defined(CONFIG_AMD_IOMMU) && defined(CONFIG_KVM_AMD_SEV)
int amd_iommu_snp_disable(void);
#else
static inline int amd_iommu_snp_disable(void) { return -ENODEV; }
#endif
and return -ENODEV to denote that so that the caller doesn't wonder
what's going on.
> I think this would be better in case these should be referenced
> elsewhere in the future.
However, looking at all that code, its design still looks iffy to me.
iommu_page_make_shared() and amd_iommu_snp_disable() is functionality
which the *IOMMU* provides in order to deal with SEV* guests. So that
functionality should be behind
CONFIG_AMD_IOMMU_SEV
or so, on which all its users depend or select. I'd prefer depend tho.
Putting IOMMU facilities around a KVM Kconfig symbol CONFIG_KVM_AMD_SEV
is simply bad design. There are providers of functionality which is
behind Kconfig symbols and users which depend on those. The current
thing is a hack IMNSVHO.
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: x86/sev] crypto: ccp - Have it depend on AMD_IOMMU
2024-02-07 20:47 [PATCH] crypto: ccp - Have it depend on AMD_IOMMU Borislav Petkov
2024-02-09 17:51 ` Tom Lendacky
@ 2024-02-13 11:30 ` tip-bot2 for Borislav Petkov (AMD)
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Borislav Petkov (AMD) @ 2024-02-13 11:30 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov (AMD), x86, linux-kernel
The following commit has been merged into the x86/sev branch of tip:
Commit-ID: ee8ff8768735edc3e013837c4416f819543ddc17
Gitweb: https://git.kernel.org/tip/ee8ff8768735edc3e013837c4416f819543ddc17
Author: Borislav Petkov (AMD) <bp@alien8.de>
AuthorDate: Wed, 07 Feb 2024 21:47:21 +01:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 13 Feb 2024 12:21:15 +01:00
crypto: ccp - Have it depend on AMD_IOMMU
sev-dev.c calls code in the AMD IOMMU now but that can't really work if
latter is not enabled in Kconfig:
ld: vmlinux.o: in function `__sev_firmware_shutdown.isra.0':
sev-dev.c:(.text+0x2501f0e): undefined reference to `amd_iommu_snp_disable'
ld: vmlinux.o: in function `snp_rmptable_init':
sev.c:(.init.text+0x26260): undefined reference to `amd_iommu_snp_en'
make[2]: *** [scripts/Makefile.vmlinux:37: vmlinux] Error 1
make: *** [Makefile:240: __sub-make] Error 2
Fix those deps.
Fixes: f366a8dac1b8 ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240207204721.6189-1-bp@alien8.de
---
drivers/crypto/ccp/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig
index 32268e2..f394e45 100644
--- a/drivers/crypto/ccp/Kconfig
+++ b/drivers/crypto/ccp/Kconfig
@@ -38,7 +38,7 @@ config CRYPTO_DEV_CCP_CRYPTO
config CRYPTO_DEV_SP_PSP
bool "Platform Security Processor (PSP) device"
default y
- depends on CRYPTO_DEV_CCP_DD && X86_64
+ depends on CRYPTO_DEV_CCP_DD && X86_64 && AMD_IOMMU
help
Provide support for the AMD Platform Security Processor (PSP).
The PSP is a dedicated processor that provides support for key
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-13 11:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-07 20:47 [PATCH] crypto: ccp - Have it depend on AMD_IOMMU Borislav Petkov
2024-02-09 17:51 ` Tom Lendacky
2024-02-11 20:18 ` Borislav Petkov
2024-02-13 11:30 ` [tip: x86/sev] " tip-bot2 for Borislav Petkov (AMD)
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).