[RFC,v2,07/14] arm64/mm: Introduce NUM_ASIDS

Message ID	20190620130608.17230-8-julien.grall@arm.com
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Julien Grall <julien.grall@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: james.morse@arm.com, marc.zyngier@arm.com, julien.thierry@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Julien Grall <julien.grall@arm.com> Subject: [RFC v2 07/14] arm64/mm: Introduce NUM_ASIDS Date: Thu, 20 Jun 2019 14:06:01 +0100 Message-Id: <20190620130608.17230-8-julien.grall@arm.com> In-Reply-To: <20190620130608.17230-1-julien.grall@arm.com> References: <20190620130608.17230-1-julien.grall@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	kvm/arm: Align the VMID allocation with the arm64 ASID one \| expand [RFC,v2,00/14] kvm/arm: Align the VMID allocation with the arm64 ASID one [RFC,v2,01/14] arm64/mm: Introduce asid_info structure and move asid_generation/asid_map to it [RFC,v2,02/14] arm64/mm: Move active_asids and reserved_asids to asid_info [RFC,v2,03/14] arm64/mm: Move bits to asid_info [RFC,v2,04/14] arm64/mm: Move the variable lock and tlb_flush_pending to asid_info [RFC,v2,05/14] arm64/mm: Remove dependency on MM in new_context [RFC,v2,06/14] arm64/mm: Store the number of asid allocated per context [RFC,v2,07/14] arm64/mm: Introduce NUM_ASIDS [RFC,v2,08/14] arm64/mm: Split asid_inits in 2 parts [RFC,v2,09/14] arm64/mm: Split the function check_and_switch_context in 3 parts [RFC,v2,10/14] arm64/mm: Introduce a callback to flush the local context [RFC,v2,11/14] arm64: Move the ASID allocator code in a separate file [RFC,v2,12/14] arm64/lib: asid: Allow user to update the context under the lock [RFC,v2,13/14] arm/kvm: Introduce a new VMID allocator [RFC,v2,14/14] kvm/arm: Align the VMID allocation with the arm64 ASID one

Message ID

20190620130608.17230-8-julien.grall@arm.com

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Julien Grall <julien.grall@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu
Cc: james.morse@arm.com, marc.zyngier@arm.com, julien.thierry@arm.com,
	suzuki.poulose@arm.com, catalin.marinas@arm.com,
	will.deacon@arm.com, Julien Grall <julien.grall@arm.com>
Subject: [RFC v2 07/14] arm64/mm: Introduce NUM_ASIDS
Date: Thu, 20 Jun 2019 14:06:01 +0100
Message-Id: <20190620130608.17230-8-julien.grall@arm.com>
In-Reply-To: <20190620130608.17230-1-julien.grall@arm.com>
References: <20190620130608.17230-1-julien.grall@arm.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

kvm/arm: Align the VMID allocation with the arm64 ASID one | expand

Commit Message

Julien Grall June 20, 2019, 1:06 p.m. UTC

At the moment ASID_FIRST_VERSION is used to know the number of ASIDs
supported. As we are going to move the ASID allocator in a separate, it
would be better to use a different name for external users.

This patch adds NUM_ASIDS and implements ASID_FIRST_VERSION using it.

Signed-off-by: Julien Grall <julien.grall@arm.com>

---
 arch/arm64/mm/context.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.11.0

diff --git a/arch/arm64/mm/context.c b/arch/arm64/mm/context.c
index d128f02644b0..beba8e5b4100 100644
--- a/arch/arm64/mm/context.c
+++ b/arch/arm64/mm/context.c
@@ -48,7 +48,9 @@  static DEFINE_PER_CPU(atomic64_t, active_asids);
 static DEFINE_PER_CPU(u64, reserved_asids);
 
 #define ASID_MASK(info)			(~GENMASK((info)->bits - 1, 0))
-#define ASID_FIRST_VERSION(info)	(1UL << ((info)->bits))
+#define NUM_ASIDS(info)			(1UL << ((info)->bits))
+
+#define ASID_FIRST_VERSION(info)	NUM_ASIDS(info)
 
 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
 #define ASID_PER_CONTEXT		2
@@ -56,7 +58,7 @@  static DEFINE_PER_CPU(u64, reserved_asids);
 #define ASID_PER_CONTEXT		1
 #endif
 
-#define NUM_CTXT_ASIDS(info)		(ASID_FIRST_VERSION(info) >> (info)->ctxt_shift)
+#define NUM_CTXT_ASIDS(info)		(NUM_ASIDS(info) >> (info)->ctxt_shift)
 #define asid2idx(info, asid)		(((asid) & ~ASID_MASK(info)) >> (info)->ctxt_shift)
 #define idx2asid(info, idx)		(((idx) << (info)->ctxt_shift) & ~ASID_MASK(info))

[RFC,v2,07/14] arm64/mm: Introduce NUM_ASIDS

Commit Message

Patch