From patchwork Fri Jul 14 00:14:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13312798 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 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; From patchwork Fri Jul 14 00:14:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13312799 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 5EB51C00528 for ; Fri, 14 Jul 2023 00:15:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 015B98E0007; Thu, 13 Jul 2023 20:15:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F08488E0001; Thu, 13 Jul 2023 20:15:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA9298E0007; Thu, 13 Jul 2023 20:15:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CB3678E0001 for ; Thu, 13 Jul 2023 20:15:00 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9BC6AB0561 for ; Fri, 14 Jul 2023 00:15:00 +0000 (UTC) X-FDA: 81008297160.14.6CBE26C Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf16.hostedemail.com (Postfix) with ESMTP id C120318000B for ; Fri, 14 Jul 2023 00:14:58 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=haAaWBwo; dmarc=none; spf=pass (imf16.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.169 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=1689293698; 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=+0r7ylMNQwjmn0OPkYDCq51XOFGJFq+TLUQNF3+/r/M=; b=pr38TJciryv2v6wK7NPZB5TfQcexmsuOnin+sJtt121StV/B/t5Af2AsnMzionDWTVP6dB nHz6md9d2h1yDsyw6f+IV6IzwCFG2RpRyDjsQrjA8EnR6jX0+8dFa/jckkPbOXrQtBKkP5 1voVXEDhqRuX3GHTzHpkD5B/XuIjZLw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=haAaWBwo; dmarc=none; spf=pass (imf16.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689293698; a=rsa-sha256; cv=none; b=r/jypiu8SApqoYCt80DnuhKpJpPvut26qAYlKOstRMzzz1dajBNX50k6dT6AFS0BZomboU dmSeJSD+C5cB94wVXfyfYfsXmOj5GtU8yCv4MRsCQLTvaRCQK2PyGTNK7+2uTWRmsR1vLi vO8Ux9E8v4VawWTvXanElVzWeTDAb6I= Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-666e6ecb52dso927560b3a.2 for ; Thu, 13 Jul 2023 17:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689293697; x=1689898497; 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=+0r7ylMNQwjmn0OPkYDCq51XOFGJFq+TLUQNF3+/r/M=; b=haAaWBwoChBxuD8Pfd0jAkJcxdJC/ed1uAjbiUoi8wxkZqPtdGIqgTjzZDWEVHfm6l 51cEMf6gM8C228ZG9wuUj6Ivc7tJZw7r0io2/ZPsqcgxBdqiLweiZCxWUsEngg2ecRtE GdBQfbZVKOt60zzCFPWEmKotw0jdgng6Qx/y4iuGm/c8FyNYyzvwro/ej/o8MrP66pVo AaPyvF5/o9oO5Z+Xy390UDeaPuXxxrG4RrL9h6v2D1lOKHKTsgTLmmiZzMi8pzjuvV3p +yscdkzgS0W2beD1gigIVK8DdAuNL41aOf8gFXxon6B6Ney5K6npBCUq592PqPNl4fIe fRHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689293697; x=1689898497; 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=+0r7ylMNQwjmn0OPkYDCq51XOFGJFq+TLUQNF3+/r/M=; b=i11aHdSaC43NMZMSP6NH3sKHYBr9611Fbyu3pxu7vABVoCT9bDaq0TxjrOF2zc0kBG lD7M8tVUsaaFuSlEmsbdHuCV0OYbUB6Ug+OgHo6BKjsYwcsyCAYqlZU9g6lIFmU8H0fy S0DufKCtuqfkGnKF54bAuRF026yXc713bPe3NYeMVyaUlrmWEgHDT81+KW5fkktDoQLx HAtgl3aobLI89WHksbneDMf2zjAof8Y/IHNZdhJzbVN9eUxd5obk//lFD+KsIum/d2BV RRVHbS7g9kmZuTRnTAj5hLkCfMgQ/o47Mmv0EaPacJzb4P8ttL/6lyE+2gkRLYg1BDyZ lbSg== X-Gm-Message-State: ABy/qLZht7R3zShePv/VVp6ZFp8W2iipQ+3L1LJOOEUw5i/Pe13PAgqp 5Y3hvze/4+G4z2tCajGZy6tPwQ== X-Google-Smtp-Source: APBJJlHthF/xOQY29h/SyVgVkdQb7LnbuS2bmKCUB6lATpARVerASAF4xQ0wVKCbGUja7e5kDLb32A== X-Received: by 2002:a05:6a20:3953:b0:12d:5b6:7b32 with SMTP id r19-20020a056a20395300b0012d05b67b32mr2817577pzg.3.1689293697603; Thu, 13 Jul 2023 17:14:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:14:57 -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 2/4] RISC-V: mm: Add tests for RISC-V mm Date: Thu, 13 Jul 2023 17:14:01 -0700 Message-ID: <20230714001430.75798-3-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 X-Rspamd-Queue-Id: C120318000B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: tjjb6ebby65dqetybzd1x995ayrr31ck X-HE-Tag: 1689293698-674152 X-HE-Meta: U2FsdGVkX1+KsI2F4sTNkUi2o3tZXFeNKk7ang/tY8CvJWDln+j2SKT66RKH+YICY6qdRzMDC70OWiTl/iU7g4s39Hr0mykoS2IInJ4zYN5kCAMdCAv/mELit/Rkup0o4nr+K/74tZ84UXPamZErlngRJ3Fdt4R1Y9xy+jYdUrrCWrbvh/tMVVMTa2WfkSyu/4bxEd5Of5+gVQ56xZ0x01qoMcYBFS+AuH3fR9opMfXbzGdLcb/aEkYu+ACpASUnDDwrekH+jSW/ZgRV0CD8ENYeipCmr7Mal+EhWMYL5LB4udjJFYIx9JRG0XVwf4jch05YWsudsHZl7uLvox0Nr+VodWmQJPgeWUAdfYlHI4goH+bLedZUkA3YGpVj6HFRoWFzylteeYYMBsffHOXTl35jp2V1tNEuXN2zgYu0Fl0OI5e4nRwee8/h+Z2P55zAXFMHucCsKt4yRuqy8fDKSJ/6ONMI9yOFQP1Hl5bUTSd/Xh3KTftrHb4lZtXGETQhoHp1mO6UDR7fh2eNniQmnnqYW0iwrP76o3T25bZP6jgR//y5OUV1lwWvEg7qYSfImALQz/FQdw91GCSqtJTLB/HF/zJwzf23n/AT7o0bbGskrAIxpWZsXESf9FQLUsgS8bKCuOXnQ/MM/DkOI4tilea1bHt3b4WM3wi77Cy5PoQIsQwOh2wNxnFjM23LFi+eZcV32yrs4fNVcCDI8fBnrMS3bxDowol1WFWuQBgxCFX2Pytc3qDs8KEbWpkyrVAsyN1uArccSNMPlY8EI6pA2gvLv7jul4c9NhsX92o/eSDkxScNCDRtN1WlGIr6z2aJA2b1EpH9h26W/CsFtBxkYvk1cPRDDNeyJKp5tP5OXnkMLvuK687IeM5/y/AAHmYscZwkEfpQL4V2spS8FGUzk255qPESK3W5RM8jkyt/RsuI9uiY1CWX7+QqWYlIGMgne/4U7ZItb6x1V3gnGcm 1PaU/J+S OcQukXxCu/dmrACof0STpxVCTGD0T1tx04fp6BQNTBbLlc585K1C+Cn84Qm0EbYIJqgUmgpmx9qDR86eJVEAiQMu3o+46XNXJt0NhTB/TzrASs7OUFEo8vL1KH0+KOCZjv3Y26Z6U2BHY2/xIvmknxAdtA7V5UFVRjNYf3TBeYjjslnsg7kyZTaOWRMnFM3G+XhaV/7LQ+MHjm2k4z+0flyoGU9nyN37jylyd0B99JFTACQ5KFY8caZOlLhUZ7K7ETcIHogNRPS3TwJL7qC4fsa54BFpnxq1q1f51Y1b++UTsEPYbyE9HFRrtnGLVS/fObz2V2sLw9e1WgPcRuB6Pdn5kwhbSb0MsxCJ7/TQJ3T+y1UTncHp3pFEO8s0YubTNONPB8l0fLdnqJnIlCMN74t0ZFKDFH6f35Y2ZIP/7LVjwoaTQizMT56IA5ukqvvgyIWGh X-Bogosity: Ham, tests=bogofilter, spamicity=0.002020, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add tests that enforce mmap hint address behavior. mmap should default to sv48. mmap will provide an address at the highest address space that can fit into the hint address, unless the hint address is less than sv39 and not 0, then it will return a sv39 address. In addition, ensure that rlimit changes do not cause mmap to fail. Signed-off-by: Charlie Jenkins --- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/riscv/mm/.gitignore | 1 + tools/testing/selftests/riscv/mm/Makefile | 21 +++ .../selftests/riscv/mm/testcases/mmap.c | 133 ++++++++++++++++++ 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/riscv/mm/.gitignore create mode 100644 tools/testing/selftests/riscv/mm/Makefile create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap.c diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile index 32a72902d045..0fee58f990ae 100644 --- a/tools/testing/selftests/riscv/Makefile +++ b/tools/testing/selftests/riscv/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell uname -m 2>/dev/null || echo not) ifneq (,$(filter $(ARCH),riscv)) -RISCV_SUBTARGETS ?= hwprobe +RISCV_SUBTARGETS ?= hwprobe mm else RISCV_SUBTARGETS := endif diff --git a/tools/testing/selftests/riscv/mm/.gitignore b/tools/testing/selftests/riscv/mm/.gitignore new file mode 100644 index 000000000000..9a6f303edcd3 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/.gitignore @@ -0,0 +1 @@ +mmap diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile new file mode 100644 index 000000000000..cf68e63e7495 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/Makefile @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0 +# Originally tools/testing/selftests/arm64/signal + +# Additional include paths needed by kselftest.h and local headers +CFLAGS += -D_GNU_SOURCE -std=gnu99 -I. + +SRCS := $(filter-out testcases/testcases.c,$(wildcard testcases/*.c)) +PROGS := $(patsubst %.c,%,$(SRCS)) + +# Generated binaries to be installed by top KSFT script +TEST_GEN_PROGS := $(notdir $(PROGS)) + +# Get Kernel headers installed and use them. + +# Including KSFT lib.mk here will also mangle the TEST_GEN_PROGS list +# to account for any OUTPUT target-dirs optionally provided by +# the toplevel makefile +include ../../lib.mk + +$(TEST_GEN_PROGS): $(PROGS) + cp $(PROGS) $(OUTPUT)/ diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap.c b/tools/testing/selftests/riscv/mm/testcases/mmap.c new file mode 100644 index 000000000000..d8e751f7b8c9 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap.c @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include + +#include "../../kselftest_harness.h" +struct addresses { + int *no_hint; + int *on_37_addr; + int *on_38_addr; + int *on_46_addr; + int *on_47_addr; + int *on_55_addr; + int *on_56_addr; +}; + +void do_mmaps(struct addresses *mmap_addresses) +{ + // Place all of the hint addresses on the boundaries of mmap + // sv39, sv48, sv57 + // User addresses end at 1<<38, 1<<47, 1<<56 respectively + void *on_37_bits = (void *)(1UL << 37); + void *on_38_bits = (void *)(1UL << 38); + void *on_46_bits = (void *)(1UL << 46); + void *on_47_bits = (void *)(1UL << 47); + void *on_55_bits = (void *)(1UL << 55); + void *on_56_bits = (void *)(1UL << 56); + + int prot = PROT_READ | PROT_WRITE; + int flags = MAP_PRIVATE | MAP_ANONYMOUS; + + mmap_addresses->no_hint = + mmap(NULL, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_37_addr = + mmap(on_37_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_38_addr = + mmap(on_38_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_46_addr = + mmap(on_46_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_47_addr = + mmap(on_47_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_55_addr = + mmap(on_55_bits, 5 * sizeof(int), prot, flags, 0, 0); + mmap_addresses->on_56_addr = + mmap(on_56_bits, 5 * sizeof(int), prot, flags, 0, 0); +} + +TEST(default_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + + do_mmaps(&mmap_addresses); + + EXPECT_NE(mmap_addresses.no_hint, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_37_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_38_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_46_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_47_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_55_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_56_addr, MAP_FAILED); + + EXPECT_LT((unsigned long)mmap_addresses.no_hint, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_37_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_38_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_46_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_47_addr, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_55_addr, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_56_addr, 1UL << 56); +#endif +} + +TEST(zero_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + struct rlimit rlim_new = { .rlim_cur = 0, .rlim_max = RLIM_INFINITY }; + + setrlimit(RLIMIT_STACK, &rlim_new); + + do_mmaps(&mmap_addresses); + + EXPECT_NE(mmap_addresses.no_hint, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_37_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_38_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_46_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_47_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_55_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_56_addr, MAP_FAILED); + + EXPECT_LT((unsigned long)mmap_addresses.no_hint, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_37_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_38_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_46_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_47_addr, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_55_addr, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_56_addr, 1UL << 56); +#endif +} + +TEST(infinite_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + struct rlimit rlim_new = { .rlim_cur = RLIM_INFINITY, + .rlim_max = RLIM_INFINITY }; + + setrlimit(RLIMIT_STACK, &rlim_new); + + do_mmaps(&mmap_addresses); + + EXPECT_NE(mmap_addresses.no_hint, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_37_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_38_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_46_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_47_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_55_addr, MAP_FAILED); + EXPECT_NE(mmap_addresses.on_56_addr, MAP_FAILED); + + EXPECT_LT((unsigned long)mmap_addresses.no_hint, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_37_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_38_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_46_addr, 1UL << 38); + EXPECT_LT((unsigned long)mmap_addresses.on_47_addr, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_55_addr, 1UL << 47); + EXPECT_LT((unsigned long)mmap_addresses.on_56_addr, 1UL << 56); +#endif +} + +TEST_HARNESS_MAIN From patchwork Fri Jul 14 00:14:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13312807 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 EA2C4C001DE for ; Fri, 14 Jul 2023 00:20:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82A058E0009; Thu, 13 Jul 2023 20:20:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DA3D8E0001; Thu, 13 Jul 2023 20:20:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A1C98E0009; Thu, 13 Jul 2023 20:20:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5AD7C8E0001 for ; Thu, 13 Jul 2023 20:20:21 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 23C321203D9 for ; Fri, 14 Jul 2023 00:20:21 +0000 (UTC) X-FDA: 81008310642.15.772DFF3 Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by imf17.hostedemail.com (Postfix) with ESMTP id 5097840005 for ; Fri, 14 Jul 2023 00:20:19 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=vtp0vgkO; dmarc=none; spf=pass (imf17.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.128.180 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=1689294019; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WogNqZmM5qIDEUwvyRv9RC9FRo2r68Wx4DIsyw3FtoM=; b=EeV9o4ad4KWEjkwVB1Tbloud1McJ8r4qg1eJhbMtikPAJff+/nG+/ahf+yEPI67g9CkM6G 0c/p+Trqk2df7cbdybV6g5tHdfH6FpTw1NgS0BUeeg0jD2yrAVzBgdrNVw/bKmImXQsplF MI1eQDQssSodvNXtFf5b8IKYbUABez8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=vtp0vgkO; dmarc=none; spf=pass (imf17.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.128.180 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689294019; a=rsa-sha256; cv=none; b=7DWfR2XU2LhyCIKhmYWGfrMjJ+uXhNnadlMPBpvdP6Pu7vhyMjD6aEQXoIkaFjg2ldE+4G cY1hG3OWjhmO6c40UY/naUsZncZGcclVJQaGLYA49Y8nyEf0KJ6KCrCUfKsVn+Idnqgye2 ycSkibkGclvZ4QEBNkCPS4sSaDPgbCQ= Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-579de633419so13227117b3.3 for ; Thu, 13 Jul 2023 17:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689294018; x=1689898818; 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=WogNqZmM5qIDEUwvyRv9RC9FRo2r68Wx4DIsyw3FtoM=; b=vtp0vgkOahUZbNHcFa9Tk0RNVWbUiAfs+m7HW4tKf4GNgqPtKXTwA072elwEL180Nd 0r/AnVNVwh4dwbR94A1zVm1ar4B/6HafxB7Q9EHURQrPdUOODuTo3pDnq1xRgBEXJ17L E5vp0Fw5BQIfNrGQ8U3CvJB1RxCNT3wiZqfYe2PQWmJDia5pglyGpT0OVSe6wGsc8xQU gZTFkx0aAkcYFOpIMgFvj+1r3v4+XbZnffM/E7jOiBfTsTV355bXYEUZ2GTNNP0fSnzx 9VXoQEkBW8w6SeAxbUZJRst7XqZihyhPZlHYqYJNFXLLyI0XlmKzxZxoeEqKosQSxb1S uZBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689294018; x=1689898818; 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=WogNqZmM5qIDEUwvyRv9RC9FRo2r68Wx4DIsyw3FtoM=; b=RSzrC1UQHLlolSwPKUtn5IaPdZYENAorRJYw/vwN6DzS3PWyLMrHevpAd45xtM5VsM uCVQdpC3d8JIbY6URyPclv0+lGmDKvxYENaTNgFg79w/e8mLI4kvKnuvp9ajtA76ankI JeTqN0Y3d4UJJGn/i3ocP9gV37I7gbaIGIvvwhB53bumM2Uss2rcqoo8bgQWfPHEjVMk oHgSShf3YCGhEkmLWNAvKR8vUhzA2voUYPm03yxmY2HcCSlJJAMvWXEvTaar1heVICHu 294/f1VdjAl5Z1V5G6X2XRG5wrZRwDTOPv372S5O4YcRdELU8A7pD7dv8vSO31w3tCSY Nlwg== X-Gm-Message-State: ABy/qLbQfdlfqqGsqaNVDDs+senme0zbeDfAEYGoGlGgqi5NxRd5nqSf dl6tGeEwGnXzLrlH0R/HqGvFKmXwiYYjoeBfX/k= X-Google-Smtp-Source: APBJJlF99rw3p+D/V7h80wItL1ogt7q2SWOZln6YuZpHDidkN54eC97ZWfBnsDKm67js+3dBZPQKGw== X-Received: by 2002:a05:6a20:1445:b0:130:52c5:5123 with SMTP id a5-20020a056a20144500b0013052c55123mr3737553pzi.3.1689293699862; Thu, 13 Jul 2023 17:14:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:14:59 -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 3/4] RISC-V: mm: Update pgtable comment documentation Date: Thu, 13 Jul 2023 17:14:02 -0700 Message-ID: <20230714001430.75798-4-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 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5097840005 X-Stat-Signature: n373x798jmtqjc4s4xoyiah3ds77gyhr X-Rspam-User: X-HE-Tag: 1689294019-304880 X-HE-Meta: U2FsdGVkX1+cpJ/8AZpPfD+HG/rjKXA/bX5OR+xv/VjhrFndxUspfG+ymHUTppN330ED+56G7a8lfLts2PDOruhTMTWCBBWFou0ykfRCsR8rcJsdgs4zBPFtHdub41F5YWbD8l5sosKhdhqePKRIcNXctk64w79IVfInygaUE86SwVA4iLUcu58Du3JSiOceZAkV/w7zqsNY1p2GOWpTw+EenkLRRNJbVxhuHr99RDDYwaGgqz8S2lxbcZyIrHmZc3BZzTtYAh30qaoNx/brtF6A3PUyy4Jols3IPfZv42Vx596Rh0scZsvHgkw7oGfffWbaGKEgmBniRJJGRnGpADD1dYzBTF1CZURVNH2Y5dJUV/cM+0i0wEVZGflQi+LC5m0wTSxvXF9BVI4z4xdNDvC24gH9DtY7Z23vQww3QtntOrQNn87wV19Jbey36LXeluTDSGGvk1+6ZaXdVahXIfFft6NFggI5W8VRp8Kn11Glp6jyX/MP4a9SbMYxpNADu3absVtYVX5SIejtW4q7YtsDTwd+ZZ+JMqOwH/onpKa4sLiqQd06BS3y7h+jDWpF5wDbNJ4ltfExIc3KJtcbobzK+BI4HMoCwB+OqNFUbERf/bhMC4etN+/9ZdzN1MpI1iMbnKmVfW1+MUK2+aJ5KrAv7oszWZ5z6N//rHSqXQTAcdy4DHhepzSDJrBrmyUf60kxaJgKShS9FFM5dfBwaLMtuha6oTj/fU85VX/RS0PLLkoDvrOEu8vyzJ7apeTKULyd9aVcEOlO1sosuk6Qvoj+9G1bLKPFuPjq9XR7PiHdUC65by0wWeSWl0OwqZ1EjZJo3x7DjN7/IXhgUu0PftlJweyQL7NmZSkOTUvGWm8rQI7dXoU8PxGfoZ1FajovOeQw/KAcivWyzyVM4wB7j0u64KAroQj0NBcIn45qGx4dgKHpjskJkyrGkE7aD96yXxaKmZDgr4piU2zBTAu zcnCC514 NYnQwKbnhEFbdEQVjUG/y7Viezzk1eGaw/rh/k1BjmNGQgMjeLp/6sVMTSdaQ+HDMlfT8+nMoRY80Wzy31iuMU3Kcpdpg0EdL7Uy6i8kh/jC6rZigF691dlaVF7XtMbWwxchP9U5xapwmQWf/jlPbbmAu0/ayVMHOGVphHVHH/l6DhaIRBCiLzRlJEQLXQ9SCIxcOrFCjAs1HqT9JLZtGFt3Wihj/SGABvRu95srlOjX2ZTclM1Q4F7odJnHFiwNnL/hAwnW8C8gjt+ZqJFMx+NW00YCTZYnkwmro6cNHRGsQZ09wouNbelft8Z/cHcsUxC/MmZQQ3uGSqEKnU72FTn5oFVE8IoHRUEu02Pj8CRm7qmMKbGI4m2mH16ZpZocZQ4grXi/R7ZxJV8MUtjYf2W3uI+kf+EzToIjNTtsSqIm+BvWYgdsGoZkVO5AEhgo9Tj3sYQ9e0FcbFyA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001530, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: sv57 is supported in the kernel so pgtable.h should reflect that. Signed-off-by: Charlie Jenkins --- arch/riscv/include/asm/pgtable.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index e13f5872bfe9..28660bab754c 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -840,14 +840,16 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32. * Note that PGDIR_SIZE must evenly divide TASK_SIZE. * Task size is: - * - 0x9fc00000 (~2.5GB) for RV32. - * - 0x4000000000 ( 256GB) for RV64 using SV39 mmu - * - 0x800000000000 ( 128TB) for RV64 using SV48 mmu + * - 0x9fc00000 (~2.5GB) for RV32. + * - 0x4000000000 ( 256GB) for RV64 using SV39 mmu + * - 0x800000000000 ( 128TB) for RV64 using SV48 mmu + * - 0x100000000000000 ( 64PB) for RV64 using SV57 mmu * * Note that PGDIR_SIZE must evenly divide TASK_SIZE since "RISC-V * Instruction Set Manual Volume II: Privileged Architecture" states that * "load and store effective addresses, which are 64bits, must have bits * 63–48 all equal to bit 47, or else a page-fault exception will occur." + * Similarly for SV57, bits 63–57 must be equal to bit 56. */ #ifdef CONFIG_64BIT #define TASK_SIZE_64 (PGDIR_SIZE * PTRS_PER_PGD / 2) From patchwork Fri Jul 14 00:14:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13312800 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 8155EC001B0 for ; Fri, 14 Jul 2023 00:15:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 127998E0008; Thu, 13 Jul 2023 20:15:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D73A8E0001; Thu, 13 Jul 2023 20:15:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E94178E0008; Thu, 13 Jul 2023 20:15:11 -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 D6AD78E0001 for ; Thu, 13 Jul 2023 20:15:11 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9E38B1203D6 for ; Fri, 14 Jul 2023 00:15:11 +0000 (UTC) X-FDA: 81008297622.11.BF84A4A Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf21.hostedemail.com (Postfix) with ESMTP id CBEF11C0020 for ; Fri, 14 Jul 2023 00:15:09 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=xExIMHzL; dmarc=none; spf=pass (imf21.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.172 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=1689293709; 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=iY0BqE22+vH8ihdQ5F+U3lQTo4OY0Ve5Zo6wbRWfHfc=; b=eB6INveydNCOHt51fRLoVtFATxcG8rkHKTyNqL8YrVUmsrD5M0rAqn0kGiiHI07633C6/+ oo8rAvartWXjk0p8z1CLTaFG6Isvpz6ODCM4WIbjGs3kBC8bs+DLmlzL4qZ40FnqCzX/7K 2+Nhwov9Ik2MHKZz1UZKWdpbRKzSXEw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=xExIMHzL; dmarc=none; spf=pass (imf21.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689293709; a=rsa-sha256; cv=none; b=kDD9S7sGKQdkEwESd28NW/1D9uTEdHBawLr+KgF1xuoEuVBXVIB/t2vwDEf6VonkIB6pwb acwOD0a6N4GxY1c97nyqEe/k/qqSGXqiKjxr55KuV+gYmpw1lPUghdmENKkfKP5gKNcPTK JEk5bL4zw1mrumHKAEd074WjGqB8mpA= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-666e6ecb52dso927669b3a.2 for ; Thu, 13 Jul 2023 17:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689293709; x=1689898509; 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=iY0BqE22+vH8ihdQ5F+U3lQTo4OY0Ve5Zo6wbRWfHfc=; b=xExIMHzLTtkjN2LFQngS3OX4jDs1xLdIX7r/tiDx0kppQfQRkPMYGwyfuGwrBTa86a XoaNrcUcmG5pmtq3t+bqbkNwiHPqfObctew9lUGCvXVSRZ5ZMzwxuDl5bh0kXZqCOeN/ 2KOkMuhJYkV6QfPobPU9mX56qewrBddlJ17DJjsRmikAwwn6WVy6MHjfUpM665kqgqnx 8Vd77tSJfClsrB+dbBunC3han9WPucnmhgEbe2AxB1x5RWqedcL/TQmo7JAbJuXl1Q+J +JuGlcjr4IzBotD3ZK9zOhKx+93UelIHVMWCiiWjS83cS6p52MDULRTAs1+X2jnehbH9 5cQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689293709; x=1689898509; 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=iY0BqE22+vH8ihdQ5F+U3lQTo4OY0Ve5Zo6wbRWfHfc=; b=Pw06XIxuCF78bXh3yLoShRaPxD21mIFYK6Y8ReWudiCn3asjEmXzsun+CFFiRzzjmt 2V6/JYLDcrnt9FEerF5xLDcYEY/4O3kBgi109b1JCFz90bZkE2ud8h+ZZbQS27Y2QC5O 5jFNCn0yFhEnKVUWBdsqpyfur69VY+1ofUCdibHIvNvyV4RsyJ45nBfbFW2OJUeYsAVK gws3y6XdtpcM6lO1g2ULwcsBoz2EfS9GHB8MOn4Nl6B28//3Ll5mDuZU5pT08GmAX6ui qjVGNE+zrW/VZSyeFkXFpzGeGHE1kuNzdXo3snNOTGF9AjVGGk0UKvCxOK2HcCVAgaYe MA2A== X-Gm-Message-State: ABy/qLYgIsMmUgCgAJjqxyOPO40ShSi+xgN/vve71SPj9vz8i/n07kV9 WamcMPbzUVx6++VHWe27TOB7vw== X-Google-Smtp-Source: APBJJlE/NehJK/yZ31QQ51ruFcoOUZ8Dr5gN8omHKM50vUTZXpJ3oVnR2nhUcvBJtDwEUljTcHiqAg== X-Received: by 2002:a05:6a00:2d84:b0:666:8cbb:6e0f with SMTP id fb4-20020a056a002d8400b006668cbb6e0fmr3042793pfb.3.1689293708687; Thu, 13 Jul 2023 17:15:08 -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.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:15:08 -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 4/4] RISC-V: mm: Document mmap changes Date: Thu, 13 Jul 2023 17:14:03 -0700 Message-ID: <20230714001430.75798-5-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 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: CBEF11C0020 X-Stat-Signature: 4xer7e6ntqdxkk7g5jnpzh1ehmh9gfuc X-HE-Tag: 1689293709-419706 X-HE-Meta: U2FsdGVkX1/k9TKgyVIqnqLt+rc+TRmj97fGBnn6ijzYCjBynq7VcNzm/1i3E6aL2Z0j5ueY1823Q4PHxgGBB1ZcoZBICgqkJbH6CZyeOgBy1k2IOCfFfW3XEPs0ddYuFSJT4sl6nb6UrCW/SBybEB7NS5JZFln/suHmiLSKMJL45yvxZFILUEAOpgqHwICHcZJ123dGnUAdYTDvNUabX9pbTdbgqD5ODBj8SsW66/M2/X2bS+OmHfvSjyHTpyh9VDaEtwByqvJXwxpwWWezj/O30TEnauj5eaW6afifhmSWMAikV8gzGUGjG6h/VIdULM0omfQve/5w5fvFJhVAjzBRskh8jRpQEHeb1oGkd2LFZv1W/Imb6JEbtL6BzJu0ET7FBqvWlmIdcI0XivS8kZrsL/bpkua1htt6Z5/8mOO8fsP91nyZks6AUC7bIryHmYkwFgcIFfRA/0DJlEDbf+X0f1kU6uqxBMSyWRRZM1pT3xg0+sQO/AteyAy7nbpbf8zs2BYD++KT/X/GKWnCIP57OcH0q2DCEJBEwMYK8AOLYJXC4+WgiUvma4qwJIpfbGHJ5V1wuhbgeXmsfBogegXoePnA7r8OK2RUG2og1nJR/ZKhoDB1PCdSB3X16+AeonvnVnLdrx1AbYIB8svGyVVOPjJa2DAndRHSzCU2HaRmJATEoAK+Nk7bkLfzAJ5ogauGBQQfuquadwjESWHe+MtbRKv0cafcohB8AB7FwZqmYkNCjA/8MzgkEtsbMmAIbYbK6cffzkAY7axMrzHqI7Gwps7c1MsVVSiNVOu0QKws0UsBUqs1Mf1tLEUAc3MHWmCozjMmiMMQ7mROreAzq7fcK0HrDzHZCltmJSUObkolMzJ233PNiqmrcI2X/W7CHBMpHvRWgYwkh/inf6bUb2J51BnymN4LhFiaaC/BXqZN2Otlb+qcMzbHZOuTvq3GapWAMwfKXEfuZO+Q6Ra +wq7IAcP +QDGyrtk2bAobgM5RuRS6pBRwzYnaueu8lb3SZJBOMmUm1moqxisvVWF8L+XL6xLhBcPW31f8vjQbgNe55y11XmWNWL/FfSgwdm/GGvxmKtVhXS6veOvijQaVVYk79sI/gAL2c0gSiLOWXVFpnxa7tMGmDIplm+XW8ai0OWcfKguvepXrM6Zyz6tt5k/yeB5szRXD0r/hI6He5G5cuZyvhZ3mKwrFegQIbIA8qdmPixkUPJ5ITnalRyD7TZ9OMqOhS59UgJ36u55POlEOggYQnubUcw0x5lRYLCPYFvQumWtMC5pdaVC+PvvYo+D/tQdcfkznpIR0L08/6QLGd7HpZ7uch2sj2rLWxCfA8wGmawWyi9X9sSBHWnQDszGWs4uJsMo9eR3VibXCOEMVkEp4cQlaUca0zeyjwxNsyZv2N6Ad404HYLpoyDo0/9YwU6AfX55h X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The behavior of mmap is modified with this patch series, so explain the changes to the mmap hint address behavior. Signed-off-by: Charlie Jenkins --- Documentation/riscv/vm-layout.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Documentation/riscv/vm-layout.rst b/Documentation/riscv/vm-layout.rst index 5462c84f4723..892412b91300 100644 --- a/Documentation/riscv/vm-layout.rst +++ b/Documentation/riscv/vm-layout.rst @@ -133,3 +133,25 @@ RISC-V Linux Kernel SV57 ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | modules, BPF ffffffff80000000 | -2 GB | ffffffffffffffff | 2 GB | kernel __________________|____________|__________________|_________|____________________________________________________________ + + +Userspace VAs +-------------------- +To maintain compatibility with software that relies on the VA space with a +maximum of 48 bits the kernel will, by default, return virtual addresses to +userspace from a 48-bit range (sv48). This default behavior is achieved by +passing 0 into the hint address parameter of mmap. On CPUs with an address space +smaller than sv48, the CPU maximum supported address space will be the default. + +Software can "opt-in" to receiving VAs from another VA space by providing +a hint address to mmap. A call to mmap is guaranteed to return an address +that will not override the unset left-aligned bits in the hint address, +unless there is no space left in the address space. If there is no space +available in the requested address space, an address in the next smallest +available address space will be returned. + +For example, in order to obtain 48-bit VA space, a hint address greater than +:code:`1 << 38` must be provided. Note that this is 38 due to sv39 userspace +ending at :code:`1 << 38` and the addresses beyond this are reserved for the +kernel. Similarly, to obtain 57-bit VA space addresses, a hint address greater +than or equal to :code:`1 << 47` must be provided.