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; \