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 21615C001DF for ; Wed, 26 Jul 2023 16:46:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD19B6B007D; Wed, 26 Jul 2023 12:46:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 995B76B007E; Wed, 26 Jul 2023 12:46:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8363F6B0080; Wed, 26 Jul 2023 12:46:35 -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 7362A6B007D for ; Wed, 26 Jul 2023 12:46:35 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AEF761CA0A1 for ; Wed, 26 Jul 2023 16:46:34 +0000 (UTC) X-FDA: 81054341508.11.271805A Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf13.hostedemail.com (Postfix) with ESMTP id 1E93F20035 for ; Wed, 26 Jul 2023 16:46:31 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=2Jz16VlH; spf=pass (imf13.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690389992; a=rsa-sha256; cv=none; b=urv0qBoQfcK4T5QntiZlYfpSw12ZAzaZBW9l26EBrMlqpz3PSiw1DIbDzm6HXl0gTfKuUS WVOY1G9fVvaP9UEIdR1G/ruYTSToS/O/H3D0j8yPltHMnYeRr7xEawF/m/Pac32+VKMnuh /LCZP4MLaaT3SrsdqzMqYM3t/IsYHUY= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=2Jz16VlH; spf=pass (imf13.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=1690389992; 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=9I72PoBRKXLvHktmcrje1n02ixRw/D4fAolrg/chvlw=; b=2ruqMfjJP7z93nsEiSQbpZJzqGFHXwU+h4GXd8TmVOBIt2l/0btVmBDa25g+v5QYUtWvDw 9s8ibLlKb8vPUiaPqIx7WOhnAHzVrxQxp+zvH127dwqsfUwTRjkyiP9AKkQ6sZWouWmuU8 XFP2Dgt5lgiP4Q+YbJ6dp6iYkBUfPZE= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8b4748fe4so41056005ad.1 for ; Wed, 26 Jul 2023 09:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1690389991; x=1690994791; 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=9I72PoBRKXLvHktmcrje1n02ixRw/D4fAolrg/chvlw=; b=2Jz16VlHfoEFfZ3AFSLSXY8u2g8fiZbPZUwm9PJbLRY7gk6jqF0t0jiYlXi7TSGAYF 3zubxHuOcq7inKRub1IH2maTkPsOZAxyx6PORG91v3QJLBcTa/dZMQOYbMdbNUouInY2 7xzKDWuWhLszpWjh3LQHwMz6C55JKbegov2VqNbT1ZtA9nhipvVWBFdoo8sQqQIN350e D0wMU5CYHIqplbYqQ9tt0g/RjLzgREP1Ls4ss+Rt/p1Xz9F2SIvJNR5F90mAfc/fCnKK cIeKdrmuE9jvExtAHXgaqbGU9cdsmnL7Rerg9I1/qayP5aEnKEIwJ3CwtCTUbx2Qm+FI ugLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690389991; x=1690994791; 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=9I72PoBRKXLvHktmcrje1n02ixRw/D4fAolrg/chvlw=; b=B617GiA521G6/2KwNEdLc6f70kjkvtbhfMrUk8L+URIeNfDnsFb4i6gRzwm1YL2Hgf +BAj4hXwmv5alyghY3Jy8Z9ykrpKmNAZwJoidnj9ra5IiYxLMEllt1WmKkqFrNVKYo0o TDu7zFwWrf65vrFmTTzKmSUl2ekc0POoKifTftDLuCk+2coaQIW7zJvelaRL09Hy34en Xc+ZhmllwUjnl4sEdTCmcI6L7XaFAG0flCqZOYs9/k17fygSXEXUVqVdEHR/ehx8m66r f2yctwpfHCJSa3CohJpOQRsOSJeIBfj1FdJUfVAupOc/2ElexkSYkgGB5jPS3HqDjICh MF4Q== X-Gm-Message-State: ABy/qLYj4iWBWUL93BIAUsmB1fjReg9+I6zWFI2qdQmLW8L8KXnAxTWN k2/L9Ey0PNKems/+fVfTJEWp9A== X-Google-Smtp-Source: APBJJlGp1GY/W4RE/89gp/16eB2AGE/qHe+6+KWmHQWy/wMthtq4d82Q6nwr43YclX/zAw9dQWmddw== X-Received: by 2002:a17:902:d501:b0:1b6:9551:e297 with SMTP id b1-20020a170902d50100b001b69551e297mr2620057plg.44.1690389990886; Wed, 26 Jul 2023 09:46:30 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id h5-20020a170902f54500b001bb6c5ff4edsm11628870plf.173.2023.07.26.09.46.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 09:46:30 -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 v7 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Wed, 26 Jul 2023 09:45:55 -0700 Message-ID: <20230726164620.717288-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726164620.717288-1-charlie@rivosinc.com> References: <20230726164620.717288-1-charlie@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1E93F20035 X-Stat-Signature: 1kim9yzbfrmdweedo3pg3yhj576b6rbx X-Rspam-User: X-HE-Tag: 1690389991-886884 X-HE-Meta: U2FsdGVkX1+qKnfF5FwN5l/8e2gPJLsWYVA0xZ+/ELr7pqLpiWimfBUQXE0Q934cuupe1NlytetCnR2D+tKi0hasb8E4K+k0PSpFI/9J/XM8m9DpDpdNPjk6nmCIFKMSV6GX0CKawpWr32VLMO63ZacIU97Do1O5kO36j4o9MNfcJjZUCy0Ok3LIPh4Mh8NtQWGgyhtpUJe4mpcaEFtHQ3vxnZUhouAaGGcuuyEHtHDfORK8LLODJr0PF3wGWnsBIv6Xe715rNx5SlY5MS1SL006PEl4H+AVXuJXE6q8K0HP0GPUo07XLxAM1RAzlMj7cnAS5MPwHn/GSMxJYaoy02seWE7pXZnGxtudgV0PaftwO/wR7tFpIJ6vDPoCH7vJSLfgXQXvw0exBkeEs/Vezi04PBR0PiOzTfmaa3liA9yItOcXdfrHa4CeiOEyi3zNF9iJswAJIT/cngbqcm7O6JhIo6+hAU3gKRhbwOVqaACh8uzAI3KjMkUW+CpSsO19hoi9JI7HKZenwuLjjNffe4387k9AWhjhLIrQGzgZsyKOVvGOsnwKQySEDcmbZI/O53xgjJEwpU2KqLRqMRyiIcdyFZVmtOmz9Fc9S5fmPcewMVaPjcKtzYmA7Jquh9z5B2JM+t9jBjvf2VoVXMgf739ypP3LbqhqSEgSe0b3m8CkF7y41dQZCXc0RmIpOAlgI4vBJErR5VqjTivbVuVfWT6ctnV44fPZhS9fbz1hWvvkxfvZbLPOvdkEsGDodEMmve6fyVyLNo3s0bHaKLxhizBgDP+y8fYvHFK4a2Ur+tBEzu2MiaIoZqoHgUcbYqKEKQgLi+6rruS8Wer24zsWluKD59B34GnBYXO9V08dw+MaQnVU20B7CpdSb6zpYcMci8sEncql/g848NPkT8thIcohrNG+/o7aMTfCWmdoMlV+xnQ/R3vHUmCHXty8NHhQy7ML381WOayg7ALWyip e2NlkTQF TTtUmvVoIa7+5A6uyImQ5XCHK7+YMYl34fSNH+NpFhz/En0KzBDKJ7Xrl2ohrTlKmL7AZAY2om6SAIZ0poyadrcBQCsR41cEvdHld50bbEhNNAgWknzEozL4+H6WElQ4RqQ127i9ydG2oV7oRlJkfroGshL1BtcQqJPz3V+B4tkrfPwVL/esZZ6rEZkYc0gAl01zKvS1ti+lrHSPqFEXbRlK2UPIJ6A3tS4QLOVVkuY+hl+leR5YvFyXfpNHaMMNengNfT4dtSq/K5eEvkcQUqf5JsW4zCQNVwmovtoPET+6PMlaKHx4OBbqW66JkuI1NLEB1TX4wmKMu0vDJc5osSIhRqt5ISTuB05ujV3bfuyeHdj36ilj1cNwYOG+4qyJnHT+e8nQBGnNIfbTmCbs56UNlrbo5g2Qc3CM8BwHBYiQGMgttNKEh+3MHIkYDFprJMFAf 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 | 13 ++++++++- arch/riscv/include/asm/processor.h | 47 +++++++++++++++++++++++++----- 3 files changed, 53 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..530f6a171a2b 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -63,12 +63,23 @@ * 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 MMAP_MIN_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 c950a8d9edef..050e27577419 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,20 +13,53 @@ #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) == 0) \ + mmap_end = DEFAULT_MAP_WINDOW; \ + 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; \ + unsigned long rnd_gap = (base) - DEFAULT_MAP_WINDOW; \ + if ((addr) == 0) \ + 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(MMAP_MIN_VA_BITS / 3) + #ifndef __ASSEMBLY__ struct task_struct; -- 2.41.0