From patchwork Thu Dec 21 15:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp499626dyi; Thu, 21 Dec 2023 07:47:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IFqsSfeMNcXWBjcBIcJ1j/j1ZQmfshCUZWm0sfnNTsRQA9rT83gRwV7JBQXgWxk5YaaWt4g X-Received: by 2002:a05:6808:6488:b0:3ba:d81:841e with SMTP id fh8-20020a056808648800b003ba0d81841emr24328275oib.55.1703173660032; Thu, 21 Dec 2023 07:47:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703173660; cv=none; d=google.com; s=arc-20160816; b=voiqlVOWT1SUKSoNN+hOHWGuSNahpaKsVq9k1U4UsonEnDM1yHTEflaApyj/NXUlq3 Qr53GvAXmPboTDMPoF8CNd9fiwKkBOCikPgLNDTseQaH8n9M/Kv9rn2zGdB3yaGyvQs6 T/t/6TnBhiCxufVdpbgupP3ANPzJ08lHA7sTtJOkCfejG/mhqNpy0UTKXXW31VBq0S15 se1H3cxSjdfUtlAvxcp7mtQmZjERVV65q6PM0Omsyo0zLKgpX7JE0vaFmqrfmCyecM9t dED3U68CZakGyagB9OhXeb6k3g5OVtxuh7sYYRbwXqAtlRm5WNucQD9Qjp1k1wagYEpL a2pA== 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=R7v7KRN5kF3f6T8ivYjW/QyKlDyLwS+koztQTaV2Ui0=; fh=3YQLS1cPsLhMKuGGotL7Ux7rpkwBoh7ZT2nN27VXc5c=; b=CVm7LDiNp5nBkLjWvLhyMSNFUnwdrGjND3255Iai1DhhfPsKKwr7dIodVMmmB5+Xlx QTI/i69CQ3LSWU6i/1tJmm2Fsi3Nl2/gPBn/v8FKhTxFb4/bbwhGg7sZPfjWhIL/uBM3 yROto85QBJzGPMfvC4qnwAPhELBqYN1UQkO/fc/18xgiFl5v7zFR4I5hl3zLX7RAEYRp glW+YQ+DpWjLOQVE/fN6NoALY6GqDgDAyEPEaIxEIzqolrlyiIKg1aIL/dRe4xTqtEi3 +7GGhFNkpCz0tzA01QYdBgLs3ysPZhbuvx767RXDrlFaB9PD75sAwoxv1YuAxoUnqfHX 5lgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=foMQzB4V; spf=pass (google.com: domain of linux-kernel+bounces-8703-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8703-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id r5-20020a0ce285000000b0067f6107bfb2si2313049qvl.403.2023.12.21.07.47.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 07:47:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8703-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=foMQzB4V; spf=pass (google.com: domain of linux-kernel+bounces-8703-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8703-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id CC19B1C25E14 for ; Thu, 21 Dec 2023 15:47:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6545555E6F; Thu, 21 Dec 2023 15:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="foMQzB4V" 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 D40EE55E41; Thu, 21 Dec 2023 15:47:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 028E0C433C9; Thu, 21 Dec 2023 15:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703173634; bh=1VkNb9SSj6ijZ3M72NIaFsxAoNnYaBQ2VS47upbIECw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=foMQzB4VeCSYCK//dcfGdemiuC7dKk0zuG1BDQxCkZdTqaRrEwvgQCiJ0pXugK9Qa LlUugpTV6s3JWWoRtIg3kD00AvVPEJP5ILsdBTWtHMZDygSEHTpeduzLfOCjCD3mUD K3IOHDR4zp4rOF+qKjzuLt5nVJFScnxaGbvVMet34PxjkKCWbSg2cZHqJJI/e/AMc/ /UaclkeRKp4EkIdtq18KfuTuwxLqSAFS+T4dthVtNZ1Tyl0Nwfu6r4+m9FZkW4q9rG X7uiwUiXnuQy4VWUUAkrbx6BAI1wIIVJ2ppeNoQPmqW7SH+zUe85KzXJjgyMQMwOfw FmXjWEdP3pzJQ== From: guoren@kernel.org To: linux-kernel@vger.kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, alexghiti@rivosinc.com, charlie@rivosinc.com, xiao.w.wang@intel.com, guoren@kernel.org, david@redhat.com, panqinglin2020@iscas.ac.cn, rick.p.edgecombe@intel.com, willy@infradead.org, bjorn@rivosinc.com, conor.dooley@microchip.com, cleger@rivosinc.com, leobras@redhat.com Cc: linux-riscv@lists.infradead.org, Guo Ren , stable@vger.kernel.org Subject: [PATCH V2 1/4] riscv: mm: Fixup compat mode boot failure Date: Thu, 21 Dec 2023 10:46:58 -0500 Message-Id: <20231221154702.2267684-2-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221154702.2267684-1-guoren@kernel.org> References: <20231221154702.2267684-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: 1785907023742897099 X-GMAIL-MSGID: 1785907023742897099 From: Guo Ren In COMPAT mode, the STACK_TOP is 0x80000000, but the TASK_SIZE is 0x7fff000. When the user stack is upon 0x7fff000, it will cause a user segment fault. Sometimes, it would cause boot failure when the whole rootfs is rv32. Freeing unused kernel image (initmem) memory: 2236K Run /sbin/init as init process Starting init: /sbin/init exists but couldn't execute it (error -14) Run /etc/init as init process ... Cc: stable@vger.kernel.org Fixes: add2cc6b6515 ("RISC-V: mm: Restrict address space for sv39,sv48,sv57") Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ab00235b018f..74ffb2178f54 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -881,7 +881,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) #define TASK_SIZE_MIN (PGDIR_SIZE_L3 * PTRS_PER_PGD / 2) #ifdef CONFIG_COMPAT -#define TASK_SIZE_32 (_AC(0x80000000, UL) - PAGE_SIZE) +#define TASK_SIZE_32 (_AC(0x80000000, UL)) #define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64) #else From patchwork Thu Dec 21 15:46:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp499762dyi; Thu, 21 Dec 2023 07:47:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IEN51GcHpkm52XzDrxaVfv7ft8lstSSGTaGQPpQwdT0yTr/tsWrtnW8rYHqCxwzT6QXdHXv X-Received: by 2002:a05:6359:4c01:b0:170:d724:b7a9 with SMTP id kj1-20020a0563594c0100b00170d724b7a9mr1534961rwc.39.1703173673967; Thu, 21 Dec 2023 07:47:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703173673; cv=none; d=google.com; s=arc-20160816; b=qEuuaL5IX6FnYDZiqE0WUS3cd72McDUum4j0r9FnYPogehd63ioiepmxBG8H8mXXlK KOH1IL9wkjsQ5qTpnMqd0hZjzLgSxRCpDMl6DtTatthPhChadhWGf2hiWqvD8E35wYmi IkA/F4HwsHxID4mXBJBwpnBF07Zo1JkD6fy/uP2G9mqylMFeiZsYa0JvtmxLaTq7jMXx kA8Kv9zwFlhErRUzqeqUwVpSjBIPm7BGEwc0vs51hPbe/cs5Rg5a4clgWfY1AF8pLiVS R0QkxQEebrz8yLt4dSA8eDajD+08zMGtA1gCjMQTxM5hJDqbThsYbTEVBOV6o1+UpMQ3 FnLw== 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=P5fSU2y1bQrGuo1xDnVoB9ZBkV6O9GH5rhy3PHTHV0M=; fh=3YQLS1cPsLhMKuGGotL7Ux7rpkwBoh7ZT2nN27VXc5c=; b=MQFCw4WJIJCJFoRkBl7j95di6HavWy4mCeDOw7crKjPZ7LKZEHPmHXi5j/i4tyWPmV GpAEmA3xHd24AZWiDgiQxrII0lNPIT3bNXwXbcvX+IwIdPZSRCxU7Ox2YuWv25Y0t16v IN1YfaI6eOD3lt4mPZ+DasdrYj3eABOidCkwCw7nWXCPwApEsCU9WPrnP+MmWHFvfpIR IHl9tbIQTHVeBXQKiXP4z5HhrBww10ZewMqCnkcuio+UCPKVWOaU4bAq5J5/eyHyS7as 3/fiVLfKp0075qWnoB4qyxb9kivLM2oagJPCNxBJiVM9w5V7IW1WXFhtbFX89tl9iMX1 YAgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cDlxg7WA; spf=pass (google.com: domain of linux-kernel+bounces-8704-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8704-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id c34-20020a630d22000000b005b8a295f016si1812142pgl.64.2023.12.21.07.47.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 07:47:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8704-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cDlxg7WA; spf=pass (google.com: domain of linux-kernel+bounces-8704-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8704-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id AA34D2893E1 for ; Thu, 21 Dec 2023 15:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4012653A17; Thu, 21 Dec 2023 15:47:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cDlxg7WA" 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 A625455E41; Thu, 21 Dec 2023 15:47:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8972C433C8; Thu, 21 Dec 2023 15:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703173638; bh=dOGyrLopRgWASgaIZLAx6CNRKKRLi1o/fzWOzw5hikY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cDlxg7WA1eBIwKV7bwZmyHXskjpiO8H0zm7M2Ghzhr/xJdhhL6Xl5kRI6BWyYA5lD VBxAhJBQbB+9gO3Ag/gZJDFb+yKcYSbIwQNpD0ma517/zmjRtZImkNo7sEdHNxRaMo 1gXtByNw8LvPKTENtE7Eyo0fI2WALLGGdtPJwJF36c/Jju3NFsv75uhnr92pS3Mkxz 9QYAV4nD600gK2ZN6ikxvxtty6vjKnY3kXSgadf2i6U5AbJDy8ZsKxPN1iBVipFQBV fplnF8mxIeIWVezxJQwQjGSA/khdXnqsTghUjHSyjZpLYbroFFW3LkjSldkXwKqcCY 8N6jkGpF6/EHQ== From: guoren@kernel.org To: linux-kernel@vger.kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, alexghiti@rivosinc.com, charlie@rivosinc.com, xiao.w.wang@intel.com, guoren@kernel.org, david@redhat.com, panqinglin2020@iscas.ac.cn, rick.p.edgecombe@intel.com, willy@infradead.org, bjorn@rivosinc.com, conor.dooley@microchip.com, cleger@rivosinc.com, leobras@redhat.com Cc: linux-riscv@lists.infradead.org, Guo Ren , stable@vger.kernel.org Subject: [PATCH V2 2/4] riscv: mm: Fixup compat arch_get_mmap_end Date: Thu, 21 Dec 2023 10:46:59 -0500 Message-Id: <20231221154702.2267684-3-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221154702.2267684-1-guoren@kernel.org> References: <20231221154702.2267684-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: 1785907038050821313 X-GMAIL-MSGID: 1785907038050821313 From: Guo Ren When the task is in COMPAT mode, the arch_get_mmap_end should be 2GB, not TASK_SIZE_64. The TASK_SIZE has contained is_compat_mode() detection, so change the definition of STACK_TOP_MAX to TASK_SIZE directly. Cc: stable@vger.kernel.org Fixes: add2cc6b6515 ("RISC-V: mm: Restrict address space for sv39,sv48,sv57") Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- arch/riscv/include/asm/processor.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index f19f861cda54..1f538fc4448d 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -16,15 +16,13 @@ #ifdef CONFIG_64BIT #define DEFAULT_MAP_WINDOW (UL(1) << (MMAP_VA_BITS - 1)) -#define STACK_TOP_MAX TASK_SIZE_64 +#define STACK_TOP_MAX TASK_SIZE #define arch_get_mmap_end(addr, len, flags) \ ({ \ unsigned long mmap_end; \ typeof(addr) _addr = (addr); \ - if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ - mmap_end = STACK_TOP_MAX; \ - else if ((_addr) >= VA_USER_SV57) \ + if ((_addr) == 0 || (_addr) >= VA_USER_SV57) \ mmap_end = STACK_TOP_MAX; \ else if ((((_addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) \ mmap_end = VA_USER_SV48; \ From patchwork Thu Dec 21 15:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp501175dyi; Thu, 21 Dec 2023 07:50:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGj4xv1jTYwYboIfbKsmIcEqiwXUWHNujeOemjVr33wD65gvYTPoTdzpuNrYTMmbODJjB/o X-Received: by 2002:a17:902:b412:b0:1d0:69dc:954e with SMTP id x18-20020a170902b41200b001d069dc954emr22579570plr.24.1703173831551; Thu, 21 Dec 2023 07:50:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703173831; cv=none; d=google.com; s=arc-20160816; b=QJddAzDi3Zb45ao0FjukTVA8oKBZivr45K0EIMWgLaqJxPwRfJKD3R54II64sEuh3P xfOEW8bmHZgb9Nm4nEJiK1/4o9ZzRFMJMN3yS66u8GmPiaBynW/buUT0uU8vNPVtI4cL IpLMR/3tp0pOn1dDF1ePXcjhOEXms2lWuuKpGmRWh0S015k8nUA5SgWfRWD9Nt60qwS5 4tGUzDDS6LH/TniF00B/H9y0kSkLm8WnK9HgJrAmqSmU+y82dqbuuN7x/q674znYM/BA ANtaBC31xaqMzXx+i7Lovh8cK6TnYowWDXdVIGD9tMwTZVW+rUZICGG3yzeGVXmKt54K ZgsQ== 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=+mUF6QgbdC5WAZt0C5LM7EcWTcYs+SDBgkdJpnvjhHo=; fh=+2B64yVuborNRhR0hRJ4G06jDIODc2br0dk92JgFIMw=; b=jgzKzhELX1zCmktQ0eq2zcKg2OsEU7Qq3oHxoiaFBxTHuzZQE9ZUPJa6Nb8CzM/HOW LzuutKzzI+NqRcTpkzUQRatgU12dNgZBC/npN57oMY7VPpSC9rLczbK7KoNKKWad4q+N QPIDxfDbgUwHinUt96PUZVy+uRMy30m2+EZvvLdgaUr5STkE48toWUxzqx9VFcfqSzxJ OIz++s8NzS5jKPdASWpRukmG9wyi035KY6eJthp/bqbgprSFff/UAQoqA4JF0Mt+4r4S 4htulpZXdkb5yS0mvaf+EEyYOj1RmtMCVGZ4vxPZdfTXS0uKDPahW2MFT3cKK2W88qUa pg5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CgB0V+Jg; spf=pass (google.com: domain of linux-kernel+bounces-8705-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8705-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. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id e13-20020a170902d38d00b001cfb1e21bcdsi1655665pld.539.2023.12.21.07.50.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 07:50:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8705-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CgB0V+Jg; spf=pass (google.com: domain of linux-kernel+bounces-8705-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8705-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 4D210B24663 for ; Thu, 21 Dec 2023 15:48:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D5E4558231; Thu, 21 Dec 2023 15:47:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CgB0V+Jg" 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 5343258215 for ; Thu, 21 Dec 2023 15:47:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98E87C433C9; Thu, 21 Dec 2023 15:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703173641; bh=6UdCU34QB2Jmf2RjW8+f6vf0kvi9jkFwVt1GuOPbhWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CgB0V+JgevKv68oSzprvvmES0zf5NYWiDKBW18gsxXShgft2Goop1S8a7mLFoT5l0 +rGKecm/9UuNuLwYdE7hr9fIyDiiecKjjmxLvtCUMUUZ6NT33DBHy3EuwYNty6beWu m54WfYoNUMG6eVMDoljKnDRfTixV1RYzkpy6afJ26+1JDdBk2BLAXU5lRJ4vQ+IEXr 1vEwskikoDkcJ/KJDvRNqPxmSQO1F0g/laB/c+eybU+7+Wjt7Iq0Pqm8zUxoly/WQF c0HI0oKrzX8K3Dzj8b/JUteTjfZwqBiqJXiIlLAXpJEatNQCozmCg9lNjo5H/zk85n bazdYY014sD7g== From: guoren@kernel.org To: linux-kernel@vger.kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, alexghiti@rivosinc.com, charlie@rivosinc.com, xiao.w.wang@intel.com, guoren@kernel.org, david@redhat.com, panqinglin2020@iscas.ac.cn, rick.p.edgecombe@intel.com, willy@infradead.org, bjorn@rivosinc.com, conor.dooley@microchip.com, cleger@rivosinc.com, leobras@redhat.com Cc: linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH V2 3/4] riscv: mm: Remove unused TASK_SIZE_MIN Date: Thu, 21 Dec 2023 10:47:00 -0500 Message-Id: <20231221154702.2267684-4-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221154702.2267684-1-guoren@kernel.org> References: <20231221154702.2267684-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: 1785907203428321230 X-GMAIL-MSGID: 1785907203428321230 From: Guo Ren Remove TASK_SIZE_MIN because it's not used anymore. Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Leonardo Bras --- arch/riscv/include/asm/pgtable.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 74ffb2178f54..e415582276ec 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -878,7 +878,6 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) */ #ifdef CONFIG_64BIT #define TASK_SIZE_64 (PGDIR_SIZE * PTRS_PER_PGD / 2) -#define TASK_SIZE_MIN (PGDIR_SIZE_L3 * PTRS_PER_PGD / 2) #ifdef CONFIG_COMPAT #define TASK_SIZE_32 (_AC(0x80000000, UL)) @@ -890,7 +889,6 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) #else #define TASK_SIZE FIXADDR_START -#define TASK_SIZE_MIN TASK_SIZE #endif #else /* CONFIG_MMU */ From patchwork Thu Dec 21 15:47:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp504507dyi; Thu, 21 Dec 2023 07:56:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQprSxFTrB5Y4+0J6YJzp28yaol8fN9OroXhJXDSNQImNJw77RKAWlXIdtRJM1gPdeffGt X-Received: by 2002:a2e:b0db:0:b0:2cc:a596:836c with SMTP id g27-20020a2eb0db000000b002cca596836cmr227272ljl.48.1703174197846; Thu, 21 Dec 2023 07:56:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703174197; cv=none; d=google.com; s=arc-20160816; b=LhwWmwRB8Ap6vKb6N171txdWJMCwkD3xm1yL3Suw0usnBloUGR+r4fPoyaSLFcNUSr GJsJt5LPxVJSnTjSSGWbQbJ3BUkeCEazqUWvpbdVz+utreahtlajtqbBEzPEFS3N8O/p tKVFnRpYSqYbjsxsD0U5WLhyMrP/j15Ll4c5H05RGv3U8uTEVAEiC+jMvNxP1CTo7L3w Vo04eowhP3yJWJQpM3KUAq/0jtr50sJy9wizvnNdxhSKVaoOp4u4Y5anBCkDq28l8QqI Zs2T3KwRqhfEIgOCu8FY51TA5afQi7qkqblOO6WMp7t1RlH6OolXlxzJNFpT51uxqdtO 5g+w== 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=AajFo/iT7WYVtZCobe2uu6pbNS/ImqF+Ccbr1QTAATk=; fh=+2B64yVuborNRhR0hRJ4G06jDIODc2br0dk92JgFIMw=; b=NQdYerMsXut4bK6rIlfmQgAvjAW0NXiMJ4hiEKxLD7N38gVCIoMsftfHQwZRkrTUni QYs8CSREtOJIIGLPR5qbRm1O17NnCOVxOQFoPnesKpYgSEe9QmveLJrq/eqkvjnWlQaH hKASjmY1/5pQzcN5I6VjEsQaKY+xQcX2H/IZS8/4FlGm2x6p3IStxzD+lMyNefJt74ho zSY22Dq3T8WZzel3Se+OSZCivSbqoq3P9MGeKiYEFwuZ8FPgc884s+YX3hZDcXi4Qviz J3ebOUl2S9CuJgEmfpKKFJwi0jKq2QKJ4667CijW4sXcd6PUWOUZX5cT9xSxy9sVpaJ6 /Tew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uhWq7HNl; spf=pass (google.com: domain of linux-kernel+bounces-8706-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8706-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id cn20-20020a0564020cb400b0055386ca9e0bsi969410edb.286.2023.12.21.07.56.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 07:56:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8706-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uhWq7HNl; spf=pass (google.com: domain of linux-kernel+bounces-8706-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8706-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 am.mirrors.kernel.org (Postfix) with ESMTPS id E74761F29B96 for ; Thu, 21 Dec 2023 15:48:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 752BC5991D; Thu, 21 Dec 2023 15:47:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uhWq7HNl" 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 EBD9458215 for ; Thu, 21 Dec 2023 15:47:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FAB8C433CC; Thu, 21 Dec 2023 15:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703173645; bh=AsvVmmiuGWBFu5stNq3XoYXyaKfmZAWOgztQ+Ek0sqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uhWq7HNl8+B0YhiTGUMxZjDlYDFYfy7vtI+h7lvAxn2hltTLuvJqzyS9lA/OSTMQ0 j/bRnzscfA31jLF0OIf5dpyilmyauPu/t8bsZprZPn/fTJSo8BvWwOh+dZXoX5KH7U 3Q2TrfEKJzGctJ3WbHBq/y/ehYU4EvRzS0xyLxbDLJO8CwhMQZhtsL7VBEVK1b6HjW QRFIwyuTmIHOEffqdhjB93JeIiBsMZFxYWtGK0x4+Sxi/pfczeoY2E6FJdQUNlfPN9 7X6ptv0pxxlOjUC0t5dE/n9RDR+UOaYXjMozP+dC1l2Tb1OToPPtbQaU9CGN/MjHpd 6446AbwEvSzUw== From: guoren@kernel.org To: linux-kernel@vger.kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, alexghiti@rivosinc.com, charlie@rivosinc.com, xiao.w.wang@intel.com, guoren@kernel.org, david@redhat.com, panqinglin2020@iscas.ac.cn, rick.p.edgecombe@intel.com, willy@infradead.org, bjorn@rivosinc.com, conor.dooley@microchip.com, cleger@rivosinc.com, leobras@redhat.com Cc: linux-riscv@lists.infradead.org, Guo Ren Subject: [PATCH V2 4/4] riscv: mm: Optimize TASK_SIZE definition Date: Thu, 21 Dec 2023 10:47:01 -0500 Message-Id: <20231221154702.2267684-5-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231221154702.2267684-1-guoren@kernel.org> References: <20231221154702.2267684-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: 1785907588011552624 X-GMAIL-MSGID: 1785907588011552624 From: Guo Ren Unify the TASK_SIZE definition with VA_BITS for better readability. Add COMPAT mode user address space info in the comment. Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Leonardo Bras --- arch/riscv/include/asm/pgtable.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index e415582276ec..d165ddae3b42 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,11 +878,11 @@ 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 (test_thread_flag(TIF_32BIT) ? \ +#define TASK_SIZE_32 (UL(1) << (VA_BITS_SV32 - 1)) +#define TASK_SIZE (is_compat_task() ? \ TASK_SIZE_32 : TASK_SIZE_64) #else #define TASK_SIZE TASK_SIZE_64