From: "Kirill A. Shutemov" <kirill@shutemov.name> To: Dave Hansen <dave.hansen@linux.intel.com>, Andy Lutomirski <luto@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Paolo Bonzini <pbonzini@redhat.com>, Sean Christopherson <sean.j.christopherson@intel.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org> Cc: David Rientjes <rientjes@google.com>, Andrea Arcangeli <aarcange@redhat.com>, Kees Cook <keescook@chromium.org>, Will Drewry <wad@chromium.org>, "Edgecombe, Rick P" <rick.p.edgecombe@intel.com>, "Kleen, Andi" <andi.kleen@intel.com>, Liran Alon <liran.alon@oracle.com>, Mike Rapoport <rppt@kernel.org>, x86@kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [RFCv2 04/16] x86/kvm: Use bounce buffers for KVM memory protection Date: Tue, 20 Oct 2020 09:18:47 +0300 [thread overview] Message-ID: <20201020061859.18385-5-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <20201020061859.18385-1-kirill.shutemov@linux.intel.com> Mirror SEV, use SWIOTLB always if KVM memory protection is enabled. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> --- arch/x86/Kconfig | 1 + arch/x86/kernel/kvm.c | 2 ++ arch/x86/kernel/pci-swiotlb.c | 3 ++- arch/x86/mm/mem_encrypt.c | 21 --------------------- arch/x86/mm/mem_encrypt_common.c | 23 +++++++++++++++++++++++ 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index cd272e3babbc..b22b95517437 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -806,6 +806,7 @@ config KVM_GUEST select ARCH_CPUIDLE_HALTPOLL select X86_HV_CALLBACK_VECTOR select X86_MEM_ENCRYPT_COMMON + select SWIOTLB default y help This option enables various optimizations for running under the KVM diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 2c1f8952b92a..30bb3d2d6ccd 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -26,6 +26,7 @@ #include <linux/kprobes.h> #include <linux/nmi.h> #include <linux/swait.h> +#include <linux/swiotlb.h> #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h> @@ -759,6 +760,7 @@ static void __init kvm_init_platform(void) pr_info("KVM memory protection enabled\n"); mem_protected = true; setup_force_cpu_cap(X86_FEATURE_KVM_MEM_PROTECTED); + swiotlb_force = SWIOTLB_FORCE; } } diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index c2cfa5e7c152..814060a6ceb0 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c @@ -13,6 +13,7 @@ #include <asm/dma.h> #include <asm/xen/swiotlb-xen.h> #include <asm/iommu_table.h> +#include <asm/kvm_para.h> int swiotlb __read_mostly; @@ -49,7 +50,7 @@ int __init pci_swiotlb_detect_4gb(void) * buffers are allocated and used for devices that do not support * the addressing range required for the encryption mask. */ - if (sme_active()) + if (sme_active() || kvm_mem_protected()) swiotlb = 1; return swiotlb; diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index 4dbdc9dac36b..5de64e068b0a 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -369,24 +369,3 @@ void __init mem_encrypt_free_decrypted_mem(void) free_init_pages("unused decrypted", vaddr, vaddr_end); } - -/* Architecture __weak replacement functions */ -void __init mem_encrypt_init(void) -{ - if (!sme_me_mask) - return; - - /* Call into SWIOTLB to update the SWIOTLB DMA buffers */ - swiotlb_update_mem_attributes(); - - /* - * With SEV, we need to unroll the rep string I/O instructions. - */ - if (sev_active()) - static_branch_enable(&sev_enable_key); - - pr_info("AMD %s active\n", - sev_active() ? "Secure Encrypted Virtualization (SEV)" - : "Secure Memory Encryption (SME)"); -} - diff --git a/arch/x86/mm/mem_encrypt_common.c b/arch/x86/mm/mem_encrypt_common.c index a878e7f246d5..7900f3788010 100644 --- a/arch/x86/mm/mem_encrypt_common.c +++ b/arch/x86/mm/mem_encrypt_common.c @@ -37,3 +37,26 @@ bool force_dma_unencrypted(struct device *dev) return false; } + +void __init mem_encrypt_init(void) +{ + if (!sme_me_mask && !kvm_mem_protected()) + return; + + /* Call into SWIOTLB to update the SWIOTLB DMA buffers */ + swiotlb_update_mem_attributes(); + + /* + * With SEV, we need to unroll the rep string I/O instructions. + */ + if (sev_active()) + static_branch_enable(&sev_enable_key); + + if (sme_me_mask) { + pr_info("AMD %s active\n", + sev_active() ? "Secure Encrypted Virtualization (SEV)" + : "Secure Memory Encryption (SME)"); + } else { + pr_info("KVM memory protection enabled\n"); + } +} -- 2.26.2
next prev parent reply other threads:[~2020-10-20 6:19 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-20 6:18 [RFCv2 00/16] KVM protected memory extension Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 01/16] x86/mm: Move force_dma_unencrypted() to common code Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 02/16] x86/kvm: Introduce KVM memory protection feature Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 03/16] x86/kvm: Make DMA pages shared Kirill A. Shutemov 2020-10-20 6:18 ` Kirill A. Shutemov [this message] 2020-10-20 6:18 ` [RFCv2 05/16] x86/kvm: Make VirtIO use DMA API in KVM guest Kirill A. Shutemov 2020-10-20 8:06 ` Christoph Hellwig 2020-10-20 12:47 ` Kirill A. Shutemov 2020-10-22 3:31 ` Halil Pasic 2020-10-20 6:18 ` [RFCv2 06/16] x86/kvmclock: Share hvclock memory with the host Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 07/16] x86/realmode: Share trampoline area if KVM memory protection enabled Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 08/16] KVM: Use GUP instead of copy_from/to_user() to access guest memory Kirill A. Shutemov 2020-10-20 8:25 ` John Hubbard 2020-10-20 12:51 ` Kirill A. Shutemov 2020-10-22 11:49 ` Matthew Wilcox 2020-10-22 19:58 ` John Hubbard 2020-10-26 4:21 ` Matthew Wilcox 2020-10-26 4:44 ` John Hubbard 2020-10-26 13:28 ` Matthew Wilcox 2020-10-26 14:16 ` Jason Gunthorpe 2020-10-26 20:52 ` John Hubbard 2020-10-20 17:29 ` Ira Weiny 2020-10-22 11:37 ` Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 09/16] KVM: mm: Introduce VM_KVM_PROTECTED Kirill A. Shutemov 2020-10-21 18:47 ` Edgecombe, Rick P 2020-10-22 12:01 ` Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 10/16] KVM: x86: Use GUP for page walk instead of __get_user() Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 11/16] KVM: Protected memory extension Kirill A. Shutemov 2020-10-20 7:17 ` Peter Zijlstra 2020-10-20 12:55 ` Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 12/16] KVM: x86: Enabled protected " Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 13/16] KVM: Rework copy_to/from_guest() to avoid direct mapping Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 14/16] KVM: Handle protected memory in __kvm_map_gfn()/__kvm_unmap_gfn() Kirill A. Shutemov 2020-10-21 18:50 ` Edgecombe, Rick P 2020-10-22 12:06 ` Kirill A. Shutemov 2020-10-22 16:59 ` Edgecombe, Rick P 2020-10-23 10:36 ` Kirill A. Shutemov 2020-10-22 3:26 ` Halil Pasic 2020-10-22 12:07 ` Kirill A. Shutemov 2020-10-20 6:18 ` [RFCv2 15/16] KVM: Unmap protected pages from direct mapping Kirill A. Shutemov 2020-10-20 7:12 ` Peter Zijlstra 2020-10-20 12:18 ` David Hildenbrand 2020-10-20 13:20 ` David Hildenbrand 2020-10-21 1:20 ` Edgecombe, Rick P 2020-10-26 19:55 ` Tom Lendacky 2020-10-21 18:49 ` Edgecombe, Rick P 2020-10-23 12:37 ` Mike Rapoport 2020-10-23 16:32 ` Sean Christopherson 2020-10-20 6:18 ` [RFCv2 16/16] mm: Do not use zero page for VM_KVM_PROTECTED VMAs Kirill A. Shutemov 2020-10-20 7:46 ` [RFCv2 00/16] KVM protected memory extension Vitaly Kuznetsov 2020-10-20 13:49 ` Kirill A. Shutemov 2020-10-21 14:46 ` Vitaly Kuznetsov 2020-10-23 11:35 ` Kirill A. Shutemov 2020-10-23 12:01 ` Vitaly Kuznetsov 2020-10-21 18:20 ` Andy Lutomirski 2020-10-26 15:29 ` Kirill A. Shutemov 2020-10-26 23:58 ` Andy Lutomirski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201020061859.18385-5-kirill.shutemov@linux.intel.com \ --to=kirill@shutemov.name \ --cc=aarcange@redhat.com \ --cc=andi.kleen@intel.com \ --cc=dave.hansen@linux.intel.com \ --cc=jmattson@google.com \ --cc=joro@8bytes.org \ --cc=keescook@chromium.org \ --cc=kirill.shutemov@linux.intel.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=liran.alon@oracle.com \ --cc=luto@kernel.org \ --cc=pbonzini@redhat.com \ --cc=peterz@infradead.org \ --cc=rick.p.edgecombe@intel.com \ --cc=rientjes@google.com \ --cc=rppt@kernel.org \ --cc=sean.j.christopherson@intel.com \ --cc=vkuznets@redhat.com \ --cc=wad@chromium.org \ --cc=wanpengli@tencent.com \ --cc=x86@kernel.org \ --subject='Re: [RFCv2 04/16] x86/kvm: Use bounce buffers for KVM memory protection' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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).