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 33C99EB64DA for ; Thu, 15 Jun 2023 17:43:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B841D6B0072; Thu, 15 Jun 2023 13:43:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B336F8E0003; Thu, 15 Jun 2023 13:43:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FC4F8E0002; Thu, 15 Jun 2023 13:43:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8FF966B0072 for ; Thu, 15 Jun 2023 13:43:02 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5EEBF809E4 for ; Thu, 15 Jun 2023 17:43:02 +0000 (UTC) X-FDA: 80905703004.12.4E2E902 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf07.hostedemail.com (Postfix) with ESMTP id 8CF3F40015 for ; Thu, 15 Jun 2023 17:43:00 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=CRqM4fJo; spf=pass (imf07.hostedemail.com: domain of 3o02LZAYKCJYI40D926EE6B4.2ECB8DKN-CCAL02A.EH6@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3o02LZAYKCJYI40D926EE6B4.2ECB8DKN-CCAL02A.EH6@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686850980; a=rsa-sha256; cv=none; b=ugTGui07TZtYpccoAWFZx1XvGQmw+mq0wvqNCLMbcJYVbfghOaoEDS1zS5iUNW7Tfb3XQS ZqlEMc5pej9CeOEtxYxuqiJLvg2SnJ/pOSBzJkrg3+xt32NjPo/v44x5AIWuOOILRyHsFQ EM0005XxcMTq+7vfdPbaMowz6eK0xQQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=CRqM4fJo; spf=pass (imf07.hostedemail.com: domain of 3o02LZAYKCJYI40D926EE6B4.2ECB8DKN-CCAL02A.EH6@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3o02LZAYKCJYI40D926EE6B4.2ECB8DKN-CCAL02A.EH6@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=1686850980; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3VaVpYnKKIXM0ZMJBv2BahWS6rKgSDR5ikxQlp7Qm5M=; b=Gncn54zP410aYnt9Qh7nFk9PgywKI1994bE5Lb1hsn7g3IKFyikJy7AipvRIMrxShyhxCu znFMENpt0fyUcF24AsrnY++5+Qnf7n/A/ox/PRA9yF7/oKrcXiKc6G3OKpkzMGPll/a3uT oerXS/v6MG0MF7sZKARG4KVo0Z1/XfQ= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1b521e4e88bso3736835ad.2 for ; Thu, 15 Jun 2023 10:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686850979; x=1689442979; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3VaVpYnKKIXM0ZMJBv2BahWS6rKgSDR5ikxQlp7Qm5M=; b=CRqM4fJoSy0TOwQEM+dwNf4YLmN8ZNvadtNeqmejsTpkrhB3fUKCS5gVORcT3YAFGF i/3D4htNDkxjLmMQr6ex9h88D9Mn3b3BcimZjQyHYDLLHrnhvGGLYYK4DnkhEsQ6CVaZ cXJTMz7MEXsf3MpnUFcr6Mx0t4RSwdzHZHJMQ/Gw529RF41s9TMoKGTDzFQ40JREZYAz j/q5bFPXA1TGS/pjeQnxzb2ibh5u61Yat52z5h2i3whlu/NZWmrHHKlNBlQzVnj3NGqb fUd5ZYUT6Xx5VG3C07mjHJV5Ti0lFZylCk6cioTWTVk9aptHHtPLM7okEk048bn6RBzX EGGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686850979; x=1689442979; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3VaVpYnKKIXM0ZMJBv2BahWS6rKgSDR5ikxQlp7Qm5M=; b=dUv/eHlJdMgSedgTBvk+oBQRvCZLCfkBsj3TuYzlh7m0zbxii8yJtSwH+yhjPByolA ryQEHGn2Z7dHL02YvZFfomcbcCYnlt4LOaL4tsj2d93EyghfiqREp2WstoKkJvWRKnmN UzXcPi76Kt/URz/OHqYbHMyOf/MBRKB7riW0SoG0pkjuXl6dvgPfWmds0Jyxo4rq7e6i RkvJb357OkANHbDfM9FrsM6hwT/TlnGVRGOCFxSsnRiC04KynRmj2vzCC4IWIMrG+jQE Fz+9EeJ6h4EK5+sBA/nS1KwedWNgaEbk3A1sk0SAHTR3VYnW83qQ8p+f/HsgM4OOUZIX z9RA== X-Gm-Message-State: AC+VfDyDMtqbADt+Bh7mu9/WvR5BfjbBk0vE4ljEWaWw0MRw5xCkbfmn Pi8KAUZ9AVJRM4IJpgZXLD+6v3yzBIY= X-Google-Smtp-Source: ACHHUZ4cQlpzVe0KczazAvYqGjGYoNkXv8UVqui26XxKS9kOBWmazT/WNj+BhRRRMGskVfw0J/AilzSk6Q0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:f7d3:b0:1b5:147f:d8d1 with SMTP id h19-20020a170902f7d300b001b5147fd8d1mr547182plw.3.1686850979254; Thu, 15 Jun 2023 10:42:59 -0700 (PDT) Date: Thu, 15 Jun 2023 10:42:57 -0700 In-Reply-To: <20230526234435.662652-2-yuzhao@google.com> Mime-Version: 1.0 References: <20230526234435.662652-1-yuzhao@google.com> <20230526234435.662652-2-yuzhao@google.com> Message-ID: Subject: Re: [PATCH mm-unstable v2 01/10] mm/kvm: add mmu_notifier_ops->test_clear_young() From: Sean Christopherson To: Yu Zhao Cc: Andrew Morton , Paolo Bonzini , Alistair Popple , Anup Patel , Ben Gardon , Borislav Petkov , Catalin Marinas , Chao Peng , Christophe Leroy , Dave Hansen , Fabiano Rosas , Gaosheng Cui , Gavin Shan , "H. Peter Anvin" , Ingo Molnar , James Morse , "Jason A. Donenfeld" , Jason Gunthorpe , Jonathan Corbet , Marc Zyngier , Masami Hiramatsu , Michael Ellerman , Michael Larabel , Mike Rapoport , Nicholas Piggin , Oliver Upton , Paul Mackerras , Peter Xu , Steven Rostedt , Suzuki K Poulose , Thomas Gleixner , Thomas Huth , Will Deacon , Zenghui Yu , kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-trace-kernel@vger.kernel.org, x86@kernel.org, linux-mm@google.com Content-Type: text/plain; charset="us-ascii" X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 8CF3F40015 X-Stat-Signature: tpi9cz3oy3iz4ato4pudbm6gqfcxm7yp X-Rspam-User: X-HE-Tag: 1686850980-461832 X-HE-Meta: U2FsdGVkX1/UARfQL+7fHzF6Tj9yV59Rgl2+K3MIJrcS7DKAamE+TkOVtuHpnCRvlNQB3xSphCPEbRQU5yz6yzfBe6zQEbIPmjAqZTnffSN+t5E5leMXU4sbPleZhYGClWkLIByIlyAsdRD2H4jtOiNooSMi36GEz/8aqPF0Ot71REKnZ/GbLc7p6wDAeMRFr4Aa9krKZKjHd0NNHCPPRfctxdsXphPsKQPk+yzZECbntsVORWKI8mlDJDUKvky49M/RS8Oit58NQP15a2Uis94c8fc7CKL+V5mj9ijX6QK1CjYkjy0CkFzj1BjVgM3mH9Vjhqe1v0r93kpFtEdgwsoxE707epomh2s6rhEaBEe9fmJXbsM5bW9yEmQbZ07y0PucVmw1GuKGSxh8pIlEwsZAmPRM6k8Ww83MDUXVrC27iJbaJ9OWRWzrGQRhCpGOw4teZThLreUZMMewarcImfFbZAad923k8vbtogU5dTvPe84IGFqxdbbVH5ZiOHv8GLNwbcW8ecXjasICRdpPNSwfcwr4Cg68ZzLKsBLRC0XMQ7KKU1WwhxhIZWrHTlwuXhHVPwMnvO6UJHKEqdEBfHu4YuopV35mpl84z8xLvyXEspIK2VUeQk5z4NQs9qmvZDuHHXoqKiAAd4GgASeVuxuS8BfHCr/0XpMsO16ytlUYpjV2mIUI8TS+KT9BXvwlmlaTi4D4ls80up6BFfv3V6itS+XQQ7C6Lwie3iBKaUIrQ3iFRy9BMwvwalwziZMO0sP/xIVduKuMhzw4yUfJ3b6lyJrtDqY2Hpj8GX20lTg/5N2gRykcRiYYIi6bimBYWdliV8TlLyf7hd81xtWZbusfGyI2cs+A6xxdN+xSnrgDFtxi6NC4poropu6/yTf3YKWlKvqgisCh2mXEo7dxwtidqX1t8dDrzblpaBsLW6ourANPXUzcRxevKq+z8tqWdzF6ExoSkkzdd0fsgN9 S6in10HU xV/n9BvWBYBLqsHjq4Rxe5zwzPuPsGHWPsXb4BF9CKVzX9+ec/w0BfH09PdHE+uHAT6YhFGqnx+4hp1/sULUuDuqNTn+KfLa3lsRRbvPFgzg2xMs+4y7Q+vTamzGfj0MzgPo9vNH3u1zeW9fUUokckFX2pAp6lHnklhspBXZnlcjwfJ57oWw4M1pQ3krqI7x/OsnbW6CkuJblR7k/rUIKfBjsjlH4pcWYPgVJIWlVAOKQ28754tylh4wPIabxjAnhmDYqe5sIBJaoW/6GgKTBkgF4JgKh5a6OJoG9+nEiw3w+ILEDFemItgpLEvvT2v7BvVhcMWhRzrVrERVcRBJ0VB3M5V9FFyXYO+9KAK43Rg7KdOQHXH9U66sz0sIOI8JphKgsIz5xSXUQD9Odj4+gyR8IPYg3CdbGeyaE0Au4FVUPPZvU0lr6xd31RsPSlWfariMqHfAgY8PEsji/fhvunQKzINvz4zL26C5GA0A3XtlPHGu+O4obuSmpjQhbHcBm4P8Ulig7EwNZEj/sqqT7+E15P7NgOEgfGsy1GMd3X645ZJk/bGnxfZ+nvYQuriQrx3yKR+GPHIejGU8lG61AQTCFFecELX9OG/qK70whCPSZoboGKhb3eA4DWZysyh3kF09p 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: On Fri, May 26, 2023, Yu Zhao wrote: > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 0e571e973bc2..374262545f96 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -258,6 +258,7 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu); > #ifdef KVM_ARCH_WANT_MMU_NOTIFIER > struct kvm_gfn_range { > struct kvm_memory_slot *slot; > + void *args; There's no reason to make this "void *", just declare "struct test_clear_young_args" in the header. Arch code won't be able to use it regardless. And I vote for something more like "test_clear_young_metadata", as there's far more information in there than just function arguments. And to stave off the argument that "void *" would allow reuse, take this opportunity to unionize the test_clear_young field with the change_pte field, e.g. /* comment about these fields being callback specific. */ union { struct test_clear_young_metadata *metadata; pte_t pte; unsigned long callback_arg; /* needs a better name */ }; > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 51e4882d0873..31ee58754b19 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -541,6 +541,7 @@ typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start, > typedef void (*on_unlock_fn_t)(struct kvm *kvm); > > struct kvm_hva_range { > + void *args; Same feedback as kvm_gfn_range. > unsigned long start; > unsigned long end; > pte_t pte; > @@ -549,6 +550,7 @@ struct kvm_hva_range { > on_unlock_fn_t on_unlock; > bool flush_on_ret; > bool may_block; > + bool lockless; > }; > > /* > @@ -602,6 +604,8 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, > hva_end = min(range->end, slot->userspace_addr + > (slot->npages << PAGE_SHIFT)); > > + gfn_range.args = range->args; And this goes away because the generic callback_arg is what gets propagated. > + > /* > * To optimize for the likely case where the address > * range is covered by zero or one memslots, don't > @@ -619,7 +623,7 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, > gfn_range.end = hva_to_gfn_memslot(hva_end + PAGE_SIZE - 1, slot); > gfn_range.slot = slot; > > - if (!locked) { > + if (!range->lockless && !locked) { > locked = true; > KVM_MMU_LOCK(kvm); > if (!IS_KVM_NULL_FN(range->on_lock)) > @@ -628,6 +632,9 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, > break; > } > ret |= range->handler(kvm, &gfn_range); > + > + if (range->lockless && ret) I don't like overloading "lockless" to also mean "stop on ret". Just add another flag, there's literally no cost for most callbacks as everything is constant at compile time and gets optimized away. > + range.args = &args; > + range.lockless = true; The lockless and stop_on_ret behavior needs comments. > + range.handler = kvm_arch_test_clear_young; > + > + if (!__kvm_handle_hva_range(kvm, &range)) > + return args.young ? MMU_NOTIFIER_RANGE_LOCKLESS : 0; > + } > + > + if (bitmap) > + return 0; > + > + range.args = NULL; > + range.lockless = false; No need to manually clear these, they'll be zeroed by the initialization code. E.g. all in all, something like so --- include/linux/kvm_host.h | 9 +++++++-- virt/kvm/kvm_main.c | 29 +++++++++++++++++------------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 7a0922cbc36f..e04605061f5e 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -256,12 +256,17 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu); #endif #ifdef KVM_ARCH_WANT_MMU_NOTIFIER +struct test_clear_young_metadata; + struct kvm_gfn_range { struct kvm_memory_slot *slot; - void *args; gfn_t start; gfn_t end; - pte_t pte; + union { + struct test_clear_young_metadata *metadata; + pte_t pte; + unsigned long callback_arg; + }; bool may_block; }; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ac83cfb30771..8cf4fee9cd8b 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -536,16 +536,20 @@ typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start, typedef void (*on_unlock_fn_t)(struct kvm *kvm); struct kvm_hva_range { - void *args; unsigned long start; unsigned long end; - pte_t pte; hva_handler_t handler; + union { + struct test_clear_young_metadata *metadata; + pte_t pte; + unsigned long callback_arg; + }; on_lock_fn_t on_lock; on_unlock_fn_t on_unlock; bool flush_on_ret; bool may_block; bool lockless; + bool stop_on_ret; }; /* @@ -576,6 +580,9 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, struct kvm_memslots *slots; int i, idx; + BUILD_BUG_ON(sizeof(gfn_range.callback_arg) != sizeof(gfn_range.pte) || + sizeof(gfn_range.callback_arg) != sizeof(gfn_range.metadata)); + if (WARN_ON_ONCE(range->end <= range->start)) return 0; @@ -599,16 +606,14 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, hva_end = min(range->end, slot->userspace_addr + (slot->npages << PAGE_SHIFT)); - gfn_range.args = range->args; - /* * To optimize for the likely case where the address * range is covered by zero or one memslots, don't * bother making these conditional (to avoid writes on * the second or later invocation of the handler). */ - gfn_range.pte = range->pte; gfn_range.may_block = range->may_block; + gfn_range.callback_arg = range->callback_arg; /* * {gfn(page) | page intersects with [hva_start, hva_end)} = @@ -628,7 +633,8 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, } ret |= range->handler(kvm, &gfn_range); - if (range->lockless && ret) + /* comment goes here. */ + if (range->stop_on_ret && ret) break; } } @@ -830,7 +836,7 @@ static int kvm_mmu_notifier_clear_flush_young(struct mmu_notifier *mn, return kvm_handle_hva_range(mn, start, end, __pte(0), kvm_age_gfn); } -struct test_clear_young_args { +struct test_clear_young_metadata { unsigned long *bitmap; unsigned long end; bool clear; @@ -839,7 +845,7 @@ struct test_clear_young_args { bool kvm_should_clear_young(struct kvm_gfn_range *range, gfn_t gfn) { - struct test_clear_young_args *args = range->args; + struct test_clear_young_metadata *args = range->metadata; VM_WARN_ON_ONCE(gfn < range->start || gfn >= range->end); @@ -880,14 +886,15 @@ static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_ trace_kvm_age_hva(start, end); if (kvm_test_clear_young) { - struct test_clear_young_args args = { + struct test_clear_young_metadata args = { .bitmap = bitmap, .end = end, .clear = clear, }; - range.args = &args; range.lockless = true; + range.stop_on_ret = true; + range.metadata = &args; range.handler = kvm_test_clear_young; if (!__kvm_handle_hva_range(kvm, &range)) @@ -897,8 +904,6 @@ static int kvm_mmu_notifier_test_clear_young(struct mmu_notifier *mn, struct mm_ if (bitmap) return 0; - range.args = NULL; - range.lockless = false; range.handler = clear ? kvm_age_gfn : kvm_test_age_gfn; return __kvm_handle_hva_range(kvm, &range) ? MMU_NOTIFIER_RANGE_YOUNG : 0; base-commit: 7a5d8be2c18415b73b9380741095f439d6983a40 --