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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D0B2C4332F for ; Sun, 5 Nov 2023 16:31:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C4B680035; Sun, 5 Nov 2023 11:31:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 94E1380018; Sun, 5 Nov 2023 11:31:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A0CE80035; Sun, 5 Nov 2023 11:31:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6881880018 for ; Sun, 5 Nov 2023 11:31:08 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2E9501A02F2 for ; Sun, 5 Nov 2023 16:31:08 +0000 (UTC) X-FDA: 81424440216.26.11CEAFB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 6E103C000F for ; Sun, 5 Nov 2023 16:31:06 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CbjXx+Oq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699201866; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pxlejjl6YmMVlFXn9rcotC9xBT4/6oGJzKZrTdq/mHw=; b=11JpbDb2Q7I0iYrXuzCXjWJe9xbCvYKcpFt+haTgl5oq9fPAMvqHFrqit8BmVdXRSODoIM +NWjCnHDj6zwxq3GSaLpL7jX7DhvsDrA3ztfPlNGlASVPubwI1zOvE4zPKJRcdV1syLR2O qqDelluW9EPujIPNzOihrYkA3vK8zxQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CbjXx+Oq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699201866; a=rsa-sha256; cv=none; b=EBcIRRoAfWg8/r0Q5QMH9T7lNF6gJCsnbUnBlYx/KUYcFQEAVdHkMvJfWivo07L1/0RykA 5TfEhBuTkQQ9dpJDxbXh2Lr5/GjTIJecyxCLeOrLgojkSWdfBboGNj+GU3Ry+nXdeSNioV LdHE4quB78/feN19MA+pBIjuM1zuE44= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699201865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pxlejjl6YmMVlFXn9rcotC9xBT4/6oGJzKZrTdq/mHw=; b=CbjXx+Oq9a91MC0j/BmVx5a9Ul9fRBMJGJOQEL8yv9ZgSYXrbFXnJvhriV+27eWNdHtlxR JP6hapjLbsLjuJp3tb6fLmcTm9NrYVner2sQDsFpm7Y5P7CXO+m/qsYy1E4jDm95EezoxY M7yXp2soUZSN55pcXyw10tyL/Q3j09Q= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-C2QXJr7EPFqH3gwtOpk27g-1; Sun, 05 Nov 2023 11:30:59 -0500 X-MC-Unique: C2QXJr7EPFqH3gwtOpk27g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF8453C0FC8E; Sun, 5 Nov 2023 16:30:56 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.192.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 295C92166B26; Sun, 5 Nov 2023 16:30:50 +0000 (UTC) From: Paolo Bonzini To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Xu Yilun , Chao Peng , Fuad Tabba , Jarkko Sakkinen , Anish Moorthy , David Matlack , Yu Zhang , Isaku Yamahata , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A. Shutemov" Subject: [PATCH 01/34] KVM: Tweak kvm_hva_range and hva_handler_t to allow reusing for gfn ranges Date: Sun, 5 Nov 2023 17:30:04 +0100 Message-ID: <20231105163040.14904-2-pbonzini@redhat.com> In-Reply-To: <20231105163040.14904-1-pbonzini@redhat.com> References: <20231105163040.14904-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Rspamd-Queue-Id: 6E103C000F X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: kuxh1mdjnoec16euc5hcc3cghyqeqmc9 X-HE-Tag: 1699201866-274589 X-HE-Meta: U2FsdGVkX1/xBi7JwVl95lGlmHMIli/kpzakO3b7cm8wECQGA3Im5SmhhNSGlkyZjktTjJBNP7kmjQGfM0tS4qKVKVDladBiGhQvrfVg2P5dyJ0urwEoGG16572S3rVbhi3Qmm1+B9/BKGm4vsdKiHWDZLIZ/cCgkbuLderjGN5LEQt7Suq6VDoalTSx7dI83PSzGimBdHgWd5Jnbt3o/MoXEV7yBWa9hKC3uxhiVIoabF2ywks1BGKLr190cHQvvF01N/t0B9mPD6vj+cEaX5n3cEON/fX+uk+PEoDO+bt458DkDVKQlhOmT2G4gArTdyfS8taTG8jwS8imxYKdGMKkcKg+RQeb130kHyE5/9Y/aTjjvTlUQktIQtzsD30XHf48pLFegkXYZSjrBt5yka/TyL4FIXirV1haYs+fjVcJIs/vnbFtnvQJlS6xUbF/N+rAr/46BqVsEkEE43i0z9JwMNE8NbyiXTN2/urRQW+y9/pZ6hs2WNSC5C+FaG3t8Hz6qb8B1+14BTFtasojFKZAnYZ8U5Maaj3eVmH6pIx8wEtUMZQHgbd2azMhaQw8d5a+FTbjImhr0ixZdU4JdRS/ZtKoTrIiTY+G43T3KxRm97ZwEfTa239Ea9Lsgbm3PXbBAg+hr5uQEEdlhmR0JMJBgAxo/Z32wPR/zcsVPXtM3qJo2tJjKo4cthMCotV7tfff2ASE7ehMWc45ffFBdzo+NcXDkY1y6Ij8Of6oQVLVFFFgkVKffcNBQ3MjCYw4mTYKgEFySNdTsvXZKen/0/qABsOGSMqXclHSs931AHv8IdlVr1g4JCggJupvvXz8y/ubezcj6lkSwVQrbWIXW05gsv6e+8Su5awlvBoqTZBlRh+IVx9o/3W7VmkdQ80v1Zu8gmc3TkjRig156TL3TgLR0fymFbhTjmFbGDpya8YjVIUjL6b2D8DvsJOjT3Hz+KxSiGV1tpawHN2KvcC MIRuy4Ab Q4FXDz6nzlM6mNs2+vITLbFPm3XAujAaYsaAcTTZCRxMkABMjnB4bzQZSZTOZpduJBLHf8JDP8QEH51VoIuvpLu+F10lKd2shPQeBmEsMXhzSYcBTZkCaXICX1VMGY5JfyWnvijtf4rbuBgda89NJ0FXccXcKam0FEQ02tcW44NDJa7aiWauRqeITMlGS1/QgCGlcS4Fyn2OcBYdxPVKcDAtiQq+/QWc2kEoPNlIPfVMNrm6eEPgEU6N1mI8YMXg1Rkyop/Dt4psRkyUR+1sojDEB/AsT3G+/xeALIIdzKG5toW1kk/zrekB7pkHPAKU5Wy0KKHIth+rAI+LcVIKXxMHdVw== 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: List-Subscribe: List-Unsubscribe: From: Sean Christopherson Rework and rename "struct kvm_hva_range" into "kvm_mmu_notifier_range" so that the structure can be used to handle notifications that operate on gfn context, i.e. that aren't tied to a host virtual address. Rename the handler typedef too (arguably it should always have been gfn_handler_t). Practically speaking, this is a nop for 64-bit kernels as the only meaningful change is to store start+end as u64s instead of unsigned longs. Reviewed-by: Paolo Bonzini Reviewed-by: Xiaoyao Li Signed-off-by: Sean Christopherson Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Message-Id: <20231027182217.3615211-2-seanjc@google.com> Signed-off-by: Paolo Bonzini --- virt/kvm/kvm_main.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 486800a7024b..0524933856d4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -541,18 +541,22 @@ static inline struct kvm *mmu_notifier_to_kvm(struct mmu_notifier *mn) return container_of(mn, struct kvm, mmu_notifier); } -typedef bool (*hva_handler_t)(struct kvm *kvm, struct kvm_gfn_range *range); +typedef bool (*gfn_handler_t)(struct kvm *kvm, struct kvm_gfn_range *range); typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start, unsigned long end); typedef void (*on_unlock_fn_t)(struct kvm *kvm); -struct kvm_hva_range { - unsigned long start; - unsigned long end; +struct kvm_mmu_notifier_range { + /* + * 64-bit addresses, as KVM notifiers can operate on host virtual + * addresses (unsigned long) and guest physical addresses (64-bit). + */ + u64 start; + u64 end; union kvm_mmu_notifier_arg arg; - hva_handler_t handler; + gfn_handler_t handler; on_lock_fn_t on_lock; on_unlock_fn_t on_unlock; bool flush_on_ret; @@ -581,7 +585,7 @@ static const union kvm_mmu_notifier_arg KVM_MMU_NOTIFIER_NO_ARG; node = interval_tree_iter_next(node, start, last)) \ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, - const struct kvm_hva_range *range) + const struct kvm_mmu_notifier_range *range) { bool ret = false, locked = false; struct kvm_gfn_range gfn_range; @@ -608,9 +612,9 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, unsigned long hva_start, hva_end; slot = container_of(node, struct kvm_memory_slot, hva_node[slots->node_idx]); - hva_start = max(range->start, slot->userspace_addr); - hva_end = min(range->end, slot->userspace_addr + - (slot->npages << PAGE_SHIFT)); + hva_start = max_t(unsigned long, range->start, slot->userspace_addr); + hva_end = min_t(unsigned long, range->end, + slot->userspace_addr + (slot->npages << PAGE_SHIFT)); /* * To optimize for the likely case where the address @@ -660,10 +664,10 @@ static __always_inline int kvm_handle_hva_range(struct mmu_notifier *mn, unsigned long start, unsigned long end, union kvm_mmu_notifier_arg arg, - hva_handler_t handler) + gfn_handler_t handler) { struct kvm *kvm = mmu_notifier_to_kvm(mn); - const struct kvm_hva_range range = { + const struct kvm_mmu_notifier_range range = { .start = start, .end = end, .arg = arg, @@ -680,10 +684,10 @@ static __always_inline int kvm_handle_hva_range(struct mmu_notifier *mn, static __always_inline int kvm_handle_hva_range_no_flush(struct mmu_notifier *mn, unsigned long start, unsigned long end, - hva_handler_t handler) + gfn_handler_t handler) { struct kvm *kvm = mmu_notifier_to_kvm(mn); - const struct kvm_hva_range range = { + const struct kvm_mmu_notifier_range range = { .start = start, .end = end, .handler = handler, @@ -771,7 +775,7 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn, const struct mmu_notifier_range *range) { struct kvm *kvm = mmu_notifier_to_kvm(mn); - const struct kvm_hva_range hva_range = { + const struct kvm_mmu_notifier_range hva_range = { .start = range->start, .end = range->end, .handler = kvm_unmap_gfn_range, @@ -835,7 +839,7 @@ static void kvm_mmu_notifier_invalidate_range_end(struct mmu_notifier *mn, const struct mmu_notifier_range *range) { struct kvm *kvm = mmu_notifier_to_kvm(mn); - const struct kvm_hva_range hva_range = { + const struct kvm_mmu_notifier_range hva_range = { .start = range->start, .end = range->end, .handler = (void *)kvm_null_fn, -- 2.39.1