From patchwork Fri Jul 14 16:54:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13313852 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 A1DF7C001E0 for ; Fri, 14 Jul 2023 16:56:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35CF9900015; Fri, 14 Jul 2023 12:56:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BD08900006; Fri, 14 Jul 2023 12:56:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11062900015; Fri, 14 Jul 2023 12:56:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id ECDD9900006 for ; Fri, 14 Jul 2023 12:55:59 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B97CB1202F2 for ; Fri, 14 Jul 2023 16:55:59 +0000 (UTC) X-FDA: 81010819638.14.66A7AB5 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf03.hostedemail.com (Postfix) with ESMTP id DEA1E2001C for ; Fri, 14 Jul 2023 16:55:57 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=azZgM6Ae; spf=pass (imf03.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689353757; a=rsa-sha256; cv=none; b=Qb+fGTPGxfyrPAA9gnpej0DdoU8PeBFgDbkJxSAlVNS+mUxh1puxjUo1wBRxbOOJfoL1nl lrGxdzFqBItr/VFDmI+I16bMOo89LtoogndZev9m+TH16yKXYRDSI7WjoN9r3YsrQggukO Mqi+6O6ReNBxLb7d/AQqrLGkhnIQDTQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=azZgM6Ae; spf=pass (imf03.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689353757; 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=GPykY2M+iBxgnfF3tLWI+OoGLznOreuMykVpzGzQM9M=; b=IxqD2EBkejeR0nI/Nqx6E0NvNyKVgyLBsSJ7Hzl06AI9/Jp2h93YXimtwt9FczLxJf3/e6 +1jSguxqO78k4fjQgVBHxk9Vx0S6WgKzkWhw0AxSVN9W7rpYvO/K8QZ1O7IQjvOGduinmU AKlY+BchYJlCScGy34TeUNnfnpK+yyU= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1bb119be881so9653445ad.3 for ; Fri, 14 Jul 2023 09:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689353756; x=1689958556; 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=GPykY2M+iBxgnfF3tLWI+OoGLznOreuMykVpzGzQM9M=; b=azZgM6AeXJmCDZjMcCvpOfGXYgGHNCAAPxNXV/uspW22hdXFA8MPuhazigJp0SbCJS 8tx99+fKEiCI1J31eTc92ZC6uoPPCBIEWn85byNxcOtC1TFjaiCPLzerJL2mujp5NPfe tcQkn3YgmIUEukMMAzAC+lS3FOWn7t2WGAWBaQbDxJ7F45liY/U120jgK6dSI82+FFGs cKJ+9Jrz+roxSXvXdpvhnZk6b+RrV4+d7dKzXAd2+9hgjhFiAUVDWsWNow2J0tlknkrp iXnusxEZA6uchq9Zw64fmDJgWEo8vBJlNrD/7xa/Q9WtmFrZU5dJZpb8ZTdqxtsXQj5e IR/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689353756; x=1689958556; 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=GPykY2M+iBxgnfF3tLWI+OoGLznOreuMykVpzGzQM9M=; b=Id6e8W3Jn7uTEo/i5yAbftl6ZZPmS/YyInfZxrSfUN3/hDIv8A0nCJnvE46RRPtLV3 1ojHgDjtQw0ac2i7SN7bmr1MFwArFbLzytlxjIeItGnhBe/PgfwQKBtLMLGjWxdBq0yA 1F8tRo5rZY50n8EUX/Mg9MA6TpCI4qKPfVO1l/qgRdxtY+mnSlkNK/FMIr2YeBOkPZhe nKBAPO8Lp9TFH6JN6s/wocOQHaYgDWQYvzQTt4Wj///VHslsFqy0G68+CJJl1dXBwGIT nCHGjD5dLiZRayGNLnfpweqKpCJ7eopXOpSSHPsySbEIySnmmkZ25g559irKmpfLypS4 yIZQ== X-Gm-Message-State: ABy/qLYSBR8VrIBPtBQXeMAo4YCqEPq2mVEWZrpmItzlQjQvyWtNpqTF 35eEvcJRs16Re7Vvs86nnoF0JjaXn18pvUm3TF4= X-Google-Smtp-Source: APBJJlEDGSDEGOdKDXhmmtq/RjWdYGrULh2CJQYPjEZOW+WH3IqJ8qF98vsQhnn68tlVv8hSzAc2BA== X-Received: by 2002:a17:902:e5c2:b0:1b8:4f92:565e with SMTP id u2-20020a170902e5c200b001b84f92565emr5737152plf.21.1689353756696; Fri, 14 Jul 2023 09:55:56 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id s8-20020a170902b18800b001b694140d96sm8008081plr.170.2023.07.14.09.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 09:55:56 -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, alexghiti@rivosinc.com Subject: [PATCH v6 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Fri, 14 Jul 2023 09:54:49 -0700 Message-ID: <20230714165508.94561-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714165508.94561-1-charlie@rivosinc.com> References: <20230714165508.94561-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DEA1E2001C X-Stat-Signature: tcief95o55dd8z5b5te9ap4j75aoos56 X-Rspam-User: X-HE-Tag: 1689353757-450574 X-HE-Meta: U2FsdGVkX1/N4PdLyYvFVhBK6utiH5MOBpNdgQkGziTQGPgGIgmXC66OTJf5oLLBVWzq6uK7T56jfN9PCzChaQIu+KdhcJfej9xU8mt8TIaPn6J5vyTTIQm8P4omtdZVlxETEUPnw/xNKuage3SPguvMNl6uETOWsBNMxT+LaXYx9Z/8aFZ0c5RS3nPwY+L8S8hI3HWLd8pPsmVVXc2EdWuTgGnntRZPkw8dvIkarpoFNy07K1iQC3T0BiOHFTAYdQqPNAE/dCi8vhRnNuBpkUfnWM4cgdk87X7Wxy9gHfEzPWGXW81w9PZnQ8uVL/8YKXe7PmcnaOOX5noX3zfPO+tCzfQFDWNFMu1SlxzzhRcRwr8L1xNcpiTOFWxrzEfEY+d2/7iFtKrjNJY63q0UHt7olQTIAY0f5nIwW59j7OwnptVTx2mhfUad0Y5lUCqeWv4qTFaOv1iLtqBhT47K4nLL1dtrG0uJs+SA3Xk9CKH8AV9Qk/6lMePSUhKrCJ2tM5lrA+w/S9q9MNSr3sHAw71VXtqLClj+EBQr7dQgeidVLVMEqddKy39+f0Dp/DjQlLwDD47dZlsDK5gxJrxMbu/NM2oqS1+fICshk/TlIj0VUzCybHs/umjm+p7UMThBdbYYBo8/pkEVeVtZ9wugLIvxoV+WibgppMnXEZlhucDlywwkQEzLZPEKhJqxIDJ3D6RYDETOfLitJ5GLa9X7KmpJnkseOg68cjYeOySGM0ffwIvPd5MEmUewX8CwpEjUv32gleOrmohxIviqNGrgzHFfeWANr0hTXgcPgbh2j1Pm4WaOWwM3tfn3ZcDq8tExdWp43pfxrRfQXjAOlDEpUMOt1ghuc3g2WwB/db065Grs5NqwR0SKLkxeRyEnywYRUQ/PC/tnB2mr7MrthQphArgX7WwAGUFAhOmaRnzOe2Ma2GWa7UWBvo1WrwSqb2SiJgsoC7rT6eaSpEllZei 7q3uG5Rj bpTQqv66+uiIQG2jnWYu4TZpTswvjshax92C35A89AU9OTVxBtVXJIoUnqHJEAydsCPwAUVIAGYoc7PePxJ0RTzM9sWuhtnfuzpYJe7cuDnMbOpIY+oaK1IndBGkwY/6ldCs1sGOS/wOzjKLRJUf25CPL43ue+s8C5iHLFYEirIp1BCmnSaS5T/cpsoxylXZrNG+Uq+4tqJN1MMtxXIEwKfBF0GYefNWzdDB+2XhVgMctdBgSnwLG10evd0el/qGXhmavJEg2dt0MoX46WppjyNGjHy8ioruoip7Jmjv0VOgnc21FFEge9eOUly/cFMQ3CLDjlXkblR2j2ES1cZ+qkffxameYDAYfn2M9zO//kWyRvvsiWZ51Fgxph/Xk1/BtWxiApLlj2JMhbQJ//V6/Q1r+SHrt5xEKkLUygeND0xaT7m9oqxkfdfbwcQ9PRSLN+Dz5 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 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..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 c950a8d9edef..14a5396eed3d 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,20 +13,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;