From patchwork Wed Jul 5 18:59:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13302672 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59F58EB64DD for ; Wed, 5 Jul 2023 19:01:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F21E08D0003; Wed, 5 Jul 2023 15:00:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED1C48D0001; Wed, 5 Jul 2023 15:00:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9A048D0003; Wed, 5 Jul 2023 15:00:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C96D38D0001 for ; Wed, 5 Jul 2023 15:00:59 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 82991160C0D for ; Wed, 5 Jul 2023 19:00:57 +0000 (UTC) X-FDA: 80978475354.21.7E28B04 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf25.hostedemail.com (Postfix) with ESMTP id 9B4FAA0026 for ; Wed, 5 Jul 2023 19:00:47 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=B5MuAnjy; dmarc=none; spf=pass (imf25.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688583647; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YwDbFN4IMu/IT2sUnJpiyfq5VoW3RyrrIlVKWP8Zp3M=; b=kcR3mSsY/u3fALU5/iC3UKSHftE0NNKojg2jcXqrT+eqVMXwGtr/WsgDlvvrBfwu/sTVES 8guuuFBOsS9UjPs2cyQKYLQytrc2yBHrx+v5GLF0E/Z3O8ofwIAgAdluIOXArDMKesykC/ o9SqkvH+L9oBUjIp4li70CiBwmnSIdw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=B5MuAnjy; dmarc=none; spf=pass (imf25.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688583647; a=rsa-sha256; cv=none; b=BbTar87WTnzlhFqvukA0qOQU+YvsqwwegXx5siFYnU0Tg9TuoKbGS6yYXgviu4pYM9X3yJ NNsvJw94EqKZMw5y4ruu7f2WoNDzP1cey8Bt1vUGCC//IW4Ob/mmLcMdYlnGQmemDzKyPz /Q6XlMttD+t5BNt16y5m3WkZTHlQFPg= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1b7ffab7ff1so40629945ad.2 for ; Wed, 05 Jul 2023 12:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1688583646; x=1691175646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YwDbFN4IMu/IT2sUnJpiyfq5VoW3RyrrIlVKWP8Zp3M=; b=B5MuAnjyPA5HWnw/0ZMD7sikNOclxpF4lGSvciWQB87w4rFYSUNfLNK+HsQp492Rf+ ZxPO1vU+712n7WlePRMhOn6SczHHo9fE6HIJLL8ZyJ/POLpUb9mOET4MxYE1D1KL66+R yc7XK/MLgV48J/rmUICg/JfoMi8RwOcb8Rdc0L6L7JA3HWXsHZEe5vqnDO4wpHtksNG0 6hykpWJqcBzzZvBlwkUnF6EpCUytPeXyckLHmbzX+YnvS2NJrlzxgyDFU30U93nh8Azf WSn1iuqn7dcZTohfbd3Vdke/R26c1Z9YtPFh/+P4RJkaVsr6lp0+b0KcwUXVO3bdjKSZ UYyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688583646; x=1691175646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YwDbFN4IMu/IT2sUnJpiyfq5VoW3RyrrIlVKWP8Zp3M=; b=SJcb2escv9XHzJAfnHGuRLC9YvetjksewAiikof/ZVyhORdh5eLajKDhcQVU8zmW90 AqsHnW8fyQp39v2b/GHLkyEGH/gkqIPj8f6uzCwV76fggvHecfwJ/2/NOQCfgCWdR2z0 7pY6LNbbM+R6VF/u1KULsguf3ESga4fdXDljwAiQGZfkrIvehtDbrsx2vgiwa/86xvaa 8CEkusFqh75SWHXTtXvd7SKzTdCONX1TgQoxraTAwnqZZuAjoFgeDo9uubsNFa8AJwkN DwG1GkSGT4x6raAO06SpRkAR6RU03yVESJ8iCVIHVZKSxAUWDVQhOgCYKVBTG/qj1ZOA xPnw== X-Gm-Message-State: ABy/qLZSFcMuEFauAfvq/GIBb69GkPIgXlOvxbBRZE7i5Rr6QIT20xLL DNO6B78QvAaWxk2mV9SNCzEAiQ== X-Google-Smtp-Source: APBJJlH1wVrF+VXjCSlnhXGll6mNEEZtDOZVaG2jB+/RzM+hSnYSGeB7ar+eRFwz/kyrKSD8lH/V1g== X-Received: by 2002:a17:903:495:b0:1b8:a372:9c25 with SMTP id jj21-20020a170903049500b001b8a3729c25mr3944409plb.9.1688583646025; Wed, 05 Jul 2023 12:00:46 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id d7-20020a170902aa8700b001b0358848b0sm19323359plr.161.2023.07.05.12.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 12:00:45 -0700 (PDT) From: Charlie Jenkins To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: charlie@rivosinc.com, conor@kernel.org, paul.walmsley@sifive.com, palmer@rivosinc.com, aou@eecs.berkeley.edu, anup@brainfault.org, konstantin@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, mick@ics.forth.gr, jrtc27@jrtc27.com Subject: [RESEND PATCH v3 1/2] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Wed, 5 Jul 2023 11:59:41 -0700 Message-ID: <20230705190002.384799-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705190002.384799-1-charlie@rivosinc.com> References: <20230705190002.384799-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: ag6nf6mzmjqhifpucqjn3z43itxgyhpm X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9B4FAA0026 X-HE-Tag: 1688583647-171982 X-HE-Meta: U2FsdGVkX18mbAL7sSH7C0Z6RlgyG9NLZPmIwYq2CkXpdIHkOTqhmGZMBbDL1jo+/CqrUkMwqTOOerQDe89KK/R2P4MTRbI8Sphxq3rqiAgRic2F9a8Uj8SSeez99wmefUlfXVbmsQw+08lAsi2oyGojZT3Ie9j41hFcxf3lz3ck6xMy7jrVgKnWZtH56LOMVoZdyJMY3QQ0kpT1vanBkNWxxT9SrRwLe2FACVRI5fFDnJhVihRcN15B6Jiz+3S91UH1TtEzaAK0I85kGNWFrhPZVRv0BPKRiQ4QH9GbcyXsdApv4ZFwIqNXayTLDnM0xkzhv+obi/PiB1iizLJiPmSQu/JHVyagrN+Dg/O39CNMabLjyGk4gOdNISwfEEGXg3zcQsmE+VIjYcPFSM3kclNlOd4hCQTm6sHTuucJ+zcrs14dvd0r1A7WxUFWoT19P9HGB7cVQF7q2UILGSHVZSUKPnzpILzFQs9WpeV/2HWjjr9h6LUuFjVVh7tUAwmIv0yKrCeenJE5zRK5CjarZc97IUPN7F2odlJs8j3lPLqw/VvAyH3PNjuTxWc5yTG7itCy8hrsssHdwTemUWhQhUK+w6wjIS0oeOt6O7eBodkPY+Eft72mN0UmERf62SmFLUkwe6PjBvYv2pxdSCe5/SiN8DH0GmE6dFImHFFRI1b7+H5rYi8YeX9Dun/4hLSd/HLU04AC+nxpczzaTUtLtkx+zVwl7FKenUqJ+C8xGtMcZERr052mJmGnwu+09jwk/Oi7FF0Mv8kVmIitsq+OP74u2yOo2RYF5lnC3Gth8dzaBNMxvW1o42oHBX4pYA1hKqB0vVAMEQHokdlUCeTIBTnYgz/k15WxTc2Bvsz3AxAGCDWViNuZPlOEUOhSrFIdF8XRNSdVVXPi+IGX532GcTCdgvnZPpk/C+DF+TqA91aj8jd/n72xmrecDSMsXT2BdfEaJSgPvbKOo5I0v7/ pEck+M3w wlUGG7g1GOr4iUaMZ/g51uMPN7xHFfCheH47X//Ek8w704DRv6OgzGkz+EdSb0TTlx2GwiLeVOWqoOTfDT0cPrFVUd5ZX+vzcU71F2WE5VZPoOkScc+66HCNjiNhCaUdWqRpaXgzALXEIZ0HxQ6d8kOlE9W7YOLclh15QCkbPGzbmJprynxPhLk2sh4QC2oA8U40bUGmJV75VYGp3+73qEr/3nMlEGZMIZin8v3itIYYlwfeFlEcjscZurtsVkGuOLkSe04OzXxESu+iIh8q3epVwo7pqW3q5IsqIQZHb66jJ4IweBsXADYFo6q4sVo1Gz1ox8zOS8n3SULzwatWbEdMNfW9edoJQGAcNI4z6B9nmnJoj+IWIqjqKEgL9DohRR0d6GkiUo+MJ7sJ+2S/5M7aH3m/AMgk+Wdj9UgakMw9yzTjL4czTkwD3/vSKTvJEWXKM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Make sv48 the default address space for mmap as some applications currently depend on this assumption. The RISC-V specification enforces that bits outside of the virtual address range are not used, so restricting the size of the default address space as such should be temporary. A hint address passed to mmap will cause the largest address space that fits entirely into the hint to be used. If the hint is less than or equal to 1<<38, an sv39 address will be used. An exception is that if the hint address is 0, then a sv48 address will be used. After an address space is completely full, the next smallest address space will be used. Signed-off-by: Charlie Jenkins --- arch/riscv/include/asm/elf.h | 2 +- arch/riscv/include/asm/pgtable.h | 13 +++++++++++- arch/riscv/include/asm/processor.h | 34 ++++++++++++++++++++++++------ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index 30e7d2455960..1b57f13a1afd 100644 --- a/arch/riscv/include/asm/elf.h +++ b/arch/riscv/include/asm/elf.h @@ -49,7 +49,7 @@ extern bool compat_elf_check_arch(Elf32_Ehdr *hdr); * the loader. We need to make sure that it is out of the way of the program * that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE ((TASK_SIZE / 3) * 2) +#define ELF_ET_DYN_BASE ((DEFAULT_MAP_WINDOW / 3) * 2) #ifdef CONFIG_64BIT #ifdef CONFIG_COMPAT diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 75970ee2bda2..752e210c7547 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -57,18 +57,29 @@ #define MODULES_END (PFN_ALIGN((unsigned long)&_start)) #endif + /* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then * position vmemmap directly below the VMALLOC region. */ #ifdef CONFIG_64BIT +#define VA_BITS_SV39 39 +#define VA_BITS_SV48 48 +#define VA_BITS_SV57 57 + +#define VA_USER_SV39 (UL(1) << (VA_BITS_SV39 - 1)) +#define VA_USER_SV48 (UL(1) << (VA_BITS_SV48 - 1)) +#define VA_USER_SV57 (UL(1) << (VA_BITS_SV57 - 1)) + #define VA_BITS (pgtable_l5_enabled ? \ - 57 : (pgtable_l4_enabled ? 48 : 39)) + VA_BITS_SV57 : (pgtable_l4_enabled ? VA_BITS_SV48 : VA_BITS_SV39)) #else #define VA_BITS 32 #endif +#define DEFAULT_VA_BITS ((VA_BITS >= VA_BITS_SV48) ? VA_BITS_SV48 : VA_BITS) + #define VMEMMAP_SHIFT \ (VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) #define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 94a0590c6971..468a1f4b9da4 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -12,20 +12,40 @@ #include -/* - * This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ -#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3) - -#define STACK_TOP TASK_SIZE #ifdef CONFIG_64BIT +#define DEFAULT_MAP_WINDOW (UL(1) << (DEFAULT_VA_BITS - 1)) #define STACK_TOP_MAX TASK_SIZE_64 + +#define arch_get_mmap_end(addr, len, flags) \ + ((addr) >= VA_USER_SV57 ? STACK_TOP_MAX : \ + ((((addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) ? \ + VA_USER_SV48 : \ + VA_USER_SV39) + +#define arch_get_mmap_base(addr, base) \ + (((addr >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) ? \ + VA_USER_SV57 - (DEFAULT_MAP_WINDOW - base) : \ + ((((addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) ? \ + VA_USER_SV48 - (DEFAULT_MAP_WINDOW - base) : \ + (addr == 0) ? \ + base : \ + VA_USER_SV39 - (DEFAULT_MAP_WINDOW - base)) + #else +#define DEFAULT_MAP_WINDOW TASK_SIZE #define STACK_TOP_MAX TASK_SIZE #endif #define STACK_ALIGN 16 + +#define STACK_TOP DEFAULT_MAP_WINDOW + +/* + * This decides where the kernel will search for a free chunk of vm + * space during mmap's. + */ +#define TASK_UNMAPPED_BASE PAGE_ALIGN(DEFAULT_MAP_WINDOW / 3) + #ifndef __ASSEMBLY__ struct task_struct;