From patchwork Wed Aug 9 23:22: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: 13348627 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 81A25C04FE0 for ; Wed, 9 Aug 2023 23:24:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0207D6B0074; Wed, 9 Aug 2023 19:24:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EEBAB8E0001; Wed, 9 Aug 2023 19:24:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3D806B0078; Wed, 9 Aug 2023 19:24:25 -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 C42996B0074 for ; Wed, 9 Aug 2023 19:24:25 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 987DC801CB for ; Wed, 9 Aug 2023 23:24:25 +0000 (UTC) X-FDA: 81106147290.15.5D09E52 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf22.hostedemail.com (Postfix) with ESMTP id C257BC0027 for ; Wed, 9 Aug 2023 23:24:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=2+bjYsQu; spf=pass (imf22.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.177 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=1691623463; 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=BmBbsdQ/RomBbwS1vxZnTkZx2Et0MhurExBgxgdCP1I=; b=vrFR6VhY8oXjhZfbIz7X0/gnULoucj0SGXnYbgKT+rKGzdf1X2a3SBUGo7jg/IyhePkSEz NDkCTlb0AfUY1O+M/jZN/iBcQzdBPr4tDlUmDJKdZ+wXPLlXqd9v7OPP/oPZGEioU4nXK4 FYG6C8I/u9ht5Rvhg17Gxo9purH4NS0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691623463; a=rsa-sha256; cv=none; b=paH2Xor7R0yZmz0NA5FTTLq/pdjaXT0kM35djbdom8Gpw81+XRzgRbqNUPergkc0rV3OOE iUpw+v+/ZitMor+bdOefjrO5zWvNcflFLxHIB0clfLHsKnyW4AgxrLb5dOe6ro6YpwpNAU ylHcd/EmWa2myv1HMc81KC+WzkxOh9Y= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=2+bjYsQu; spf=pass (imf22.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1bc6bfc4b58so3381985ad.1 for ; Wed, 09 Aug 2023 16:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1691623463; x=1692228263; 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=BmBbsdQ/RomBbwS1vxZnTkZx2Et0MhurExBgxgdCP1I=; b=2+bjYsQuCuir4dXzfsoxd+f2uLvMo+55BujM3RV74p9qc01puICn3suYXl9PdG27HR 6MlZXk8AAnRoaiKJL13ccMX1uf4QKbGt8Hh/bNm1YesgqMS51G0b/8fzdP9eA6NrA/1l rFgvFkJHzxu987W8DljvJYRi+n62AtZKjSJtheuMQvxpOPwMUgtQG8AF8UHYaoGKbmNX HUgJPK3bCetz7V1Yo7dT3SuJINERzhRHFq5fuSJUqF49V90xFMKgXrCbZNMkE42mVKF0 h+9/V8lzU/iPyiDJ2uY3OxrgT6eQp95NvTdYAGOmf4wohaiXftvKIMkcBpUDdiaSQh8P rrVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691623463; x=1692228263; 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=BmBbsdQ/RomBbwS1vxZnTkZx2Et0MhurExBgxgdCP1I=; b=NLf1lDi/bsccfIZsUsiWw5lAEFM1tkJhpRqbapUk8k20lKWVOPXzTq/FeYWMrMeVMn XXdSQb78HSJmCuTkw6i7i/+ovudjjkVA7Z7UtgJRQ5enm98yF5jRTIUHx/f6tflgHkF/ VD6XI9QgNzfj1x9bm0fECbj35V6Nh/P2/lkMUrGSrFSipN8QHIJuxNKW0D9+bSdqNLfq +Fblweq9awIENASDE+SchO0yAmHdLkCm9XSsl0flhG3K1o3UXyVkfqrotrs/IiXXQr/0 wzMaC8o19Gdu7791jS+AZ93eF2/qH+wCE1HW04M7rkvM/Dvs940KSjgwDrQ3STRi5XeU OCfw== X-Gm-Message-State: AOJu0Yyym9coOqYFWbv4z3Udq0+YpQmZ46ILJJxBK8R4wwYDGClHTLXY WD27+1g3S4Jy3ZCLXM+s8ky6lA== X-Google-Smtp-Source: AGHT+IEvMNXMKRDHFqB7btAA63/lSftDQmnwUngeNUblgGgKLK4eUIYFOblXSJ04gi6spIkTx3aMKQ== X-Received: by 2002:a17:902:db06:b0:1bc:506a:58f2 with SMTP id m6-20020a170902db0600b001bc506a58f2mr632035plx.46.1691623462666; Wed, 09 Aug 2023 16:24:22 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id l18-20020a170902d35200b001b54d064a4bsm82765plk.259.2023.08.09.16.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 16:24:22 -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 v10 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Wed, 9 Aug 2023 16:22:01 -0700 Message-ID: <20230809232218.849726-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809232218.849726-1-charlie@rivosinc.com> References: <20230809232218.849726-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C257BC0027 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: gqiw1un6b9z5nwumhqp3qq44bw8soghj X-HE-Tag: 1691623463-25827 X-HE-Meta: U2FsdGVkX1/E+PHKG76GEvZU4j58h6ngDxSv/i1ytGRo68qZBs6BIzBwn3W9jYsRw2JGej2CnXfVTX017dO6BF2JhsedExGOpnDf1h8nI2sUUSI1hdgOz5JfUF8mmtsbO3i4qkw1puXRR9njTVhbhG3/bXQPOwXeSlBbZIVloVIR7WWTQkc1fewsTX0+E6OvYCHTE90wCEX4Ng38EJwlTd5uK7BVzYp+muhdMUHFpss+QYS8+jQ/MFnsPPhl8ZsrbZUF1WUukQ8QPNHVWcKDkWcub9KR2wjhvJkBhj76O6b8faHP+XR+64p37CLR84/DtuphDc1okm8A7uFwNN76bywb70hLYAg8s0nFsmNItKc7wRDpHflnVkK3aC6F/Y24175sCEv02s3FnUaeQCvJJoG9EsxdFH9HHqIFiXkWyK50cBYpB4ov+o6bzWUlmMv8y+Cq1AM0lZn7QJgfCkP0VB4+PcacwH9tOmbL4pJj+EZxuSIrR+U03Td6074uor5L3IsERL+uygNZZj7HJ7vQs3almFKSN33h8U2g9FPXHM+WdbOZEQPa1IOqygGi4DEcdHNbgfzuEuefuz9NPRKoUI96D3CnL6tL1qAQqxyQ4x59tkMDPneS2eV027O9W+WTKFU4SBWAYkM7TXtic+90jlRosjagzPZJHbKUYQeXuu72FTI1iv800Y7AEnytLFY6ZrnIipQUPIecf1EHb3EjLlx3JW93sI1DoEisVlW0Xrn3Ic/cUsWbWwBo2q3IBH9UjIf29rklH5SARGPVjGRLAD1b8lZLWIEN6CpXBFbER9+DUJN3/vb6nfBArR7nqw9+CHZH96ACg1MtG7xUljAHOVvnCmcQSzYGlBufmZqzU+pcG7viw1TNiugHnYzRgZLGeH2+zd8Zn0nEGT+3Atl5EvbWC6ca7eHY+1B4FK99FocNvBzQXk1hJv8gfOmDuI/wVhuc2BcglefvXpkcRzq Q/eIio8s GHDFSOTtSvW1jR3h8gHv7x1EuxlNcCbtJmgmKCzMy/5CoY0mdfC/tyqrSnJiS0B+/pJaoi51nb5b/Y0iLF6mjmIAv8DKM5Yl0d4Amq/PlPzRM033cDe27nyM9sEgbRVZ14j/aXijBpXgyhpkqIJmMuBimUi1aZy3kHH9RHSFHLioWR9iULcRlV1yb8O++YQZAtdNmVA/pObgW3VzabEiaBqCZzxhf2DOyW/oTsf91xZ8QXuJiLZNB5S/bzT5R68AaJmKmX/UiPkAqWBxyj3+/fVJ0govIsaDCPRoynw3UIjaQElaLsjLDUWxzjQ7FCSmv3oYXw7soJHuaFK7dV4w+raXSn411Ud7DuOmE2x4Vx0JaonioyM69a+3M7n1NWLcNlAMFv7KgqPX2UBYpc2FEfXx9rbuGtWHKeWUArtbskNyhTkRDXHfaXBAmIyRV/rFBvtih 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 | 25 ++++++++++++-- arch/riscv/include/asm/processor.h | 52 ++++++++++++++++++++++++++---- 3 files changed, 70 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..bb0b9ac7b581 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -62,11 +62,16 @@ * struct pages to map half the virtual address space. Then * position vmemmap directly below the VMALLOC region. */ +#define VA_BITS_SV32 32 #ifdef CONFIG_64BIT +#define VA_BITS_SV39 39 +#define VA_BITS_SV48 48 +#define VA_BITS_SV57 57 + #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 +#define VA_BITS VA_BITS_SV32 #endif #define VMEMMAP_SHIFT \ @@ -111,11 +116,27 @@ #include #include #include +#include #define __page_val_to_pfn(_val) (((_val) & _PAGE_PFN_MASK) >> _PAGE_PFN_SHIFT) #ifdef CONFIG_64BIT #include + +#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)) + +#ifdef CONFIG_COMPAT +#define MMAP_VA_BITS_64 ((VA_BITS >= VA_BITS_SV48) ? VA_BITS_SV48 : VA_BITS) +#define MMAP_MIN_VA_BITS_64 (VA_BITS_SV39) +#define MMAP_VA_BITS (is_compat_task() ? VA_BITS_SV32 : MMAP_VA_BITS_64) +#define MMAP_MIN_VA_BITS (is_compat_task() ? VA_BITS_SV32 : MMAP_MIN_VA_BITS_64) +#else +#define MMAP_VA_BITS ((VA_BITS >= VA_BITS_SV48) ? VA_BITS_SV48 : VA_BITS) +#define MMAP_MIN_VA_BITS (VA_BITS_SV39) +#endif /* CONFIG_COMPAT */ + #else #include #endif /* CONFIG_64BIT */ diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index c950a8d9edef..3e23e1786d05 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,19 +13,59 @@ #include +#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; \ + typeof(addr) _addr = (addr); \ + if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ + mmap_end = STACK_TOP_MAX; \ + else 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 \ + mmap_end = VA_USER_SV39; \ + mmap_end; \ +}) + +#define arch_get_mmap_base(addr, base) \ +({ \ + unsigned long mmap_base; \ + typeof(addr) _addr = (addr); \ + typeof(base) _base = (base); \ + unsigned long rnd_gap = DEFAULT_MAP_WINDOW - (_base); \ + if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ + mmap_base = (_base); \ + else if (((_addr) >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) \ + mmap_base = VA_USER_SV57 - rnd_gap; \ + else if ((((_addr) >= VA_USER_SV48)) && (VA_BITS >= VA_BITS_SV48)) \ + mmap_base = VA_USER_SV48 - rnd_gap; \ + else \ + mmap_base = VA_USER_SV39 - rnd_gap; \ + 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(TASK_SIZE / 3) - -#define STACK_TOP TASK_SIZE #ifdef CONFIG_64BIT -#define STACK_TOP_MAX TASK_SIZE_64 +#define TASK_UNMAPPED_BASE PAGE_ALIGN((UL(1) << MMAP_MIN_VA_BITS) / 3) #else -#define STACK_TOP_MAX TASK_SIZE +#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3) #endif -#define STACK_ALIGN 16 #ifndef __ASSEMBLY__ From patchwork Wed Aug 9 23:22:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13348628 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 4F566C04FE1 for ; Wed, 9 Aug 2023 23:24:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D197D6B0075; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCA038E0002; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B42A78E0001; Wed, 9 Aug 2023 19:24:27 -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 A71D26B0075 for ; Wed, 9 Aug 2023 19:24:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 74E821A0713 for ; Wed, 9 Aug 2023 23:24:27 +0000 (UTC) X-FDA: 81106147374.03.AAC2F30 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf28.hostedemail.com (Postfix) with ESMTP id 5D613C0005 for ; Wed, 9 Aug 2023 23:24:25 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=gm83jILU; spf=pass (imf28.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=1691623465; a=rsa-sha256; cv=none; b=gtCFJtAZiRiLjMGccXbne4hhO/yWzkJ9WLsW/qXIEB+PelVVO9+WCxklIJkNILYnL9pGrd /sLimbPFetQkbyoTGCRD4SSp7QlkIpGBEX3EuGBqQ78kDd2GIuMqU/bvYIsIziQGl22Ffw aTTtDj+ETSldF6RuR8vknTuky8fV25M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=gm83jILU; spf=pass (imf28.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=1691623465; 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=IqoPeA6wKcuCb1RtSAVao8nNOFMZCDDFQoFYxZEN+6o=; b=ewQ1q6VdEKZiXUCeBLGQQ9db88AxPD9tXk4/0I4kcrOb30ETTGXZWhQGNVtDWCpy7Cq0bq LnOTjYAhCit5VP90t47cPKwF6/c4idFMAgnwn2ssWVRsJ3e4t0dYqx1ub/ZcJFk8QnpXw/ 0vn9MxGTjFQmm5OF9mo1W8sCEM29tEU= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1bbc06f830aso2664775ad.0 for ; Wed, 09 Aug 2023 16:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1691623464; x=1692228264; 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=IqoPeA6wKcuCb1RtSAVao8nNOFMZCDDFQoFYxZEN+6o=; b=gm83jILUNh6/zUoHxIyJIwVa+3RhunqO72lQbd7nCP8mXnRB6+Q8xAJWnBgKIxVv/Z xK5JgJo0QvTKYA7DYV/AHIrOZ1B5IbILi3JVN3JmDwfaP2D6wMjQlPAjGIWqhmKCPxHi PxK3A+wH/hdiwJiOuTAivkS+xdvLEkANWyAJRr66/sAkUjh3MLlNgn0m5W0nG7o6OBjQ luhey6ythegI/26xUwHqziHB5B2ze0H/YpU4ElAtp4496rPsdLsI1CozqbhwHtNFSo8O P3p726zTROCmGKUUDst8emxPfWRQsLv5dRQ8HWgZZFM2zUtJ0TmIcnWUOoOKiXjhnXHV rYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691623464; x=1692228264; 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=IqoPeA6wKcuCb1RtSAVao8nNOFMZCDDFQoFYxZEN+6o=; b=UFnLc3+AEBktCUBBZQC4vCK4KUHCsvJtcgwhzbcVdMFMGw2Gsp0KuxJo0YH4eC4OT/ vEGxzIbROQcvKTTor8YYhrnIkr3Q6kJzeAmslElHE5xZZP26I59EJlTfLiZJeV8urtJF Y28HsNtvnkCWckmJhuFk+uYEAxlPr2ncNdNexAFcRtmP2vARUH0Jbth8DVMOK1ZgmLMP MYaXyzm/+Bj7ss2K8TzYFVzruElqnVEYHjuuA7rCaQcoDF0AJTe6vkueCimkL/15H+QJ vhX11X6N6czDnQ8htPjcDv7TcdS6EANiRiFpLhhyqZRVD0f5szRCn2ojXFUBMyqjPLcn oSrA== X-Gm-Message-State: AOJu0YytvctL6mzLVLFB7FLjJVS2k/1QJMvD0bA1Ne3UWG3svLHWQBWa bYVCjBY8b2kcOqhfii8OHZzbCA9d5MCQe550a3E= X-Google-Smtp-Source: AGHT+IHcvB5aZ1/jH0xEHaj38dn4RpyZuSnSm8co06xmNZJ+mCf4bPmLMzzwfzqyOgM8RXZLwQ3GHw== X-Received: by 2002:a17:902:c101:b0:1b6:9954:2030 with SMTP id 1-20020a170902c10100b001b699542030mr458836pli.8.1691623464252; Wed, 09 Aug 2023 16:24:24 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id l18-20020a170902d35200b001b54d064a4bsm82765plk.259.2023.08.09.16.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 16:24:23 -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 v10 2/4] RISC-V: mm: Add tests for RISC-V mm Date: Wed, 9 Aug 2023 16:22:02 -0700 Message-ID: <20230809232218.849726-3-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809232218.849726-1-charlie@rivosinc.com> References: <20230809232218.849726-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5D613C0005 X-Stat-Signature: 8eawrh6qh4x6bwt4tonw6cubfdqyxbci X-Rspam-User: X-HE-Tag: 1691623465-789341 X-HE-Meta: U2FsdGVkX1/TGlM/v5n3wpHsa3aYWBxWX9Fy5KjxBE1SuBc80MgKBwA+d1pCTImKL8ylosM8T6UVOwdMAnJIKOZSSnQnin1oYIMKlrahdLh7226mFKLD6RSE2oDeWBngzIo6TAJPBZbNoaKVIl91wYDrFjDc7+PFKBCf+bpD09T9DCReDT76bAWmtVCep1ePxNnturKI4bvNiD020owUabRvtVeq9/K5GDktxzDLxsTsOBK/MAR0lO8laAQ7ZhBbx4YhFp7ixhcMCiB8wx94t4QU0O8ozq3pDlc7jKnbJyMxILEX6KID/SQiIC1P6BkhZjoQc/DZyzcmPqVldGdqUXZT5LcRHHuw3clS9oJvHU7UIhGFSDMIYFjkGnWNzPT8lxJ+exKPD5Osr8Nek9RmdEdM3D1MK+HTtSMITczLO76Z1fLZdlFuAZdb6MQE+RA3rwOtiGG3F1iW3+7SyCIHdZCr36cNVVrOhUtrN7BctfooPmylgnb8PZRtaonBhh48HVChcdRfA5vj52voKi5t38/PIMb2bZBosf+eeksbohnPwyvyT9jO7z1FxfwWjQjKCUOhq3hoVjxtebF6ZgYgsioGHLQTO6AVEBd5LRNzI14JN0ReY8dG8D/mKjHIvmbI0BJMo+mXBb5TgAVA5oWwaSE+IryIWbuXxcrkkWCISm6P6G5jeSPb9KwtUVZUlavqdVSh5hg+TfIgM8grCFiQBPTdL/gfqvJlCkxrK43Uxrx0MCh1sMAU3zgkgCunStC/BYWD9kcD4XUhqb1GOU+PaVzfLl8T2EvbSRGIt2idUA2xbgYFEd5BCyNCGGd8avaNyBSHUJYeXMnx6YgZAUcA0Ou7mJbNsDEVwjvQ18gRbGyP3sIpzG37fyv8slgwaSePMQrtWTzFiaJwZLLP7N9sc23wE6h6ruOtKhf4gFNYdlbaKQMZV1lrbypX6YT+3q69xwG5H+PAwpU4GHLJrmk DavdTiZw LBDe9Ps3FM25kyRNeLzEh9KPLA4x3DvzH3r/j0nn5PomAf8jyNlPaV6FHll0S+K/v8lrUHECS5Lx74G98mmlAZaOni5qXnJpMHLY6p0A3jCF4ZxXt4jBLSbX4qMVrD+KEt5Wmp/uDwMO4hwp9pQbhwp8tEqu/ilGiiatIaDhcfQBAQbHskz9nK2N9aaJqqZppEMJzfmGu6eNQHyQDTiY7SNGxRTP8uzm/8gENfy3EqeQ5BxFZmoPz25lsIiJ1MAXBtgZ10KQ02hc7lAzEJzr+dv2axTE2gc37tw6L+EFtYTu607TUTLrh14Z0/Z4FeE/9171Zsf2iHz4Sr8ByqViYID/DC5GpnMfDs575azAHK/AVpzLYyj55dmbQxv0h4j5Ofi6LyQS7M9f5Uq2plXT6OJgbvF9g41oRkbxZB3htw7+rAxWlrU99cKG+G6YyfQRrduXM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000299, 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. These tests are split into two files: mmap_default.c and mmap_bottomup.c because a new process must be exec'd in order to change the mmap layout. The run_mmap.sh script sets the stack to be unlimited for the mmap_bottomup.c test which triggers a bottomup layout. Signed-off-by: Charlie Jenkins --- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/riscv/mm/.gitignore | 2 + tools/testing/selftests/riscv/mm/Makefile | 15 +++++ .../riscv/mm/testcases/mmap_bottomup.c | 35 ++++++++++ .../riscv/mm/testcases/mmap_default.c | 35 ++++++++++ .../selftests/riscv/mm/testcases/mmap_test.h | 64 +++++++++++++++++++ .../selftests/riscv/mm/testcases/run_mmap.sh | 12 ++++ 7 files changed, 164 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_bottomup.c create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_default.c create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_test.h create mode 100755 tools/testing/selftests/riscv/mm/testcases/run_mmap.sh diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile index f4b3d5c9af5b..4a9ff515a3a0 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..5c2c57cb950c --- /dev/null +++ b/tools/testing/selftests/riscv/mm/.gitignore @@ -0,0 +1,2 @@ +mmap_bottomup +mmap_default diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile new file mode 100644 index 000000000000..11e0f0568923 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/Makefile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2021 ARM Limited +# Originally tools/testing/arm64/abi/Makefile + +# Additional include paths needed by kselftest.h and local headers +CFLAGS += -D_GNU_SOURCE -std=gnu99 -I. + +TEST_GEN_FILES := testcases/mmap_default testcases/mmap_bottomup + +TEST_PROGS := testcases/run_mmap.sh + +include ../../lib.mk + +$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h + $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c new file mode 100644 index 000000000000..b29379f7e478 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include + +#include "../../kselftest_harness.h" + +TEST(infinite_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + + EXPECT_EQ(BOTTOM_UP, memory_layout()); + + do_mmaps(&mmap_addresses); + + EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr); + + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr); + EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr); +#endif +} + +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c new file mode 100644 index 000000000000..d1accb91b726 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include + +#include "../../kselftest_harness.h" + +TEST(default_rlimit) +{ +// Only works on 64 bit +#if __riscv_xlen == 64 + struct addresses mmap_addresses; + + EXPECT_EQ(TOP_DOWN, memory_layout()); + + do_mmaps(&mmap_addresses); + + EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr); + EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr); + + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr); + EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr); + EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr); + EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr); +#endif +} + +TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h new file mode 100644 index 000000000000..9b8434f62f57 --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _TESTCASES_MMAP_TEST_H +#define _TESTCASES_MMAP_TEST_H +#include +#include +#include + +#define TOP_DOWN 0 +#define BOTTOM_UP 1 + +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; +}; + +static inline 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); +} + +static inline int memory_layout(void) +{ + int prot = PROT_READ | PROT_WRITE; + int flags = MAP_PRIVATE | MAP_ANONYMOUS; + + void *value1 = mmap(NULL, sizeof(int), prot, flags, 0, 0); + void *value2 = mmap(NULL, sizeof(int), prot, flags, 0, 0); + + return value2 > value1; +} +#endif /* _TESTCASES_MMAP_TEST_H */ diff --git a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh new file mode 100755 index 000000000000..ca5ad7c48bad --- /dev/null +++ b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +original_stack_limit=$(ulimit -s) + +./mmap_default + +# Force mmap_bottomup to be ran with bottomup memory due to +# the unlimited stack +ulimit -s unlimited +./mmap_bottomup +ulimit -s $original_stack_limit From patchwork Wed Aug 9 23:22:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13348629 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 6FB24C001DE for ; Wed, 9 Aug 2023 23:24:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 182406B0078; Wed, 9 Aug 2023 19:24:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10B528E0002; Wed, 9 Aug 2023 19:24:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4F7F8E0001; Wed, 9 Aug 2023 19:24:28 -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 D58F86B0078 for ; Wed, 9 Aug 2023 19:24:28 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A79781403F9 for ; Wed, 9 Aug 2023 23:24:28 +0000 (UTC) X-FDA: 81106147416.19.EA28CFA Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf15.hostedemail.com (Postfix) with ESMTP id CCEF6A000D for ; Wed, 9 Aug 2023 23:24:26 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=DPqz69bv; dmarc=none; spf=pass (imf15.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.176 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=1691623466; 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=yZ0IVnzj5yL9SoUKLkLsC9JEkQ8y1OJuZ3kbIa3etj8=; b=LdBv6RAKmRZobccF59BQ2lMj/JPSR2jt1ySrmFArh4tBn0mvCEkuhJrjW2lwmbX1mRzowq jSFhIh72J+PqdQyFGUUBnmdU6uIeFTXKi+vyABqGtxN7Asl++7Kh6LpuW8U2OJlhhFtxwA csjRDPj5XXKnPd//TpC16L/mFKh9ANk= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=DPqz69bv; dmarc=none; spf=pass (imf15.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691623466; a=rsa-sha256; cv=none; b=MhNajEMtk6UPqfv7c5h8RSmqbNgilQY728egPE2BfqcPRa3/Xhi3n8tP43xg4YzmyYEUww E43fwLlzPbB4Ynnb7HkAM6C5Cr3irzjWBmceUX749TwYdzHfnQctRGVAc0aIrJAT3AnAAN udJe1rlG9UWb1WjyO4iBt+TFmjRaYBE= Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-563e21a6011so309750a12.0 for ; Wed, 09 Aug 2023 16:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1691623465; x=1692228265; 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=yZ0IVnzj5yL9SoUKLkLsC9JEkQ8y1OJuZ3kbIa3etj8=; b=DPqz69bvmOi0drz5sANCyS+ejDOE4tK2aPT6CgqMeO23pKOSYzYTRtQqX2sUrjiJmC RrSZUkbRkQCVs7wzIENC1wePmX11ZnFj1kEpsCllQfjH8OdDSh+ynaBkruLDhKbxi/y7 hNKWT+H9FuM6BoaCv58BuAIhRmwJFzvP7uVm9tr4dtvvEe/YDApQvNm32rOzdMYd7vlm L6nJ3tcaqJbaF9pxp0H0xccKqzMXdCN5FaL8hF9CFS4XTf6Avl0vGc+i3JB23oEo+UYb B70BdpKfpKDQSAPKlmFJOXdwGmfAe0rv+GpuSvzqq6Fu2b/L19mwtUPiLUPiPFcaAgxf UibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691623465; x=1692228265; 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=yZ0IVnzj5yL9SoUKLkLsC9JEkQ8y1OJuZ3kbIa3etj8=; b=ebKhLSCW1dGzO0ShmZOg1yuP/+D+/WPUwOiRpbrcFBp30EiZdf861LV4Ds+V+60jlp RQHxtfo5VqWljWT9xqidNUVEIScJ0a98LLFNoT7vYm9Gzk74JKQUaM68lVkUCpXvWUf4 tVNbcETZDQNdcZeytcCFed2U21Rq0l4f5wx0N2qo8uAR9N6mF0XrWlhjBhE+5tTXcR+H 9yMbkHJQqy0rNSx0y04wOvdmXAShqMy9yz7hOscAMGG96hhMIEU4v3KqIQTXyboiKJ8P ViZWyyK2+oplov7c2uYezTdS9vYH4JhhFa6efdfbKDncAd8wLCkmQlRciI9o6V1KL3TJ mJEQ== X-Gm-Message-State: AOJu0YxyJoY+qxjgtaZkf9C1iWI+wF8IDFImRJoKkr0iUPVhOHus8bVT si2pev7tmdP/HAilb1/6N6EnYQ== X-Google-Smtp-Source: AGHT+IGNqJdWSYMcQx8TPRNJ4iYLWH440g3FftcqWpJUU1qXCbGZJ1xpxGkgBJ1xgrmbxMZywlEjtw== X-Received: by 2002:a17:903:110f:b0:1b8:b5f8:c485 with SMTP id n15-20020a170903110f00b001b8b5f8c485mr741164plh.50.1691623465574; Wed, 09 Aug 2023 16:24:25 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id l18-20020a170902d35200b001b54d064a4bsm82765plk.259.2023.08.09.16.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 16:24:25 -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 v10 3/4] RISC-V: mm: Update pgtable comment documentation Date: Wed, 9 Aug 2023 16:22:03 -0700 Message-ID: <20230809232218.849726-4-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809232218.849726-1-charlie@rivosinc.com> References: <20230809232218.849726-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: js9azpy8czroosz7hy6otcut8rrzrsit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CCEF6A000D X-HE-Tag: 1691623466-618976 X-HE-Meta: U2FsdGVkX18MMg6bCJuP0Mq9bp7Of5eUq8bSCe+C05AkMklPB70FUG+YMSIPy8n1fsM6tvya/DzRkCKcT0+NpcRC+DzVIUdWq9Vrrzm+SrCLYwx8DvuoFiyXpVkdCy2CvYfjPMjsodEwrzG5ZTBecyQMC4BDycP+aO/ec7CVwNRBxTFcST8rSc/wbW5vYtcU0J/EoxgdzcCRzXGrEtQVX3Y+aMN8a85CFiJuL833jJjHJ++yVgprgGNnMx+bt0Vgn51JPElDwRIvcSrba8VZizbvQAXOuFdNoE2u18haojD68IAGcora5v0CYctuftt2s+LiU0odTidJjzSbDREtecdnuiIJI2kUfxmS/TMU5BUNpvfxX25YktVxVjSIL+k4/niIqYU57Mu74SKYqCFfI/+9nfweJRBFNf9YfUBhzSdu30/3z4mq1/wYo/77Dn3Me7PkyEeycA/P1//KvyXvDKcnox1+tOF+unFwOXeUCjqe1vCaWpiEHiIVY+Y0T1w292TnzVhM7BfWKL6A7E7Mt9Yq2sAzKLys2nUexuV2GCoXG9fcPdarVuEOWdBelkf55vuLDaP8DX2xcBHIDkepoq7vf9yw1na3pWLZogziLG0gudKImZQxzFn48AYTFknxyHNarUQtVBGbgO0SuzEQIiqBJ1N2tWml7lc0eZHDJ1h6BE/BxNmb50PVCUubA4vJaRO7pKp6uoLktkxg4eOoeAFEMXdZlywtRWvX1fm6FFtJZEWQNGonGRQBDWNc0SqhV+bwrSGkXjdlttbNoNFfntArpSkJy/NScxi76b0XJnS8ZWrvlNTi79ALB0hSgaArbp7xhuZFd5+1KctWtiGaSEe6q3PWAKRV/IX1yiWbUZzYbZDZ8Ah4gwqI6mVetv9HJzUzGKYFf2YeIi7CHBPmZPn064/NBGdE2WfqkqxHTu4SFROw9Vn9vu6kWrIt+dqOyJlSIwm0wzCIXF/mvmI AZkMkpS/ iBRtvmpseVAk1oDApQ4maef5QV7uzss4/1hI62PZZYZoFODnQ6X7masHjQOQeiwymsdFVaWuXKmo9+htJkphSUIl95ScgaJW7YSSdu6GANmzFjBCj9lyN9OUM8FU/Yc2+dxJveSh/REff73f9Ry5Gl079abhx0tmDtqiqqb7v1DCkTw2tJMychFdMP9WOuD97+2V33yE/YL/PIWmfvTnXSMW2RCmTpcQDe2OiigUVoMsdiWHbe68lI582JGyHdOmKmKeHB09pBHoygUqUvkR4jz3Pkc/Ur77jdCDpBdIOY1+ZRUncYA+rZWE/gkiRYkuvcAjog+nLoDPomJLe1TiRZcvPLJv3LP3/ON/FcMMUMSS8H1NVVQmjhHQGj9L89ibtbW+D194JxLT2GOs1+y/CmaarjEMF8v17j4o8mKq1L1SEh+cvnP91Xmd7z0HYj1WVDbTToPgj33RtWpg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000223, 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 bb0b9ac7b581..2c5f6c8edc8a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -851,14 +851,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 Wed Aug 9 23:22:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13348630 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 72D31C001B0 for ; Wed, 9 Aug 2023 23:24:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A3246B007B; Wed, 9 Aug 2023 19:24:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 353668E0002; Wed, 9 Aug 2023 19:24:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 180BF8E0001; Wed, 9 Aug 2023 19:24:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id EF8836B007B for ; Wed, 9 Aug 2023 19:24:29 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C843E1A0744 for ; Wed, 9 Aug 2023 23:24:29 +0000 (UTC) X-FDA: 81106147458.13.9BE9AD5 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf02.hostedemail.com (Postfix) with ESMTP id 0AE4F80022 for ; Wed, 9 Aug 2023 23:24:27 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=qdQX3WNw; spf=pass (imf02.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.173 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=1691623468; 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=2tar+fwRF9EwexnZBlGXBQ+bino7OPSUOa9FVKEDgW8=; b=ysX7bcSkJge3yOXtj9+Lx7chCoFlMIhipUF1iJzRQAUxEVKKiZPvoBRJzh4PcpR3cYmruN 4ebTJYWpQ64K5sHS6OkhYJD1j4tlq8+9YgPinogYFnYcLIuZqm9Ji8KXm3SS2W75O1lQxn 7WuEIGcoEZsFi6eu1CiglTt8eSg+C0Q= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=qdQX3WNw; spf=pass (imf02.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691623468; a=rsa-sha256; cv=none; b=U2NHTXjaHqnyp3Z+gVWn7PRKu9RndyVaLDM6OL7Tt14F8twcCx9gIN0fwspNnQ51Owqcw9 okBszFg21FtFFxCGJG1nzEDAsiBqod3kn9l+Z9Y3auct4+q0q1L09eM4SzsY/p/SWD9I+r QCKhxSuUZyiD/c+SiMM7/GknysFWHAo= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-686f19b6dd2so243945b3a.2 for ; Wed, 09 Aug 2023 16:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1691623467; x=1692228267; 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=2tar+fwRF9EwexnZBlGXBQ+bino7OPSUOa9FVKEDgW8=; b=qdQX3WNwo4sWt4WkjKnJ08HLG31URbRoXVf7H5AnZ3n4OTaa437cOko2jjYggYBNx3 Uqtl8hjdOaQ5sFdI1pNdsg5WlvudRipmfEHH3jC3kSBPVvsl7sDCBIi9hJH3htjd+Scj +x4lyW8BfGjDQRdW6mPcEQh967lWkyY2MfrU8iYYuoqSur4+c4vzP8UjeTWZVpmWsXTi GrPLP1dKdTJl7/hWM1px5eML9DIPSblOF40Phwg5YuT2IX5LPipDqccZemKALDv8ntos VpDwK38TgYbp1DMAPUyfGhk2yDGhNkoAIbI8xAeXULhQkWloI08NyYlwSj+DJ7tiDJ+v bzLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691623467; x=1692228267; 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=2tar+fwRF9EwexnZBlGXBQ+bino7OPSUOa9FVKEDgW8=; b=iUxit1LEmwzV8nf2urzlfrPkkRw7CyINisIAoIiZFiOBq63pwt93kMydmpTtIteiRf blfjG44LR5BBw7ei5h/vyUtvbWH36FIYRHC1BQcM3vi41hL4UYtZWB1e+aAiV6Kk/avX 5rK5MsM4qWLeorRdDhEYPfFzK3pUcHzCxMKdBgrKSyyL+ndFUn4pBZrhx8O50oLv6b3o boH9dGD87FB/BBppF5w02O6zUddbEiKkOvPKyEtZabZb4EUsQE87+C1xmyEhBLPZDYBJ U3ODtNNKJKFHLZcBW2OdBtqiYx4LR52YaMo/ZY3WGXLVaWm0RlbMbn8pVpmSYxycVpIk vrQg== X-Gm-Message-State: AOJu0YyOK8yPZsTz2FeP0xnYE77mFiKAliWSGLUP0+VReZkkVdWYdOfG rrJC+dQndqAdJomrIh6ZBshqFw== X-Google-Smtp-Source: AGHT+IHPggFTtnxabsF/jkLvnF3G7KP5USE4CizFGjoAWFxir/OOf3x64PmOQQ970Z2IhxBU3MEknw== X-Received: by 2002:a05:6a20:12c2:b0:131:4808:d5a1 with SMTP id v2-20020a056a2012c200b001314808d5a1mr781717pzg.28.1691623467045; Wed, 09 Aug 2023 16:24:27 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id l18-20020a170902d35200b001b54d064a4bsm82765plk.259.2023.08.09.16.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 16:24:26 -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 v10 4/4] RISC-V: mm: Document mmap changes Date: Wed, 9 Aug 2023 16:22:04 -0700 Message-ID: <20230809232218.849726-5-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809232218.849726-1-charlie@rivosinc.com> References: <20230809232218.849726-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0AE4F80022 X-Rspam-User: X-Stat-Signature: 68e5yto9b9o6t4mbomcipq16s73jj9wc X-Rspamd-Server: rspam01 X-HE-Tag: 1691623467-923039 X-HE-Meta: U2FsdGVkX19G7nPldYb3uH16LnBl9b8CeK6XVbbe08EYPxON2JiYDc0c+qqud0NPTLzB1bWB0xf6XGqFWyGix99xK+HtjUI2PzKIMkUYPxiDp28ZkvzsFzCsokw957lqHn9PP/FEgVyHU3BoieHIuITT2+0SyQ7VLJF/N4BdWfx6HFz5OpbfY0KpxVDAx25dOtqu/qXnlk3Zt599tUlOXGsjbsrdLp/J0i1+S9fxAEA08pCKp/zBfkmH1GwqmFnJaNcd1eQ7xWakM18hvhKS4TIzlzDHIkxBrjbtBGIn8NzhAZ36JeuF+xmyjV1EQXnzqSZNlacaElxi1d7XQ4Y/P8SarIqoBqSSON7w5NVej3bloP0o9SZ7cUYhxTkppzHAUoVF/8xEmVa8gqhFy1QD2zB9+YJiQMIwWzdhQl6eIRWwzycoI4OpuvBcqfSxwtaxi3avobzovKyz0Y8J5ORsfAtGC+0zUkX/L6MbbXX8MzOmSYQe+gcnLcMVXPr9KEAhNE4p3OqPtQ15zwW0fcrk3VpTFW0eHMU/GFUryHrY9aCkSUvWzYgB5Y0llhgoNCNOF7ErZqUbh62mVWwjmsdsVGiiMQpoJotVaiqzzLXUQNMqkTCGZ4BnXZUXfr6vGKowZ8qShBM4rNcwU3AvSnDC8FZWVAz8Ce8ph1mXT9WjgTcNgyzck7asGyMeyfIE6947nZ0vcudanpFdjgbHNuTrQKGxwA5s2dWWoUdWS8xAPnx00ngXnyuabN2jI4ZRuCoPE7fNRYTTS8+Nqmx3QarDxANJJYBXK1jj4I5ZDzchCPfRl4nGfuzjEN/uOGtACWYV7BbeHK1TS3WRKngBTyhPWgPSfy00C4UsZdXAsWvsfChuNsvhGUwV4q6pZk0itFdCB3zdDTQEZEnurCSJTsQssiqAyqfwvkc9/fKDgxXkcQUHw9Y4CmsjQAPZUI5g1lrlI4Wtgmb8JmwH/6rf1z8 AGobbH/U JrbOdveU6MyQPi9z6gQwgiHBNnnPUMiu644IkW71DqH7w0Ug1lMl0Eym6uk8hTge5nZw6I0oU/EVhq3dB7n8B+aI4sYwDC46JXNnkAXOsK9rAdZDzPt1U3iQ2MPlUmyREMhRS9YXCW9EaRzO6IUCp2ZxDSiiMBqlGD5ElN12TqGozZqH6YcecSnV7pwUUYivfU03A5gv7BuAxZF3+qqjZSV5aPS4HQS+JYs57H5nDWrMGkgnGu5IiGS4cnkQErs0svXFNPyt8aGf2VOjIo+SVU8zi4EvI9AAf3XxwhtPawBkaTn6kyv8ql+LrnZThyBjv8gM9ZOk16orvPi/+IpMmD/WiSs5rF38O8FRx3Djd4lOMdxgDT3b9WTuBReD+rbC7D7jTYEi+mhZDnlXvVg+XAq16SaRtFrBb14uRphtBmnQBhlRQFimMlieRksDWKuCEgqef 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: 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 Reviewed-by: Alexandre Ghiti --- 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..69ff6da1dbf8 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 hint address passed to mmap will cause the largest +address space that fits entirely into the hint to be used, 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 << 47` must be provided. Note that this is 47 due to sv48 userspace +ending at :code:`1 << 47` 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 << 56` must be provided.