From patchwork Sun Jan 7 06:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 185714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp418310dyq; Sat, 6 Jan 2024 22:32:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IE44zF1TBYgAGGOHnKeaUPQNIXkbg7hQqNwhXOB/69CBQTX5RCVwTBsSF4nOey1gx76tsPa X-Received: by 2002:a17:902:7c8c:b0:1d4:477c:4753 with SMTP id y12-20020a1709027c8c00b001d4477c4753mr1963258pll.42.1704609123110; Sat, 06 Jan 2024 22:32:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704609123; cv=none; d=google.com; s=arc-20160816; b=JhOXgBB/b4T9wfokfKAK1BkH0kQ5V+oyxBKBM/bZWxN1W16iyIA+ON/fb/UG5/OWx3 RokxLsqzASvTVZm0L+0uTpyn67HnhYKGNi0xsEoEu9OlxZ6xFosDqebF7tOkQmgxweay F28jC3xTCD5BXAOlNAKkMof4BBg2Zps8ghPvqMG7oHjpF+NhIGiA2ObKltX1vyW5AqQD AhZ2DHyf8boNpAHUSfBt3sL04rl+5WSFE4yPUc1uVY5Qt/ZiuNyScYER8ehzMcxsG8Te RizHhDhjvG6i1bvlEn6zAcWkRGix40MnteNjDgXLU+3999inONf3qWYp1YbGshjUh2VZ H1sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=oOZZs3PpDAkDeF0MOjYrzS4GP5LC1t8VKDdE5SDt6qw=; fh=yhmNvk3uep6UOKkj3Qx0qRxJTOOYElfRY/Q5awrrhME=; b=0ZMqKIFahw/Im5MdVAWIlhXBuikNqqJCRGzXHG86v14YopJpiDpULEld+Pc1g9/qgP Ki+8HfeA8JfDGhNzUnH616+gYkCB7WsbGXrwZFcdQWDGqkwZtQVhblXuF6dJqmQD4F9P HVFJEnoP329cl9vLCN/m9ArhZasPXdC9PklNElxEmBd3HZso8pl8wfJS4icyCpu+1/iR Zwh6qSCZtORwIlxgafeKAGF7g6UW2xjtaUyS/xkA+CLXifsTssdRNlUib9jiEPTCwYKj LqWhyDhHPrOrddtS3f5Ak/fXhHtUF4u4MLo82KqJQhYwbL0y583312TWM8NXHM08gd0F rpbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="agAcaV/N"; spf=pass (google.com: domain of linux-kernel+bounces-18803-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18803-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id d16-20020a170903231000b001d40595144bsi4010063plh.282.2024.01.06.22.32.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 22:32:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18803-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="agAcaV/N"; spf=pass (google.com: domain of linux-kernel+bounces-18803-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18803-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id B67F6B217D3 for ; Sun, 7 Jan 2024 06:31:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E5A2D8826; Sun, 7 Jan 2024 06:30:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="agAcaV/N" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C2A612B83 for ; Sun, 7 Jan 2024 06:30:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E65CDC433C7; Sun, 7 Jan 2024 06:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704609053; bh=Bpr3cN4ZdKoHQcirLqVi0ln0qEuA20LN4TwxV/9UyIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=agAcaV/NvLQp39pnbxq5D6E3FwE2Kwp0XpWaz5aMDV3I4idAjyymK1ctu+sf4nhWS KryA/Rv1bnzYa+sqzTyoCklXBMwfcoByx13WuGYsH7hOdoeC65nTGu1jvoU2atK2rW 9dKKWkvCl7wL1uw/b64Aov6lca1OdzHYKTYA8XNFMKhMY8rksmoWPRHEO+Iy75Wq0c K1WPlv/dFlIWmbIWHvuVJPr+DEKOTQi4hjBfifT38XFMsF9ZDsFzrkeRauqlhLsyN1 L7IkKLk97GgFAkFu0zFiekkJDLVgUj1jln47xCpWyWHAiGGk8arh1tKhbYWLKsRSWs jinIrjKHkMGsA== From: guoren@kernel.org To: paul.walmsley@sifive.com, palmer@dabbelt.com, alexghiti@rivosinc.com, charlie@rivosinc.com, guoren@kernel.org, panqinglin2020@iscas.ac.cn, bjorn@rivosinc.com, conor.dooley@microchip.com, leobras@redhat.com, cleger@rivosinc.com, willy@infradead.org Cc: linux-kernel@vger.kernel.org, Guo Ren Subject: [PATCH V4 4/4] riscv: mm: Optimize TASK_SIZE definition Date: Sun, 7 Jan 2024 01:30:25 -0500 Message-Id: <20240107063025.1628475-5-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240107063025.1628475-1-guoren@kernel.org> References: <20240107063025.1628475-1-guoren@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787412215950135210 X-GMAIL-MSGID: 1787412215950135210 From: Guo Ren Unify the TASK_SIZE definition with VA_BITS for better readability. Add COMPAT mode user address space info in the comment. Reviewed-by: Leonardo Bras Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/pgtable.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index e415582276ec..271565e1956f 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -866,6 +866,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) * Note that PGDIR_SIZE must evenly divide TASK_SIZE. * Task size is: * - 0x9fc00000 (~2.5GB) for RV32. + * - 0x80000000 ( 2GB) for RV64 compat mode * - 0x4000000000 ( 256GB) for RV64 using SV39 mmu * - 0x800000000000 ( 128TB) for RV64 using SV48 mmu * - 0x100000000000000 ( 64PB) for RV64 using SV57 mmu @@ -877,10 +878,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) * Similarly for SV57, bits 63–57 must be equal to bit 56. */ #ifdef CONFIG_64BIT -#define TASK_SIZE_64 (PGDIR_SIZE * PTRS_PER_PGD / 2) +#define TASK_SIZE_64 (UL(1) << (VA_BITS - 1)) #ifdef CONFIG_COMPAT -#define TASK_SIZE_32 (_AC(0x80000000, UL)) +#define TASK_SIZE_32 (UL(1) << (VA_BITS_SV32 - 1)) #define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64) #else