From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29991EE14C3 for ; Sat, 9 Sep 2023 20:17:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C15E06B0121; Sat, 9 Sep 2023 16:17:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4E786B0122; Sat, 9 Sep 2023 16:17:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C7C76B0123; Sat, 9 Sep 2023 16:17:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8E0816B0121 for ; Sat, 9 Sep 2023 16:17:38 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5EC8240729 for ; Sat, 9 Sep 2023 20:17:38 +0000 (UTC) X-FDA: 81218169396.10.F18E3D0 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by imf27.hostedemail.com (Postfix) with ESMTP id 4A08F40005 for ; Sat, 9 Sep 2023 20:17:35 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=sholland.org header.s=fm2 header.b="o JKP/cc"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b="O GuyNno"; dmarc=pass (policy=none) header.from=sholland.org; spf=pass (imf27.hostedemail.com: domain of samuel@sholland.org designates 64.147.123.20 as permitted sender) smtp.mailfrom=samuel@sholland.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694290655; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9o/8XILCtdG4mXKommKnttfmvY+ZRjJhj3Lk+06yNt8=; b=QmwQjQchmD2myhTh5IgniUR8T3a6dG9ICuCv0F8VA819f+nnM0cPw/vgbtVDmtag2YwAhF nVHc6ETmx1WPrEigGtIYIUKCGyEjNnBSgviK3E/uBtS91nnIT6hNCxJea7XSpItVa07+Ul IcXvm419w2vpAED4nDYmlXYBy7B+2p0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=sholland.org header.s=fm2 header.b="o JKP/cc"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b="O GuyNno"; dmarc=pass (policy=none) header.from=sholland.org; spf=pass (imf27.hostedemail.com: domain of samuel@sholland.org designates 64.147.123.20 as permitted sender) smtp.mailfrom=samuel@sholland.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694290655; a=rsa-sha256; cv=none; b=urGuNNcRu0uvvTDaips6S/OKgXjDvGCnTCVcnzkAr052x6q7irCoqGfL8f8fTaub1SpoML NufH79WXI0w9LjAdpORb/Og/k20c3NLWo2Fj8UNV2G8vuML502Pg8aWX8aE2X+x1HPIESD VgUAmZlQhmyePMMQYmVLVMqk7NxGNt0= Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 8DF853200805; Sat, 9 Sep 2023 16:17:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 09 Sep 2023 16:17:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1694290653; x= 1694377053; bh=9o/8XILCtdG4mXKommKnttfmvY+ZRjJhj3Lk+06yNt8=; b=o JKP/ccSB9pnH/lIQMaUwNjeMx4b0yKYX1T3YcLti7UShQ/qMN4NIAZHuIgnVE/0M jJ/Xf5DbTmoSXWsC3bgwqsNScEBW2b42gSESxEFIEwPt95leJISLNrcMcdx+bvIS PaqmQNrLlYZ3C6XRNZgaGpadzDgk4FsdQ/QGH3Ls9GLLcrFqTC3pqVOjJkZNjSm/ 2c03LXAroxyjMhbXuX8RO9u3jBqh46QtS6s4J4RQL/y8c+36SLen/y5+rHfG8anL GaJyzx1yFDuafoUFgAdVFBklTwVO8T7ljdOrm6ymmiK7qAd3UNTT2Oq+YmS2IwZ3 FiX024vNMz5HVfNifNulw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1694290653; x= 1694377053; bh=9o/8XILCtdG4mXKommKnttfmvY+ZRjJhj3Lk+06yNt8=; b=O GuyNno8goMCmg0N6xXxvylW9yZdKkK0dhtII1fAqnR8EPO8WRSg3xTHFltHJfOtG xklZ7h25LOpDZ8Pdd8yEzVIDGiE3WlKqXZd4c4Mt8CeMOlJwiCEL8wMA0Wp++nB3 diyEu5p5YyJ684tWQ9kj5y93p3dX0+k5sGlNSnYnhdJiVs3btWIxt2NtVHX9kr0F 2MoIc3nT/Xaw7CbuTs8r5qeYH4iqxzJPyJjEZ45DgeEjeO5kY5E4xTs769xHSoPW r0qjpQK4YP7Pap2cj9ZTX2Ilzc09jZ269qNpRnrJgWgERWivIQrT7Em1Q85/Duuh DLCNFDBeLW4Gh3hKxfihw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudehledgudegiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghm uhgvlhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenuc ggtffrrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeeh gfdufeeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 9 Sep 2023 16:17:32 -0400 (EDT) From: Samuel Holland To: Palmer Dabbelt , Alexandre Ghiti , linux-riscv@lists.infradead.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 2/7] riscv: mm: Introduce cntx2asid/cntx2version helper macros Date: Sat, 9 Sep 2023 15:16:30 -0500 Message-ID: <20230909201727.10909-3-samuel@sholland.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230909201727.10909-1-samuel@sholland.org> References: <20230909201727.10909-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: z9esxzy64rxdscisaaq6pdfamkufybtr X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4A08F40005 X-HE-Tag: 1694290655-243174 X-HE-Meta: U2FsdGVkX1/g32hWIsb1HeBDN/eHs4QFuNLtpWootn3uaxnk474zUGa1h0/EIM1fvvkVqJbNtCBvasGMNPOj/dgYB5JE33NXJjuMiIZA5yCmlHbLwNYCqETZrwJ978rMjk2ugynSXBYRJOlOyda69gDI31X6iWFqiZSibUMpyrnvNyf+BIupt8OThCGroC/CrAvRuQiCx/igKlHtw1oxvxunvDTk8Hx0i9yIS8pXd9+JOu9NE3Aw9DlrfO/ExQf9YN48E/2MnI/utS2631zydMHKoKRkyOWl2GfxY9qglOcziaH/08rflA9wguBQ4KEA315lKd6GP22+/VOvu5Ok274qnsqTy7qb4Tiu48edH9sl5hmt+UjD7fZB5Dbtdx9Ws6l2r7l4nF90Kj9XVBBhtNDtfwUIS7kk6D5UZAY3/55CSHgLTvOsFKhd6egyQoX/m7/t7vw59QrX6jUxTIvPLYyQOfWRRAHw7lZJfSDD+cB/mGamQJBjn35A/h49y5KA74O18A2b/j6oMhJNkT8IK8v/htKtuI1n6Ql3PoBiENSOHKZyH/kayzDctyXlICjXd9K17HaEDvBlVe+w9bz64lCwHKgmKB3MPGWzWOYeigdevdhYB9cUTZPF/x65bv1ZPPyttApiGVRUbosHCU05GIjtu2eHI01X9CuglvOj8Pg8GtDX5G36XRiXTB/Gj63lvh+3+gNNmIqoFDulugOVp5iIWlFrebn9+hld+D2P9JuTyskpKGBuJ/nmuZ/IbcYfxxvo+RN3L8lc8KeznG9e8NvHz8wvPnshnRDNBjyJLcpscHDG7gAVWGIDfjY0ooo88474LKdGX0dtT2+oNvgxw9NuSvcJTby7WoQPJ39d27nNplc0zPDISDEts1IB9BRFT9sNdR18Vcwce71aW+eduaQYIqVMGF9gm+Rwwc+/i+7cv3jYpaBbCf5QDq+UydURNXlL+MZd9wsNfdZobD2 zL19eVqw BpycseRTLxhqMGZPfMJBvgFV/3KXetLD/CxL3V/r0le5VLBSqVIgMGlyhGMtLQoNjPaq4GDd3qjIcJ+xCLiAISEx9MZFSKHKqoO9NqzwsWgJR9hXCghu9ctseSeK/EkPi+iLRDglqlhi/4FB+NGd9WelD1IJsAergNFzBYFUkP61+gxatcfBrzTDRcrZUnvf3uu5GBuM4ZFK02qHgc57XTDg7Q8qE6F1Fu7YKTfTNrzxQHydVy0nTNroJnCSgNWpBwLdUitrn6tJBRCPW5RSJqzyP0lY41JxXbZs/Pnspi3+/SjbcOu39mXw99MruXEVVRVwv X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When using the ASID allocator, the MM context ID contains two values: the ASID in the lower bits, and the allocator version number in the remaining bits. Use macros to make this separation more obvious. Signed-off-by: Samuel Holland --- arch/riscv/include/asm/mmu.h | 3 +++ arch/riscv/mm/context.c | 12 ++++++------ arch/riscv/mm/tlbflush.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/riscv/include/asm/mmu.h b/arch/riscv/include/asm/mmu.h index 355504b37f8e..a550fbf770be 100644 --- a/arch/riscv/include/asm/mmu.h +++ b/arch/riscv/include/asm/mmu.h @@ -26,6 +26,9 @@ typedef struct { #endif } mm_context_t; +#define cntx2asid(cntx) ((cntx) & asid_mask) +#define cntx2version(cntx) ((cntx) & ~asid_mask) + void __init create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t pa, phys_addr_t sz, pgprot_t prot); #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/mm/context.c b/arch/riscv/mm/context.c index 217fd4de6134..43d005f63253 100644 --- a/arch/riscv/mm/context.c +++ b/arch/riscv/mm/context.c @@ -81,7 +81,7 @@ static void __flush_context(void) if (cntx == 0) cntx = per_cpu(reserved_context, i); - __set_bit(cntx & asid_mask, context_asid_map); + __set_bit(cntx2asid(cntx), context_asid_map); per_cpu(reserved_context, i) = cntx; } @@ -102,7 +102,7 @@ static unsigned long __new_context(struct mm_struct *mm) lockdep_assert_held(&context_lock); if (cntx != 0) { - unsigned long newcntx = ver | (cntx & asid_mask); + unsigned long newcntx = ver | cntx2asid(cntx); /* * If our current CONTEXT was active during a rollover, we @@ -115,7 +115,7 @@ static unsigned long __new_context(struct mm_struct *mm) * We had a valid CONTEXT in a previous life, so try to * re-use it if possible. */ - if (!__test_and_set_bit(cntx & asid_mask, context_asid_map)) + if (!__test_and_set_bit(cntx2asid(cntx), context_asid_map)) return newcntx; } @@ -168,7 +168,7 @@ static void set_mm_asid(struct mm_struct *mm, unsigned int cpu) */ old_active_cntx = atomic_long_read(&per_cpu(active_context, cpu)); if (old_active_cntx && - ((cntx & ~asid_mask) == atomic_long_read(¤t_version)) && + (cntx2version(cntx) == atomic_long_read(¤t_version)) && atomic_long_cmpxchg_relaxed(&per_cpu(active_context, cpu), old_active_cntx, cntx)) goto switch_mm_fast; @@ -177,7 +177,7 @@ static void set_mm_asid(struct mm_struct *mm, unsigned int cpu) /* Check that our ASID belongs to the current_version. */ cntx = atomic_long_read(&mm->context.id); - if ((cntx & ~asid_mask) != atomic_long_read(¤t_version)) { + if (cntx2version(cntx) != atomic_long_read(¤t_version)) { cntx = __new_context(mm); atomic_long_set(&mm->context.id, cntx); } @@ -191,7 +191,7 @@ static void set_mm_asid(struct mm_struct *mm, unsigned int cpu) switch_mm_fast: csr_write(CSR_SATP, virt_to_pfn(mm->pgd) | - ((cntx & asid_mask) << SATP_ASID_SHIFT) | + (cntx2asid(cntx) << SATP_ASID_SHIFT) | satp_mode); if (need_flush_tlb) diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 115d617d16c9..54c3e70ccd81 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -73,7 +73,7 @@ static void __flush_tlb_range(struct mm_struct *mm, unsigned long start, /* check if the tlbflush needs to be sent to other CPUs */ broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; if (static_branch_unlikely(&use_asid_allocator)) { - unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask; + unsigned long asid = cntx2asid(atomic_long_read(&mm->context.id)); if (broadcast) { if (riscv_use_ipi_for_rfence()) { -- 2.41.0