From nobody Thu Dec 18 07:10:25 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1E90C61D90 for ; Tue, 21 Nov 2023 18:03:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234535AbjKUSDz (ORCPT ); Tue, 21 Nov 2023 13:03:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234459AbjKUSDl (ORCPT ); Tue, 21 Nov 2023 13:03:41 -0500 Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E1AC1A3; Tue, 21 Nov 2023 10:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From; bh=R5zu2fbmulZSBUoYOg07PimInxmf93FIm2KI5QqK+5Y=; b=L73KD4ZOAS321GpuHdbrdTbAPv h6dIj+mpWJeULW3G/hxZOgY+VvQEgUk/FkcjdawCgytojXZKYqc4Ql8fBFxx/gnqX80w5DK74uEzN 2PmajqnBUyDiWXF3nmG/R9hO5aywrw4hskmYBVm2GLNlkCKzXRPtQKU0lfsn5gBhAcag=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r5V5h-00085e-PA; Tue, 21 Nov 2023 18:03:17 +0000 Received: from 54-240-197-231.amazon.com ([54.240.197.231] helo=REM-PW02S00X.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r5V5h-0004Z3-GW; Tue, 21 Nov 2023 18:03:17 +0000 From: Paul Durrant To: David Woodhouse , Paul Durrant , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 08/15] KVM: pfncache: allow a cache to be activated with a fixed (userspace) HVA Date: Tue, 21 Nov 2023 18:02:16 +0000 Message-Id: <20231121180223.12484-9-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231121180223.12484-1-paul@xen.org> References: <20231121180223.12484-1-paul@xen.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Paul Durrant Some pfncache pages may actually be overlays on guest memory that have a fixed HVA within the VMM. It's pointless to invalidate such cached mappings if the overlay is moved so allow a cache to be activated directly with the HVA to cater for such cases. A subsequent patch will make use of this facility. Signed-off-by: Paul Durrant --- Cc: Sean Christopherson Cc: Paolo Bonzini Cc: David Woodhouse v8: - Re-worked to avoid messing with struct gfn_to_pfn_cache. --- include/linux/kvm_host.h | 19 +++++++++++++++++- virt/kvm/pfncache.c | 43 ++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index b1dc2e5a64f3..484c587e8290 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1312,6 +1312,22 @@ void kvm_gpc_init(struct gfn_to_pfn_cache *gpc, stru= ct kvm *kvm); */ int kvm_gpc_activate(struct gfn_to_pfn_cache *gpc, gpa_t gpa, unsigned lon= g len); =20 +/** + * kvm_gpc_activate_hva - prepare a cached kernel mapping and HPA for a gi= ven HVA. + * + * @gpc: struct gfn_to_pfn_cache object. + * @hva: userspace virtual address to map. + * @len: sanity check; the range being access must fit a single p= age. + * + * @return: 0 for success. + * -EINVAL for a mapping which would cross a page boundary. + * -EFAULT for an untranslatable guest physical address. + * + * The semantics of this function are the same as those of kvm_gpc_activat= e(). It + * merely bypasses a layer of address translation. + */ +int kvm_gpc_activate_hva(struct gfn_to_pfn_cache *gpc, unsigned long hva, = unsigned long len); + /** * kvm_gpc_check - check validity of a gfn_to_pfn_cache. * @@ -1365,7 +1381,8 @@ void kvm_gpc_deactivate(struct gfn_to_pfn_cache *gpc); */ static inline void kvm_gpc_mark_dirty(struct gfn_to_pfn_cache *gpc) { - mark_page_dirty_in_slot(gpc->kvm, gpc->memslot, gpc->gpa >> PAGE_SHIFT); + if (gpc->gpa !=3D KVM_XEN_INVALID_GPA) + mark_page_dirty_in_slot(gpc->kvm, gpc->memslot, gpc->gpa >> PAGE_SHIFT); } =20 void kvm_sigset_activate(struct kvm_vcpu *vcpu); diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index c545f6246501..ed700afeec49 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -209,11 +209,11 @@ static kvm_pfn_t hva_to_pfn_retry(struct gfn_to_pfn_c= ache *gpc) return -EFAULT; } =20 -static int __kvm_gpc_refresh(struct gfn_to_pfn_cache *gpc, gpa_t gpa, +static int __kvm_gpc_refresh(struct gfn_to_pfn_cache *gpc, u64 addr, bool = addr_is_gpa, unsigned long len) { struct kvm_memslots *slots =3D kvm_memslots(gpc->kvm); - unsigned long page_offset =3D offset_in_page(gpa); + unsigned long page_offset =3D offset_in_page(addr); bool unmap_old =3D false; kvm_pfn_t old_pfn; bool hva_change =3D false; @@ -244,12 +244,21 @@ static int __kvm_gpc_refresh(struct gfn_to_pfn_cache = *gpc, gpa_t gpa, old_pfn =3D gpc->pfn; old_khva =3D (void *)PAGE_ALIGN_DOWN((uintptr_t)gpc->khva); =20 - /* If the userspace HVA is invalid, refresh that first */ - if (gpc->gpa !=3D gpa || gpc->generation !=3D slots->generation || - kvm_is_error_hva(gpc->uhva)) { - gfn_t gfn =3D gpa_to_gfn(gpa); + if (!addr_is_gpa) { + gpc->gpa =3D KVM_XEN_INVALID_GPA; + gpc->uhva =3D PAGE_ALIGN_DOWN(gpc->uhva); + addr =3D PAGE_ALIGN_DOWN(addr); + + if (gpc->uhva !=3D addr) { + gpc->uhva =3D addr; + hva_change =3D true; + } + } else if (gpc->gpa !=3D addr || + gpc->generation !=3D slots->generation || + kvm_is_error_hva(gpc->uhva)) { + gfn_t gfn =3D gpa_to_gfn(addr); =20 - gpc->gpa =3D gpa; + gpc->gpa =3D addr; gpc->generation =3D slots->generation; gpc->memslot =3D __gfn_to_memslot(slots, gfn); gpc->uhva =3D gfn_to_hva_memslot(gpc->memslot, gfn); @@ -317,7 +326,10 @@ static int __kvm_gpc_refresh(struct gfn_to_pfn_cache *= gpc, gpa_t gpa, =20 int kvm_gpc_refresh(struct gfn_to_pfn_cache *gpc, unsigned long len) { - return __kvm_gpc_refresh(gpc, gpc->gpa, len); + if (gpc->gpa !=3D KVM_XEN_INVALID_GPA) + return __kvm_gpc_refresh(gpc, gpc->gpa, true, len); + + return __kvm_gpc_refresh(gpc, gpc->uhva, false, len); } =20 void kvm_gpc_init(struct gfn_to_pfn_cache *gpc, struct kvm *kvm) @@ -330,7 +342,8 @@ void kvm_gpc_init(struct gfn_to_pfn_cache *gpc, struct = kvm *kvm) gpc->uhva =3D KVM_HVA_ERR_BAD; } =20 -int kvm_gpc_activate(struct gfn_to_pfn_cache *gpc, gpa_t gpa, unsigned lon= g len) +static int __kvm_gpc_activate(struct gfn_to_pfn_cache *gpc, u64 addr, bool= addr_is_gpa, + unsigned long len) { struct kvm *kvm =3D gpc->kvm; =20 @@ -351,7 +364,17 @@ int kvm_gpc_activate(struct gfn_to_pfn_cache *gpc, gpa= _t gpa, unsigned long len) gpc->active =3D true; write_unlock_irq(&gpc->lock); } - return __kvm_gpc_refresh(gpc, gpa, len); + return __kvm_gpc_refresh(gpc, addr, addr_is_gpa, len); +} + +int kvm_gpc_activate(struct gfn_to_pfn_cache *gpc, gpa_t gpa, unsigned lon= g len) +{ + return __kvm_gpc_activate(gpc, gpa, true, len); +} + +int kvm_gpc_activate_hva(struct gfn_to_pfn_cache *gpc, unsigned long hva, = unsigned long len) +{ + return __kvm_gpc_activate(gpc, hva, false, len); } =20 void kvm_gpc_deactivate(struct gfn_to_pfn_cache *gpc) --=20 2.39.2