From patchwork Wed Mar 27 12:48:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13606539 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 14C99C54E67 for ; Wed, 27 Mar 2024 12:49:24 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=guw71TxnbIcXcQL2p0cguWE4AhRVUl2m10pxaZtjFd8=; b=PH+pCG3E5ipH94 Ccr4A+MQu/rQ9dTATZYT3OrbwAGfLOgHrTiWg3r4SBWzWWcQoSrdEo8OH81G/V8Z+5NcGq6PnbvYS f/77jGScawn89EFxJ0KK2mLa0Igo4n3P2XhiRfMljD3P4llxMVP/craOhQcn4WeFjJKCdhfMkZc4p IUuCm/AJHgLvpftHhZ7sR2EVddPtt5ZPfg5LaLIH75XtBdplUT0e1RanNu+D3RLy9lXUd7tQQbfCf LdrXO6tvZilKfTCuXkDrDib8kLYi4VGT7WoPjnxF2urgvJ7oLs1knksAZMVARIj7UlrkmMQEp4ltj ej1HrpFYXL1Fo6JvYu9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpSiO-00000008zo7-47iQ; Wed, 27 Mar 2024 12:49:12 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpSiJ-00000008zkM-17pG for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 12:49:08 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 7FE2FCE19A2; Wed, 27 Mar 2024 12:49:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 680F5C433F1; Wed, 27 Mar 2024 12:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711543744; bh=bXN/HevD7CPAdyg/mpq/H+7HLHjel9WBtmGPHdrhUQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QLO7/kcqYjCcdII7Jo9ynbKhRdeNj36WLWFGPCWwUpP+sibe4I6YThh/jHQltBHT0 GnTaMZJq6eeRUS8Bd9Kp1JjRCtNqLNUTxUaz1DHDd+tp3inpurlhbSTrTuK8CHdVGB sP9URBFsDQdpArFFjH3Pgq0dS99hz6FLnBsSbiwTbqUB89YCdprP0olff/jwyzA0Tr AB8xnL1QUBcMRRnRbAcFcvGf6sXzfWPkdMd/Q4zB2Wouy+TF9zxcM1N411wpGqDzsi IpW6U4B6t0rys61rI6iqfzS5JaSP5WYkU6FWZzGK5/gPCQwIZAPMdphFw0Bjh2NOEc tW6w/1ev5Q0sQ== From: Will Deacon To: kvmarm@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , Catalin Marinas , Gavin Shan , Marc Zyngier , Mostafa Saleh , Oliver Upton , Quentin Perret , Raghavendra Rao Ananta , Ryan Roberts , Shaoqin Huang Subject: [PATCH v2 2/4] KVM: arm64: Don't pass a TLBI level hint when zapping table entries Date: Wed, 27 Mar 2024 12:48:51 +0000 Message-Id: <20240327124853.11206-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240327124853.11206-1-will@kernel.org> References: <20240327124853.11206-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_054907_539585_B169FEF8 X-CRM114-Status: GOOD ( 10.61 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The TLBI level hints are for leaf entries only, so take care not to pass them incorrectly after clearing a table entry. Cc: Gavin Shan Cc: Marc Zyngier Cc: Quentin Perret Fixes: 82bb02445de5 ("KVM: arm64: Implement kvm_pgtable_hyp_unmap() at EL2") Fixes: 6d9d2115c480 ("KVM: arm64: Add support for stage-2 map()/unmap() in generic page-table") Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/pgtable.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index de0b667ba296..a40dafc43bb6 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -528,7 +528,7 @@ static int hyp_unmap_walker(const struct kvm_pgtable_visit_ctx *ctx, kvm_clear_pte(ctx->ptep); dsb(ishst); - __tlbi_level(vae2is, __TLBI_VADDR(ctx->addr, 0), ctx->level); + __tlbi_level(vae2is, __TLBI_VADDR(ctx->addr, 0), TLBI_TTL_UNKNOWN); } else { if (ctx->end - ctx->addr < granule) return -EINVAL; @@ -896,10 +896,12 @@ static void stage2_unmap_put_pte(const struct kvm_pgtable_visit_ctx *ctx, if (kvm_pte_valid(ctx->old)) { kvm_clear_pte(ctx->ptep); - if (!stage2_unmap_defer_tlb_flush(pgt) || - kvm_pte_table(ctx->old, ctx->level)) { - kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, - ctx->addr, ctx->level); + if (kvm_pte_table(ctx->old, ctx->level)) { + kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr, + TLBI_TTL_UNKNOWN); + } else if (!stage2_unmap_defer_tlb_flush(pgt)) { + kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, ctx->addr, + ctx->level); } }