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; From patchwork Fri Jul 14 16:54:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13313853 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 33DCDC04A6A for ; Fri, 14 Jul 2023 16:56:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE7BD900016; Fri, 14 Jul 2023 12:56:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B71E0900006; Fri, 14 Jul 2023 12:56:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E9B9900016; Fri, 14 Jul 2023 12:56:01 -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 835C0900006 for ; Fri, 14 Jul 2023 12:56:01 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 44DFDB0654 for ; Fri, 14 Jul 2023 16:56:01 +0000 (UTC) X-FDA: 81010819722.02.F8FFCE3 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf21.hostedemail.com (Postfix) with ESMTP id 65CCC1C002C for ; Fri, 14 Jul 2023 16:55:59 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=zn1whIzF; dmarc=none; spf=pass (imf21.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.182 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=1689353759; 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=fFZ0EGHA/E167mwLb87wWH3iE0UjDp5JHbGLXoRkRqA=; b=WiJmuWt5qGR/bkOm/UMX6ycYhqLhLrB2DZe0WZaDkjmoFG9RWQt8unKNI54sw8K6rXfmvu Y0Vz0GGDCiTCBQu9FusBpsS7WnVzX6vPCD3blO5mCnNqIKQ2TvresVVIRvFPTYPxSKPLTD HKfOzWhbC0nTpUu2hk2TLMGML9BFfTw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=zn1whIzF; dmarc=none; spf=pass (imf21.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689353759; a=rsa-sha256; cv=none; b=RNAy5cZL0DjSRgD6XZbcnBhUbBarH7fmjb2aiHvAWtaLdtAXWpdgqM2UqGhUfdIE8S1X+6 9GjvH83txkCF4eqJCnDEO8KZAoQ3flb4Da3gUbCjEkyZ3aB0ke+1tdLKkFEiEhmkpuSwA8 J5xOdch1LKsB8Wa015DZn4tsLmoGzMU= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1b9cd6a0051so13643835ad.1 for ; Fri, 14 Jul 2023 09:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689353758; x=1689958558; 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=fFZ0EGHA/E167mwLb87wWH3iE0UjDp5JHbGLXoRkRqA=; b=zn1whIzFksbFhXTqO34vKblrmsHff/17GQr3bYOcezH28cQyvPFNhQUxXa2sAPmMS1 1WI0ByZzMGBTJbHi/dO8HxLEz8TgAL8vMPlN/S9Zlsd9+L0JcfDsc/ikDWbR3lPJjq17 adM7DlbZeACS2bGGGK5LbhAjLUMSTXTi7aBNuf6MnFpcIurtWpRgYjYi7jf1WGpkUtp2 zscz6fUP32Fhq928O1gU6GgR6VfLSBJ1gX7eP4OWmx7it+jF6Ll0l5TqyoxCdBmQtFi1 C+Hb6hQIy3kY2fVb4xvTy0IgnX2o2sglJ+bfpV+gz1AiXbrLwVBWPm4t4lez/7lvKMfS EcJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689353758; x=1689958558; 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=fFZ0EGHA/E167mwLb87wWH3iE0UjDp5JHbGLXoRkRqA=; b=b6TXyNBZeyKMvd1ww7vcS9CKDPh62faAtUtSxta0t7uwSbNkhrQS8wvr/R1IuSlxbe joY5ZKyPzttOu0gli5dYdlfrBIzmkzJBjD0WdL0ZCl88ZN8RxmmCCudgdyeJBhJU2L+j 0kf2UPXzIBLW1SkjMOfYTJ4T+/qMUoAkIB5MfmSNtmeEgDTcUaS0J6BQeEOcfxSpIz1+ h/S67EfhFLKXrvS736ghWgB1LeClsYsBEkzZ6FTY+kGfaRze1mEShORpfD7XpEbtZFaf VVd1ZbmUX5mU9flv/rgRuMiajwsvbgXlmz2qtQ/kBvjeoH/5gV2nSbMAUakZqJBeYjAo Ordw== X-Gm-Message-State: ABy/qLbPl2kYo5GxK0mm4piJRcmXO98ohg+GvvJmhTNo8RAxGig9mjHi hMvPnHnrN7foWajzPBGaHPInMQ== X-Google-Smtp-Source: APBJJlHqhS0uCuOyMfhOId30Fk2bIt7sCu1bJXWOcbA6EcvHwaFt3gMEbaHPbnOB7iiOK1Fg3tgsWA== X-Received: by 2002:a17:902:bd94:b0:1b8:1e05:ed09 with SMTP id q20-20020a170902bd9400b001b81e05ed09mr3727099pls.36.1689353758143; Fri, 14 Jul 2023 09:55:58 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 09:55:57 -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 2/4] RISC-V: mm: Add tests for RISC-V mm Date: Fri, 14 Jul 2023 09:54:50 -0700 Message-ID: <20230714165508.94561-3-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-Queue-Id: 65CCC1C002C X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: y9945s1rkn3pjg5ub34tyii4syjt1rb1 X-HE-Tag: 1689353759-584331 X-HE-Meta: U2FsdGVkX19UMr16b9sET0xzl4Kl961HwaV8q2mDGhzQbVX7qmhzIIVhi3PHr70keRJ6arN4kaDfrlhI5hbI7GyetEpRwpeulDvy9ixNdBUoHu62KAEws2t9RD2UK8He9C4nTMmBn/cUTZQosm3ARRvp6ynjSNGcSfQhDEzExpd7L6fyDnOzZ6j2onIo1IVLw/v3lVOaY+xin9M3YSDefUo33/d8kzjzC6zBNfe3kvQsrFnAzQ7kWbI3QBuRVwVyhesdkizuE1QZDDJ458/WsSWRcDB813fSvqTMGBZxlZRSrPVuHF0Pp1u+qTs0vJRUTlyEExUgB+XD31MQL7vHBmc+NvRX2zA2ZPS971hwEsTGhQSUFRV+u3JiWLdfeIZHdo3OQCeu5L/BK2C8yp+FXsU79NxH81S2Wbr8SvRkQNQwpq/ktTqt3frRbPXJZ1tH67z/scMIO1f8ZyaNqc9fA3hftNDWGI0VVXDUNG1Rencn+4T2uwYlqd6I0SI2W9Jhea7U9oWhIXc3sJ8RkEAQO6YW2ax9k7V8ICTW/8ms4AmfnUPO21TKv5EmbsGMgebpsVqt+mGnaQc7m3rk1CONtfQOmaR7LJgHgQ52Kmvy7kxWtyjydO0oJyrybY2t/ZbrDrcPrM6AVIdxhPghDmz6b+MLQj0EWOzm1D7UbZ2twzD5ZmcgNRWDDReD0rh/rQ76sZv+X/dKwfTyvAr0rFU8Mc/XB7gH/1x/4rbqcTVPLlVBn2RxKpMKKaupZ+WmrcnPBkc4NvRKybv0suHoWQlzdoXXckwpnG3YrUscFV9HM/hvQs9UarBRMqfPcXIdeHeQtT/0DDXtv65gckwYp3W0hcaTnQntbnuHffOIWlQN0eg+HjJzEp0Tk7JP9Q1NJMGhgPW2LDuAVGmKTQbXf1TVXOa/dKLzVuPBjo9bukbT4LQSnB6XPg1Lm9QRWOITakn7OzMJx3APMlSZCHHtDeS BNvzPvOn kw5DSTEYIgbiR/l1wA7UxbgaCnbZ4W2nI9VRgqSXTikHaE4CxER7loHwOnCUJN87g4YTmz0yZ8/MOjwkLDXsILPNN6y30VVxZ0sRIUPyZnrtoZHist9ZsCC0QUw5erour7sAvB0V9jYzTHorv2KwseYMYeeDAAUoOAxC1Ki4EBbHbe1I05fax29iZ1IG05Wmwuqtap4oYRT+E44pMf/s3EHf5gY/0UPWBi0GQomS1zvHf2EiEQ+dGvRohQX40irzHC32GAa63RqbmduGtOEp7saTphQbCuNDe/LW2eFQh10dsNom2rvgiFpHSKQJ+Z2OR81lyha71/G5SMMl0YuQB6FJof6wm2YB+BYY456WVWw8xo5MmvrdQkFt25EtHFRSJ/h/SIt6F3fZgI+3QC3piVOnCvJzOetk4Ass1fzVVFRXAJbaw3E7tgE1KQfIc9GjHTlyP X-Bogosity: Ham, tests=bogofilter, spamicity=0.004375, 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 9dd629cc86aa..1b79da90396e 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 vector +RISCV_SUBTARGETS ?= hwprobe vector 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 16:54:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13313854 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 0C966C0015E for ; Fri, 14 Jul 2023 16:56:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E733900017; Fri, 14 Jul 2023 12:56:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FBA6900006; Fri, 14 Jul 2023 12:56:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0272E900017; Fri, 14 Jul 2023 12:56:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E80D3900006 for ; Fri, 14 Jul 2023 12:56:02 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B98131202DC for ; Fri, 14 Jul 2023 16:56:02 +0000 (UTC) X-FDA: 81010819764.20.178D82E Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by imf01.hostedemail.com (Postfix) with ESMTP id C677B40014 for ; Fri, 14 Jul 2023 16:56:00 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=k4JpV8O2; dmarc=none; spf=pass (imf01.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.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=1689353760; 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=VXoby8v4OrtksqA7Gkg/+xb0IwHpe/VrKikm+mqMUeZ4eYIVDq89q6VzJVgfJmzqcmW2/L cBY3nPUfh3zm2DT5S1zYhB5pndS4XrRCYZSdHmTxAGbvsmXwlRs/8lMPwRNj29vOt1b6Mz Pv7dWI5Coa7ug3zcWMmcZcDfPNZDIuw= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=k4JpV8O2; dmarc=none; spf=pass (imf01.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689353760; a=rsa-sha256; cv=none; b=KysoIEFl6Jwvn/Pvh6a/3C+9cE1obG8tnHmQO6IXnR39iE9LsJ7AvfF3ojmpzkG1pc+h2t VLMpdUQ8OPX2ziIcXqmZybPTfh2O5M/9qavCM/PT4Z8+Zvvbzg14UVXXSQDDnYEO7rT9Iq Xe5OVhDPiUb3YNZESjgAjQCd+QqfmBU= Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-666eec46206so2053562b3a.3 for ; Fri, 14 Jul 2023 09:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689353760; x=1689958560; 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=k4JpV8O2fSGGk7XNKD9q0ujwSrgLNS5JKisf0sw0jvUKEZew9wqD0mOgv5xqEakXS6 pzsAREBd08kDkGplbNP1AkoiyWeRAIz7FulZLlqtB8qp3y/qckPqJhQJiKhZfl9WN0WU nMle1U6p0NZ6MT6w5szP3MC1Av+TfDzsM7avqkgjrKklsCAEJOIvC2zN/3btjBehraei NSwhWdWxIJBc5KhqU4BaNyhMvKIzjfVx6EmHAfAN5LUA6SlhocFalrUll5gGPpviaIA5 tMoWOIW4JYBkvXrXMWF2tH+8ZBhwSqtGJVaUkW1XRy8sQZxk+lMN38vEoUg+I8BBf1Ee cuQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689353760; x=1689958560; 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=kYgNXpMdHmcGSXlCHwKN9suhYLWGDNdfM7KhgXIcACYFV2Nd4piEiiRVy/92dEao67 fJJZCsgI4lp7srStoAeRhU+vVd4ijCnxMxVgNDBvhApNEnRfKa0idZEIzmhzP5aqtzX/ ijoZsDELDmgcVgjvv415OLkiRXDroSoNg8QFrQlN5MF+fkNa9UXdxBccAMB9R1kB5dn+ wH4aHPvKQR30id43xdd2N/ZdWAPP15BmmYLMl8zBk1zRUT+WFALrzdVQuITDqPJiDBiA LVctx5XSN4s8nAxQkvvqpLbz0AOrtNVleVP1X4RCFkFB5ZgH4a59Aeo+WsUDe+uxqzKh x4yQ== X-Gm-Message-State: ABy/qLaqTcG+/zh9yAWKgDr84ZFANU96RYkLNambytPuI7t6Y3NBEB/8 TIOM8J5BJAUfk8EfN0ghp4Cy+Q== X-Google-Smtp-Source: APBJJlFI//JCJ/vZz+Q9PwxyNeL/qKz+QPWaKPFke/aicziyFeQBMzZv9VLqcfrN88UuwdEdg68umg== X-Received: by 2002:a05:6a20:639e:b0:133:ee16:5677 with SMTP id m30-20020a056a20639e00b00133ee165677mr1028643pzg.59.1689353759643; Fri, 14 Jul 2023 09:55:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 09:55:59 -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 3/4] RISC-V: mm: Update pgtable comment documentation Date: Fri, 14 Jul 2023 09:54:51 -0700 Message-ID: <20230714165508.94561-4-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-Queue-Id: C677B40014 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: tmg5ua39whca6nczjm3afy4u667e9k71 X-HE-Tag: 1689353760-48664 X-HE-Meta: U2FsdGVkX1/ASd8Lbvw40SV3lpg2uDp8NJ+OBHwhCKCdhpDWXO/gM5dhJxZ17EyqQpichvB92Asy1HKNJs9smRdQU/4JL5gwTd+nzG0SFiD93ie2qiAmf3Ro0S4G3HC1hGpg56ERcMLofrDPFT4QbJCFCxtc832JkAt3X4FjS8+TFVvQb6cC+2IDHkX3qxy+ZsxBh+0q1Lk/wU63mxnmOlOJLtWX1Psuzr56AmrYtZVMF/4+bMI7Zmv1FaJZs65I3l9rAb6WXNDZ8yPzIsM/PyQsPMrlMmVSS3mNz15YjLOzL9yxS4oecHRRxR0HW0vaNa1GtaR1rX2jWoX1w4gGn+9ttVc94AMgAurp8jzKnCphD0F2i6rxPncEsHxpugRkfgCE6quWWah55RjmjZdjhc3FmqZL4qAUCUub+3oiQ0F7Q4d0hyauxYsp4gnae2UxBdR3PS/7RRll4Iwg0Ut8OFukrJLriGG7ysL+zcDObA09oscBdgMALSxNxJXaJpdEBgL8ju6Q412Gyli5jTZRWLr3EA5fAHNnh+qlJ7J+3RXxNedfZt7nRCXt3NpTKmT45Da0n14CPPpo2T6aMqYRo7lIdx5OC+x+/S9Z2//59hqSWSOK8BE1Z0YAN4M9tiKBn4qKwkbpRGk+PpMhqN/cVv6WedfmU4QWVmokP1xVQhW8g72LU1TXcegThdeecJjCwpPqTD+6iT5FiImPdpnBAXrvYW7vknMk7Q28HpCVt5vc4xvEPlsSXJ9Yg7ZSuiZFcxKPKw2T84EU83Ju1D7Kw1qet2WMaCUAMnFHy+opzM2jPcmmaI0TJFBfRP41V9DuKz0MA+0Vmmetpj3qLqwmCV6vatNB2ukFXPYWQmGG/DGMdo5qXNftnHkFYwB9ikTGB2zLBxb+RPhmmurOYrxo80ewel6xBoCXoD5lD800I9spwyH3CgXc0oOT9CCY58E4Ldw4knNgTd44HqJ7izN uEGlxmRP 7OWPW8K/bxBKAilPBOvj7g5MoBaFszhRSltnTrqTvzF5FaRtt03U8zzNGTELZ7KXA3G+vRvZUXJ42wkmSZcEz07487fdIidw/Q+77nAyYxbSpH65EqoSZhEtt0q+dUca1x+dwhnQ8JMyC5GeHf0cUjmRDUMtIgGw9/iM/+OcIshFoQ7nwG9Jf5+XJ4Qbi/63q9EDmynGgZB77BlVTPjwOxz/qkdB5KZ/VH6zcZSStwij9qT+KQQvHFMjbOw8uOfvUvaE8vfEyjdJ4dcN2ypnqHqwIiEMTGa7hM9aYETQd+G1PD2CNqFBfXWcEoJp67aCDZmOclKLdLduei8rZ/JuDjtdc0MWwPYVrfghSBqUy4nOuVlI4S/mzop/8KW5wtq8WNCA0CB8KFreylRYvFXSXuFvTG+vpl16bdSD0QuC1jCISejH4XzBN1H8YPly6fuqh4so4Z1yDvwosVSE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001334, 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 Reviewed-by: Alexandre Ghiti --- 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 16:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13313855 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 0858BC04A94 for ; Fri, 14 Jul 2023 16:56:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5832900018; Fri, 14 Jul 2023 12:56:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE2A1900006; Fri, 14 Jul 2023 12:56:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C33AC900018; Fri, 14 Jul 2023 12:56:04 -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 B489C900006 for ; Fri, 14 Jul 2023 12:56:04 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 43CD71C8230 for ; Fri, 14 Jul 2023 16:56:04 +0000 (UTC) X-FDA: 81010819848.06.CF12455 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf01.hostedemail.com (Postfix) with ESMTP id 5E6A04000C for ; Fri, 14 Jul 2023 16:56:02 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=ECP+dufn; spf=pass (imf01.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689353762; a=rsa-sha256; cv=none; b=SeXgm8v3p18bvfTlf7/CmmKeXpNtDOaAk4i/SiUmbOC0fXpQ0O3w9Ku4f/SOtU2ZZSmE27 f78saXcfMSugit/sd+QnrRbw+sBIlcNleX3tKOIGdWSKi86QVSudRZ1ookv8UGzRuFml9Z grpDX+VSIDX6H6dgyG0LIgWnX8haQeY= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=ECP+dufn; spf=pass (imf01.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.170 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=1689353762; 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=VxzMtdNlhIORTd9OFTDPQDrA0z7SLFaH2UXX5YEdUsGSbqoJCijVHOZj9pLYQ3Yj4SyM9Q CUUFduqCuP0YOuCXAluOuIHRSfCGlq+hLGDiSWmZBZ74C4E2OLAJK50MjefIaLuHwgmLfp HC9QTboin2iEVppoLkf0uQ70Sffc4a8= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b8b4748fe4so13102255ad.1 for ; Fri, 14 Jul 2023 09:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689353761; x=1689958561; 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=ECP+dufnQHsYRxuqgPOTnUSVvIo4ePBLAYzcr/uPu+86xHXRbq559fnQxM4loYgYii 9q/1Ih5sS/4Nz4IV5XKxNs5M7eNK2wNCyxQPv1SoVXWcMmwbEpzI74Jdn1u5Cczfadul jSHTTTzLM34mcqiVS7oXLHnW//LVLHHdygX3s6M81zVFp+Lmjk+KCS/Jt+2NFtsSEwsS hM2QAfrxJ4G7EMIqqaMGTDm7wAokuRc+ct0d85q54+SDh5Xc1EJl+Md33rZrNOHTixiq BSKIqdZJu/lQ2SebCzY5jdSZwDdpY3w9ELYszKlZ96Lgs1OHBPPpkiA+q8wz6OTq9PHQ LbBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689353761; x=1689958561; 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=i1zoANHyKnMbaLq3kWpVre+sLKv+Vo4maaZDtcqQqaCMvrBO6+nI0D/IC94zKENKEM wX9rg9j/EyuLuhTnEkaW/tPQy6bbzD9ma64bgCPzE1p5OfTDw6b/UOOCMG46Sl2YcHi2 A1qvBH9PLwbezg7VkauHhB/K03+DTum0XuBr1RXV5U4RJVMBPHRLfZjJnGii3EIr1Gb/ tvBGoUIiW88Vzj1JwotuMDsd35u/j1PR2lEryyaULfiOHoqVWWVcaiCe5ctZpqclfygs 7dbrv+GhJyGOPSP3PgQYijNK+ZMFR2mOBibtpXp+boCaYFxtN5SIJUP5HVEjUqmH46on AEzw== X-Gm-Message-State: ABy/qLbPF+QOSJu2xYM8kXkW5PFW4hyt8exmSvGGPFI/wV1rE7gMKiU0 UZaz5llMUqDt3BqgOGY9zshgFw== X-Google-Smtp-Source: APBJJlFsvoNdVZTC5wGAHNOb7OEsPFjJFgSI3IvikXJ3ahp3VMzgfUgYU2kfHESUML2FBAHGPHaiUA== X-Received: by 2002:a17:903:1248:b0:1b3:d11c:23ca with SMTP id u8-20020a170903124800b001b3d11c23camr4729934plh.8.1689353761143; Fri, 14 Jul 2023 09:56:01 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 09:56:00 -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 4/4] RISC-V: mm: Document mmap changes Date: Fri, 14 Jul 2023 09:54:52 -0700 Message-ID: <20230714165508.94561-5-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: 5E6A04000C X-Stat-Signature: 5hzgewtpjz68zb7eeot115gh7kz5w69k X-Rspam-User: X-HE-Tag: 1689353762-829096 X-HE-Meta: U2FsdGVkX18yuw7qoZMAUb12FgCpbt0SE75JnPUUgDB26DUd/35jbUPuklRuWFQthnIUOlBJZKov1QQdYmC3TDE4pWXtSD+uMsICNIpG2qXVbhE2U4YGxe9k9GlE4lV2RZkfvZi//EL7JBlMmBDREbn5csf/zo7ikVQcmPM4VnaRZXi+2VNgphWi5MvozE3DHFdEOtq/T1ai0lR4baalxjusTF/feqTUvCLexkojsJR0zKRJh5WAbRLYJ8MJOVGEf2qSpKnrmgYD6s5phNJKnYY2fGavV59kJixAkglnrHi5raTx6FYWKTTEblmyqXzZT5sVpX7wYf/+VAkuU0KU1YnzY5pQ9TgTecSRX49johGMFIsL2xKEsd9j/BLMaXl5CvNL9w6VbjWKGdDQoOUCflug8vGNsPSGlrEj/89odnfefnN0s4ruzsQktEkLuasG8tk4eg2e7ayfhuoirSfQ9l22HdVz9Mq3ydUWhLPZgaNZqnJ/PfAL7rsOeOBgSM28WSOGBey0VGrcNz2ikM74n18ljwSmKSHq6JH58/f539zQy4Ue+jsVd7qJDmz6pdeS7Q/zASc4rWtSW4OhjiK/dM2MqWxFQ04wueto4fJ0DtQndZMjQ02uQSkKnOUTDNgM3Vo4oSRURdJZYzCP1Ln91q3faC35TMLAtv62nEYdAjyNwKfDYwgg7ryv/z3P2k6fpk1flRovqHOOfMI1Yp9G1pCvvnZm7hHSuIU8Z3jx8bq8/2dXGzAY2kvOqHhXIfUd76xUc88VJLmQz6eyIqEJJH0jY4gTMsKp50Z0Shd8FESbtYo24sUf22GAMIXBL9UoIGmSzwSrd/+nFooXCZpgbXZuoCZLPx/tXUDeKNoXDgp9vN3iMX1c8PtfDDyuAMvPegET7WkTaN13yko2/YGJuZMuRSjNO5KmN7p6t2TZU8XJZ01+pqGWRBt2XZ46jeM2zSURnd1ZQ/2Vhjb6LMt tYNap4Jf l0GEzUgi0jZNTdkMfJN7skmFnwD41ub3gB33njZFPisCQE2IKqN5ZEUpyBibt6/FIhNqzhAPXckNf46EGsMmmuxew2NbXfVdnaxOzR1JxBUp0dBbfIGFvHQt/DcegU0DrcPb85bFwhCHBx0yLggKk6TSbp+YN4zJnomgy79O5KnBoxm7r09m223BBXwMOled+vXQIZUCXJ9jl/6oB7gLw64Dvd79CqJnEJGbT0LH+e6M1jqwwSgOoNqEmZYYY4GMV3C937+dC7Jn3ocOvGALJUk+oX2jgkvGkSmCLV+6VEKnzTDplwDAs0fjVXPNTW0les1MMXrUDJkQzSlrvaBdy4xhJkBMM5RVHDo3mnsiM70GQmHVxwasM83VBGkK2rczp4pYV2vOOo0L1jU0CEhx81OpJA6Dnim8cdiLTULiigq5NQxQKh56sicI3myiAbZ5PDGuG X-Bogosity: Ham, tests=bogofilter, spamicity=0.000373, 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.