From patchwork Tue Jul 18 23:44:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13317872 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 18A5BC04A94 for ; Tue, 18 Jul 2023 23:48:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E4C48D0021; Tue, 18 Jul 2023 19:48:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 396858D0012; Tue, 18 Jul 2023 19:48:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 212238D0021; Tue, 18 Jul 2023 19:48:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0B85D8D0012 for ; Tue, 18 Jul 2023 19:48:38 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D7618A04F5 for ; Tue, 18 Jul 2023 23:48:37 +0000 (UTC) X-FDA: 81026374674.04.003C29B Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf06.hostedemail.com (Postfix) with ESMTP id E7B69180016 for ; Tue, 18 Jul 2023 23:48:35 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=tLDg009L; spf=pass (imf06.hostedemail.com: domain of 30yS3ZAYKCCYUGCPLEIQQING.EQONKPWZ-OOMXCEM.QTI@flex--seanjc.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=30yS3ZAYKCCYUGCPLEIQQING.EQONKPWZ-OOMXCEM.QTI@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689724115; h=from:from:sender:reply-to: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/Q2YqUewU0QJU59tCBKplqkoUGv4ucil0ZC6wcpHcqQ=; b=NbOG0AEI3PijwEursC0fc8A3zIo5N5jGI+ASaUfaB0ORAuJo5xQ0e2TgB8daLJoPYLHvNb 5R+4Wo8QOfCq+EOEvH1nPAIQMRGM/xP8TnUZE1XKZzIp1/5tFbm6rb3tad+R1Sd0xGjY3P +fAD5xOYHONJ9GUAxpwaOwBpWKqEY1g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689724115; a=rsa-sha256; cv=none; b=C1jf8os/Ts4nWyrd775gaxBUS7bfg6foTQt380HaN+LgXluMsBZ5vbn8Pe0cJxJ4uuMi5u wOnlBbWwumBy+i9zjDo3fjQCpyXmmJZWp/s8POxYNsCeJa/b5ScLNe+nmihJeELkuZgoFn 045pn/nBwU6Yjy8gFhkDdBDyd2R3JgU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=tLDg009L; spf=pass (imf06.hostedemail.com: domain of 30yS3ZAYKCCYUGCPLEIQQING.EQONKPWZ-OOMXCEM.QTI@flex--seanjc.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=30yS3ZAYKCCYUGCPLEIQQING.EQONKPWZ-OOMXCEM.QTI@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-57745160c1dso58219227b3.2 for ; Tue, 18 Jul 2023 16:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689724115; x=1692316115; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=/Q2YqUewU0QJU59tCBKplqkoUGv4ucil0ZC6wcpHcqQ=; b=tLDg009LSV9Tr1yXeY8d4SfO26PrwJIaLtLynftl5yKXvNFsST0X3aD0RRd4GHX/wv vtU1d3HuUEp4/WvsYO14a7YtyRpqHdAIKX5GRwFujpPChgWaWrOtfOGhpxiDxfb2FIcp Ae9zBTxW6KL3hmvrpUDBJiNqXIyNkauGtse5upwrlxh/E50i4d2vGBX75qEPajnBgZGc 62JFVrZFAM+EhDxD7kWVSnkyBrTTVuPq5qxvIJYKXmn+OcNdrNUgMZjrQKHRGqfkHsON U3BqIvW3OKP/jQkfPxwptTqtHQZYGlpqMzy7K9mx0E1p+mdrooSa+nj413aqHz+roVeF gxuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689724115; x=1692316115; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/Q2YqUewU0QJU59tCBKplqkoUGv4ucil0ZC6wcpHcqQ=; b=ik660ICFlOJbIDj8oiBEgs0QtwUcLG0mBNQmw8g32KHeQ9a+wzv/KczmO/c4zgNoDx iGCbezaT4DAtSd50L0lftB+T1oorLNvTseVQsh8IQ0Sc4AaeEa7pU0uZ7FbEw1EmdT6g wW0PP6WlzMjbu9P1HbclPbrICzFaMkLixxq9XtsaGN0FdB1VnrbwIXiS8b2ypa33jzb6 uY5kicz7nU3EJAY0tRWJCvx9M7qeuBkJ9/uoHPu516krv1ZWINtxS4/SXyzUh3iE1MZ8 Jf61ILbgz+Ep1oVk50MburXqQX38Mu+lyVw1F/DRIOPjX5eZ1pRn4UHoYNyMNGAHblJ5 1Ccg== X-Gm-Message-State: ABy/qLZk5hziaJL0xXhL3mENmBzHyx0cTN5SfwRCojSEHVobW1mWXDYo +TXjOoJopdEf4EvjpstTHbTNvhF8wFE= X-Google-Smtp-Source: APBJJlHjosfFmr47fAQ4FwoHYiy0rQprOrE8ng/AJ+BqBK9Dg+T53fJUISRxGIkaIZYnyupUcGSciTRGnxE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:b61d:0:b0:57a:141f:b4f7 with SMTP id u29-20020a81b61d000000b0057a141fb4f7mr40058ywh.6.1689724115002; Tue, 18 Jul 2023 16:48:35 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 18 Jul 2023 16:44:45 -0700 In-Reply-To: <20230718234512.1690985-1-seanjc@google.com> Mime-Version: 1.0 References: <20230718234512.1690985-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230718234512.1690985-3-seanjc@google.com> Subject: [RFC PATCH v11 02/29] KVM: Tweak kvm_hva_range and hva_handler_t to allow reusing for gfn ranges From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , "Matthew Wilcox (Oracle)" , Andrew Morton , Paul Moore , James Morris , "Serge E. Hallyn" 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-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Peng , Fuad Tabba , Jarkko Sakkinen , Yu Zhang , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , Vlastimil Babka , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" X-Stat-Signature: 31o8bs4das15ctoeszjbkt1rru33bj7g X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E7B69180016 X-Rspam-User: X-HE-Tag: 1689724115-153078 X-HE-Meta: U2FsdGVkX18+4s9FkTudsDj3zLYHe2+X67U/yXEPPIJrlKQe3vV0UIRHZ5Jo0t/H+yZdRufLHgcTjBdWkB3wJa1nffGVWVs11vf2ubXWmlbotRuzdfZKQ/GU1CdPpIsS4usqV6EoUvSKpcxSdlfVW1QJTGjVo+URobT3DNOZ+DCmC2Dissj0wdDjWGI/KhTRqkx/jGXNlpoUHWGdgtnOLf/8J5n+5JypU0MAaroPX3d+3TKQw4Zkq4jZ0bvU7Gui8Hqk0EYFwIgnGBaPRyEgPKkIGbYsLKuP+0VyuzknG54bre4NeMGi8xFOSnHhtT9t6TLkBujjDS4EHDw993fYyIJw70vvCeTTNqAA4FXOrCD9GgR3ZuvqESHsVTqgqI3iK9akZpUuDwggMF/KNF1W5jOEQy1R6FypuaSO3Kz77W8i5IQzUAQtwLgcmmynzXITxqBa3uTS5XTzEm67MDpIRV1yaEWVVqwV0tdGjxcY3ZkLZpuH4sE95wEZWXeoUz1San7PCk0/b9j6znXf2ISa2ju3fq7tnh8mHCph4/y0B9ZJTV8Ter7x+tkkIrrbIGXLvo117zGWn35cf5gt1hKFmvxsIqQVQTeLvRsnLJzpxRWFf0IzyaEYIX5Lt6UasKnlLpGHqVOYtp/CU8hN28t1EU91wrou4d4yBIt+qejKd4VywUUE0b249inxloX4YRPxxAt/Pr5gaKKb4QzGgwlaxkvVTYena+dkVbx2PymUv0q2P+NeDj7YvjFM7MD25i4qXQqmUrbvpvUi0Y0mhQevZRs+w1VgxHC2x+Vufj1rfctQ96k4Y0WPb1Ixzc7vauUPWf7I9/cp3Q7fCaavznAVx5Wzn9i6XKl87i+luDDK10jJ1UGSBuk4+77+S6nhxeXbQsS4qmxTgC50RNxdKA8AP7rO0JO4IDMsUGWqB5T/GlwvoLBXme5fdlnlFIk7sF9cOMm+u4+yTeEYK5jhVia y9cT3o1A HB3bdTylomwXfN084xSGMsxKhXdaT2wFbF3+GT99ARUr596R+2tCG52PcUcYe65kJnuOxJbJs3Df5WSjrLF3B9JAtGmAGS8s3Qaq4AgHwVq5F0QRpNeILK9TpHBb8DW4BMnf3D5d1sjqnmfPzaF57xBONghNpBoYxGwfsQ1jsZMuhwkE2H5PgNjMyUveQqwrGLK2AI31dCtQt0ertXrTKWz3CbGqzIl7RvJ48AJ7Q3D1W7vvqIDBUh8QFalDu1vG1p0uI5+CGeKCsSAxJE5PBrg0AwyGVdvcdK7Xi/1YXtVK0XezFcDtW/kcZxjx8EUi/X6Iqsmq1pKYeNos/A3o962mA67nxyNaYHg9vFWVdHlpm1whYGZY93Kx9idTG53FVzR/owJuuqDwuihw8ubgY1UHOW/NynG8TuAGK6vYzXdiQnM1lqsGmqUw9BGg8wVPFDZ0C1cVaktKk9uA9t638tZV2ZVhBVt05Y0CiG5Wp8GZg8Rds/MKB6YjaehmuJIWNA/yFn8lFawoKUUTDMapKz6KwEDlU9hRSBEjfX5Wr6JDDE5UgZY+fCRYXOCEU7N0eEIJxA5O21sB8lIfiIbfhVW/ImIjGd4qzqHsfFKIHKlyU270iY9meEibuf2lX3Qp3RMr1IUP0qkxZu82dwh1+kK4uIa/UN0PizXAsHJXw0dmplKvICvBPGu7vwLLJw23mWxg4V1c/7nUhTuiXtkdGwB6sgygYNu3lWUB1/kGbGpcvJ5JbSzi2ihz1PtAkL96Zv1Vy1gsILFySOoRg4vVtgCypQVeesn4zx2SB1RMxP2htbsJNKZAUp+iRMg== 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: Signed-off-by: Sean Christopherson Reviewed-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 d58b7a506d27..50aea855eeae 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -516,21 +516,25 @@ 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 { pte_t pte; u64 raw; } 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; @@ -557,7 +561,7 @@ static void kvm_null_fn(void) 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; @@ -588,9 +592,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 @@ -640,10 +644,10 @@ static __always_inline int kvm_handle_hva_range(struct mmu_notifier *mn, unsigned long start, unsigned long end, pte_t pte, - 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.pte = pte, @@ -660,10 +664,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, @@ -750,7 +754,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, @@ -814,7 +818,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,