From patchwork Mon Mar 25 18:51:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13602763 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 DE645C54E64 for ; Mon, 25 Mar 2024 18:52:37 +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=YP1mQ/0iFICl0m 11xH96zFhsLsvCMiAAkJre4lcySwUQsqKYVi9PfU+eS8wqCSNPT6BYGNNeWgW7D9VB6Q4B2O4t3Pn Trw+66REJy7YvOh4yywRuHi+H8f0MiEI4gQTvJuhdeJW5K4cHsoz1QPmTRgxij0d7Li8hklyZoxDt JcpwzjHC6fLQMDiABOtghFqTeXqBlltOiTxXWTfc69qopgqwfVoraiDe7Jf4avJaeNJRcMbth8Clt 0HvUnUH1ILdr/b5kCCPgInS0gxhQosl4HtzSy6/ZpAogOdJwBjCe3jCBRfqLcfeJwb39Q53qFFlH0 +9lygSkwPGPUuXRkZl1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ropQj-00000001Ruc-3OlK; Mon, 25 Mar 2024 18:52:22 +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 1ropQc-00000001Rra-3dnl for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2024 18:52:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 24562CE1AB9; Mon, 25 Mar 2024 18:52:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C67E3C433C7; Mon, 25 Mar 2024 18:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711392732; bh=bXN/HevD7CPAdyg/mpq/H+7HLHjel9WBtmGPHdrhUQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iqkXUcEqtXtdLyi6K+9/BQsjj4e5kgjUopHt/DtwiYzGrlNzSLd6ydKyOAsF3XNQh 28vLSImXPQUJihOMxFLRUXi3anhq6aG0oB18h2tVn8K/vH/+OMh+jYAyh1WtUWQoGo vm72biZGh5ILWtD4RfILoKyMmNnZlv6JG7XpLHC0J4d0/CT2psTgt/7G+W64Ob1obc W1LG9WUIQmN5EVr+Am9B6ozT8scdoSie+tZ9QnPPDlN1h+U80pGTypfvUgqHAJw2P1 Q3UGJIgW2I9fJ4uvfcKo698NSDS835GfFBLVn6VJr9d58mnxc0ehYcmP1UXxJ+APu1 8Cp+DiMItY3Gg== 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 , Suzuki K Poulose , Zenghui Yu Subject: [PATCH 2/3] KVM: arm64: Don't pass a TLBI level hint when zapping table entries Date: Mon, 25 Mar 2024 18:51:57 +0000 Message-Id: <20240325185158.8565-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240325185158.8565-1-will@kernel.org> References: <20240325185158.8565-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240325_115215_200859_B06C7527 X-CRM114-Status: GOOD ( 10.69 ) 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); } }