From patchwork Mon Mar 25 18:51:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13602765 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 A385BCD11DC for ; Mon, 25 Mar 2024 18:52:39 +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=Wpjgn+OrxT3r/PoYz/OkjOpQe9r32q74zbsgN/8XaTA=; b=JYW3hwK0Ly1o9Q clQSa6aQLUbsNLj0Udbh84e6opvayDkE0ZdpnGwFIpqA6qoxIZW8y9k6m5LjQafXU0diA95cpNaoP bK/5uysYxlD0hCL6oqygZbJp4uv5gwUwjz39HilU1tVHj8llYP9XwusQ20Pm/MHtZwQ8uzJmT4Ic9 PhXCGNfx8SLYaMRelqr3uZitBx3VYvHB/egoDPgrjVDtEWJKHZbv7Tq6w6ujqoAW1CJDlxBAzfA32 d1LOB67dfvltRAHub+C9+kq0wPOVDK4xqKHPUlQRD465jba3xu8EUJ+AfqI3lw7m5AjpjmEIBsCsd x3w4P5D8jAnICyt+m75g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ropQl-00000001Rvb-3c40; Mon, 25 Mar 2024 18:52:23 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ropQe-00000001Rss-2mzY for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2024 18:52:18 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CDD1361155; Mon, 25 Mar 2024 18:52:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAA95C433F1; Mon, 25 Mar 2024 18:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711392735; bh=5VC9JxVG/MnzPe32qgOZJvC9+h/6mt0fn+04mmR6EA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WRR+3X41/frNKQpo6GkyBimMxAofL3xe8b6d8Gkd1GzgbE1ZcKJKHWtZhrPwAPm1D vlk6iVLTeRzZPStF6jiWZOk7aX7o1mmLuclHZjWII5F4fImPb54vSiWGTv4a8OsML1 iemPkxJJ3cvhehYXVsOA8C1yEZSTp8/YP4JjlsiPYxO8HZWeFAYf9x1ewoqmCT056I DkzsJhdysXzYTu+6XRsU+qlXGiIqmergAfW2m8av7xTg7qj65tS02BtV7BoiiBX357 t2vXubitUsJGEhqPlXTN4oC6E/buIg+NrBPKxMTgrHE1yJiQmruuLnvlRm9qtufck/ dCMFKx+OKpLhQ== 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 3/3] KVM: arm64: Use TLBI_TTL_UNKNOWN in __kvm_tlb_flush_vmid_range() Date: Mon, 25 Mar 2024 18:51:58 +0000 Message-Id: <20240325185158.8565-4-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_115217_007841_2D5D7828 X-CRM114-Status: GOOD ( 11.83 ) 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 Commit c910f2b65518 ("arm64/mm: Update tlb invalidation routines for FEAT_LPA2") updated the __tlbi_level() macro to take the target level as an argument, with TLBI_TTL_UNKNOWN (rather than 0) indicating that the caller cannot provide level information. Unfortunately, the two implementations of __kvm_tlb_flush_vmid_range() were not updated and so now ask for an level 0 invalidation if FEAT_LPA2 is implemented. Fix the problem by passing TLBI_TTL_UNKNOWN instead of 0 as the level argument to __flush_s2_tlb_range_op() in __kvm_tlb_flush_vmid_range(). Cc: Ryan Roberts Cc: Catalin Marinas Cc: Oliver Upton Cc: Marc Zyngier Fixes: c910f2b65518 ("arm64/mm: Update tlb invalidation routines for FEAT_LPA2") Signed-off-by: Will Deacon Reviewed-by: Ryan Roberts --- arch/arm64/kvm/hyp/nvhe/tlb.c | 3 ++- arch/arm64/kvm/hyp/vhe/tlb.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/tlb.c b/arch/arm64/kvm/hyp/nvhe/tlb.c index a60fb13e2192..2fc68da4036d 100644 --- a/arch/arm64/kvm/hyp/nvhe/tlb.c +++ b/arch/arm64/kvm/hyp/nvhe/tlb.c @@ -154,7 +154,8 @@ void __kvm_tlb_flush_vmid_range(struct kvm_s2_mmu *mmu, /* Switch to requested VMID */ __tlb_switch_to_guest(mmu, &cxt, false); - __flush_s2_tlb_range_op(ipas2e1is, start, pages, stride, 0); + __flush_s2_tlb_range_op(ipas2e1is, start, pages, stride, + TLBI_TTL_UNKNOWN); dsb(ish); __tlbi(vmalle1is); diff --git a/arch/arm64/kvm/hyp/vhe/tlb.c b/arch/arm64/kvm/hyp/vhe/tlb.c index b32e2940df7d..1a60b95381e8 100644 --- a/arch/arm64/kvm/hyp/vhe/tlb.c +++ b/arch/arm64/kvm/hyp/vhe/tlb.c @@ -171,7 +171,8 @@ void __kvm_tlb_flush_vmid_range(struct kvm_s2_mmu *mmu, /* Switch to requested VMID */ __tlb_switch_to_guest(mmu, &cxt); - __flush_s2_tlb_range_op(ipas2e1is, start, pages, stride, 0); + __flush_s2_tlb_range_op(ipas2e1is, start, pages, stride, + TLBI_TTL_UNKNOWN); dsb(ish); __tlbi(vmalle1is);