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 99222C001DD for ; Tue, 27 Jun 2023 22:23:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D66D48D0003; Tue, 27 Jun 2023 18:23:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D16D68D0001; Tue, 27 Jun 2023 18:23:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDF288D0003; Tue, 27 Jun 2023 18:23:25 -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 AF4BB8D0001 for ; Tue, 27 Jun 2023 18:23:25 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7C659803B5 for ; Tue, 27 Jun 2023 22:23:25 +0000 (UTC) X-FDA: 80949955170.22.53409D2 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf11.hostedemail.com (Postfix) with ESMTP id 99D8F40014 for ; Tue, 27 Jun 2023 22:23:23 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=gEcExF6c; dmarc=none; spf=pass (imf11.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=1687904603; 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=0b1uVANehIH/+ZRkMH5+9QKYLvg0brFXglBZxj/Lb5k=; b=046MFWSk/QzV4GeujHu1NckIzckYiW87uUfN3aF7sUK50jxa5NsQIHoSuLEYfU5k41j+Fd j9iiqbXhLAhMqRSRLj5WJQEypgDM5CramSd62Zcn1VLmGt6S+X0k6DEcR5c28tX3M92fA2 mNTG64IFo9G25uHKOXoa/sU0SAyAxMg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=gEcExF6c; dmarc=none; spf=pass (imf11.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=1687904603; a=rsa-sha256; cv=none; b=QmDAvvjFepeBrgFFGHvCUngvwWlY/XAtaB2ATM9VyAWgmlGDZwDoQExl3CAQaHo0ssdpdJ v5yzNEoZKFpYTt9eBAuhBP+DyD7koO/jX9sk9hhBEadJRZYAiJnhIo3d50yXw+GC4XsRd8 ldKvGGRK+rquINw5iJ8lnRgdW1PnV5E= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b7e66ff65fso31828865ad.0 for ; Tue, 27 Jun 2023 15:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1687904602; x=1690496602; 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=0b1uVANehIH/+ZRkMH5+9QKYLvg0brFXglBZxj/Lb5k=; b=gEcExF6ctP9ecPj0QdqDgAMhxYjv7gEA2EWt5Y19A2daB2l8HRLMkEr6We3il4IgP3 vevmVr8fRe7IriRi65dyKzYMFgEGBEWpYz/x9jTSEpBgGZ+jYYarELi/NjfHnww+lzwN rQToyYkdVETwl2WczZGkqaJ4hoJ79UatG4QvdDJxvSf1dW8OCuZEdDmPIAKmWRLx3RFb S5kQigp+4/aDWD2kqAGi3NJe/ghuP+ZmoJGGZd/g7O27j8tOAjQFdsovK7/ONC9t9XFT f8FJNYDTdjWXwzWLtMYkAqQ1tKAiOgD+yH3lOhGkiAyRe/BGzpg/s0s50kwg1twgcn7L WGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687904602; x=1690496602; 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=0b1uVANehIH/+ZRkMH5+9QKYLvg0brFXglBZxj/Lb5k=; b=hdHUUS5oq7sPGuqN2Mj/dCa0xNhz0iWiZ+eP9A0onPjWE5RfuZQrf9BWEukHXcwAch cA3986iqMnTCxGHu5VGvYzdqUMvLPtg3dagJjWvdQO2gMHmkYHFWDvQxV+pJ12q5pqtI Ai/sF+O3BwYawEMakrzWG38dCUtvUG67Zuot/sLB4oPYZtMZkL37kLSvWM4nghkFv23w +1t+zE/Qv4Txh1GKpWRFxiSAORV1CwNBq75FIq618mLak8C6BdDEQYsvUT0ffUJvIPay 1+AktLx839I5cnJKZYu7AKV9CRtfnHlZmncXJnIzxVbwOHUSL2UjIt4eAYoC2fbvXl9H deQA== X-Gm-Message-State: AC+VfDx7gza/qDwiiRXdQX7X/l3an6NEd8D1kxCfefwBdlKEiKBQv4dK jn8yodV2tG6IiNTW6J+3Hq7mLA== X-Google-Smtp-Source: ACHHUZ6Tj8W8zHg8xhmH4tU7cYqw43xProPUlEbN/8uZqACTAzhliVCOpHStCVkiQqvhKTPN9Q2VBw== X-Received: by 2002:a17:903:1205:b0:1b3:e90b:93e1 with SMTP id l5-20020a170903120500b001b3e90b93e1mr16854146plh.36.1687904602358; Tue, 27 Jun 2023 15:23:22 -0700 (PDT) Received: from ghost.hq.rivosinc.com ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id 4-20020a170902c24400b001ac94b33ab1sm5108271plg.304.2023.06.27.15.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 15:23:21 -0700 (PDT) From: Charlie Jenkins To: alexghiti@rivosinc.com Cc: charlie@rivosinc.com, atishp@rivosinc.com, conor@kernel.org, paul.walmsley@sifive.com, palmer@rivosinc.com, aou@eecs.berkeley.edu, bjorn@rivosinc.com, anup@brainfault.org, evan@rivosinc.com, linux-riscv@lists.infradead.org, konstantin@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/2] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Tue, 27 Jun 2023 15:21:51 -0700 Message-Id: <20230627222152.177716-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230627222152.177716-1-charlie@rivosinc.com> References: <20230627222152.177716-1-charlie@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 99D8F40014 X-Stat-Signature: j9ezqettr9ccyin93nhma38acdwy8oo8 X-HE-Tag: 1687904603-429365 X-HE-Meta: U2FsdGVkX18koNrZBaxKtqE7fgCvahUePMZoU+oHsjNICMXSMW24UuU/A1/+1ma4QPbBkf636L3jHOnBPSrYGk53BuWg92kgv1adwlOdGrumpQg4km9xvPZU3efE1Jsmvoz/qGVSyYGVBf+afofKKYlPbVROWgLCy6lXL6leHpl2pERAqsYPGfKCSz8wNfVymrMaQZsOD9/exdXcxucUhbMz2xATyH7c9/zTTMZpkVyVEm/Wj79DJSQ4IqFogtkO2L9C2ylOOfutT8dLAhK6rJFFKQxO6OZRQ8m+ridgmRFqMTl/DG1TGrp2gt/fXcRygBP+NRwOWGn5QKw2uOYWgnXOECHzC0Z782aO1SL2ot95nudo8O8qZ0vpR+kAgZ+191P7i2ja0WnY0aYufevKEur5DY9gU4UsI4hm9uxCWF0VDlT11oPWUy2Z6asoAX1vipgD5VAkPQWANrMp/aQCVcUf9HgXfRpbNwkFcspSeq0xbjk2pbM6LZodnOCkFhEtnCSxUyMLLkE7hFT4VLafRmUAZeTtGdD++M5g1g35vf+WFACNJ//ytthETncosRmnNAhBnO/Js4FQAV/ca9iC3JOcgATU6W+Bi8MmJJa5rqVR2Jo+7izL02OFf1mNTx2xOcDH725FXYHQCK71pLAIF0FMXDWPkJwUql939Ussx0oqRbIt3wWuCRv2DhK7/LpU2nl9GnHaRmtnmBTokB+Gz7hw3M9cjO7Z1mvboq29iB+iSdPqL+a/5j0Ai4+cjtQF2PcFUWlUANaAa9Q+2ysXUd3qT2hDCmO2NPEKdLyfYIwwZ2gPgYCce2WTKl2FS0iVNHNFGzLFlGm51di8RWp+rf0gsWxvY8UYg1R8zFXpMXnCQE2ruQxNRwxXiDs/xkFRNBdvj/5B7hG5tPTLr1OqMNcppB+dA8bBEe2bqVUC8PLq6uUsO899yDXkOF6n2KeIa+1x1oMOQWbAlL8kMY5 HH/IotWH 8PdE10n4w6ZZ4V3CP0MxOgZRlZHhii/deJiGNW0MS+tGgm3QYj9CGIeSwCoFDWBIwVDKcPSJpBh1ZwcaOTlkbWDB2SMlUPuX79AjDRHQMFxBaRRLp17QLegt9dzeIxieBhFZKfz/v3RU1P70dr8nM5QzO9mXC34E+8Ftj6lgRKTvah+pM5FkmBkYFb4Ev3+orut+g7VNcDCVQXX/CSEux41eUJ95rgkGEMqARHw3HsLe6yrx6nwZ2pdmY86vWjAE7sgV7MN9YpJ4OuIgQf13jojTyXCXb/aF9rJbnz41kK9KwOryo7vOJM4LdfTlo+yOkYJTM2PoCUaMcoNLocljwKDrSBuobhcTU4zm2E9t2WXOkvkduGyxYgYECiGXq7di9Kli1W6WpJL9PHpT4qiG/6fKefjyE7oOWoRaZyXZYsvLP1jP1/zrF+P24M20ExyBHb7Tk 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 sv39 the default address space for mmap as some applications currently depend on this assumption. The RISC-V specification enforces that bits outside of the virtual address range are not used, so restricting the size of the default address space as such should be temporary. 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, a 39-bit 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 | 13 +++++++++- arch/riscv/include/asm/processor.h | 41 +++++++++++++++++++++++++----- 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index 30e7d2455960..1b57f13a1afd 100644 --- a/arch/riscv/include/asm/elf.h +++ b/arch/riscv/include/asm/elf.h @@ -49,7 +49,7 @@ extern bool compat_elf_check_arch(Elf32_Ehdr *hdr); * the loader. We need to make sure that it is out of the way of the program * that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE ((TASK_SIZE / 3) * 2) +#define ELF_ET_DYN_BASE ((DEFAULT_MAP_WINDOW / 3) * 2) #ifdef CONFIG_64BIT #ifdef CONFIG_COMPAT diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 75970ee2bda2..e83912e97870 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -57,18 +57,29 @@ #define MODULES_END (PFN_ALIGN((unsigned long)&_start)) #endif + /* * Roughly size the vmemmap space to be large enough to fit enough * struct pages to map half the virtual address space. Then * 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 DEFAULT_VA_BITS ((VA_BITS >= VA_BITS_SV39) ? VA_BITS_SV39 : VA_BITS) + #define VMEMMAP_SHIFT \ (VA_BITS - PAGE_SHIFT - 1 + STRUCT_PAGE_MAX_SHIFT) #define VMEMMAP_SIZE BIT(VMEMMAP_SHIFT) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 6fb8bbec8459..019dcd4ecae4 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -12,20 +12,47 @@ #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) << (DEFAULT_VA_BITS - 1)) #define STACK_TOP_MAX TASK_SIZE_64 + +#define arch_get_mmap_end(addr, len, flags) \ + ((addr) == 0 || (addr) >= VA_USER_SV57 ? STACK_TOP_MAX : \ + (((addr) >= VA_USER_SV48) && (VA_BITS >= VA_BITS_SV48)) ? \ + VA_USER_SV48 : \ + VA_USER_SV39) + +#define arch_get_mmap_base(addr, base) \ + (((addr >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) ? \ + base + STACK_TOP_MAX - DEFAULT_MAP_WINDOW : \ + (((addr) >= VA_USER_SV48) && (VA_BITS >= VA_BITS_SV48)) ? \ + base + VA_USER_SV48 - DEFAULT_MAP_WINDOW : \ + base) + #else +#define DEFAULT_MAP_WINDOW TASK_SIZE #define STACK_TOP_MAX TASK_SIZE + +#define arch_get_mmap_end(addr, len, flags) \ + ((addr) > DEFAULT_MAP_WINDOW ? STACK_TOP_MAX : DEFAULT_MAP_WINDOW) + +#define arch_get_mmap_base(addr, base) \ + ((addr > DEFAULT_MAP_WINDOW) ? \ + base + STACK_TOP_MAX - DEFAULT_MAP_WINDOW : \ + base) + #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; -- 2.34.1