From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 880DDEB64DD for ; Wed, 5 Jul 2023 19:01:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 250578D0003; Wed, 5 Jul 2023 15:01:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 200DB8D0001; Wed, 5 Jul 2023 15:01:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C8588D0003; Wed, 5 Jul 2023 15:01:27 -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 F2D938D0001 for ; Wed, 5 Jul 2023 15:01:26 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 694541C8D6C for ; Wed, 5 Jul 2023 19:01:26 +0000 (UTC) X-FDA: 80978476572.07.0A519BC Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf10.hostedemail.com (Postfix) with ESMTP id 815DFC007A for ; Wed, 5 Jul 2023 19:00:49 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Y2UVb5+n; dmarc=none; spf=pass (imf10.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.181 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=1688583650; 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=g+onSdyNmgQC+v4LtELg3zbx9wOUlyHN/0HEir9Iam0=; b=g9xmVoyBGX5NPFwPtb6RQtxe1xSoHuqo8GBaPqWiNNFCjkd7dN4GncQUpoLkVLb6VuJ3IU JUIieaDIZRixmDXsVCmuXjMBDz4gUrKoDwHHs7v32dfEr7Vk2OLwCO3GRHhh/KthFJG3gX WKADbUWDLAqjrw84mHfj4MFSsvSz7F0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Y2UVb5+n; dmarc=none; spf=pass (imf10.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688583650; a=rsa-sha256; cv=none; b=jJz2Ws7kNMnPPLeQZtKrR/i+0ty1Ur92n4EPAvuW62O+yFKsGmQGqAY7eqeLup3wA89M26 8P9v1xUm/iPGX6sc/laII1YZH9utr7D0YPT0/U4E1gESejffKyFZ8pPKzDzZSi2N8Ay9Sv EgQneWuDU4cDJTFpVsxR63mAs8r+Drc= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b89600a37fso18049745ad.2 for ; Wed, 05 Jul 2023 12:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1688583649; x=1691175649; 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=g+onSdyNmgQC+v4LtELg3zbx9wOUlyHN/0HEir9Iam0=; b=Y2UVb5+n9XRR+3Qq+CzcNMWOhXvD18mK2k+/9FQVcwi+CZNvw8dSktJcdIqkkQhWBz 3zCfSNrUI2dXImVan1dOdJzxCaKrjKuP6YseAHcIRK2IMSusV0xmDHvT4eWJLFCJpUPe EEwaxMH8ldyqnpxbfxAc8KMPKWeReQeo3uZZf3D4ugrEpm2eb/WhJ8JKZpBULxz7q9mz 47SjNQUOtvRlTIYpk1p8bVBaY7ORfHXUb2uRlJuY/sMOzQgjjAC4vxoAsyGxtsCRMNTk nmvGc3uZTMpLbXLByrXTOCsAMiMQCUXWpIWLiwu0Ijw56ixdlXpDHCdLUniWHU08X7GH tF9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688583649; x=1691175649; 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=g+onSdyNmgQC+v4LtELg3zbx9wOUlyHN/0HEir9Iam0=; b=eqkBeGtdYT+aw1ObdaMCW0cQivOKgojt9iN6KoksY7FhRQ+EvHWI9E2gbRzCriVZUF xFZp9tQR5jkN4EuXLbdFVFPa0jY/mAih0C00BHrNe9yQGl+Vf43tKJMl+4R7A/EGQ2pf iFAlcotEAH2o4QC7Vv1Y7LOaUVZXeCCLmtrdvIXa8C+z/vxwM2BBUE6CxEQwGOJ84RYS r+fUXld/BSmI5cqS3Nf60t9DVv47WyC0PE0T6Eu6b9fB3bdMxnkE/PsRjalumDkfg+mw zsYsoUr+mFL4AW6sfTkoxwctWemH6aMie9RcD8FRz0xHvWr9VB909dseqRh4LCi2dziL cQjg== X-Gm-Message-State: ABy/qLYsOczuO4VJtXEy6n/6CCD6DlH+C5WU2udJavFkVKlUA2tstM9P b+yXFJ1U1bdbn4cEIvO/KDdMnA== X-Google-Smtp-Source: APBJJlFuOAgD7LWzqReAn1zCfjvErX2vpmWIfSjZRVsTHzYVsI0f3AkL2dL1V202eSOEBemPUdWm7A== X-Received: by 2002:a17:902:ce86:b0:1b8:6deb:dd6d with SMTP id f6-20020a170902ce8600b001b86debdd6dmr15157321plg.0.1688583648578; Wed, 05 Jul 2023 12:00:48 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id d7-20020a170902aa8700b001b0358848b0sm19323359plr.161.2023.07.05.12.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 12:00:48 -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 Subject: [RESEND PATCH v3 2/2] RISC-V: mm: Update documentation and include test Date: Wed, 5 Jul 2023 11:59:42 -0700 Message-ID: <20230705190002.384799-3-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705190002.384799-1-charlie@rivosinc.com> References: <20230705190002.384799-1-charlie@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 815DFC007A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ruum6zqjt4gw7qs3x9tif5yedqyxn9m1 X-HE-Tag: 1688583649-195529 X-HE-Meta: U2FsdGVkX1/UQu2/t5ciixlJBl1+Hy9X8IVflVvZLXZEmdmjHoswMVkoXV8B3NiJ8G13yG4z+QNBQ4zusibAEqEnb4Tl6uNKLkl3g0pJxRBj7MCiWGV9KzouG24LjF+gD41JyZYimbzXhv21gWWeEVsZ+vb7HOFzXXO3LVK1Rffdedhdd/INigZN6ZXVxdmIqXoGkuJu25YAfskTkTIel9GcN95HecOp/jD0XLdjDu4se4oCCy61dTfnjCfHtYvWhsDBIO79wCFG9QrmFb+UZgqaJXX05ve+j7mPu12vGJynOkSSqJaKFq4FpQnb+5O/wFqjiDjc9A6onMsi+TtqitSzX3zz+zhu7y1aDwlCewriBVBj0mUUpqT815C+wxAO3x11hfpfIoy4lYCu+2+pGooCf2WFaOTq5W4ZPeC8EdxHLPKmBb7m2NbBjCaPX0qittPdc7PaVQ+tUB2burTzbClacXzhv1ILuJ3PWhMyGwVqBd7lcojfzdNs1y5hx/rs6IIb7Qe68I8aYrYXJcKPqf5Pfihl5mV5i4F12iPoSAOrFThVTh3C7joIAj/UN8DxJRztDP+90LvGFNxYk908DyVo9HUVRBbn/ZOh3ADyVOt4j3lll4RQVdwg/HpzLxtj97uIxgWvVZRTcm0DM+jmEPtY2zf0ZlbLQT3tKyq62PzPC9EPO1ClS6KF8gu5I7ny7oU+tnyCdeKcYNPS3SSkQpP5vC+gllllg+j8CG6LrOguiI4+evqylmrrrwD+wdcgpXW2cXf+4ixS39En6GPuX+A2mORUnRqckrQrA0IJ/a9qF1sYjJO8xXEAipu0gmWr13ePD9vKfXI2mHwry49pPFwj6LKuIedC8ER5gtM+s8OOxeiiZJpPk52gPGNwnsfc0LrFHNzeuCkbcyQ07j4WM6J1NG+MTrnoCAjok+pds4S08v8j4gWSC2k7dBFBiIY+PlI9DIHo16ch7/LUOk4 xmDMMBLa Nbp+l8+jEXfMdEMDdGOwIxcUnQz9/Oq+/pjfjCUJDjjtaLLOXCYt+f0Vb5xpOjA1QFDQXFCwsPW1GK60RcM815al2lSvll5Owel6YfGGIqsUNFUxBecgN3CME6fuN2C1wmRRhWSEttqypPKyAqUSDH9/68yktjgDY5vlQpbXBy0IzaILWkjknKY62U1aunFwZzuCIB/nOMG8f+39wvQfs96vH1wkoM8nf3OaouM3k0G3ZItW4oirI2S8kmbi4PV0K4wos3+GDo0d76FNPX8tV8JoENLGqHXgfRT7jJDxcy3Z3hetvK5dtOjzrucKhZ7v6D30ToIhxnFRAeLzsKDJUmhrlJ7MPAeKo57Jzc3CI7+LZT+x9XcM1zWm/N39UwELm/bREuOjGk29/nbGvPgGivc6MOFWe5z4FRbgeRgTIY9Ws9/OOacKqD68fTuq8GSjDiNLw4NdaQdj2KYU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000140, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add documentation explaining the behavior of mmap. Include a simple test that ensures that mmap returns an address less than the hint address while there are still addresses available. Signed-off-by: Charlie Jenkins --- Documentation/riscv/vm-layout.rst | 22 +++++++++ arch/riscv/include/asm/pgtable.h | 8 +-- 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 | 49 +++++++++++++++++++ 6 files changed, 99 insertions(+), 4 deletions(-) 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/Documentation/riscv/vm-layout.rst b/Documentation/riscv/vm-layout.rst index 5462c84f4723..a610c68c9f3f 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 39-bits, the kernel will, by default, return virtual +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. + +Software can "opt-in" to receiving VAs from other 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` with the addresses beyond this and up to :code:`1 << 39` +being 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. diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 752e210c7547..5ac973193fab 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -841,14 +841,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) 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..022ea0a3f7df --- /dev/null +++ b/tools/testing/selftests/riscv/mm/.gitignore @@ -0,0 +1 @@ +mmap \ No newline at end of file diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile new file mode 100644 index 000000000000..d41a0b3d2ca2 --- /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)/ \ No newline at end of file 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..781576f4c14b --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap.c @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include "../../kselftest_harness.h" + +TEST(sv57_test) +{ + // Only works on 64 bit + #if __riscv_xlen == 64 + // 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; + + int *no_hint = mmap(NULL, 5*sizeof(int), prot, flags, 0, 0); + int *on_37_addr = mmap(on_37_bits, 5*sizeof(int), prot, flags, 0, 0); + int *on_38_addr = mmap(on_38_bits, 5*sizeof(int), prot, flags, 0, 0); + int *on_46_addr = mmap(on_46_bits, 5*sizeof(int), prot, flags, 0, 0); + int *on_47_addr = mmap(on_47_bits, 5*sizeof(int), prot, flags, 0, 0); + int *on_55_addr = mmap(on_55_bits, 5*sizeof(int), prot, flags, 0, 0); + int *on_56_addr = mmap(on_56_bits, 5*sizeof(int), prot, flags, 0, 0); + + EXPECT_NE(no_hint, MAP_FAILED); + EXPECT_NE(on_37_addr, MAP_FAILED); + EXPECT_NE(on_38_addr, MAP_FAILED); + EXPECT_NE(on_46_addr, MAP_FAILED); + EXPECT_NE(on_47_addr, MAP_FAILED); + EXPECT_NE(on_55_addr, MAP_FAILED); + EXPECT_NE(on_56_addr, MAP_FAILED); + + EXPECT_LT((unsigned long) no_hint, 1UL << 47); + EXPECT_LT((unsigned long) on_37_addr, 1UL << 38); + EXPECT_LT((unsigned long) on_38_addr, 1UL << 38); + EXPECT_LT((unsigned long) on_46_addr, 1UL << 38); + EXPECT_LT((unsigned long) on_47_addr, 1UL << 47); + EXPECT_LT((unsigned long) on_55_addr, 1UL << 47); + EXPECT_LT((unsigned long) on_56_addr, 1UL << 57); + #else + #endif +} + +TEST_HARNESS_MAIN -- 2.41.0