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 X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C4BDC43467 for ; Tue, 20 Oct 2020 06:19:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BB19922282 for ; Tue, 20 Oct 2020 06:19:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="OvuEbAZW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB19922282 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 49DC46B007B; Tue, 20 Oct 2020 02:19:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D2B66B0080; Tue, 20 Oct 2020 02:19:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12F036B007B; Tue, 20 Oct 2020 02:19:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0054.hostedemail.com [216.40.44.54]) by kanga.kvack.org (Postfix) with ESMTP id CCAA86B007D for ; Tue, 20 Oct 2020 02:19:13 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 770C5180AD811 for ; Tue, 20 Oct 2020 06:19:13 +0000 (UTC) X-FDA: 77391301386.06.ice62_57070d52723d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 4935A1021D0B9 for ; Tue, 20 Oct 2020 06:19:13 +0000 (UTC) X-HE-Tag: ice62_57070d52723d X-Filterd-Recvd-Size: 10449 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Tue, 20 Oct 2020 06:19:12 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id a7so653911lfk.9 for ; Mon, 19 Oct 2020 23:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YqXoyWzrpggXifhp2ZZvkYQN13pzHcgcJE84Cdo/0fA=; b=OvuEbAZWg3vpu8+LZy777g08/QYkrpy0M/C3pJJUVn5405klpLJKvddwUm/X8YG7sp GyOX+PH1FyvsxFbYCY9z84kfL6l126OrW4VmCKmakO3y1HTg9VEyY02PYG1PEge7/Q8r z2j50GS5eoRh2cLyya1+OFS64Xwz8sEdMr3uN1ZnQBxMTBotnH7o/PoKd8pHThWyvsn+ uRCnDYRMb9t5l1XcGamPtITidQt8bkWtkHpL0SGaWPxfwx4Wwu0AkhnmRi2RXvyTfx5A MJ9bSUBb3CHAqNR0w2ov2Jg1ExbFBpFv7W9z60KdpSn3fpPMRxCujKX9CYht0WBYmcls MjlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YqXoyWzrpggXifhp2ZZvkYQN13pzHcgcJE84Cdo/0fA=; b=NK4kqQabVrvfyqxZuptoTb+FGOnvxt6KPP89l5Myq50niWmG0tQT5zLbemWPumjdrV hxSMS0kQFlP7l4Jvag+E37Y8kA0omf8tSg6buIv9ICOSamFzraWdxCgF890Ms74eWVe9 r6WOj3burgaUTfEkmLtJ3XHxMxrERD3xJYq4g3148aCKD8/g72dVdalCs365jYTX6EQn 5V/IyS90o42hyunwPmk+Uz+XG6mJppt2yCcPQPQf/tWnDWVUTBfBGgw1K98ScTfM8AYt juKk+whImUl8fvkIx+xm3L0bmhGsGoxn1yXbZUCHeswVmgo3W87hDd8aclmp4N/F+8vZ Ittw== X-Gm-Message-State: AOAM533mfcd4GakrUPNBpkbauvhOFZp+nd4lgwKuBgtcHeBwPi4seHoH HDwkGRwKIXNoAOo+PiXdhz3R5w== X-Google-Smtp-Source: ABdhPJx1Za/f8n8gS2Lf4tVPWSC9ysXQk4V29HtHvIrTK/S7VXXVqCjMAeIH20fbfqK12CcIlnQacA== X-Received: by 2002:a19:4cd:: with SMTP id 196mr374025lfe.484.1603174751608; Mon, 19 Oct 2020 23:19:11 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id o14sm136989lfc.29.2020.10.19.23.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 23:19:09 -0700 (PDT) From: "Kirill A. Shutemov" X-Google-Original-From: "Kirill A. Shutemov" Received: by box.localdomain (Postfix, from userid 1000) id 24A6D102F6C; Tue, 20 Oct 2020 09:19:02 +0300 (+03) To: Dave Hansen , Andy Lutomirski , Peter Zijlstra , Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel Cc: David Rientjes , Andrea Arcangeli , Kees Cook , Will Drewry , "Edgecombe, Rick P" , "Kleen, Andi" , Liran Alon , Mike Rapoport , x86@kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [RFCv2 13/16] KVM: Rework copy_to/from_guest() to avoid direct mapping Date: Tue, 20 Oct 2020 09:18:56 +0300 Message-Id: <20201020061859.18385-14-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020061859.18385-1-kirill.shutemov@linux.intel.com> References: <20201020061859.18385-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: We are going unmap guest pages from direct mapping and cannot rely on it for guest memory access. Use temporary kmap_atomic()-style mapping to access guest memory. Signed-off-by: Kirill A. Shutemov --- virt/kvm/kvm_main.c | 27 ++++++++++- virt/lib/mem_protected.c | 101 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 2 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4c008c7b4974..9b569b78874a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -51,6 +51,7 @@ #include #include #include +#include =20 #include #include @@ -154,6 +155,12 @@ static void kvm_uevent_notify_change(unsigned int ty= pe, struct kvm *kvm); static unsigned long long kvm_createvm_count; static unsigned long long kvm_active_vms; =20 +void *kvm_map_page_atomic(struct page *page); +void kvm_unmap_page_atomic(void *vaddr); + +int kvm_init_protected_memory(void); +void kvm_exit_protected_memory(void); + int __kvm_protect_memory(unsigned long start, unsigned long end, bool pr= otect); =20 __weak void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm, @@ -2329,6 +2336,7 @@ int copy_from_guest(void *data, unsigned long hva, = int len, bool protected) int offset =3D offset_in_page(hva); struct page *page; int npages, seg; + void *vaddr; =20 if (!protected) return __copy_from_user(data, (void __user *)hva, len); @@ -2341,7 +2349,11 @@ int copy_from_guest(void *data, unsigned long hva,= int len, bool protected) npages =3D get_user_pages_unlocked(hva, 1, &page, FOLL_KVM); if (npages !=3D 1) return -EFAULT; - memcpy(data, page_address(page) + offset, seg); + + vaddr =3D kvm_map_page_atomic(page); + memcpy(data, vaddr + offset, seg); + kvm_unmap_page_atomic(vaddr); + put_page(page); len -=3D seg; hva +=3D seg; @@ -2356,6 +2368,7 @@ int copy_to_guest(unsigned long hva, const void *da= ta, int len, bool protected) int offset =3D offset_in_page(hva); struct page *page; int npages, seg; + void *vaddr; =20 if (!protected) return __copy_to_user((void __user *)hva, data, len); @@ -2369,7 +2382,11 @@ int copy_to_guest(unsigned long hva, const void *d= ata, int len, bool protected) FOLL_WRITE | FOLL_KVM); if (npages !=3D 1) return -EFAULT; - memcpy(page_address(page) + offset, data, seg); + + vaddr =3D kvm_map_page_atomic(page); + memcpy(vaddr + offset, data, seg); + kvm_unmap_page_atomic(vaddr); + put_page(page); len -=3D seg; hva +=3D seg; @@ -4945,6 +4962,10 @@ int kvm_init(void *opaque, unsigned vcpu_size, uns= igned vcpu_align, if (r) goto out_free; =20 + if (IS_ENABLED(CONFIG_HAVE_KVM_PROTECTED_MEMORY) && + kvm_init_protected_memory()) + goto out_unreg; + kvm_chardev_ops.owner =3D module; kvm_vm_fops.owner =3D module; kvm_vcpu_fops.owner =3D module; @@ -4968,6 +4989,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsi= gned vcpu_align, return 0; =20 out_unreg: + kvm_exit_protected_memory(); kvm_async_pf_deinit(); out_free: kmem_cache_destroy(kvm_vcpu_cache); @@ -4989,6 +5011,7 @@ EXPORT_SYMBOL_GPL(kvm_init); =20 void kvm_exit(void) { + kvm_exit_protected_memory(); debugfs_remove_recursive(kvm_debugfs_dir); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); diff --git a/virt/lib/mem_protected.c b/virt/lib/mem_protected.c index 0b01dd74f29c..1dfe82534242 100644 --- a/virt/lib/mem_protected.c +++ b/virt/lib/mem_protected.c @@ -5,6 +5,100 @@ #include #include =20 +static pte_t **guest_map_ptes; +static struct vm_struct *guest_map_area; + +void *kvm_map_page_atomic(struct page *page) +{ + pte_t *pte; + void *vaddr; + + preempt_disable(); + pte =3D guest_map_ptes[smp_processor_id()]; + vaddr =3D guest_map_area->addr + smp_processor_id() * PAGE_SIZE; + set_pte(pte, mk_pte(page, PAGE_KERNEL)); + return vaddr; +} +EXPORT_SYMBOL_GPL(kvm_map_page_atomic); + +void kvm_unmap_page_atomic(void *vaddr) +{ + pte_t *pte =3D guest_map_ptes[smp_processor_id()]; + set_pte(pte, __pte(0)); + flush_tlb_one_kernel((unsigned long)vaddr); + preempt_enable(); +} +EXPORT_SYMBOL_GPL(kvm_unmap_page_atomic); + +int kvm_init_protected_memory(void) +{ + guest_map_ptes =3D kmalloc_array(num_possible_cpus(), + sizeof(pte_t *), GFP_KERNEL); + if (!guest_map_ptes) + return -ENOMEM; + + guest_map_area =3D alloc_vm_area(PAGE_SIZE * num_possible_cpus(), + guest_map_ptes); + if (!guest_map_ptes) { + kfree(guest_map_ptes); + return -ENOMEM; + } + + return 0; +} +EXPORT_SYMBOL_GPL(kvm_init_protected_memory); + +void kvm_exit_protected_memory(void) +{ + if (guest_map_area) + free_vm_area(guest_map_area); + if (guest_map_ptes) + kfree(guest_map_ptes); +} +EXPORT_SYMBOL_GPL(kvm_exit_protected_memory); + +static int adjust_direct_mapping_pte_range(pmd_t *pmd, unsigned long add= r, + unsigned long end, + struct mm_walk *walk) +{ + bool protect =3D (bool)walk->private; + pte_t *pte; + struct page *page; + + if (pmd_trans_huge(*pmd)) { + page =3D pmd_page(*pmd); + if (is_huge_zero_page(page)) + return 0; + VM_BUG_ON_PAGE(total_mapcount(page) !=3D 1, page); + /* XXX: Would it fail with direct device assignment? */ + VM_BUG_ON_PAGE(page_count(page) !=3D 1, page); + kernel_map_pages(page, HPAGE_PMD_NR, !protect); + return 0; + } + + pte =3D pte_offset_map(pmd, addr); + for (; addr !=3D end; pte++, addr +=3D PAGE_SIZE) { + pte_t entry =3D *pte; + + if (!pte_present(entry)) + continue; + + if (is_zero_pfn(pte_pfn(entry))) + continue; + + page =3D pte_page(entry); + + VM_BUG_ON_PAGE(page_mapcount(page) !=3D 1, page); + kernel_map_pages(page, 1, !protect); + } + + return 0; +} + +static const struct mm_walk_ops adjust_direct_mapping_ops =3D { + .pmd_entry =3D adjust_direct_mapping_pte_range, +}; + int __kvm_protect_memory(unsigned long start, unsigned long end, bool pr= otect) { struct mm_struct *mm =3D current->mm; @@ -50,6 +144,13 @@ int __kvm_protect_memory(unsigned long start, unsigne= d long end, bool protect) if (ret) goto out; =20 + if (vma_is_anonymous(vma)) { + ret =3D walk_page_range_novma(mm, start, tmp, + &adjust_direct_mapping_ops, NULL, + (void *) protect); + if (ret) + goto out; + } next: start =3D tmp; if (start < prev->vm_end) --=20 2.26.2