From patchwork Wed Mar 27 12:48:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13606540 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 100FFC47DD9 for ; Wed, 27 Mar 2024 12:49:38 +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=gl/0CqLx7EqsPhmlR0Rhk0XF5QDo28aZEg/jEhvSYFs=; b=WtSJSeX/4CK/aP MfjKUz2wdlfFwIliwMBlSDoLUgAl/hPrpdQNDYfPNuoVNYbqYH0HPbM2uh5ss4kRjs+a82PQQJUVK iFjHLnEahaR1bhAdHWe7+YexeQIEffLGvklHClO02xdnMkyva5E7PK+G7BXJkRLbOC+JvbIuR0Dte k4nxyxj9/L+AVbxzMSIwSJa+YsrWSmhM7hpxHcl3Rq4TqKmjn8SBna8rviHQn/mkw9gmcDeoJcWFA TVQCbXCzoXNig8nxaWXGkrtr6lcksKXR8/EIXnPMblTOahQYlmBsyYLgdzbqPjY8pnJt9gKTWHvap d2sHyAhjn+dSlJlIq34Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpSie-00000008zwS-3yTU; Wed, 27 Mar 2024 12:49:28 +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 1rpSiM-00000008zlc-0xtO for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 12:49:12 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 57D1CCE262F; Wed, 27 Mar 2024 12:49:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41156C43399; Wed, 27 Mar 2024 12:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711543747; bh=RUbUwiDDCmKdVzP1MptQx2+25gra+2nVr0exWg9VYxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dFfLlfW+8VqDLHrIgG3G7EIhdB4e2uSOo0qBiKw1dYwO+LgbN7VCySLQNEgrYHLDE qtPeM3nlUN7OqAqHJwwOKHs/to/tsOO3eq1h4YdZJjYratX1gWhxL7/yOp5OiKvWX5 SyfTQ8l6SJ6E81JEC1nwBJJmIEzUOQd1GhaL/rOEDHYUcngzOMPFNMEu3YwBepgEcb CKBtKmyjwh6V5flzlGiGR1S139Ih7jJd2uSrm7Q9nw04tPgsIPZ/d3YPH28NjDvW7F QHmGoxatjwmntE4kVq08ln57ZYbiCNwaTBckyI+RAAJ2Kvf9xCZ5Gc0ZjDMBkrMgsk vb+Ze52bwGebA== 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 3/4] KVM: arm64: Use TLBI_TTL_UNKNOWN in __kvm_tlb_flush_vmid_range() Date: Wed, 27 Mar 2024 12:48:52 +0000 Message-Id: <20240327124853.11206-4-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_054910_576589_EF5C98D7 X-CRM114-Status: GOOD ( 11.92 ) 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: Catalin Marinas Cc: Oliver Upton Cc: Marc Zyngier Reviewed-by: Ryan Roberts Fixes: c910f2b65518 ("arm64/mm: Update tlb invalidation routines for FEAT_LPA2") Signed-off-by: Will Deacon --- 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);