From patchwork Sat Jul 8 01:11:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13305512 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 99517C00528 for ; Sat, 8 Jul 2023 01:12:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 388986B0072; Fri, 7 Jul 2023 21:12:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3389F8D0002; Fri, 7 Jul 2023 21:12:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D9508D0001; Fri, 7 Jul 2023 21:12:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F2FC06B0072 for ; Fri, 7 Jul 2023 21:12:17 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AF3F4140169 for ; Sat, 8 Jul 2023 01:12:17 +0000 (UTC) X-FDA: 80986668714.14.5080185 Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by imf28.hostedemail.com (Postfix) with ESMTP id D70FDC000D for ; Sat, 8 Jul 2023 01:12:15 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=3xtx3kLk; dmarc=none; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.50 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=1688778735; 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=1lKe6yHyZy9K3PFiy7uwsh090/tMqL+ZOHLxwbJUQNU=; b=MGObZs2+IKxlrTlCiBfeFpCgqKOTRkqFatmNB8qpe3sWfSIGNAbWfGnGPPvyu/DauSTfjV VyePLl6Ah177O5qvdo8du8PPX4LF2q4wAACWVC0V7jQiHLfNmCUjQjdT46Ysw/54cKIBbe MHnts8v5dlosCUbetRHcI175cN0OG2o= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=3xtx3kLk; dmarc=none; spf=pass (imf28.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.161.50 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688778735; a=rsa-sha256; cv=none; b=jeaRS/lWloDKkIAgKtMlpNqo8KVXoie+9/vbB7Uon8TWCvyy0f3ewXMsGTCScrTBtr07M+ IHk9EKC1Xob4RssXhAJ4PqxokWim7Cxmrpg2UH706/tkUvcUeRy1yaZSPC5KGkgKCHBfbx JhWKlUs9vdhTLbKXF1nYlvc5drFsFDY= Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-56584266c41so1830024eaf.2 for ; Fri, 07 Jul 2023 18:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1688778735; x=1691370735; 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=1lKe6yHyZy9K3PFiy7uwsh090/tMqL+ZOHLxwbJUQNU=; b=3xtx3kLk27Pt5nQRjo2gIABwLUOicjlR50GeIy3PIPo3T7ivLSyd0Mn3gjEwJzZM0r 0dM6f2JeTRuxED/dJNaqCELwLP/w1FTo+GLHgNP34xh7mKbJ64eikyBDPxbg/DJfJvhx Y+cVCTchX1Y+56HFaSRczQptsqV3qq+Kgpfme7g5v27i80wMH/Qmbw0AYfYv2t1nCjW6 uX/hFmbnWEGjyG+JKsxI/H0ErMxzzsryWUexcdUBjZwftfcYW2BCK7xlKqyuh3609j9J t8ostOouYIat8RZ6iWw8hSRqtnElpqSCQeRwT1TOVrpbUFlUkDBnyRauYk/bLjMvJq4c jJjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688778735; x=1691370735; 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=1lKe6yHyZy9K3PFiy7uwsh090/tMqL+ZOHLxwbJUQNU=; b=BeenGLzh/RzIxcwvYsBOyTuMwf9qLO6CUrtKTzm4TUz53H0Jm+NTBZeb4YijrWOF96 3u/VLnZElKCo5eGXBzqWIeuTShxXRN/qS15F16tKWpB2Br/0I4PwinWajkeJ0dGNDUc7 /lTWTvtYyneqZZ5zvqINvi3D4ca1wZFkAU07RX6XJfVLyllRVDTa/c1Z8ll/P3/5ASjf QqFuSSEIhKIlpyHRkSt0P0WzQzyE9aS4UgzVFsAcJxhiH1Gl3LIroUCt04cmMTN+7ic9 pzne6fm/iN6BTTbFFoAWX0KpOWNrzf2mP42Qt70d5L2zXnQ+sNSCy/IK2Gc8DgSP63YQ oKvw== X-Gm-Message-State: ABy/qLZn48w8A3JSJpOmA8dNcPKXtexe7iWuQf/o7Z0F3hdH/jNyPW/2 E6FksCvW43/bEUaOXh9r+S9Cxg== X-Google-Smtp-Source: APBJJlGg5nRKgYW+XdI1rMP/hwn173NFRuMlzbFPemjPeQPEYTIF5WuXBIKOFywdw6/fbn7CMjMf9Q== X-Received: by 2002:a05:6358:e48b:b0:135:24ed:5108 with SMTP id by11-20020a056358e48b00b0013524ed5108mr8839615rwb.10.1688778734803; Fri, 07 Jul 2023 18:12:14 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id x24-20020a170902b41800b001b87d3e845bsm3830654plr.149.2023.07.07.18.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:12:14 -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, rdunlap@infradead.org Subject: [PATCH v4 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Fri, 7 Jul 2023 18:11:32 -0700 Message-ID: <20230708011156.2697409-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230708011156.2697409-1-charlie@rivosinc.com> References: <20230708011156.2697409-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D70FDC000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 4rynmmu5an8mzstxsa9jxmo14ima6hpg X-HE-Tag: 1688778735-301241 X-HE-Meta: U2FsdGVkX19+eQf1Uhh13KJTqgnGUejd1aAfY2+ZW9pc8F2+04WEACBvaoIPYI5EyZQ+PLeqYAdo2LPGppCJR0czZsL7kF4ZV5NWENu4YJcYNfRctfKaBVXSoo7Flwnrs3V5b9tPkBGtgoFTQ88fiM7Y7cF6Fgg6WavDSxNtgwj09agnsbiAiufXBiWlishI3lowSZChpUQfGxxALgVESJ3skqCtmqhNQ376fMURcvtDHn2dOBqKi9KctQ2+wj6hggcqhFSAw6iAWf/RSYxDdZjS8C6Icyf3U6n/fgCGw5kNBzRq3SWKhqZ4NjhH1OOkrXRIzftYpBEuWvbo7CKZAQB+xl34XemzJdZZ4Qus/2UhTgSBup8YPLo3GP6XbSBvXYPdFnxv6cVfRTe3FKyZnuAvn5nJ9c0Z6Ji6uQI34aXjeqWNUY/alFNFqmjENSPXJMO7UPKZmcbT1wdyawS3E2CBdsQwMoz38mhgI9gSaxiamwSqU1ZBpwNkSXRo/d8UeFgB/7Mr8mLGaN67ZQ+8Ck0qmya7Ux+WdqtuHZf0RrvqoxTyQFTLU7lMD7GKXiMrzYgP6n15AP3WgjgqMNpXtufM/6PtcZAT9O4gFg7uZbAKHEqdmK5gssfQO8EeUYfcfpYX01VSMmt2flNS2IEV3900vIXSbRlh8aiix0z7DRUw3AZ0zFpVsc0pnvkFw/cy8+Pruu/RY8M+CUVOtBTc4VQ0UNR2scrdR7XS17CHgs0CAfOIKCOseSJwV0McQbXDtOlZnnqtORBMjPrt9KiwqSjpwuQfxgBIPlEZK5fyFbxE9v9W857nEUmw+POYZK6NZZMfreTSXgJV/832CDPVQgfhG7GY5vxtDbWtvQEKnO/Exb4Li80ReFhMQL8tbhVtxRmMu8e/f9bztwQugh0/w4sdoziB5PDs8F1mIdFRvZgQI8dcD+PzpPHk7ZoDCTE/UuUU6HLaEZM9Glsrn7Q sJ1BtDom 5eyZN/Nedq3CQvAQkgUdgI6hWq+enFrr6LxEzRmccQjwDsgz0MX+DYkJ7EH1+f2HIFlpj0bqXEDK+gljQ7qRRpPjR4k9DESKbjwIpYrfsApbu/+o9lc8XY6/S7bfb6o74QjoiE8SrzQvHXG6bngW+xNf6eRItcTca+obH+aQ/szAKvUgOy/cOrFkI2dy1XZxQ5m1rCrAmBRuuzlwVuUEboY9F1mgTHpD/3fqnV5pidMrqhALz11cHZTVDYKKuFimbCqMVaz2Y8vXetz203TeVuK/OsgnR3WpvkvY2lXmyJU08Ybnc6rfgj9JIiq3XEttUFjkUFr8Kjj6tucgpIl+ULKsEZUeBCaA6JcPxwD+Ma7bSL58ZAw/cjATRrcW2cjhAduzNVBIZcOjMl3nf1v3h+gZcdRaQFZAAUAHH13auTvA8Iz4ckTudG5hTmuqZynqUcwp8 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. 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 | 43 +++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index c24280774caf..5d3368d5585c 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..a8090ebea705 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 MMAP_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 c950a8d9edef..63715c071e1b 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,20 +13,49 @@ #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) << (MMAP_VA_BITS - 1)) #define STACK_TOP_MAX TASK_SIZE_64 + +#define arch_get_mmap_end(addr, len, flags) \ +({ \ + unsigned long mmap_end; \ + if ((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; \ + else \ + mmap_end = VA_USER_SV39; \ + mmap_end; \ +}) + +#define arch_get_mmap_base(addr, base) \ +({ \ + unsigned long mmap_base; \ + if ((addr >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) \ + mmap_base = base + (VA_USER_SV57 - DEFAULT_MAP_WINDOW); \ + else if ((((addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) \ + mmap_base = base + (VA_USER_SV48 - DEFAULT_MAP_WINDOW); \ + else \ + mmap_base = base + (VA_USER_SV39 - DEFAULT_MAP_WINDOW); \ + mmap_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;