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=-9.6 required=3.0 tests=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 35D64C433E4 for ; Fri, 22 May 2020 12:52:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E7686206C3 for ; Fri, 22 May 2020 12:52:44 +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="lp2cPjep" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7686206C3 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 3526D80011; Fri, 22 May 2020 08:52:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B7D880008; Fri, 22 May 2020 08:52:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0941A80011; Fri, 22 May 2020 08:52:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id D825980008 for ; Fri, 22 May 2020 08:52:25 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 9FB6D180AD820 for ; Fri, 22 May 2020 12:52:25 +0000 (UTC) X-FDA: 76844343450.08.seat29_8992be843f203 X-HE-Tag: seat29_8992be843f203 X-Filterd-Recvd-Size: 7299 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Fri, 22 May 2020 12:52:25 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id u16so4680322lfl.8 for ; Fri, 22 May 2020 05:52:25 -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=xSlGXwZufpWJ/6PcI9wa5h49Q8Cff6k8tuJGZLYF0wg=; b=lp2cPjep8pO3ef7efxdX23yH12G8mY0S4LTqFaOt/6xv78Aem/EuLlfjxwRSjMbbX6 c/dhpm9jzQrXTaRqmuhQnVhYJ57/t1GipR/F3oPpH3D9CpdHSxRqWtAWWfxqBHwcX35q N/mtjNJ0ytEFesRnXoV+7dcOCh8RsSxoqPlYhBDXhNelnTH6s4nT8zWyM/ICFQNSBqOB wpqX8Yb6D2a4QNiHpDYDllg292XKYpO5BULq04WYMN60SYONE1D1z/40f5Ghu0nEf2eD cY62ID2aNCkj5MbDfWn54C9PukEjzMouBZ+xToc5f1RZETPmdrUqEoHRwkg9Cd6Z6A7V SOKg== 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=xSlGXwZufpWJ/6PcI9wa5h49Q8Cff6k8tuJGZLYF0wg=; b=UbpuWNZ0+OT0COigvXc7fW9rWHBn4/EBl3jUw+rYhakpGmKNcfnyffRagjh2tMNlh3 XydCl2TSnCdBrNN4Q68aKkT6tVeC4RmGTSlphkwfZTO0ykrs6bsB47pzsemk6HvmCKH3 Srx+pbuQVAtrNUvphYU9BFkmCuv47Keo1G09UEZ3C9Rxq0RduuwCZVUjlFs//7pL/Oqk GGNu6MF5NBbojOrIy3L50v/FWj2YBwhkitKUI27xnS7OD5d3O3Ch7+OpLFaaFp3+akux A45PVCO7OQIx+trO1YHuNAtbEmuyZQcwNiD0SSI3IvzG/i5rT9FMngJjRNmIiQA3KFce gz7w== X-Gm-Message-State: AOAM533paaHzUcjvOmfa03wJZG9PTism3NZK0dwTcTeo9YN7Kq1MmUCy FbL65hSG6kbFVCPqEGghmlNFZA== X-Google-Smtp-Source: ABdhPJz0KS216ZdFcrTTxidcO5MGn8K/8zWzWL1hNqwpMUy/NI3epk39K070+VkyxSdfYpnbmRHWxQ== X-Received: by 2002:a05:6512:14c:: with SMTP id m12mr7492997lfo.165.1590151944083; Fri, 22 May 2020 05:52:24 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id h8sm1020840ljg.28.2020.05.22.05.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 05:52:22 -0700 (PDT) From: "Kirill A. Shutemov" X-Google-Original-From: "Kirill A. Shutemov" Received: by box.localdomain (Postfix, from userid 1000) id EF8CA102059; Fri, 22 May 2020 15:52:19 +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" , x86@kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [RFC 11/16] KVM: Rework copy_to/from_guest() to avoid direct mapping Date: Fri, 22 May 2020 15:52:09 +0300 Message-Id: <20200522125214.31348-12-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200522125214.31348-1-kirill.shutemov@linux.intel.com> References: <20200522125214.31348-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 | 57 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 07d45da5d2aa..63282def3760 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2258,17 +2258,45 @@ static int next_segment(unsigned long len, int of= fset) return len; } =20 +static pte_t **guest_map_ptes; +static struct vm_struct *guest_map_area; + +static void *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; +} + +static void 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(); +} + int copy_from_guest(void *data, unsigned long hva, int len) { int offset =3D offset_in_page(hva); struct page *page; int npages, seg; + void *vaddr; =20 while ((seg =3D next_segment(len, offset)) !=3D 0) { 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 map_page_atomic(page); + memcpy(data, vaddr + offset, seg); + unmap_page_atomic(vaddr); + put_page(page); len -=3D seg; hva +=3D seg; @@ -2283,13 +2311,18 @@ int copy_to_guest(unsigned long hva, const void *= data, int len) int offset =3D offset_in_page(hva); struct page *page; int npages, seg; + void *vaddr; =20 while ((seg =3D next_segment(len, offset)) !=3D 0) { npages =3D get_user_pages_unlocked(hva, 1, &page, FOLL_WRITE | FOLL_KVM); if (npages !=3D 1) return -EFAULT; - memcpy(page_address(page) + offset, data, seg); + + vaddr =3D map_page_atomic(page); + memcpy(vaddr + offset, data, seg); + unmap_page_atomic(vaddr); + put_page(page); len -=3D seg; hva +=3D seg; @@ -4921,6 +4954,18 @@ int kvm_init(void *opaque, unsigned vcpu_size, uns= igned vcpu_align, if (r) goto out_free; =20 + if (VM_KVM_PROTECTED) { + guest_map_ptes =3D kmalloc_array(num_possible_cpus(), + sizeof(pte_t *), GFP_KERNEL); + if (!guest_map_ptes) + goto out_unreg; + + guest_map_area =3D alloc_vm_area(PAGE_SIZE * num_possible_cpus(), + guest_map_ptes); + if (!guest_map_ptes) + goto out_unreg; + } + kvm_chardev_ops.owner =3D module; kvm_vm_fops.owner =3D module; kvm_vcpu_fops.owner =3D module; @@ -4944,6 +4989,10 @@ int kvm_init(void *opaque, unsigned vcpu_size, uns= igned vcpu_align, return 0; =20 out_unreg: + if (guest_map_area) + free_vm_area(guest_map_area); + if (guest_map_ptes) + kfree(guest_map_ptes); kvm_async_pf_deinit(); out_free: kmem_cache_destroy(kvm_vcpu_cache); @@ -4965,6 +5014,10 @@ EXPORT_SYMBOL_GPL(kvm_init); =20 void kvm_exit(void) { + if (guest_map_area) + free_vm_area(guest_map_area); + if (guest_map_ptes) + kfree(guest_map_ptes); debugfs_remove_recursive(kvm_debugfs_dir); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); --=20 2.26.2