lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] KVM: SVM: fix compilation with modular PSP and non-modular KVM
From
Date
On 4/13/20 2:50 AM, Paolo Bonzini wrote:
> Use svm_sev_enabled() in order to cull all calls to PSP code. Otherwise,
> compilation fails with undefined symbols if the PSP device driver is compiled
> as a module and KVM is not.

The Kconfig support will set CONFIG_KVM_AMD_SEV to "n" in this situation,
so it might be worth seeing if sev.o could be removed from the build at
that point. I'll try and look at that when I get a chance, but I'm
currently buried with a ton of other work.

>
> Reported-by: Uros Bizjak <ubizjak@gmail.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> arch/x86/kvm/svm/sev.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index 0e3fc311d7da..364ffe32139c 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -1117,7 +1117,7 @@ int __init sev_hardware_setup(void)
> /* Maximum number of encrypted guests supported simultaneously */
> max_sev_asid = cpuid_ecx(0x8000001F);
>
> - if (!max_sev_asid)
> + if (!svm_sev_enabled())

It looks like these are spaces instead of tabs, could just be my email
veiwer, though.

> return 1;
>
> /* Minimum ASID value that should be used for SEV guest */
> @@ -1156,6 +1156,9 @@ int __init sev_hardware_setup(void)
>
> void sev_hardware_teardown(void)
> {
> + if (!svm_sev_enabled())
> + return;
> +

Ditto on the spaces/tabs thing, here.

Thanks,
Tom

> bitmap_free(sev_asid_bitmap);
> bitmap_free(sev_reclaim_asid_bitmap);
>
>

\
 
 \ /
  Last update: 2020-04-16 16:54    [W:0.081 / U:0.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site