From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8B7E63A7 for ; Fri, 22 Dec 2023 04:04:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="g5QKOqVi" Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-5942c83c97fso608727eaf.1 for ; Thu, 21 Dec 2023 20:04:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1703217886; x=1703822686; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=oMbuyICQl6nMe9y2KZW9tM4PAnxgLD1bGygk69Ul4qI=; b=g5QKOqViMBUMoSnUGY6JKMgdzR3U/sqCDPGURtAoExF++rWUxnFTf+USoFYxklzUwK 0fbnXqg7WL9KQQXoeQ/iYR+Q8sveyGT917KTkEX7qpeTisjlcuBhj5FPYLA15SXvoieR 1PMbam61yIMw1NFGc/71tVbAlgO2maGZw5npimCNOv/LolX+S0FXQw8t9mLqluGwgdR8 xEml8jpAHN4197KV7ge38wyO6DuvBKBltWOsh/ASohiOCfbigkXzrG51e5ueMK+B/3h4 oGHzF+7SUN/PeRMtnnvMqC4k+VQu/03ADsoiY5k3atbOnYXqY5a58i2DsIMJc2dP9aJP Ldqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703217886; x=1703822686; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oMbuyICQl6nMe9y2KZW9tM4PAnxgLD1bGygk69Ul4qI=; b=ZPD/40ZSDH1/kNwPJ+SF0gt5BSHVIgGnHD5czAZ867TUpeFlsLBUotQBFrw3/CEMH+ XLLIQerHTf2vqeulZ4V0EsKCdyAa9vW0w3Wr1HxpxoS+yq7nZW7KdHIdx/ckZP7ptlrZ 7nqPRKB8tckZ3aG39MMUjGWW4FfnwxAUqMEUYB8QqFCKpj7qKyRe1yLKaD0KIEGErbZ1 LYW3J6Vq8nQJuj7goKodIck+Haz1FmZevVirO+vbFq04x2yVGRUgsgZTkOQqwTIA4/QY HFqsYrd3PRzUb+GGGhuHevzzcrhtK9S6dSkkedZ6/L+hXISD0i3WstunpZbhd/hSJU6G ostA== X-Gm-Message-State: AOJu0YxmjjXA1qPgwTyFKIiEiFca5ZnivyImuYwLJcqq70Sk7jxH8UXu bi9P0SU1ZFREQVyEZv1/KYBsQ/b9ueRCMQ== X-Google-Smtp-Source: AGHT+IHXq5Glvort/8zooZ1cONqbJxMUnI4QjEEM2kI4kr0xLRxYvX/XwiS3CJjJ1rCS66QRkiGFCQ== X-Received: by 2002:a05:6359:4c27:b0:170:c2d0:7236 with SMTP id kj39-20020a0563594c2700b00170c2d07236mr872470rwc.27.1703217885712; Thu, 21 Dec 2023 20:04:45 -0800 (PST) Received: from ghost ([2601:647:5700:6860:9585:2e30:5aba:e80c]) by smtp.gmail.com with ESMTPSA id f7-20020a056a001ac700b006d7310a683dsm2356295pfv.80.2023.12.21.20.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 20:04:45 -0800 (PST) Date: Thu, 21 Dec 2023 20:04:43 -0800 From: Charlie Jenkins To: Leonardo Bras Cc: guoren@kernel.org, linux-kernel@vger.kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, alexghiti@rivosinc.com, xiao.w.wang@intel.com, 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, linux-riscv@lists.infradead.org, Guo Ren , stable@vger.kernel.org Subject: Re: [PATCH V2 2/4] riscv: mm: Fixup compat arch_get_mmap_end Message-ID: References: <20231221154702.2267684-1-guoren@kernel.org> <20231221154702.2267684-3-guoren@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Fri, Dec 22, 2023 at 12:34:56AM -0300, Leonardo Bras wrote: > On Thu, Dec 21, 2023 at 10:46:59AM -0500, guoren@kernel.org wrote: > > 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. > > ok > > > > > 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 > > It means STACK_TOP_MAX will be in 64BIT: > - TASK_SIZE_32 if compat_mode=y > - TASK_SIZE_64 if compat_mode=n > > Makes sense for me. > > > > > #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; \ > > > I don't think I got this change, or how it's connected to the commit msg. > > Before: > - addr == 0, or addr > 2^57, or compat: mmap_end = STACK_TOP_MAX > - 2^48 < addr < 2^57: mmap_end = 2^48 > - 0 < addr < 2^48 : mmap_end = 2^39 > > Now: > - addr == 0, or addr > 2^57: mmap_end = STACK_TOP_MAX > - 2^48 < addr < 2^57: mmap_end = 2^48 > - 0 < addr < 2^48 : mmap_end = 2^39 > > IIUC compat mode addr will be < 2^32, so will always have mmap_end = 2^39 > if addr != 0. Is that desireable? > (if not, above change is unneeded) I agree, this change does not make sense for compat mode. Compat mode should never return an address that is greater than 2^32, but this change allows that. > > Also, unrelated to the change: > - 2^48 < addr < 2^57: mmap_end = 2^48 > Is the above correct? > It looks like it should be 2^57 instead, and a new if clause for > 2^32 < addr < 2^48 should have mmap_end = 2^48. That is not the case. I documented this behavior and reasoning in Documentation/arch/riscv/vm-layout.rst in the "Userspace VAs" section. I can reiterate here though. The hint address to mmap (defined here as "addr") is the maximum userspace address that mmap should provide. What you are describing is a minimum. The purpose of this change was to allow applications that are not compatible with a larger virtual address (such as applications like Java that use the upper bits of the VA to store data) to have a consistent way of specifying how many bits they would like to be left free in the VA. This requires to take the next lowest address space to guaruntee that all of the most-significant bits left clear in hint address do not end up populated in the virtual address returned by mmap. - Charlie > > Do I get it wrong? > > (I will send an RFC 'fixing' the code the way I am whinking it should look > like) > > Thanks, > Leo > > > > > > > -- > > 2.40.1 > > >