From patchwork Fri Dec 22 11:57: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: 182650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp1006781dyi; Fri, 22 Dec 2023 03:58:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHzRvv4qh/h4sXGxmZhpEoftlSz+M2Un1p5F0gCaI+KgX6uK8WFSKXOb7ev4tFrGCpG/nBr X-Received: by 2002:a05:622a:1ba0:b0:427:9b36:d8f with SMTP id bp32-20020a05622a1ba000b004279b360d8fmr1235192qtb.93.1703246289823; Fri, 22 Dec 2023 03:58:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703246289; cv=none; d=google.com; s=arc-20160816; b=egjogcVjiVJf1sNIqEksND0XfqxnCbnMWbKtSoOggTJ53JRcS0wuYKJ0AFhceKHh5J vpEJSo0LNBft2hqTwGQ/821D08cRiWEoeIXXtuUOsxT7tXXIrC55MgVFprRwoYQz//1n G9fSkbeltLgO0NrYz+7Pj6IFEzmCdN7wfwbQDzXD7eFOQ+XeOD85paesBUreJ+eg/UM6 ypCtwQY9yItAEDb2LolbgU1HallIg9rzr8ZPEZC2MQOwQHo66r5S3sXr3KGlMqon774z W0+3vKFWzPoUttoFe/9sIcpbJ31T9ioaE4w4s8fHnb72kc00DtvmPZ73nLS2k8dSU3E5 AwBg== 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=cA4wksJKldGt+LCgiLDGw2cF2dfjvj8srBypxzsUtSk=; fh=3YQLS1cPsLhMKuGGotL7Ux7rpkwBoh7ZT2nN27VXc5c=; b=fmc2r1vEh7qH2gPdDC1By4ntgdb1IN74yXIICFI0+SVSoCagMJs4AyHeYYqqEGB0Gr M5b9Q5nlqE/7SiNpB05DgWn2oPiPY7AzF2bSXATJG7zOCFEpsphkK8GE+34GHMeNCG5z W9Y+qnHainywHw63HTbYdM9hyZZVB8mbVPlExp/VbRPvGWQyqKZ6KEjZgXgg6wq3PzkK ScGV1MhICroj0lku286lZ2zyZCvO4bExWrxQ+ELLS3W5Tbk9S5uPBrtdmW9YWM7ciiM6 kEqbWnhaugz8dgMhHAVVhqtxJ6+3IpkI3UICI0Oj9Vp8Ig7S1N/C8d0qpuwkuQAshcx/ nwUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b9qp0VEO; spf=pass (google.com: domain of linux-kernel+bounces-9679-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9679-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 u21-20020ac858d5000000b004259d9fde02si4164892qta.438.2023.12.22.03.58.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 03:58:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9679-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=b9qp0VEO; spf=pass (google.com: domain of linux-kernel+bounces-9679-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9679-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 98D251C24A06 for ; Fri, 22 Dec 2023 11:58:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 176FA1A726; Fri, 22 Dec 2023 11:57:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="b9qp0VEO" 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 6451F17985; Fri, 22 Dec 2023 11:57:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A7F8C433C8; Fri, 22 Dec 2023 11:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703246245; bh=OMHoJ47sH8QL4h4TQhZ+b4gxch9yOK4WdYt6lzVlcv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b9qp0VEOGkrFAhxqIe4d6Y9gIs4x6sOfZwhGePIfwsqsVInwDYDn9xyPy0D6jHDf8 l80dp1DCIjiaIdq+5PnC7VMWBk1I1MVo2Kvz3lRX0lS+aStpiAEZpUTJ8a+nK6Cisq NPYiyqFkNnPd8iWk2opA3z9L0YWxKnMqBqifWtQZIoRcJt3hQZ5/8BdK20/JycOtV9 Vbu+Nf5bLXqImKx4F3uGjyRTiWakhBpnEd8OBDrR5Ky3U9rAjZcwI9w4n3wFEDlAUO JZQPQG3kpw5ZQVC2kAlMqOCLgqXJ97JXpA6tIzhx/yl2RMQQcSH9BYkEJx/5wHioZL HHbRAb8qWlz/w== 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 V3 1/4] riscv: mm: Fixup compat mode boot failure Date: Fri, 22 Dec 2023 06:57:00 -0500 Message-Id: <20231222115703.2404036-2-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231222115703.2404036-1-guoren@kernel.org> References: <20231222115703.2404036-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: 1785983181296459584 X-GMAIL-MSGID: 1785983181296459584 From: Guo Ren In COMPAT mode, the STACK_TOP is DEFAULT_MAP_WINDOW (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 ... Increase the TASK_SIZE to cover STACK_TOP. 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 Reviewed-by: Leonardo Bras Reviewed-by: Charlie Jenkins --- 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 Fri Dec 22 11:57:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182651 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp1007030dyi; Fri, 22 Dec 2023 03:58:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmPQ4AQjEn+oMF5L0BB+1y1hy/swIFjjBz0QMHOavfluNrvY1L29e4otKHc/Mm4FpgvwmR X-Received: by 2002:a17:90a:8c05:b0:28b:db65:7789 with SMTP id a5-20020a17090a8c0500b0028bdb657789mr914118pjo.55.1703246330216; Fri, 22 Dec 2023 03:58:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703246330; cv=none; d=google.com; s=arc-20160816; b=BmXWgnx/xR5o7B8Gr9FES81GaLeW2tgvskQimOnO1hs/BCb3ezgD+sfBdM3f9H30bm yA0BH6ibA1KXdZc0qd6lf3KcHSjXUGr7Q6JqmzPAPolkexJ1UPT7Bedbz38YO/2ZUiht Ge0rxD/24V0qVZjJ1bToeKorhmoLVSrPpwqNnrfV86kpvhdV3Ji+qgtEY3FJqcJ33Fp0 KjjyhmInTCOxY4EddrgxgLLTbjl8Bp3NNwnmG+vY7wpdJg665e3Y7+4PaUeLrysfwP5o Cxsv0fjvVB3EyhW+nkKALx0sln9tKhKuVBkMHL0D2OVejubEmc0q/C3sdVkfV/b3wKQL /3mA== 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=k0sScacABXMGFrKuN+NtMmOrYlksc/zZarQoVdLrsoY=; fh=3YQLS1cPsLhMKuGGotL7Ux7rpkwBoh7ZT2nN27VXc5c=; b=piTEbS+DWUFcCauvALQ82F9bjN0d+8TNooBfQ/+3l40dEMhmI8DZwBa3Ba+MWrGckd e2ZpXvZ6y8Xb1Xph//tVmC/JeNyBCWOqTu0BCm2KMvRxlPEEpWJdH0SuE1rKWNIqhNGr sy5/0zc3jem3+RUtht7OUC9SvshcyE+m88j387gP0c4C6moBJmnBIK6zdexEMrFksAoz dJhH4CGbd4e1hDZV18loxENdMD1PwyDGclVPWB/2ukDIgjA0Nf30Vvwbr5bev85Zk7EY 3lWADxTMBOlIQ4CUvNZ6BXNasHrF2WfMddjtMTpxV1RHcCqigjj3QgiMqOoVu0YGPRPK 929g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k9NA+rgg; spf=pass (google.com: domain of linux-kernel+bounces-9680-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9680-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 o9-20020a17090a744900b0028becbe821csi2958883pjk.35.2023.12.22.03.58.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 03:58:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9680-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=k9NA+rgg; spf=pass (google.com: domain of linux-kernel+bounces-9680-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9680-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 684FA286C05 for ; Fri, 22 Dec 2023 11:58:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CA200210F5; Fri, 22 Dec 2023 11:57:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k9NA+rgg" 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 33A1B1D53B; Fri, 22 Dec 2023 11:57:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 453B3C433C7; Fri, 22 Dec 2023 11:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703246249; bh=/l6avMA7EU8OdaEPKAk6fYnGo8Aj3OZ74KZJkfMi7ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k9NA+rgguh457yYzw8xXp5ZSYH8I1HoC3z7XcoXIbtLpB/D+HRAQ9UcNBjMluElnH 4RUzNAaKXXd53Sy2egoIyBSCVfN0GNLMKj7M3XGHOUXMNdjJ4SgJHjW2/Da9nSYvpj zNiQsEn2KI9bPrHx7VRY1NHyGJPOD5GZlnZDtD7oZZgXwJEma8EIbyEBlFYy+8fhpD lro6yLLsWb0bTPAf0kmFRnRgbyjo3069vahuhziEzw7kS4uw3mP4UL5mRq/gU06ncr pZ1tbjgYFuBjUUVxMg1xYLXYHriQeO06xrHkSHiRN/vO8PT1k96fZgxqxNvHtspWxk 3SKGxdrbqPVCA== 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 V3 2/4] riscv: mm: Fixup compat arch_get_mmap_end Date: Fri, 22 Dec 2023 06:57:01 -0500 Message-Id: <20231222115703.2404036-3-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231222115703.2404036-1-guoren@kernel.org> References: <20231222115703.2404036-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: 1785983223888572568 X-GMAIL-MSGID: 1785983223888572568 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 Reviewed-by: Leonardo Bras Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index f19f861cda54..e1944ff0757a 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -16,7 +16,7 @@ #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) \ ({ \ From patchwork Fri Dec 22 11:57:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp1007116dyi; Fri, 22 Dec 2023 03:59:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhn2Jag12uluN2hYQEmYkWTRgAVU//ZyYQCNrGAKsWSSbRnCPaRRUAvHPyIuAUWnP8x1bj X-Received: by 2002:a17:903:22cc:b0:1d0:a2b2:6b0d with SMTP id y12-20020a17090322cc00b001d0a2b26b0dmr1050932plg.4.1703246342819; Fri, 22 Dec 2023 03:59:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703246342; cv=none; d=google.com; s=arc-20160816; b=AvEkSS6S3XinUSPdIb0esd/Ik5Nv6nU86Qgd6AJcy8EtSmgbeJFR/nhXZ2rpFUu8OJ tYLZxRnGSey2lDIvGCIm+WtDKKbW8POMcYNIDD1H3Hqgsb4QRMnPOZGeB24PsouuNIHc ZvPMuPwLxfHaWsknqspPlmVqqnJE2V/qwXCClfon4djfGUZ6iCw3CDifc7XaLPYwLSUQ Vhg7mea44oQxJ59fYbRs1DJHOyD5B4Hb5jrfVCDNiNk7OZrP/cYISfi1rrf/I04yh/v0 2XoJWHdBTE+U/R1BFRcKWpAwoNcyy4Xvn8hWH5x1NzIwtRhi4di319SNwguOyH3erUGO Yu8A== 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=51cR+iiFTSeuQGXrjyfcONIKJ3brzFQxfBINGcHw8C4=; fh=+2B64yVuborNRhR0hRJ4G06jDIODc2br0dk92JgFIMw=; b=z9WxsWcLIJE37UOu9ejxf1RXA2oz/9fZKtczAgA8kOD9zTRik9BjcbVdOT8P355Gqy JasophfppJdZeJKJTffHHfA8U/3E+Nj9SWlxnUwdoxa3jc1UAi/xuOTznQLykUww51gB cdzstC6ozKSUxXHmHsqvS+YQDypPcMWvUpM6P2vPoxY/nY6BddVZZOP7VLXdQVPYxX8S wKn+YTq0sDoR7QhCR0z+lKA4rBS5aIayXrasfKrbuaG1OBWp7fHlwmzLUDvOBx7+y3eF 1pYFHxJUDbjsPn57CnV0/YJ8Zqv29f4ikuz3R6cx0Ot4d5U9aqJQciR1uj4n8+PjdelE O6ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rjHR5MVA; spf=pass (google.com: domain of linux-kernel+bounces-9681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9681-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 d12-20020a170902728c00b001d408a4f5fdsi2501177pll.646.2023.12.22.03.59.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 03:59:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9681-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=rjHR5MVA; spf=pass (google.com: domain of linux-kernel+bounces-9681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9681-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 73AF1286AA7 for ; Fri, 22 Dec 2023 11:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5D34322338; Fri, 22 Dec 2023 11:57:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rjHR5MVA" 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 D13242134B for ; Fri, 22 Dec 2023 11:57:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13664C433CB; Fri, 22 Dec 2023 11:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703246253; bh=vzAUwHIH1r+/fUC34Yyxdlm+3Xgnktg3iqTJcmMW334=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjHR5MVAmrvSXQrnh46hTtmqK2B9Ui39aUg7OorT2cb7T849p32wzZw9EYsyX9q9N pBB+OF3PIATNO4q1fk4nJjhiCj7Vtir85aXm+msta1pHfJBBUi49qgN+24XqFg/cnh 9AODp2lyUyp/yMu1DkyVIuZ4hjS0Sf0kwkbyy9vhPiti2WZ3KGKEGRdbvBIVFQPLOB CJpuzMqlx2Hnk8FPva7wkN7HUj0wizLUI2a9WJF/1iztEH6nb2GGSkVLDXBX465EEr nWpko0+T3CgqYkOaQAKDzZOBFMmlxTXV6KLQD9pxMD0PyvN/24cCIFzUJT3KCkdHs3 CN27UjUDwUs4Q== 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 V3 3/4] riscv: mm: Remove unused TASK_SIZE_MIN Date: Fri, 22 Dec 2023 06:57:02 -0500 Message-Id: <20231222115703.2404036-4-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231222115703.2404036-1-guoren@kernel.org> References: <20231222115703.2404036-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: 1785983237156423443 X-GMAIL-MSGID: 1785983237156423443 From: Guo Ren Remove TASK_SIZE_MIN because it's not used anymore. Reviewed-by: Leonardo Bras Signed-off-by: Guo Ren Signed-off-by: Guo Ren Reviewed-by: Charlie Jenkins --- 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 Fri Dec 22 11:57:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 182653 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp1007392dyi; Fri, 22 Dec 2023 03:59:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFLIKFK/YyCWaQbvd7H7ENEnjDrNz/Ifa0rMI0o4o9Oda+4ZwnpcqW/A5UkItVHEuuc6bZT X-Received: by 2002:a05:6358:4403:b0:173:9de:23d1 with SMTP id z3-20020a056358440300b0017309de23d1mr1195125rwc.53.1703246395364; Fri, 22 Dec 2023 03:59:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703246395; cv=none; d=google.com; s=arc-20160816; b=ebKrBI0l5AsZm51ewj6p1oEu4EFOoOjKV2X5vryIEr0DG/wYyKlJk5cLDMwzYbZ7er BmFDCMz04hqW1f61JlojJs3w23juEb8Jvx7tp0ge8NqDRIGbYGJ0Z83Z3zwrkDyUv361 dj/fRitAn8lON7lGHcKJbRwUQx3CFVmGmeECbtnthWUnXeSLlYhOjH90biK6DgaGJECj sBAquytQnPl8edQjDu0QqkP7UG3UiPNcNf1+Zq3npWUFYLriQJe5TuzhXfCgJj8w5al9 19wRpnWy+3vdOrBJ21JDVCMbQA82DuxQKn6foDReDrkmR/NldU9oyyC3BbtFRdtMMl8N Efmg== 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=+2B64yVuborNRhR0hRJ4G06jDIODc2br0dk92JgFIMw=; b=aMct/qhhh2TxenihWEOQJXUwfODOLrbwKFVTnA0AV86CY0afjcPx4KP1PH6d2OKpAK nD2Wun1K0P9ODzwwr4/ae39YEwloWr1cQC0L4HMA4e5vrHjFWMLB/OS5nWMExZ/P6NPF jryC7IZhYV/CNACP/kDGJ1lmwKGyc3tHBjBjwSpzfq9qHCsrSXQDdpcucaHQiFBQZ5vK 7lMS70vl4fuPDYfzDPcFw+bqhPtOuet8CouRW47YTZbJojaQUAuXg5NCCjB2dGGjqPJZ 5btvpJkHTT/Q5fZO392BEmUwbON/R9Sfpf8kM/v9ovVOBasr2aljGIo3ooPx35B5XfS/ Nbpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rjcGbIgb; spf=pass (google.com: domain of linux-kernel+bounces-9682-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9682-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 r28-20020aa7989c000000b006d958013120si3123434pfl.265.2023.12.22.03.59.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 03:59:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9682-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=rjcGbIgb; spf=pass (google.com: domain of linux-kernel+bounces-9682-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9682-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 1EA7EB237DD for ; Fri, 22 Dec 2023 11:59:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 850B6224DD; Fri, 22 Dec 2023 11:57:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rjcGbIgb" 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 03AB317756 for ; Fri, 22 Dec 2023 11:57:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A766CC433C8; Fri, 22 Dec 2023 11:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703246256; bh=Bpr3cN4ZdKoHQcirLqVi0ln0qEuA20LN4TwxV/9UyIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjcGbIgbK6jeqRf0kFK/o/IXjdlWN8p3XQ341829gtV0RN55zBIUKzU9aN7xDTlgA zyf6OCzTD5OC9qHWt3vJyq2YcHKDP0SMJ9HbtR3ap1kESS4nV7DFY31dyGYZY+JuVS J3FlEf3O+GyKQDOBGV9HsfJ2kT/RSJQdmiz0fDn5fgqKFknvpe2YPpAJLkf7ZWp/dV MPSXzXd+ixCj0hN9NEyzV5U/K6kPSbGIAipGtlKaXKWh7hpap4klETzGww7OPff+sx bmPFbqvn/rbd2/W+Q3T/Q23dUe66PeSpwB/7AQErVEWtM+uQZhq42Q0OOt8taV+Pf2 Yh8qaadcxErdA== 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 V3 4/4] riscv: mm: Optimize TASK_SIZE definition Date: Fri, 22 Dec 2023 06:57:03 -0500 Message-Id: <20231222115703.2404036-5-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231222115703.2404036-1-guoren@kernel.org> References: <20231222115703.2404036-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: 1785983292257793962 X-GMAIL-MSGID: 1785983292257793962 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 Reviewed-by: Charlie Jenkins --- 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