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 mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA206FA3742 for ; Fri, 28 Oct 2022 18:42:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 126AA4B750; Fri, 28 Oct 2022 14:42:08 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iBsJ3St8tSlu; Fri, 28 Oct 2022 14:42:06 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id A3F184B6FA; Fri, 28 Oct 2022 14:42:06 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id BFB704B6F0 for ; Fri, 28 Oct 2022 14:42:04 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qxxdKzLzM82j for ; Fri, 28 Oct 2022 14:42:03 -0400 (EDT) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 34DC74B630 for ; Fri, 28 Oct 2022 14:42:03 -0400 (EDT) Received: by mail-pf1-f178.google.com with SMTP id 17so1233337pfv.4 for ; Fri, 28 Oct 2022 11:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=J7Pp437tloA+icZkR1b9Du/W1JxcPnliqndmG+LwN8k=; b=Kjcjz/n15ffOSTc+a6pGW5Gj0c3s58/6oGT0BG23uqNbSfcYbuIoVBs6b73Dtf+jo6 u123qt6O/cL59eD4AhKxvUkQcyEu3vUqHmGB8gccd0PAwk3GStCT494PJwmAwHMGz1os koRCt7fJ9upcJDk5RpxNc1/STTcfQq24SR2A4CjGeOkg+XGAzu7TLGtNc2PxH+HPzeYy wqsh9fCMoeduNDz7/jMIOBWo/YlAF3ChoCYJ0aPycwEYZoH21iMxZUQl8drSe+jDPNXU vhF4f2ZGrcx7G/GL5jp6IUrx2t0wXMylcwC51YLG0bbZqSmZ3ctAwsB8KFnFdQfeHxId +Huw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=J7Pp437tloA+icZkR1b9Du/W1JxcPnliqndmG+LwN8k=; b=S3/z7oMXlZyIOTrP+pnR4uSdm4uakk0HGIylx59okw2cscp2UQs3QJB5R6BmHmF5OV t0S9a5qgkKNIs/XpWasKMj/VM9vMw7cd3nsr+oGVDGqGWxAqku6G39JNkC3zySL57wvG IXeZLygT1NjbZ+H06pjilDbwDIZNxD2yY9Eyxu9xTE7CCFaanvVfglK57Nq6+6WSq9IP xPyR2I1wFcp9MeU30RjXePLpgXec2rK3VLset8Tuyu7vxF4Stc14NNLky02gJ+yS54Fi 2JsZbAu6Bfa4KnaK/+SfUqEy00f3AEeRtMenlaPtlhQbWTh2hGT8DQUuICdgWGeJwunX qJ+g== X-Gm-Message-State: ACrzQf2YAu8sc2/LyJ3Ca9Suv1EFKgSr3uRsWOt6C83EMaMRVTIwyagK gzm6GKtxqlx7L9cIqKIp5FEUMQ== X-Google-Smtp-Source: AMsMyM4hj7wWT1cmqTcrjVK4YiStAjCd8j/6G1J+LRsWway+MUT7Cct3dfgiinOCe2CNvTmvkp5VaA== X-Received: by 2002:a63:ff5a:0:b0:42c:61f:b81 with SMTP id s26-20020a63ff5a000000b0042c061f0b81mr780601pgk.254.1666982521903; Fri, 28 Oct 2022 11:42:01 -0700 (PDT) Received: from google.com (220.181.82.34.bc.googleusercontent.com. [34.82.181.220]) by smtp.gmail.com with ESMTPSA id d10-20020a170903230a00b00177e5d83d3esm3468315plh.88.2022.10.28.11.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 11:42:01 -0700 (PDT) Date: Fri, 28 Oct 2022 11:41:57 -0700 From: Ricardo Koller To: Oliver Upton Subject: Re: [PATCH v2 06/15] KVM: arm64: Tear down unlinked stage-2 subtree after break-before-make Message-ID: References: <20221007232818.459650-1-oliver.upton@linux.dev> <20221007232818.459650-7-oliver.upton@linux.dev> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221007232818.459650-7-oliver.upton@linux.dev> Cc: kvm@vger.kernel.org, Marc Zyngier , kvmarm@lists.linux.dev, Will Deacon , Ben Gardon , David Matlack , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Fri, Oct 07, 2022 at 11:28:09PM +0000, Oliver Upton wrote: > The break-before-make sequence is a bit annoying as it opens a window > wherein memory is unmapped from the guest. KVM should replace the PTE > as quickly as possible and avoid unnecessary work in between. > > Presently, the stage-2 map walker tears down a removed table before > installing a block mapping when coalescing a table into a block. As the > removed table is no longer visible to hardware walkers after the > DSB+TLBI, it is possible to move the remaining cleanup to happen after > installing the new PTE. > > Reshuffle the stage-2 map walker to install the new block entry in > the pre-order callback. Unwire all of the teardown logic and replace > it with a call to kvm_pgtable_stage2_free_removed() after fixing > the PTE. The post-order visitor is now completely unnecessary, so drop > it. Finally, touch up the comments to better represent the now > simplified map walker. > > Note that the call to tear down the unlinked stage-2 is indirected > as a subsequent change will use an RCU callback to trigger tear down. > RCU is not available to pKVM, so there is a need to use different > implementations on pKVM and non-pKVM VMs. > > Signed-off-by: Oliver Upton > --- > arch/arm64/include/asm/kvm_pgtable.h | 3 + > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 ++ > arch/arm64/kvm/hyp/pgtable.c | 84 ++++++++------------------- > arch/arm64/kvm/mmu.c | 8 +++ > 4 files changed, 40 insertions(+), 61 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h > index 71b7d154b78a..c33edcf36b5b 100644 > --- a/arch/arm64/include/asm/kvm_pgtable.h > +++ b/arch/arm64/include/asm/kvm_pgtable.h > @@ -77,6 +77,8 @@ static inline bool kvm_level_supports_block_mapping(u32 level) > * allocation is physically contiguous. > * @free_pages_exact: Free an exact number of memory pages previously > * allocated by zalloc_pages_exact. > + * @free_removed_table: Free a removed paging structure by unlinking and > + * dropping references. > * @get_page: Increment the refcount on a page. > * @put_page: Decrement the refcount on a page. When the > * refcount reaches 0 the page is automatically > @@ -95,6 +97,7 @@ struct kvm_pgtable_mm_ops { > void* (*zalloc_page)(void *arg); > void* (*zalloc_pages_exact)(size_t size); > void (*free_pages_exact)(void *addr, size_t size); > + void (*free_removed_table)(void *addr, u32 level); > void (*get_page)(void *addr); > void (*put_page)(void *addr); > int (*page_count)(void *addr); > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index d21d1b08a055..735769886b55 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -79,6 +79,11 @@ static void host_s2_put_page(void *addr) > hyp_put_page(&host_s2_pool, addr); > } > > +static void host_s2_free_removed_table(void *addr, u32 level) > +{ > + kvm_pgtable_stage2_free_removed(&host_kvm.mm_ops, addr, level); > +} > + > static int prepare_s2_pool(void *pgt_pool_base) > { > unsigned long nr_pages, pfn; > @@ -93,6 +98,7 @@ static int prepare_s2_pool(void *pgt_pool_base) > host_kvm.mm_ops = (struct kvm_pgtable_mm_ops) { > .zalloc_pages_exact = host_s2_zalloc_pages_exact, > .zalloc_page = host_s2_zalloc_page, > + .free_removed_table = host_s2_free_removed_table, > .phys_to_virt = hyp_phys_to_virt, > .virt_to_phys = hyp_virt_to_phys, > .page_count = hyp_page_count, > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index 363a5cce7e1a..02c33fccb178 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -746,16 +746,19 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx, > return 0; > } > > +static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > + struct stage2_map_data *data); > + > static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx, > struct stage2_map_data *data) > { > - if (data->anchor) > - return 0; > + struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; > + kvm_pte_t *childp = kvm_pte_follow(ctx->old, mm_ops); > + int ret; > > if (!stage2_leaf_mapping_allowed(ctx, data)) > return 0; > > - data->childp = kvm_pte_follow(ctx->old, ctx->mm_ops); > kvm_clear_pte(ctx->ptep); > > /* > @@ -764,8 +767,13 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx, > * individually. > */ > kvm_call_hyp(__kvm_tlb_flush_vmid, data->mmu); > - data->anchor = ctx->ptep; > - return 0; > + > + ret = stage2_map_walk_leaf(ctx, data); > + > + mm_ops->put_page(ctx->ptep); > + mm_ops->free_removed_table(childp, ctx->level + 1); This could save some cycles: if (stage2_pte_is_counted(ctx->old) mm_ops->free_removed_table(childp, ctx->level + 1); as coming back using the stage2_free_walker() requires some preparation, and it does the exact same check anyawy. > + > + return ret; > } > > static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > @@ -775,13 +783,6 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > kvm_pte_t *childp; > int ret; > > - if (data->anchor) { > - if (stage2_pte_is_counted(ctx->old)) > - mm_ops->put_page(ctx->ptep); > - > - return 0; > - } > - > ret = stage2_map_walker_try_leaf(ctx, data); > if (ret != -E2BIG) > return ret; > @@ -810,49 +811,14 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > return 0; > } > > -static int stage2_map_walk_table_post(const struct kvm_pgtable_visit_ctx *ctx, > - struct stage2_map_data *data) > -{ > - struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; > - kvm_pte_t *childp; > - int ret = 0; > - > - if (!data->anchor) > - return 0; > - > - if (data->anchor == ctx->ptep) { > - childp = data->childp; > - data->anchor = NULL; > - data->childp = NULL; > - ret = stage2_map_walk_leaf(ctx, data); > - } else { > - childp = kvm_pte_follow(ctx->old, mm_ops); > - } > - > - mm_ops->put_page(childp); > - mm_ops->put_page(ctx->ptep); > - > - return ret; > -} > - > /* > - * This is a little fiddly, as we use all three of the walk flags. The idea > - * is that the TABLE_PRE callback runs for table entries on the way down, > - * looking for table entries which we could conceivably replace with a > - * block entry for this mapping. If it finds one, then it sets the 'anchor' > - * field in 'struct stage2_map_data' to point at the table entry, before > - * clearing the entry to zero and descending into the now detached table. > - * > - * The behaviour of the LEAF callback then depends on whether or not the > - * anchor has been set. If not, then we're not using a block mapping higher > - * up the table and we perform the mapping at the existing leaves instead. > - * If, on the other hand, the anchor _is_ set, then we drop references to > - * all valid leaves so that the pages beneath the anchor can be freed. > + * The TABLE_PRE callback runs for table entries on the way down, looking > + * for table entries which we could conceivably replace with a block entry > + * for this mapping. If it finds one it replaces the entry and calls > + * kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. > * > - * Finally, the TABLE_POST callback does nothing if the anchor has not > - * been set, but otherwise frees the page-table pages while walking back up > - * the page-table, installing the block entry when it revisits the anchor > - * pointer and clearing the anchor to NULL. > + * Otherwise, the LEAF callback performs the mapping at the existing leaves > + * instead. > */ > static int stage2_map_walker(const struct kvm_pgtable_visit_ctx *ctx, > enum kvm_pgtable_walk_flags visit) > @@ -864,11 +830,9 @@ static int stage2_map_walker(const struct kvm_pgtable_visit_ctx *ctx, > return stage2_map_walk_table_pre(ctx, data); > case KVM_PGTABLE_WALK_LEAF: > return stage2_map_walk_leaf(ctx, data); > - case KVM_PGTABLE_WALK_TABLE_POST: > - return stage2_map_walk_table_post(ctx, data); > + default: > + return -EINVAL; > } > - > - return -EINVAL; > } > > int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, > @@ -885,8 +849,7 @@ int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, > struct kvm_pgtable_walker walker = { > .cb = stage2_map_walker, > .flags = KVM_PGTABLE_WALK_TABLE_PRE | > - KVM_PGTABLE_WALK_LEAF | > - KVM_PGTABLE_WALK_TABLE_POST, > + KVM_PGTABLE_WALK_LEAF, > .arg = &map_data, > }; > > @@ -916,8 +879,7 @@ int kvm_pgtable_stage2_set_owner(struct kvm_pgtable *pgt, u64 addr, u64 size, > struct kvm_pgtable_walker walker = { > .cb = stage2_map_walker, > .flags = KVM_PGTABLE_WALK_TABLE_PRE | > - KVM_PGTABLE_WALK_LEAF | > - KVM_PGTABLE_WALK_TABLE_POST, > + KVM_PGTABLE_WALK_LEAF, > .arg = &map_data, > }; > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index c9a13e487187..04a25319abb0 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -102,6 +102,13 @@ static void *kvm_host_zalloc_pages_exact(size_t size) > return alloc_pages_exact(size, GFP_KERNEL_ACCOUNT | __GFP_ZERO); > } > > +static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; > + > +static void stage2_free_removed_table(void *addr, u32 level) > +{ > + kvm_pgtable_stage2_free_removed(&kvm_s2_mm_ops, addr, level); > +} > + > static void kvm_host_get_page(void *addr) > { > get_page(virt_to_page(addr)); > @@ -627,6 +634,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { > .zalloc_page = stage2_memcache_zalloc_page, > .zalloc_pages_exact = kvm_host_zalloc_pages_exact, > .free_pages_exact = free_pages_exact, > + .free_removed_table = stage2_free_removed_table, > .get_page = kvm_host_get_page, > .put_page = kvm_host_put_page, > .page_count = kvm_host_page_count, > -- > 2.38.0.rc1.362.ged0d419d3c-goog > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF6EEBA41 for ; Fri, 28 Oct 2022 18:42:02 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id d10so5486466pfh.6 for ; Fri, 28 Oct 2022 11:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=J7Pp437tloA+icZkR1b9Du/W1JxcPnliqndmG+LwN8k=; b=Kjcjz/n15ffOSTc+a6pGW5Gj0c3s58/6oGT0BG23uqNbSfcYbuIoVBs6b73Dtf+jo6 u123qt6O/cL59eD4AhKxvUkQcyEu3vUqHmGB8gccd0PAwk3GStCT494PJwmAwHMGz1os koRCt7fJ9upcJDk5RpxNc1/STTcfQq24SR2A4CjGeOkg+XGAzu7TLGtNc2PxH+HPzeYy wqsh9fCMoeduNDz7/jMIOBWo/YlAF3ChoCYJ0aPycwEYZoH21iMxZUQl8drSe+jDPNXU vhF4f2ZGrcx7G/GL5jp6IUrx2t0wXMylcwC51YLG0bbZqSmZ3ctAwsB8KFnFdQfeHxId +Huw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=J7Pp437tloA+icZkR1b9Du/W1JxcPnliqndmG+LwN8k=; b=0zYuTa/tPuXN9e0/tPMe2fIUdQ48fgJUGDN34MgL0uxW0aT/ZMhgCNbYMFTIl1HsUQ L/8Ay92Xr+ll4zlCnuAQG2F0jC/xpSZ3+1K2e4RI6WgPFeh36LCMIWrHVK48LF0thcDN nkBxqhc5Gy8dmSX3zC2aSUMzILOcsWpKV+7GnOjMOsCIA8tV9VXi1AyeRh3u32rLUhVI L6Q1n5VK4cYkUcdGDZB+NE8tuq+Bbc/OZ+8WKHhqFYE9pKwBp00KABkfWNyAM2NhK8vs NrtL/SNehfzFTkSbVCv4kIT6z+iCBDroAlxDHfZ2tzIINdo8CaUg6Mb+QeTEu90xYAtc 0Qsg== X-Gm-Message-State: ACrzQf1tdu09vuTSXchmJPOyVbhJTb18/g9Hs/ldDHBVcHYP1SJI+98T rtJSKTKq17leoTRYwziPP5pNqg== X-Google-Smtp-Source: AMsMyM4hj7wWT1cmqTcrjVK4YiStAjCd8j/6G1J+LRsWway+MUT7Cct3dfgiinOCe2CNvTmvkp5VaA== X-Received: by 2002:a63:ff5a:0:b0:42c:61f:b81 with SMTP id s26-20020a63ff5a000000b0042c061f0b81mr780601pgk.254.1666982521903; Fri, 28 Oct 2022 11:42:01 -0700 (PDT) Received: from google.com (220.181.82.34.bc.googleusercontent.com. [34.82.181.220]) by smtp.gmail.com with ESMTPSA id d10-20020a170903230a00b00177e5d83d3esm3468315plh.88.2022.10.28.11.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 11:42:01 -0700 (PDT) Date: Fri, 28 Oct 2022 11:41:57 -0700 From: Ricardo Koller To: Oliver Upton Cc: Marc Zyngier , James Morse , Alexandru Elisei , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Reiji Watanabe , David Matlack , Quentin Perret , Ben Gardon , Gavin Shan , Peter Xu , Will Deacon , Sean Christopherson , kvmarm@lists.linux.dev Subject: Re: [PATCH v2 06/15] KVM: arm64: Tear down unlinked stage-2 subtree after break-before-make Message-ID: References: <20221007232818.459650-1-oliver.upton@linux.dev> <20221007232818.459650-7-oliver.upton@linux.dev> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221007232818.459650-7-oliver.upton@linux.dev> Message-ID: <20221028184157.TMioF_oJZ6bWSEncLmcM2XZ5ihXWy8uCJo4w33GL35w@z> On Fri, Oct 07, 2022 at 11:28:09PM +0000, Oliver Upton wrote: > The break-before-make sequence is a bit annoying as it opens a window > wherein memory is unmapped from the guest. KVM should replace the PTE > as quickly as possible and avoid unnecessary work in between. > > Presently, the stage-2 map walker tears down a removed table before > installing a block mapping when coalescing a table into a block. As the > removed table is no longer visible to hardware walkers after the > DSB+TLBI, it is possible to move the remaining cleanup to happen after > installing the new PTE. > > Reshuffle the stage-2 map walker to install the new block entry in > the pre-order callback. Unwire all of the teardown logic and replace > it with a call to kvm_pgtable_stage2_free_removed() after fixing > the PTE. The post-order visitor is now completely unnecessary, so drop > it. Finally, touch up the comments to better represent the now > simplified map walker. > > Note that the call to tear down the unlinked stage-2 is indirected > as a subsequent change will use an RCU callback to trigger tear down. > RCU is not available to pKVM, so there is a need to use different > implementations on pKVM and non-pKVM VMs. > > Signed-off-by: Oliver Upton > --- > arch/arm64/include/asm/kvm_pgtable.h | 3 + > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 ++ > arch/arm64/kvm/hyp/pgtable.c | 84 ++++++++------------------- > arch/arm64/kvm/mmu.c | 8 +++ > 4 files changed, 40 insertions(+), 61 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h > index 71b7d154b78a..c33edcf36b5b 100644 > --- a/arch/arm64/include/asm/kvm_pgtable.h > +++ b/arch/arm64/include/asm/kvm_pgtable.h > @@ -77,6 +77,8 @@ static inline bool kvm_level_supports_block_mapping(u32 level) > * allocation is physically contiguous. > * @free_pages_exact: Free an exact number of memory pages previously > * allocated by zalloc_pages_exact. > + * @free_removed_table: Free a removed paging structure by unlinking and > + * dropping references. > * @get_page: Increment the refcount on a page. > * @put_page: Decrement the refcount on a page. When the > * refcount reaches 0 the page is automatically > @@ -95,6 +97,7 @@ struct kvm_pgtable_mm_ops { > void* (*zalloc_page)(void *arg); > void* (*zalloc_pages_exact)(size_t size); > void (*free_pages_exact)(void *addr, size_t size); > + void (*free_removed_table)(void *addr, u32 level); > void (*get_page)(void *addr); > void (*put_page)(void *addr); > int (*page_count)(void *addr); > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index d21d1b08a055..735769886b55 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -79,6 +79,11 @@ static void host_s2_put_page(void *addr) > hyp_put_page(&host_s2_pool, addr); > } > > +static void host_s2_free_removed_table(void *addr, u32 level) > +{ > + kvm_pgtable_stage2_free_removed(&host_kvm.mm_ops, addr, level); > +} > + > static int prepare_s2_pool(void *pgt_pool_base) > { > unsigned long nr_pages, pfn; > @@ -93,6 +98,7 @@ static int prepare_s2_pool(void *pgt_pool_base) > host_kvm.mm_ops = (struct kvm_pgtable_mm_ops) { > .zalloc_pages_exact = host_s2_zalloc_pages_exact, > .zalloc_page = host_s2_zalloc_page, > + .free_removed_table = host_s2_free_removed_table, > .phys_to_virt = hyp_phys_to_virt, > .virt_to_phys = hyp_virt_to_phys, > .page_count = hyp_page_count, > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index 363a5cce7e1a..02c33fccb178 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -746,16 +746,19 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx, > return 0; > } > > +static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > + struct stage2_map_data *data); > + > static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx, > struct stage2_map_data *data) > { > - if (data->anchor) > - return 0; > + struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; > + kvm_pte_t *childp = kvm_pte_follow(ctx->old, mm_ops); > + int ret; > > if (!stage2_leaf_mapping_allowed(ctx, data)) > return 0; > > - data->childp = kvm_pte_follow(ctx->old, ctx->mm_ops); > kvm_clear_pte(ctx->ptep); > > /* > @@ -764,8 +767,13 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx, > * individually. > */ > kvm_call_hyp(__kvm_tlb_flush_vmid, data->mmu); > - data->anchor = ctx->ptep; > - return 0; > + > + ret = stage2_map_walk_leaf(ctx, data); > + > + mm_ops->put_page(ctx->ptep); > + mm_ops->free_removed_table(childp, ctx->level + 1); This could save some cycles: if (stage2_pte_is_counted(ctx->old) mm_ops->free_removed_table(childp, ctx->level + 1); as coming back using the stage2_free_walker() requires some preparation, and it does the exact same check anyawy. > + > + return ret; > } > > static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > @@ -775,13 +783,6 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > kvm_pte_t *childp; > int ret; > > - if (data->anchor) { > - if (stage2_pte_is_counted(ctx->old)) > - mm_ops->put_page(ctx->ptep); > - > - return 0; > - } > - > ret = stage2_map_walker_try_leaf(ctx, data); > if (ret != -E2BIG) > return ret; > @@ -810,49 +811,14 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > return 0; > } > > -static int stage2_map_walk_table_post(const struct kvm_pgtable_visit_ctx *ctx, > - struct stage2_map_data *data) > -{ > - struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; > - kvm_pte_t *childp; > - int ret = 0; > - > - if (!data->anchor) > - return 0; > - > - if (data->anchor == ctx->ptep) { > - childp = data->childp; > - data->anchor = NULL; > - data->childp = NULL; > - ret = stage2_map_walk_leaf(ctx, data); > - } else { > - childp = kvm_pte_follow(ctx->old, mm_ops); > - } > - > - mm_ops->put_page(childp); > - mm_ops->put_page(ctx->ptep); > - > - return ret; > -} > - > /* > - * This is a little fiddly, as we use all three of the walk flags. The idea > - * is that the TABLE_PRE callback runs for table entries on the way down, > - * looking for table entries which we could conceivably replace with a > - * block entry for this mapping. If it finds one, then it sets the 'anchor' > - * field in 'struct stage2_map_data' to point at the table entry, before > - * clearing the entry to zero and descending into the now detached table. > - * > - * The behaviour of the LEAF callback then depends on whether or not the > - * anchor has been set. If not, then we're not using a block mapping higher > - * up the table and we perform the mapping at the existing leaves instead. > - * If, on the other hand, the anchor _is_ set, then we drop references to > - * all valid leaves so that the pages beneath the anchor can be freed. > + * The TABLE_PRE callback runs for table entries on the way down, looking > + * for table entries which we could conceivably replace with a block entry > + * for this mapping. If it finds one it replaces the entry and calls > + * kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. > * > - * Finally, the TABLE_POST callback does nothing if the anchor has not > - * been set, but otherwise frees the page-table pages while walking back up > - * the page-table, installing the block entry when it revisits the anchor > - * pointer and clearing the anchor to NULL. > + * Otherwise, the LEAF callback performs the mapping at the existing leaves > + * instead. > */ > static int stage2_map_walker(const struct kvm_pgtable_visit_ctx *ctx, > enum kvm_pgtable_walk_flags visit) > @@ -864,11 +830,9 @@ static int stage2_map_walker(const struct kvm_pgtable_visit_ctx *ctx, > return stage2_map_walk_table_pre(ctx, data); > case KVM_PGTABLE_WALK_LEAF: > return stage2_map_walk_leaf(ctx, data); > - case KVM_PGTABLE_WALK_TABLE_POST: > - return stage2_map_walk_table_post(ctx, data); > + default: > + return -EINVAL; > } > - > - return -EINVAL; > } > > int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, > @@ -885,8 +849,7 @@ int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, > struct kvm_pgtable_walker walker = { > .cb = stage2_map_walker, > .flags = KVM_PGTABLE_WALK_TABLE_PRE | > - KVM_PGTABLE_WALK_LEAF | > - KVM_PGTABLE_WALK_TABLE_POST, > + KVM_PGTABLE_WALK_LEAF, > .arg = &map_data, > }; > > @@ -916,8 +879,7 @@ int kvm_pgtable_stage2_set_owner(struct kvm_pgtable *pgt, u64 addr, u64 size, > struct kvm_pgtable_walker walker = { > .cb = stage2_map_walker, > .flags = KVM_PGTABLE_WALK_TABLE_PRE | > - KVM_PGTABLE_WALK_LEAF | > - KVM_PGTABLE_WALK_TABLE_POST, > + KVM_PGTABLE_WALK_LEAF, > .arg = &map_data, > }; > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index c9a13e487187..04a25319abb0 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -102,6 +102,13 @@ static void *kvm_host_zalloc_pages_exact(size_t size) > return alloc_pages_exact(size, GFP_KERNEL_ACCOUNT | __GFP_ZERO); > } > > +static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; > + > +static void stage2_free_removed_table(void *addr, u32 level) > +{ > + kvm_pgtable_stage2_free_removed(&kvm_s2_mm_ops, addr, level); > +} > + > static void kvm_host_get_page(void *addr) > { > get_page(virt_to_page(addr)); > @@ -627,6 +634,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { > .zalloc_page = stage2_memcache_zalloc_page, > .zalloc_pages_exact = kvm_host_zalloc_pages_exact, > .free_pages_exact = free_pages_exact, > + .free_removed_table = stage2_free_removed_table, > .get_page = kvm_host_get_page, > .put_page = kvm_host_put_page, > .page_count = kvm_host_page_count, > -- > 2.38.0.rc1.362.ged0d419d3c-goog > 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C6533ECAAA1 for ; Fri, 28 Oct 2022 18:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IGChRtQlI82QZCVZ50UhuMsKOfud/cQoKhUh+gpaOVA=; b=iHLRTF19e7NCwf 3NcHZMeANCB7BB5IuGzA0fVNxaSiCATECrybihvY+Ty4L0MkqfERYYVMOE9AbPAAFQ81ecQ1WX8gh vwTyaNiu5TT57nAKliz84esfr8vb5+l70KGyvJZ0g5yvL5u1VbVyY1ydjOthkJbb6hvjTa2zP9hxs PMf6jRPARDvYGTV8uB9QS8VJbGQAehe6pJu6U7S/hiLYE+DsHhr1mrqjMWQ0C8Z0SGST7UVQkIsBn aZUyrnSK9gEO8EcVPl5+omGwjjlmmEAHVwOFGlRI9botWIWE7StvOcUoLQhxhipPMqJe9Iv++KIQr 8aStF381PyfYUgyCwLTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ooUJ4-001gVS-NY; Fri, 28 Oct 2022 18:42:14 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ooUJ1-001gSR-2I for linux-arm-kernel@lists.infradead.org; Fri, 28 Oct 2022 18:42:13 +0000 Received: by mail-pf1-x42e.google.com with SMTP id y13so5480362pfp.7 for ; Fri, 28 Oct 2022 11:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=J7Pp437tloA+icZkR1b9Du/W1JxcPnliqndmG+LwN8k=; b=Kjcjz/n15ffOSTc+a6pGW5Gj0c3s58/6oGT0BG23uqNbSfcYbuIoVBs6b73Dtf+jo6 u123qt6O/cL59eD4AhKxvUkQcyEu3vUqHmGB8gccd0PAwk3GStCT494PJwmAwHMGz1os koRCt7fJ9upcJDk5RpxNc1/STTcfQq24SR2A4CjGeOkg+XGAzu7TLGtNc2PxH+HPzeYy wqsh9fCMoeduNDz7/jMIOBWo/YlAF3ChoCYJ0aPycwEYZoH21iMxZUQl8drSe+jDPNXU vhF4f2ZGrcx7G/GL5jp6IUrx2t0wXMylcwC51YLG0bbZqSmZ3ctAwsB8KFnFdQfeHxId +Huw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=J7Pp437tloA+icZkR1b9Du/W1JxcPnliqndmG+LwN8k=; b=S9usga2rRA/qw72D71WGLfI/wtLayWkcEeEDv1SFe6fhg1NfK1aoNtE5tnYsRW/4ap w24vtB2Nk3Q5Y43zJo9DjAxLPJbea/950/vsb5M3YOPVE4qK6Pzeofig9R9adIQJdkPA vRbkGnaPE/fKWYZyP/NjMAr/V7ZY3V5BDRvMFCOoUBWsavHPFwMP84lWoy5MpN+iW2kN zLfDyF4MjZwSu96A4GFPwGZRg9RaVYgDa8xQVeB54Oqb1DDtiAZ0twWi42XEs6nBx1UY RrPnTsKVL5FLimCcPyfp+Z34SGRZv3c7d1PEUl/nIQqrpEQvpIEQNVk+Pqt0vVRzF27W 6+cw== X-Gm-Message-State: ACrzQf0YxHEMx3LzHWSPayY5365kRBDoybTKWnuLji62QmTifG7yh6lL iD9RXSnaxkb9qDPaWpJLfTiiXA== X-Google-Smtp-Source: AMsMyM4hj7wWT1cmqTcrjVK4YiStAjCd8j/6G1J+LRsWway+MUT7Cct3dfgiinOCe2CNvTmvkp5VaA== X-Received: by 2002:a63:ff5a:0:b0:42c:61f:b81 with SMTP id s26-20020a63ff5a000000b0042c061f0b81mr780601pgk.254.1666982521903; Fri, 28 Oct 2022 11:42:01 -0700 (PDT) Received: from google.com (220.181.82.34.bc.googleusercontent.com. [34.82.181.220]) by smtp.gmail.com with ESMTPSA id d10-20020a170903230a00b00177e5d83d3esm3468315plh.88.2022.10.28.11.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 11:42:01 -0700 (PDT) Date: Fri, 28 Oct 2022 11:41:57 -0700 From: Ricardo Koller To: Oliver Upton Cc: Marc Zyngier , James Morse , Alexandru Elisei , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Reiji Watanabe , David Matlack , Quentin Perret , Ben Gardon , Gavin Shan , Peter Xu , Will Deacon , Sean Christopherson , kvmarm@lists.linux.dev Subject: Re: [PATCH v2 06/15] KVM: arm64: Tear down unlinked stage-2 subtree after break-before-make Message-ID: References: <20221007232818.459650-1-oliver.upton@linux.dev> <20221007232818.459650-7-oliver.upton@linux.dev> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221007232818.459650-7-oliver.upton@linux.dev> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221028_114211_135310_76BF2FB1 X-CRM114-Status: GOOD ( 45.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Oct 07, 2022 at 11:28:09PM +0000, Oliver Upton wrote: > The break-before-make sequence is a bit annoying as it opens a window > wherein memory is unmapped from the guest. KVM should replace the PTE > as quickly as possible and avoid unnecessary work in between. > > Presently, the stage-2 map walker tears down a removed table before > installing a block mapping when coalescing a table into a block. As the > removed table is no longer visible to hardware walkers after the > DSB+TLBI, it is possible to move the remaining cleanup to happen after > installing the new PTE. > > Reshuffle the stage-2 map walker to install the new block entry in > the pre-order callback. Unwire all of the teardown logic and replace > it with a call to kvm_pgtable_stage2_free_removed() after fixing > the PTE. The post-order visitor is now completely unnecessary, so drop > it. Finally, touch up the comments to better represent the now > simplified map walker. > > Note that the call to tear down the unlinked stage-2 is indirected > as a subsequent change will use an RCU callback to trigger tear down. > RCU is not available to pKVM, so there is a need to use different > implementations on pKVM and non-pKVM VMs. > > Signed-off-by: Oliver Upton > --- > arch/arm64/include/asm/kvm_pgtable.h | 3 + > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 ++ > arch/arm64/kvm/hyp/pgtable.c | 84 ++++++++------------------- > arch/arm64/kvm/mmu.c | 8 +++ > 4 files changed, 40 insertions(+), 61 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h > index 71b7d154b78a..c33edcf36b5b 100644 > --- a/arch/arm64/include/asm/kvm_pgtable.h > +++ b/arch/arm64/include/asm/kvm_pgtable.h > @@ -77,6 +77,8 @@ static inline bool kvm_level_supports_block_mapping(u32 level) > * allocation is physically contiguous. > * @free_pages_exact: Free an exact number of memory pages previously > * allocated by zalloc_pages_exact. > + * @free_removed_table: Free a removed paging structure by unlinking and > + * dropping references. > * @get_page: Increment the refcount on a page. > * @put_page: Decrement the refcount on a page. When the > * refcount reaches 0 the page is automatically > @@ -95,6 +97,7 @@ struct kvm_pgtable_mm_ops { > void* (*zalloc_page)(void *arg); > void* (*zalloc_pages_exact)(size_t size); > void (*free_pages_exact)(void *addr, size_t size); > + void (*free_removed_table)(void *addr, u32 level); > void (*get_page)(void *addr); > void (*put_page)(void *addr); > int (*page_count)(void *addr); > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index d21d1b08a055..735769886b55 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -79,6 +79,11 @@ static void host_s2_put_page(void *addr) > hyp_put_page(&host_s2_pool, addr); > } > > +static void host_s2_free_removed_table(void *addr, u32 level) > +{ > + kvm_pgtable_stage2_free_removed(&host_kvm.mm_ops, addr, level); > +} > + > static int prepare_s2_pool(void *pgt_pool_base) > { > unsigned long nr_pages, pfn; > @@ -93,6 +98,7 @@ static int prepare_s2_pool(void *pgt_pool_base) > host_kvm.mm_ops = (struct kvm_pgtable_mm_ops) { > .zalloc_pages_exact = host_s2_zalloc_pages_exact, > .zalloc_page = host_s2_zalloc_page, > + .free_removed_table = host_s2_free_removed_table, > .phys_to_virt = hyp_phys_to_virt, > .virt_to_phys = hyp_virt_to_phys, > .page_count = hyp_page_count, > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index 363a5cce7e1a..02c33fccb178 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -746,16 +746,19 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx, > return 0; > } > > +static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > + struct stage2_map_data *data); > + > static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx, > struct stage2_map_data *data) > { > - if (data->anchor) > - return 0; > + struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; > + kvm_pte_t *childp = kvm_pte_follow(ctx->old, mm_ops); > + int ret; > > if (!stage2_leaf_mapping_allowed(ctx, data)) > return 0; > > - data->childp = kvm_pte_follow(ctx->old, ctx->mm_ops); > kvm_clear_pte(ctx->ptep); > > /* > @@ -764,8 +767,13 @@ static int stage2_map_walk_table_pre(const struct kvm_pgtable_visit_ctx *ctx, > * individually. > */ > kvm_call_hyp(__kvm_tlb_flush_vmid, data->mmu); > - data->anchor = ctx->ptep; > - return 0; > + > + ret = stage2_map_walk_leaf(ctx, data); > + > + mm_ops->put_page(ctx->ptep); > + mm_ops->free_removed_table(childp, ctx->level + 1); This could save some cycles: if (stage2_pte_is_counted(ctx->old) mm_ops->free_removed_table(childp, ctx->level + 1); as coming back using the stage2_free_walker() requires some preparation, and it does the exact same check anyawy. > + > + return ret; > } > > static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > @@ -775,13 +783,6 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > kvm_pte_t *childp; > int ret; > > - if (data->anchor) { > - if (stage2_pte_is_counted(ctx->old)) > - mm_ops->put_page(ctx->ptep); > - > - return 0; > - } > - > ret = stage2_map_walker_try_leaf(ctx, data); > if (ret != -E2BIG) > return ret; > @@ -810,49 +811,14 @@ static int stage2_map_walk_leaf(const struct kvm_pgtable_visit_ctx *ctx, > return 0; > } > > -static int stage2_map_walk_table_post(const struct kvm_pgtable_visit_ctx *ctx, > - struct stage2_map_data *data) > -{ > - struct kvm_pgtable_mm_ops *mm_ops = ctx->mm_ops; > - kvm_pte_t *childp; > - int ret = 0; > - > - if (!data->anchor) > - return 0; > - > - if (data->anchor == ctx->ptep) { > - childp = data->childp; > - data->anchor = NULL; > - data->childp = NULL; > - ret = stage2_map_walk_leaf(ctx, data); > - } else { > - childp = kvm_pte_follow(ctx->old, mm_ops); > - } > - > - mm_ops->put_page(childp); > - mm_ops->put_page(ctx->ptep); > - > - return ret; > -} > - > /* > - * This is a little fiddly, as we use all three of the walk flags. The idea > - * is that the TABLE_PRE callback runs for table entries on the way down, > - * looking for table entries which we could conceivably replace with a > - * block entry for this mapping. If it finds one, then it sets the 'anchor' > - * field in 'struct stage2_map_data' to point at the table entry, before > - * clearing the entry to zero and descending into the now detached table. > - * > - * The behaviour of the LEAF callback then depends on whether or not the > - * anchor has been set. If not, then we're not using a block mapping higher > - * up the table and we perform the mapping at the existing leaves instead. > - * If, on the other hand, the anchor _is_ set, then we drop references to > - * all valid leaves so that the pages beneath the anchor can be freed. > + * The TABLE_PRE callback runs for table entries on the way down, looking > + * for table entries which we could conceivably replace with a block entry > + * for this mapping. If it finds one it replaces the entry and calls > + * kvm_pgtable_mm_ops::free_removed_table() to tear down the detached table. > * > - * Finally, the TABLE_POST callback does nothing if the anchor has not > - * been set, but otherwise frees the page-table pages while walking back up > - * the page-table, installing the block entry when it revisits the anchor > - * pointer and clearing the anchor to NULL. > + * Otherwise, the LEAF callback performs the mapping at the existing leaves > + * instead. > */ > static int stage2_map_walker(const struct kvm_pgtable_visit_ctx *ctx, > enum kvm_pgtable_walk_flags visit) > @@ -864,11 +830,9 @@ static int stage2_map_walker(const struct kvm_pgtable_visit_ctx *ctx, > return stage2_map_walk_table_pre(ctx, data); > case KVM_PGTABLE_WALK_LEAF: > return stage2_map_walk_leaf(ctx, data); > - case KVM_PGTABLE_WALK_TABLE_POST: > - return stage2_map_walk_table_post(ctx, data); > + default: > + return -EINVAL; > } > - > - return -EINVAL; > } > > int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, > @@ -885,8 +849,7 @@ int kvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, > struct kvm_pgtable_walker walker = { > .cb = stage2_map_walker, > .flags = KVM_PGTABLE_WALK_TABLE_PRE | > - KVM_PGTABLE_WALK_LEAF | > - KVM_PGTABLE_WALK_TABLE_POST, > + KVM_PGTABLE_WALK_LEAF, > .arg = &map_data, > }; > > @@ -916,8 +879,7 @@ int kvm_pgtable_stage2_set_owner(struct kvm_pgtable *pgt, u64 addr, u64 size, > struct kvm_pgtable_walker walker = { > .cb = stage2_map_walker, > .flags = KVM_PGTABLE_WALK_TABLE_PRE | > - KVM_PGTABLE_WALK_LEAF | > - KVM_PGTABLE_WALK_TABLE_POST, > + KVM_PGTABLE_WALK_LEAF, > .arg = &map_data, > }; > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index c9a13e487187..04a25319abb0 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -102,6 +102,13 @@ static void *kvm_host_zalloc_pages_exact(size_t size) > return alloc_pages_exact(size, GFP_KERNEL_ACCOUNT | __GFP_ZERO); > } > > +static struct kvm_pgtable_mm_ops kvm_s2_mm_ops; > + > +static void stage2_free_removed_table(void *addr, u32 level) > +{ > + kvm_pgtable_stage2_free_removed(&kvm_s2_mm_ops, addr, level); > +} > + > static void kvm_host_get_page(void *addr) > { > get_page(virt_to_page(addr)); > @@ -627,6 +634,7 @@ static struct kvm_pgtable_mm_ops kvm_s2_mm_ops = { > .zalloc_page = stage2_memcache_zalloc_page, > .zalloc_pages_exact = kvm_host_zalloc_pages_exact, > .free_pages_exact = free_pages_exact, > + .free_removed_table = stage2_free_removed_table, > .get_page = kvm_host_get_page, > .put_page = kvm_host_put_page, > .page_count = kvm_host_page_count, > -- > 2.38.0.rc1.362.ged0d419d3c-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel