From mboxrd@z Thu Jan 1 00:00:00 1970 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 1ED14C001B0 for ; Fri, 14 Jul 2023 00:14:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9CF58E0006; Thu, 13 Jul 2023 20:14:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4D138E0001; Thu, 13 Jul 2023 20:14:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EE5C8E0006; Thu, 13 Jul 2023 20:14:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7C6DD8E0001 for ; Thu, 13 Jul 2023 20:14:57 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4961F803AC for ; Fri, 14 Jul 2023 00:14:57 +0000 (UTC) X-FDA: 81008297034.04.CA82CA4 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf04.hostedemail.com (Postfix) with ESMTP id 695C04000D for ; Fri, 14 Jul 2023 00:14:55 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=AL3kuhM3; dmarc=none; spf=pass (imf04.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.179 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=1689293695; 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=gaOlsfnVfuDi3L0JPH/BTa+gkm3/5AuBwRdskT34l3o=; b=HDxaKXdk9F0LodMCl9PhWyCtnTMR1pkiLVO3i1tZpbJEuviMBE/Fp7J6jiiMO8AqQ1rD3S dWXugFf4pf93KbWXBGBy7pHtmg6lNegpZrfIeiW9tPeXr2dW7mJCAObkfpqEznQrMVM+cw d6CbY73E1v9j8EmLCUaPz5cMBk5ViHI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=AL3kuhM3; dmarc=none; spf=pass (imf04.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689293695; a=rsa-sha256; cv=none; b=YtuDDfxElPXM5xhv4D1cFg7oox97k0W5JpQsoeAd36BTyha8DaFgs+NuRuvhXnBitxFeXy 05LPEi3uRhWgfEJjWRAqDWcdgahZ7uuwH1MhCoH0RyzC88ptACdx0LlPkEgH+s1vTGRkhi Hn/C16iuuXxuh2+Eq5d7wAua0+cHR1Q= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-666ecb21f86so1299290b3a.3 for ; Thu, 13 Jul 2023 17:14:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689293694; x=1689898494; 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=gaOlsfnVfuDi3L0JPH/BTa+gkm3/5AuBwRdskT34l3o=; b=AL3kuhM3H/KioO8nbvBIAHfJSh0ylMITN2V1WGhpPItpZGNPicIwiuWqPGD+7VoS0z 9FGlE1CgfAh8cjmYagx4MRN+8wl2lQ+QACCOgOXgGwch30R34LbpdjmgbsCbRm7/1+qS 5lQgBLaufmp7hE48Kz0gDSHhxzktORPOkcKaw+5sYuu2JixEoI9KNU/qSO4KHEMkTjk7 2AO7O4PH5DOiBbl9tv04KSv9dDiZGCL5Ttk+UHhDWqky0jutHbNrNoKDBlqyG+gjhLA4 +CaqYrjt2lGBjIIpu0YFmeiHh6e2hCPllmikOwdH4S53O2RezlO9/m1MwSgzi3xPi/3n gFdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689293694; x=1689898494; 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=gaOlsfnVfuDi3L0JPH/BTa+gkm3/5AuBwRdskT34l3o=; b=Ira6+W5tlhXNLQCz+pqQG4JWP13hc/QQAMi7A9mopT0kb696SQWcHt8zglkmIcMUUE ScliN/HKf93MX1gLRMqSB/9HVQIQTlY+eGA64G6P5LL0OwdgV+mEZbFWgWu5QrCq6LBr xuUi+P7+yFA74kP0dlY8TMMiF/FoffND+YvgOFLEpVXsNzST6uWWuTe9ThLl9qd7QGlF fW3zgP18cdLGC8Hr4vBD+6hpnqb3q21C22YK6OBDV07hJJUiydvkr1GWA3jURTY404au IRwvxhBj0S+UQR2BsIPBh9PlheRiX+rbyEZvAmpbQjuO8BxPsdVLUkq9AYhfhDJS9AXc PJ4A== X-Gm-Message-State: ABy/qLZdn7MDLKYcTXcWipk3MLpgyf/4jtBgMf9yEmIl2E0eBf6+PDOk 9I7WuKzwssaiEiluU6ZYMwq/VA== X-Google-Smtp-Source: APBJJlEm0y+XwN1HcIrD1Y1SpQoPIoi8ZkhnjBzIMT1G9MQroevPWLioJkyh+pJ5J18N+bgxMtKKmg== X-Received: by 2002:a05:6a00:23d1:b0:667:e17e:85b7 with SMTP id g17-20020a056a0023d100b00667e17e85b7mr4000094pfc.1.1689293694212; Thu, 13 Jul 2023 17:14:54 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id x25-20020aa793b9000000b00673e652985esm5938107pff.44.2023.07.13.17.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:14:53 -0700 (PDT) From: Charlie Jenkins To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.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, alexghiti@rivosinc.com Subject: [PATCH v5 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Thu, 13 Jul 2023 17:14:00 -0700 Message-ID: <20230714001430.75798-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714001430.75798-1-charlie@rivosinc.com> References: <20230714001430.75798-1-charlie@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 695C04000D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 1run9898x9xa76xeukay9zp19k7hf48d X-HE-Tag: 1689293695-408725 X-HE-Meta: U2FsdGVkX19djGPaIgcx4T93GbhbCJ2hhjRa1QjXKlYLqFDpwljiJHeO0Sxp7DmRImXJUwL/G93G5Z9TerO9GWsuw0rPw2tCtJodNZaf521z1tA19pqxL0TJXoRStnjUeY97WePB0QkFiBqWmNKP+Tob3H8smSad/Y0rC2zntAtPgZRcu/mCVMUQsVFMPuA0jFaf02k1/bYxZu7/l87GjplnM2I3+U5nUQjRwI+0hSmRFXVA4dSB8YiBhM8Ek7Hvz2PjLhYcpCAZkImB/XThOAf9moWP1iK5mZ2yQrkEsNKwuYPFSgMGMpzuORtFCclazvAimT4KoXOqHCHHDCUh/jmTO/5RGSiQKD9iPr4rjzggObBmaiWUMHNUT//7KDWjVU6DDC/xFzHpGmKfAwD07m9a5QjJ04QGgxHKqNb8zzH3AUD+qUrz2eKXyj2HjUntYNneFNPeQdP9uYVHyKGp8CGpuOLXwdMZBkajzIK1ST0KjgLEyAhx46jIgTr/zL34jll6jg+UYchez2Pl239NnjMyjOJoEod/ngErE4IACnHiU2icg1HYPVm6uA+XGQx6g+uD0AzQxnDhMsr3gpUJqy91fGYY02l9KPZJW3LHtjlsRxXBLS9OtSbIH9fJs8pc5y4Or+kCuhdujRaPAP9Cgt5/lKdnmUlXQ4ENU/O57659eXX8ozk73kCIvUkYbSrgG+ja+N4CUfQOrXq8+2rL48u+rSN8d6JN/hGDTdapuduydNBqO8jsSC8BIbBDdX6MkOw3Mfm9KSpY6OuXuPMfxZE4U8EbsECUm/wX46I2S3e8TDzea7/FcNOkhOByD8KwmpnZqLp8nZyMUsIPEQoQTqo6g2E2IKCzD+H267jQLB7aZkBmgi2N46JnbSs5FOPPeXQMIQNvw1wS5Dnh8KAji/mummcWqWKVfzUQ52hC/Isxw24+E7t0AoEMuRuhtEmOlHAijSBaAlqoDvDwwpl +QrZheQy ffpVSrm9INVcB/gLuYCMb6BP/nzwY0ZF3R3MEP13nCiQdBPDSgPBicNuuQZZ6lyYY71BAZaFMWzcTi0s2bmcAVjhsYIf1m8aEaEDVoAmnHG2rra8Yt0uIYTwgKn6BiQ4khLgt+7Z7dOt/yuuheLpjLTUE60SAK59w7IK16fYTQaZpe29j3hTyysyp/M2VnRVC7Pc7MTtor6WSfKmGXgE29upC7zcauZIlJpYGRTuD3d2mn2Ok8HJE+Tva+2IrlgBELJLGv6a9GcCh4DCdXv5y03TDt1aCqs2jFcOKCADy91UXDIXS3aI+1qWlElN+1nei+KAQdN9Qq3KngQf1AXuLqbPjSG8YS7uryh9xwJJlJu5T30+n2oCvd/ygLFgC0V3uJkk0Bwjg0AVc1VZBpHb+w6WvJnjhVsb5toSySES9vx9yPYLG3m+0BPiWob03jVm5Ui/Q 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 | 12 +++++++- arch/riscv/include/asm/processor.h | 46 +++++++++++++++++++++++++----- 3 files changed, 51 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..e13f5872bfe9 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -63,12 +63,22 @@ * 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 6fb8bbec8459..d889dabada46 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -12,20 +12,52 @@ #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 if ((addr) == 0) \ + mmap_end = DEFAULT_MAP_WINDOW; \ + 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 if ((addr) == 0) \ + mmap_base = (base); \ + 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; -- 2.41.0