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 EC92FEB64D9 for ; Mon, 26 Jun 2023 18:42:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BF608D0005; Mon, 26 Jun 2023 14:42:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 748028D0001; Mon, 26 Jun 2023 14:42:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59AED8D0005; Mon, 26 Jun 2023 14:42:10 -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 4812D8D0001 for ; Mon, 26 Jun 2023 14:42:10 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 014DEA0556 for ; Mon, 26 Jun 2023 18:42:09 +0000 (UTC) X-FDA: 80945768820.12.5591EAD Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf07.hostedemail.com (Postfix) with ESMTP id DE9C440016 for ; Mon, 26 Jun 2023 18:42:07 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=bybKJLkY; dmarc=none; spf=pass (imf07.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687804928; a=rsa-sha256; cv=none; b=kDojDtOSNVja2poVK1R353LuImx2T16xKHcHY3lEqbQjW+cznBoOtbGaM3M/wIAagFHIeI VSRzsYBs3PrgXYZt9GR3urSxJEHcQZLbm+6l9Z25UW3MvfPcEIMKOVCYLcSYCuztTySDXL JGsqgR/U2gkfPggxD+KnXU9MIDmcZIc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=bybKJLkY; dmarc=none; spf=pass (imf07.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.178 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=1687804927; 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=5Sd7J58gj0ato4Oq2VFgLf5p/8qCbk8sLs7xJ2oSK+xZTc5BR3DJLv3R8hoZCzRM8GRUeI /GMUPxCqMww2m2y0GdWgBquKuKMJIxN0H8eEwzVPaVCESjLC5BCA0Is4YfmycqNydwNRlL oGQrwwPgUQUl/xndaduc2yE1zQciuGs= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1b80f2e6c17so6406265ad.0 for ; Mon, 26 Jun 2023 11:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1687804927; x=1690396927; 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=bybKJLkY02mGgsEHB/G5huYNAjJ+Jax7ubFmyT/xSUWJapWYrReIBV/awAq2yPQwz1 LjHqQahv88eqfHOji66+8tfPFl2X3OukadEVM7rwzVWa7W71PJ3tsejRPYK8HD92XYpK CEtbGwUpvVHYqe9q0qtEHxqJLLWSrsExtBqrh3SUsJTpokBfCvMOz0DBFqRSSB5EsbcT IlmGArf+IWgJcsxOVMwVw7EzBLpyyhk8qSc0NOSAvY+9nWpUoJgW5HHI9wccQ8iYxmYX wHVJCNO/fA9k47pR/QmmfBaTg/X4rTYX1LUtNSjVDb4jvoUD8U8b1o/11Pj4TdhKwedI cKBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687804927; x=1690396927; 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=RMQE7lQx+VAm6UldPyvAi7RsUEqYsRvsREDVvXSAE6SCjPGulxJMplk562ShS7Crew XgGyiMdrd5TrHnJo7wI+yBm2qHuS7PSM7ZT0JyhfGz4Tior/6iR2vysXpwXRtP5dxGo1 +DpnCQJxdImoY+jl9F1SamLA0jmXD0UKuvtGgZrHqradSEr6aI3HIF0uKBQXvjaNtbDE xkQ2KW47L7cKeJ+3EiSI/UarlnucWpqAXown9C0H8QbIY+PEvBkA3e6CpC9mXuomKBR0 MMztruNNQTRGvEudJtu06tDmRcpPy28IcorLV0w3neiZSE2nDdmu+48vNHRNhBACngRr ACuQ== X-Gm-Message-State: AC+VfDzy4FDFszI3AIDAW5+JL6Ys+Dm1H2KEiy7nRLWo98GElyZtuvGw 0XtRfngnplR3IUDWv/KA66euZg== X-Google-Smtp-Source: ACHHUZ62/G8gBs8d6kAQdaMAXiShDB+yqOiLofZ8iajX1fHC5c1IefdBrnNt+qeRN+82Vda57HyAig== X-Received: by 2002:a17:902:e88e:b0:1b6:b40c:b022 with SMTP id w14-20020a170902e88e00b001b6b40cb022mr9499718plg.30.1687804926663; Mon, 26 Jun 2023 11:42:06 -0700 (PDT) Received: from ghost.hq.rivosinc.com ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id y6-20020a1709029b8600b001b682336f66sm4499842plp.55.2023.06.26.11.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 11:42:06 -0700 (PDT) From: Charlie Jenkins To: charlie@rivosinc.com Cc: Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Eric Biederman , Kees Cook , Shuah Khan , Alexandre Ghiti , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Conor Dooley , Zong Li , Greentime Hu , Andrew Morton , Guo Ren , David Hildenbrand , Sergey Matyukevich , Juergen Gross , Qinglin Pan , Anshuman Khandual , Anup Patel , Huacai Chen , Geert Uytterhoeven , Sunil V L , Kefeng Wang , Evan Green , Mark Brown , Guillaume Tucker , Catalin Marinas , linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE), linux-kernel@vger.kernel.org (open list), linux-mm@kvack.org (open list:EXEC & BINFMT API), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK) Subject: [PATCH 1/2] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Mon, 26 Jun 2023 11:36:03 -0700 Message-Id: <20230626183611.40479-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230626183611.40479-1-charlie@rivosinc.com> References: <20230626183611.40479-1-charlie@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: DE9C440016 X-Stat-Signature: q8mbfasd6gccn55dbfaismdenkukjtn1 X-HE-Tag: 1687804927-588464 X-HE-Meta: U2FsdGVkX19An1bw6l1F5BCiPxj1Z6FfKevtzVsBGzjvaDTcJdYVrJBld/hx9626jaKb75jue/IHKmulPx3dWCRjI0aixpZet1ASjucYkfhEpfm6D2lXfF+kUetR8LlLCfh3wOzvviCE7CVtYO9jo6sWVRR883kaV0fnLp7pUw0yv5i+5hTurF659TfPgxfQkAQQHPkqgazRszXPwSEtmfaSvozZdmAjz71lEjbbNOnKAmuGdRT3APuitW+bnHR5e2/tizY4y6yZtzDF+L0k0h5b1of6tz+cHB1l5xg6x5kmoUF83uuyqJ/894+Ny4qMR03a7WZ+akE2j5MU+/VC+bjk92iFFQnlSDtY2cwkF/d3mXAoxc/kVGpxMsdqRqXHQypVT1QekaSGW0ST/lfXCuXZXlKv5t8DhL/kUW9D80fFkiEeIHF8jtyXlwLR5gLdFfXZA/1Wu2rMcF2MHtOXJYeMYfM5e8W3EVF73HdG9hS+ixGQOzo2Ors6ainybGX9e4URrDTcvOK1zyfXUZ+MS/xyHN4qsfhD+RLeKW3sERsz2iYiuqc8QihXFFzPsYnwB/kBU2tClaH9BoMa0yzT9LDIKBqsvFP1kg9YEDIWuObfOmyneenBQtsXM+KtgB/9tt59PHBJC8NgcSmxhbweh1T6VCyLYjagLf2x4Nigvli1anjwh5BFKQCwxENIC0RF3XlmRHPl2RUZG8nNzdbawt1Vz+Pq8SsXeB/K5W8IrU0PH8m+QJI1lEqWKJTx2Bf3uhjGnA41MyYyd3pw8oHL+JqGgKHfkBesuhLWG2KSITHUYFibyTn1mO/EpQe9LmDC3d3FYkotwUXPzgYduEZFfG3RDAb2edGxDq+3RkaLbtSnbzgdFfC0ZI6IZBY8N2HXbFL7FyB8m6AIXC5HQTfVJFj/4ga6CATCK2YBkQnSdteQBIyeJbvHitXaQI3D7LtLpKO7zBf5avVkmgdAMgb jEXpy2qY /MnMj8H4AUcDkCOiJiKd/y12cBP1TcQGL9lhhuK1CEpZUG9sNB+sFnXBelG7TTOP/zQHw2L0LxP8OUKj/5gS4HY4gmhxAcXoiSYZe7BZccF2a3EEK2Be1CrSCZrIZRZK41nWt5Jbnyj4Hkct3lvOslidw+OzGH2876aWZOKQy41zFl9aZTjFFvbVijP5AMAnhiwJQjZvEzrou6AukyxCsH+xOnGmCWwm6wBd3fJkoSTJYpjFXbMkJ2wyp/s2qg86/xXGFmkqgi6e07hS3QuotrKZ0nWdxAaGJS3kodbOjI3Coc3erYaN8ax6cSPpI+MuOohcFXTNPam0ypikZ5SmqBh5ZJsg/DsElUD3oQMhPx6NsdS10pIcuQWOblyETGLlWB8B6Qg679mrkuP/FhQ1KTbt+v4os+a/FmbJXH5+ZZqQDNL9/bk3x7sWK1dcrxH0mlgFP 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