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 32BCFC352BC for ; Tue, 20 Oct 2020 06:19:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 961F822282 for ; Tue, 20 Oct 2020 06:19:20 +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="Mx8Loju0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 961F822282 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 3571D6B0072; Tue, 20 Oct 2020 02:19:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E1AD6B0073; Tue, 20 Oct 2020 02:19:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 137DA6B0074; Tue, 20 Oct 2020 02:19:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0148.hostedemail.com [216.40.44.148]) by kanga.kvack.org (Postfix) with ESMTP id D87846B0072 for ; Tue, 20 Oct 2020 02:19:10 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 7EBB23626 for ; Tue, 20 Oct 2020 06:19:10 +0000 (UTC) X-FDA: 77391301260.09.geese91_0515ec62723d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 5B6F5180AD811 for ; Tue, 20 Oct 2020 06:19:10 +0000 (UTC) X-HE-Tag: geese91_0515ec62723d X-Filterd-Recvd-Size: 10618 Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Tue, 20 Oct 2020 06:19:09 +0000 (UTC) Received: by mail-lf1-f66.google.com with SMTP id d24so660108lfa.8 for ; Mon, 19 Oct 2020 23:19:09 -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=AaYRj6xxvmS8+RSQnvAq9Jrn29IaqjqNuI5uDDknTs8=; b=Mx8Loju0ToSqHftzzoqfzPESbc1/N5hRz2KdNGw6KMMpjbYco5/VUfE0YsDuD/OBDB JpJ/p+fJo/oJLR6hyaQ81Ij7sV1JyaGGX4cvNalQc+/Smhjx6MWeJvV+7MmRii4qI9lr iLtnSPtkcNN9ChtzzeCEBk/GWIthMl995KtwZndE+McBnOElURh1YWLGLm9290oiKyzQ gs85KEQcShl9Na88mBkbryY9v93NrKHgz3fPWpqALkn/h2k8+gSjUvqBxaO5z39uQ/p4 H2s7AwoLkEmDssTQesbwtQiJXlxCDVAw3vhvG35bXeapUXA2tBY8eSngavhDBqnymtbB Rmeg== 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=AaYRj6xxvmS8+RSQnvAq9Jrn29IaqjqNuI5uDDknTs8=; b=Urwrp6379qUo+OnulX6yzPovN9iU/EbbRmuh0lp+owZp0hKZTHkxRlHk+PuGjmRWPz xL40Mk2ifXekMfwXphpRoPm8CZscoTn8qk1dwU9AF1i7RrXSVoZL9onqtQlbCH2Oy226 Vw56YOclUMCQMCK7RlmH6RiXUgbXFKp5/2T8aUYVggqqO++Ni/oLcvg5pvconN/bweM+ frliyjXAFLKLeELuqLbW6j/2nU00Vskfi6R6v1cRsoK1QCJo4xYIR0C12NEh5tzLsvN3 k1edpAufMGi/x7JbVj3m1C8BB79pxhizCTAXVI3ExoDoAMv/qeXJRryBC1iRgZQA8xVW +nng== X-Gm-Message-State: AOAM5301Y/PcByV1maPR0sw+rnwopFzqWvvU3KeTeJM5+D/tAz+yhHXY tawC19JeIV8cUc9UZ1IsXyP/GA== X-Google-Smtp-Source: ABdhPJzbVM30/ELO/VgPUbztIkJyCxcT3aLv3ozPYXAT3IE2iadH3MCBuaGjih+qQs0NlZhBazcvPQ== X-Received: by 2002:a19:8988:: with SMTP id l130mr405110lfd.126.1603174748490; Mon, 19 Oct 2020 23:19:08 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id s17sm135242lfp.292.2020.10.19.23.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 23:19:07 -0700 (PDT) From: "Kirill A. Shutemov" X-Google-Original-From: "Kirill A. Shutemov" Received: by box.localdomain (Postfix, from userid 1000) id EF98B102F67; Tue, 20 Oct 2020 09:19:01 +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 08/16] KVM: Use GUP instead of copy_from/to_user() to access guest memory Date: Tue, 20 Oct 2020 09:18:51 +0300 Message-Id: <20201020061859.18385-9-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: New helpers copy_from_guest()/copy_to_guest() to be used if KVM memory protection feature is enabled. Signed-off-by: Kirill A. Shutemov --- include/linux/kvm_host.h | 4 ++ virt/kvm/kvm_main.c | 90 +++++++++++++++++++++++++++++++--------- 2 files changed, 75 insertions(+), 19 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 05e3c2fb3ef7..380a64613880 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -504,6 +504,7 @@ struct kvm { struct srcu_struct irq_srcu; pid_t userspace_pid; unsigned int max_halt_poll_ns; + bool mem_protected; }; =20 #define kvm_err(fmt, ...) \ @@ -728,6 +729,9 @@ void kvm_set_pfn_dirty(kvm_pfn_t pfn); void kvm_set_pfn_accessed(kvm_pfn_t pfn); void kvm_get_pfn(kvm_pfn_t pfn); =20 +int copy_from_guest(void *data, unsigned long hva, int len, bool protect= ed); +int copy_to_guest(unsigned long hva, const void *data, int len, bool pro= tected); + void kvm_release_pfn(kvm_pfn_t pfn, bool dirty, struct gfn_to_pfn_cache = *cache); int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offs= et, int len); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index cf88233b819a..a9884cb8c867 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2313,19 +2313,70 @@ static int next_segment(unsigned long len, int of= fset) return len; } =20 +int copy_from_guest(void *data, unsigned long hva, int len, bool protect= ed) +{ + int offset =3D offset_in_page(hva); + struct page *page; + int npages, seg; + + if (!protected) + return __copy_from_user(data, (void __user *)hva, len); + + might_fault(); + kasan_check_write(data, len); + check_object_size(data, len, false); + + while ((seg =3D next_segment(len, offset)) !=3D 0) { + npages =3D get_user_pages_unlocked(hva, 1, &page, 0); + if (npages !=3D 1) + return -EFAULT; + memcpy(data, page_address(page) + offset, seg); + put_page(page); + len -=3D seg; + hva +=3D seg; + offset =3D 0; + } + + return 0; +} + +int copy_to_guest(unsigned long hva, const void *data, int len, bool pro= tected) +{ + int offset =3D offset_in_page(hva); + struct page *page; + int npages, seg; + + if (!protected) + return __copy_to_user((void __user *)hva, data, len); + + might_fault(); + kasan_check_read(data, len); + check_object_size(data, len, true); + + while ((seg =3D next_segment(len, offset)) !=3D 0) { + npages =3D get_user_pages_unlocked(hva, 1, &page, FOLL_WRITE); + if (npages !=3D 1) + return -EFAULT; + memcpy(page_address(page) + offset, data, seg); + put_page(page); + len -=3D seg; + hva +=3D seg; + offset =3D 0; + } + + return 0; +} + static int __kvm_read_guest_page(struct kvm_memory_slot *slot, gfn_t gfn= , - void *data, int offset, int len) + void *data, int offset, int len, + bool protected) { - int r; unsigned long addr; =20 addr =3D gfn_to_hva_memslot_prot(slot, gfn, NULL); if (kvm_is_error_hva(addr)) return -EFAULT; - r =3D __copy_from_user(data, (void __user *)addr + offset, len); - if (r) - return -EFAULT; - return 0; + return copy_from_guest(data, addr + offset, len, protected); } =20 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offs= et, @@ -2333,7 +2384,8 @@ int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn,= void *data, int offset, { struct kvm_memory_slot *slot =3D gfn_to_memslot(kvm, gfn); =20 - return __kvm_read_guest_page(slot, gfn, data, offset, len); + return __kvm_read_guest_page(slot, gfn, data, offset, len, + kvm->mem_protected); } EXPORT_SYMBOL_GPL(kvm_read_guest_page); =20 @@ -2342,7 +2394,8 @@ int kvm_vcpu_read_guest_page(struct kvm_vcpu *vcpu,= gfn_t gfn, void *data, { struct kvm_memory_slot *slot =3D kvm_vcpu_gfn_to_memslot(vcpu, gfn); =20 - return __kvm_read_guest_page(slot, gfn, data, offset, len); + return __kvm_read_guest_page(slot, gfn, data, offset, len, + vcpu->kvm->mem_protected); } EXPORT_SYMBOL_GPL(kvm_vcpu_read_guest_page); =20 @@ -2415,7 +2468,8 @@ int kvm_vcpu_read_guest_atomic(struct kvm_vcpu *vcp= u, gpa_t gpa, EXPORT_SYMBOL_GPL(kvm_vcpu_read_guest_atomic); =20 static int __kvm_write_guest_page(struct kvm_memory_slot *memslot, gfn_t= gfn, - const void *data, int offset, int len) + const void *data, int offset, int len, + bool protected) { int r; unsigned long addr; @@ -2423,7 +2477,8 @@ static int __kvm_write_guest_page(struct kvm_memory= _slot *memslot, gfn_t gfn, addr =3D gfn_to_hva_memslot(memslot, gfn); if (kvm_is_error_hva(addr)) return -EFAULT; - r =3D __copy_to_user((void __user *)addr + offset, data, len); + + r =3D copy_to_guest(addr + offset, data, len, protected); if (r) return -EFAULT; mark_page_dirty_in_slot(memslot, gfn); @@ -2435,7 +2490,8 @@ int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn= , { struct kvm_memory_slot *slot =3D gfn_to_memslot(kvm, gfn); =20 - return __kvm_write_guest_page(slot, gfn, data, offset, len); + return __kvm_write_guest_page(slot, gfn, data, offset, len, + kvm->mem_protected); } EXPORT_SYMBOL_GPL(kvm_write_guest_page); =20 @@ -2444,7 +2500,8 @@ int kvm_vcpu_write_guest_page(struct kvm_vcpu *vcpu= , gfn_t gfn, { struct kvm_memory_slot *slot =3D kvm_vcpu_gfn_to_memslot(vcpu, gfn); =20 - return __kvm_write_guest_page(slot, gfn, data, offset, len); + return __kvm_write_guest_page(slot, gfn, data, offset, len, + vcpu->kvm->mem_protected); } EXPORT_SYMBOL_GPL(kvm_vcpu_write_guest_page); =20 @@ -2560,7 +2617,7 @@ int kvm_write_guest_offset_cached(struct kvm *kvm, = struct gfn_to_hva_cache *ghc, if (unlikely(!ghc->memslot)) return kvm_write_guest(kvm, gpa, data, len); =20 - r =3D __copy_to_user((void __user *)ghc->hva + offset, data, len); + r =3D copy_to_guest(ghc->hva + offset, data, len, kvm->mem_protected); if (r) return -EFAULT; mark_page_dirty_in_slot(ghc->memslot, gpa >> PAGE_SHIFT); @@ -2581,7 +2638,6 @@ int kvm_read_guest_offset_cached(struct kvm *kvm, s= truct gfn_to_hva_cache *ghc, unsigned long len) { struct kvm_memslots *slots =3D kvm_memslots(kvm); - int r; gpa_t gpa =3D ghc->gpa + offset; =20 BUG_ON(len + offset > ghc->len); @@ -2597,11 +2653,7 @@ int kvm_read_guest_offset_cached(struct kvm *kvm, = struct gfn_to_hva_cache *ghc, if (unlikely(!ghc->memslot)) return kvm_read_guest(kvm, gpa, data, len); =20 - r =3D __copy_from_user(data, (void __user *)ghc->hva + offset, len); - if (r) - return -EFAULT; - - return 0; + return copy_from_guest(data, ghc->hva + offset, len, kvm->mem_protected= ); } EXPORT_SYMBOL_GPL(kvm_read_guest_offset_cached); =20 --=20 2.26.2