From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C559EC4332F for ; Fri, 23 Dec 2022 17:05:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 280EE940007; Fri, 23 Dec 2022 12:05:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2309F900002; Fri, 23 Dec 2022 12:05:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F8BD940007; Fri, 23 Dec 2022 12:05:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F371B900002 for ; Fri, 23 Dec 2022 12:05:03 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B179980ECE for ; Fri, 23 Dec 2022 17:05:03 +0000 (UTC) X-FDA: 80274196086.08.EA64CB2 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by imf14.hostedemail.com (Postfix) with ESMTP id BD18710000F for ; Fri, 23 Dec 2022 17:05:00 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=alien8.de header.s=dkim header.b=sQpLqtBZ; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf14.hostedemail.com: domain of bp@alien8.de designates 5.9.137.197 as permitted sender) smtp.mailfrom=bp@alien8.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671815101; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eIrwyfehmxU3S8OfAsjHXXxAvKGYqWtRXnlHsmPvMIs=; b=eTe8tYprAzeimjEpmjeblh/ckFHdHfYKnaBM1npy9J+vKvOMfvgj2/pSUbf0y2qmT50Uy2 ZsuI8TwTMntW9mw1C24Kkg662nJ9hZjnFQ3QqTPKHdrT0aUu4pyDLh+wEye6K4I6j5kZ+i RiWLLLHFZYrpffLe41ysSkhsJdAUwzk= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=alien8.de header.s=dkim header.b=sQpLqtBZ; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf14.hostedemail.com: domain of bp@alien8.de designates 5.9.137.197 as permitted sender) smtp.mailfrom=bp@alien8.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671815101; a=rsa-sha256; cv=none; b=Qw3FN6/qtrDB34uyNrkz0sway1It3WCoGmShEEhRLc3z+j4d5UNqzYR0xr9aLkIlaCxuun pR/Hk8H1GziQ/GnjzrKLzBICrGPv/ycif15Ht3dE10s0Yjvrc2P3rdh89WnPmtwWBFApU9 jJStSW/pARw2LRnXlRkW1z7LjKfwkh4= Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 62AA51EC0724; Fri, 23 Dec 2022 17:56:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1671814616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=eIrwyfehmxU3S8OfAsjHXXxAvKGYqWtRXnlHsmPvMIs=; b=sQpLqtBZNyzt9lCkh02Tv1TArmXNvAYkccThgPqKToX+E4uRVMeRWpB6DQOtn0UgGq7QfH xnfQYy4dQI8JTVvBFgPDRc1+UI8QVqekXcGosVLwwJkrENFYZi9w4fEUexsMn6EYHGTJQO Vhfz7bb9sk0ICgmVHhqqvOh8tEjrjhY= Date: Fri, 23 Dec 2022 17:56:50 +0100 From: Borislav Petkov To: Michael Roth Cc: kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com, ardb@kernel.org, pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, luto@kernel.org, dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com, peterz@infradead.org, srinivas.pandruvada@linux.intel.com, rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, marcorr@google.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, dgilbert@redhat.com, jarkko@kernel.org, ashish.kalra@amd.com, harald@profian.com, Nikunj A Dadhania Subject: Re: [PATCH RFC v7 03/64] KVM: SVM: Advertise private memory support to KVM Message-ID: References: <20221214194056.161492-1-michael.roth@amd.com> <20221214194056.161492-4-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20221214194056.161492-4-michael.roth@amd.com> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: BD18710000F X-Stat-Signature: 3rgex8yj4uc7dbegaoo7h1b3aijyqgnx X-HE-Tag: 1671815100-882876 X-HE-Meta: U2FsdGVkX1/eqYUT/VDJ0Sgp+m4BMu7O5EfMYpNXYDx8yTe5gnp8HP5k/RN+zwE4va7f1qBBhpkvCqeVTupPt1emH9F9S04Z5G5Rfw86JWbOOUKQqOZcDiqNkLvRUbqjc3moxmB7UH2YxrWkd4VwqiU/g/8S26lkrseOKbcy7VhgVtLl0Jk5rBlSa4gAiw3DzouRrumfAKe/zqjEUHur5gv4C87fSr5u/fTMZSZ0AnXZnMRfSdxFHfTcuAZlr9gplsrDOxDolWVylkp18YhWwHcJmgH7IZLLUizQuQEeQy5ugqIqBDlEwNdjazqo/MpNOxzCSr0jB992TOq/rX612OWjJKzIxjFD6Vu036gWSbEFC4iEJKRn5u1Mp8/imOWF6BDvh6oKEsAIj+Jp9TaKNLv91XESVVXMtTKXCtqnt+ydrYMPqMbndtJNhDqhpaY9zFRm3NDEm9FJhqRK4aHe9nSS771nKyQWfaMmSBKziSR9neWV1TWkGZk+eODXa14WvMbbq8Ft78hAXJpXAAGkkjp7V8rvPfh6xkPHHoeoZxQ9cnyoCeKPaR0YPDcLTQzU92J3Q4o3uVsZcwWtmfIWTlaKe3SyaTWeeAinTCYX5mFBJCPNyx5LXxKnGhTN+aSCja4DvuNqEJG4K/3BUyTZy60hmguRcWZ8ZiN/K+Ooo/edyMbOHipCaJc4QTxq8UTlrxiqtJDNiFLwei4kXiW2x2d/CqGHYpQjd/Lg86gNfDhTZq5nGVSIfI+Guby11qHxObIZ0gOQGCwu5OMiKAbddFLBe/i20pmo8GjO00MM0R69MN5/m3Y4mByeLg7Vu/f4C+SPPkmvSa/2zIZnYu4yw/FYdqJ2ZGaM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Dec 14, 2022 at 01:39:55PM -0600, Michael Roth wrote: > + bool (*private_mem_enabled)(struct kvm *kvm); This looks like a function returning boolean to me. IOW, you can simplify this to: diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h index 82ba4a564e58..4449aeff0dff 100644 --- a/arch/x86/include/asm/kvm-x86-ops.h +++ b/arch/x86/include/asm/kvm-x86-ops.h @@ -129,6 +129,7 @@ KVM_X86_OP(msr_filter_changed) KVM_X86_OP(complete_emulated_msr) KVM_X86_OP(vcpu_deliver_sipi_vector) KVM_X86_OP_OPTIONAL_RET0(vcpu_get_apicv_inhibit_reasons); +KVM_X86_OP_OPTIONAL_RET0(private_mem_enabled); #undef KVM_X86_OP #undef KVM_X86_OP_OPTIONAL diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 1da0474edb2d..1b4b89ddeb55 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1574,6 +1574,7 @@ struct kvm_x86_ops { void (*load_mmu_pgd)(struct kvm_vcpu *vcpu, hpa_t root_hpa, int root_level); + bool (*private_mem_enabled)(struct kvm *kvm); bool (*has_wbinvd_exit)(void); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index ce362e88a567..73b780fa4653 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4680,6 +4680,14 @@ static int svm_vm_init(struct kvm *kvm) return 0; } +static bool svm_private_mem_enabled(struct kvm *kvm) +{ + if (sev_guest(kvm)) + return kvm->arch.upm_mode; + + return IS_ENABLED(CONFIG_HAVE_KVM_PRIVATE_MEM_TESTING); +} + static struct kvm_x86_ops svm_x86_ops __initdata = { .name = "kvm_amd", @@ -4760,6 +4768,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .vcpu_after_set_cpuid = svm_vcpu_after_set_cpuid, + .private_mem_enabled = svm_private_mem_enabled, + .has_wbinvd_exit = svm_has_wbinvd_exit, .get_l2_tsc_offset = svm_get_l2_tsc_offset, diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 823646d601db..9a1ca59d36a4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12556,6 +12556,11 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, } EXPORT_SYMBOL_GPL(__x86_set_memory_region); +bool kvm_arch_has_private_mem(struct kvm *kvm) +{ + return static_call(kvm_x86_private_mem_enabled)(kvm); +} + void kvm_arch_pre_destroy_vm(struct kvm *kvm) { kvm_mmu_pre_destroy_vm(kvm); -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette