From patchwork Wed Aug 9 01:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13347309 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 EF25EC04FE0 for ; Wed, 9 Aug 2023 01:53:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CD616B0074; Tue, 8 Aug 2023 21:53:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32EDD6B0075; Tue, 8 Aug 2023 21:53:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A96A8D0001; Tue, 8 Aug 2023 21:53:11 -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 095BB6B0074 for ; Tue, 8 Aug 2023 21:53:11 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D41FA40267 for ; Wed, 9 Aug 2023 01:53:10 +0000 (UTC) X-FDA: 81102893340.19.F6D542A Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf07.hostedemail.com (Postfix) with ESMTP id 162CE40005 for ; Wed, 9 Aug 2023 01:53:08 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Z+OB3UIx; spf=pass (imf07.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.180 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=1691545989; 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=lS9t1IQslP2lZOcFIMMBEvL86hG9xRW12aLXbO27oNk=; b=mpbsE/zXH46VHqOqZvNgmTfVGUsmFs1KpEczCO0DqO4tJltU3YCycnFICTmntojtlny1pL IFfPG2yzsdunwfrhRAvR1uoka1PmvaQvVcQ0I7IbnE3DbfyOH8eyQxYh6hsbqVd8MsQ5/i 3QD0VSRFd7v0ZWLgebdluwIqP/xtudg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691545989; a=rsa-sha256; cv=none; b=KZ8F7vrX7Ri8QEw5mke5a/q1KgJdSRTJE04TZ0RYoKb3sLncOzog2n9wiU1zEZgeh9JhUj c2WB/4UyeSY0yr2E1j6ErRD/aF68UeZnj3uzVSQXqyajPApqtIo1sAZdqGKfhQUhQp32r6 lZELnBASgsGTZi/s7fPuAjaPhLI3cFQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Z+OB3UIx; spf=pass (imf07.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1bc7e65ea44so3257065ad.1 for ; Tue, 08 Aug 2023 18:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1691545988; x=1692150788; 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=lS9t1IQslP2lZOcFIMMBEvL86hG9xRW12aLXbO27oNk=; b=Z+OB3UIxb6UJl4LqG4lOl8uoEklqlYBf9fFwC0SMsGtkHV738p4LE/eBRuGJp3a7UL wiCEXG/nMIuiiOQ7dHYWcDcYDiZ0ZcWXZQ1pgmZ/9o7/7EIhMFgNACuq5EWyHaQJ3Z7E G6kwf7AbrVK8ofW7juhqT77yDPEbZow9W3sjyhQnYVmRcEDxZmUSGarbtD1I7I3ufInS hpDnZmswCg7wHzP7gZzoJ4bbO4uBGnuWGbFO0kEtksOZCBlotH47BAkIcT5zEnw+UIYM X6/5ndgr/c496H7frfwd+bRtqm0VeHE4I0TmM4v7PHuRHDwdflAx5jyymiQ36NBcmSnr I07w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691545988; x=1692150788; 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=lS9t1IQslP2lZOcFIMMBEvL86hG9xRW12aLXbO27oNk=; b=B3lobuK6QaQRHs/n6QOjCRUBmJmLEBR7IZcZWKmdq2A+Ndzu4wSfB5TScwP53469Gm l5rXM1CqbYHGRRgGY4L2FcjZ3xnP8RJfP5rPjlC9vVmj+zYtt+M+G4//DJShtm6peWnG kfu/9ah+ZQbwvklWnEYowl36naT6bW7UUx4ZVIn52qv8TmQkpe5sz2Y0YnG+P7/T+zLK C4qIDU2Y0jBXgleKoMCQIh4KlQ1z0Ygvo6BpOPGr5ee25Vvj0UBmcAE41pKM+vR0j4Hd FPQnpPilUCa2bA1fhuWqDXebnJVZcoqDO3ObcOclIqxqeCJQnU9YCDS8/9C9VmyL9j7j EB1Q== X-Gm-Message-State: AOJu0YxwJBOKIwSXYM0AGkkMUcy1Oj7mvSeo+wlOBpJmH3DghMx0qdmp AHxofdgQHe9Fem5q30IXgQJ+Yg== X-Google-Smtp-Source: AGHT+IFhoPRNUuepUsmxYmygopTPVe56v5cNvHLyHa5Ol8fKT1Rsk8P+vvViBz+AASwbOoRW+3rwYA== X-Received: by 2002:a17:902:d491:b0:1b0:3ab6:5140 with SMTP id c17-20020a170902d49100b001b03ab65140mr1838365plg.4.1691545987885; Tue, 08 Aug 2023 18:53:07 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id bj7-20020a170902850700b001b87bedcc6fsm9657591plb.93.2023.08.08.18.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 18:53:07 -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 v9 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Date: Tue, 8 Aug 2023 18:51:07 -0700 Message-Id: <20230809015110.3290774-2-charlie@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230809015110.3290774-1-charlie@rivosinc.com> References: <20230809015110.3290774-1-charlie@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 162CE40005 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 69aihb96eicahrwkowypwsttxhbyomqy X-HE-Tag: 1691545988-775508 X-HE-Meta: U2FsdGVkX199KTQ6SYU3FB+ns1f2C43YSA510I9z4kndiIIiIGyzs8RHTT1BnHPhiF9qWf7OxVNCqeScAr8slUjUPQamNDSgvP1MSX93A/rdrgdjqHWSNWDETWtyhP2isPApzsnNc7kCC9gtRucAFa52B0OUz418Xp1Xlt8vnKwv1jwu0nb+l3c4p6i2ddr0JaiuR0EjZmY6eJp6OM5+UEB09LOawivgyIvUTrbLu4BsZMYUAT1FSiDz5SDspshgtyuuZHKiD7i+ZbxYOLM7F3o2o8qeBcV6i5yi1tVQZoJ9SWi3Ma+VAJSHrpbLPGNz9FupjwJneo3z5KTRQwFkPi41i4CCXw2vksyaaOYg2V3eEjltmuA2fj3SiE84IcpsOEF6NEVw5NGAJdYq1MGKfk/OCM07YFFNZD7bd1AjXbeaEKeLhAT9zhbSN1fA0r0MoY2Ke5/ZdubbhWsRsuExqf2zTCIy+0aVwNsBPZEecElfy1v8g8fz+ewmD9TIY3rx8+V2/mPdyrwJanjFlhyeVkf2zeEPmSt913EZJDVM4zxUzcaWpfzQ4qP1iSYt9AMNMyi4R8EdVPkF1+5kgAr+lCY4GLWBLgAhSVvjJ7kufj/JZpvGRirQ/zYSvlk5gznIjYtjs26Nmzmf7/fvxXNIH7FWaUJzLl237999bfOdTeDBkYXD8JghDsqyM4WeKYNkcnk2eXDUNECWf98dr+ii25bpVQn855AiMuaOo/j+rUpJdNKeEC45nxm5cViH564XGIXDTVGm9mLmIululFqgTgBrsJTMwqTghXWpkpXo+0ZMx3OjN9VNjoykzJtb0l0pQchJcFGUSG0MtZt6c9P9QcTFgp+3xuu75yCTv42nEGuiRyJrQ1Xlo5v0KfaPcWbHBZb3YlPzoZ9N3xIqB+cWN5pc3ETEppMhYPeIm5luG4TBDEeIn+R8uu8skpc2lhx1SVNBb5H2hTeD1OwXdEc HAfnB8Dn tJx/aMDua4eurg752mxxrTtcpPAM0j8SoWJnZmudbphlii2wWqxG+fSTNGfoGNxRTdL8HMsesL+iF3JgKkUDHcnefFTFKFbv8kUUXE9pjegqn68hI1D398Ta8fSMXbgBIqZuf4qN0NqENFuNnivPiZgvpA+gJYu1vYBKe7NOaOZDoaxgH0VipLEmCbUjBQdVgcMREj1gNh7GG6HYYbpwZ9GZlgeLmpNm1aGL5DPYTiWg9+XOBamuNo4MD0ebwvnUtWryJG1bA5x63CpCW6qT4LpkVCFWLs0k34XG5e570GMZLCPJ0s/qDMqQAXHn+j/mAVJJ9c2Q6m2RSUXQvRpC7gsEkmdE5GqDlBNGdDYxvRhttYr3fuaIki/LuFovfzQ3sm75BBNCcIuiyaHNVzMubC5jMs3C0AihtQuulIfkAini00C2yjLSji3L2S7jx+qyfyOub 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 | 21 +++++++++++- arch/riscv/include/asm/processor.h | 52 ++++++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 8 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..2611c1324a7c 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -63,8 +63,27 @@ * position vmemmap directly below the VMALLOC region. */ #ifdef CONFIG_64BIT +#define VA_BITS_SV32 32 +#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)) + +#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 #else #define VA_BITS 32 #endif 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__