From nobody Sat May 10 02:25:06 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621328886; cv=none; d=zohomail.com; s=zohoarc; b=EaD0/h/mo82P67XrXL7eFABR1ii0+98lxtTfp8BWedmpon4bP5ftBaW3Pe/vYIiowyJHI/vAot32Xt54I+cM/amemUcCp8EXdIrxnV4qRySYibZHiNIrjuIz7U3yr19VmuCwtx1YzwLCxB06EUcijQNvRo7fZIvrNP0mCpe8arI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621328886; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Subject:To; bh=G/r5fensnn55MXUHGBjpVLt7X4x9tXaFMDjcQRg5EpA=; b=djj3w7WjVefr9BsEiYvpRiLKHWMiGWAnqI3wJgLzDIVbeGrVNtJ1sbzSFUbox8e4fnsoNVevg/XaGmaS+HlCGXOeuSfoaPGpSvu+1GyGwTDfWJL165Qh4nunDMzfyKP+R84pnBV2JHHtPZ76VC4Pqk+V339++vCqy2PDbFxs0wo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1621328886753896.7103470698913; Tue, 18 May 2021 02:08:06 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347713AbhERJJX (ORCPT ); Tue, 18 May 2021 05:09:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347809AbhERJIa (ORCPT ); Tue, 18 May 2021 05:08:30 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49337C061756 for ; Tue, 18 May 2021 02:07:12 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id r12so9352095wrp.1 for ; Tue, 18 May 2021 02:07:12 -0700 (PDT) Received: from amanieu-laptop.home ([2a00:23c6:f081:f801:91cf:b949:c46c:f5a9]) by smtp.gmail.com with ESMTPSA id z17sm7520306wrt.81.2021.05.18.02.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 02:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G/r5fensnn55MXUHGBjpVLt7X4x9tXaFMDjcQRg5EpA=; b=eUJE1f1YvEhBwCYMcbqD+IMmg8AvbE3Y2ox7q6oQSyKdbDSMnTKfChaWfqNCSwh5Y5 l1349V6mwRmwj8biCJ/NRe0DE7QKW7sDue1E7G6gaCvUBiIfjwai6p+0zYig0AKnduFf In3eRdQJYonyyqPJAOrEGwL+fXM4hleyqjCApPY5KqhYfwKE+Yr41zXhZjEE2AO2/ZOo SYtXCMIy7oPi18cJkyoNQCkFfRZRbihoeimDdCEXvT9hz/agnQhvfMgIUXi6Ak/f4SQ5 TPqZjOKCHAAC7RIcpLMNskPUeC/Z6gw1LQJppIB99faQFNRpNcNBraN4ggn7E6eKk136 LVGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G/r5fensnn55MXUHGBjpVLt7X4x9tXaFMDjcQRg5EpA=; b=qJBpw8Ipg+lOGl1RpAAeksb7e46OnxTrALvrVx5Ig8msOX68r/x/RcHBXFWQDxC+UT xO8HKZwytyuUK0Jp2VYifWfUwiDyMMasiI/RdVabh52U09XJwGReczpao8OKRFxvDTju zdDdmtwZr8aL69FOWhfJqAU5QsDm2gU5qKiPVuDpg2s2y8wAzu1+IMJQvxIFkQGVz6OD K0WVdKNgQwp42maVZP6J4GEbmG2KfQgHjFsIpIK52kGqUbAdJZHutjcYK2PRm5caIydQ cnvhXy2lK7KmDDxcIDneUNUYgkPaN3gPSHN9Toa6hTdqgn9Y0JeFOpgfY7h20ubEjIIR rxsg== X-Gm-Message-State: AOAM532Nj/MaPbV+VO8YJO8iYAivGU7EBJzmvdMdyREORU+dbznOnaOw y94t6EuDGLadGXI+gpUy8ik= X-Google-Smtp-Source: ABdhPJweEKk2l8D7ru8vr0SN32RW6HDKj9rEKHootedlexMXHcpQSqg1DuJKtxJaY0VMRcQjOYP66A== X-Received: by 2002:a5d:5049:: with SMTP id h9mr5596727wrt.24.1621328831089; Tue, 18 May 2021 02:07:11 -0700 (PDT) From: Amanieu d'Antras Cc: Amanieu d'Antras , Ryan Houdek , Catalin Marinas , Will Deacon , Mark Rutland , Steven Price , Arnd Bergmann , David Laight , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v4 5/8] arm64: mm: Use HAVE_ARCH_COMPAT_MMAP_BASES Date: Tue, 18 May 2021 10:06:55 +0100 Message-Id: <20210518090658.9519-6-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518090658.9519-1-amanieu@gmail.com> References: <20210518090658.9519-1-amanieu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch switches arm64 to use separate mmap_base for 32-bit and 64-bit mmaps. This is needed to ensure that compat syscalls invoked by 64-bit tasks perform VM allocations in the low 4G of the address space. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/elf.h | 8 +++++--- arch/arm64/include/asm/processor.h | 33 ++++++++++++++++++------------ arch/arm64/mm/mmap.c | 33 ++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 16 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index dfdc3e0af5e1..d57b7bcbd758 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -133,6 +133,7 @@ config ARM64 select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_BITREVERSE + select HAVE_ARCH_COMPAT_MMAP_BASES if COMPAT select HAVE_ARCH_COMPILER_H select HAVE_ARCH_HUGE_VMAP select HAVE_ARCH_JUMP_LABEL diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 8d1c8dcb87fd..e21964898d06 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -187,12 +187,14 @@ extern int arch_setup_additional_pages(struct linux_b= inprm *bprm, int uses_interp); =20 /* 1GB of VA */ +#define STACK_RND_MASK_64 (0x3ffff >> (PAGE_SHIFT - 12)) #ifdef CONFIG_COMPAT +#define STACK_RND_MASK_32 (0x7ff >> (PAGE_SHIFT - 12)) #define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ - 0x7ff >> (PAGE_SHIFT - 12) : \ - 0x3ffff >> (PAGE_SHIFT - 12)) + STACK_RND_MASK_32 : \ + STACK_RND_MASK_64) #else -#define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12)) +#define STACK_RND_MASK STACK_RND_MASK_64 #endif =20 #ifdef __AARCH64EB__ diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/pr= ocessor.h index f47528aae321..f8309f8d0ece 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -70,29 +70,36 @@ =20 #ifdef CONFIG_ARM64_FORCE_52BIT #define STACK_TOP_MAX TASK_SIZE_64 -#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 4)) +#define TASK_UNMAPPED_BASE_64 (PAGE_ALIGN(TASK_SIZE_64 / 4)) #else #define STACK_TOP_MAX DEFAULT_MAP_WINDOW_64 -#define TASK_UNMAPPED_BASE (PAGE_ALIGN(DEFAULT_MAP_WINDOW / 4)) +#define TASK_UNMAPPED_BASE_64 (PAGE_ALIGN(DEFAULT_MAP_WINDOW_64 / 4)) #endif /* CONFIG_ARM64_FORCE_52BIT */ =20 +#ifdef CONFIG_COMPAT +#define TASK_UNMAPPED_BASE_32 (PAGE_ALIGN(TASK_SIZE_32 / 4)) +#define TASK_UNMAPPED_BASE (test_thread_flag(TIF_32BIT) ? \ + TASK_UNMAPPED_BASE_32 : TASK_UNMAPPED_BASE_64) +#else +#define TASK_UNMAPPED_BASE TASK_UNMAPPED_BASE_64 +#endif /* CONFIG_COMPAT */ + +#define STACK_TOP_64 STACK_TOP_MAX #ifdef CONFIG_COMPAT #define AARCH32_VECTORS_BASE 0xffff0000 +#define STACK_TOP_32 AARCH32_VECTORS_BASE #define STACK_TOP (test_thread_flag(TIF_32BIT) ? \ - AARCH32_VECTORS_BASE : STACK_TOP_MAX) + STACK_TOP_32 : STACK_TOP_64) #else -#define STACK_TOP STACK_TOP_MAX +#define STACK_TOP STACK_TOP_64 #endif /* CONFIG_COMPAT */ =20 -#ifndef CONFIG_ARM64_FORCE_52BIT -#define arch_get_mmap_end(addr) ((addr > DEFAULT_MAP_WINDOW) ? TASK_SIZE :\ - DEFAULT_MAP_WINDOW) - -#define arch_get_mmap_base_topdown(addr) \ - ((addr > DEFAULT_MAP_WINDOW) ? \ - current->mm->mmap_base + TASK_SIZE - DEFAULT_MAP_WINDOW :\ - current->mm->mmap_base) -#endif /* CONFIG_ARM64_FORCE_52BIT */ +#define arch_get_mmap_end arch_get_mmap_end +#define arch_get_mmap_base arch_get_mmap_base +#define arch_get_mmap_base_topdown arch_get_mmap_base_topdown +unsigned long arch_get_mmap_end(unsigned long addr); +unsigned long arch_get_mmap_base(unsigned long addr); +unsigned long arch_get_mmap_base_topdown(unsigned long addr); =20 extern phys_addr_t arm64_dma_phys_limit; #define ARCH_LOW_ADDRESS_LIMIT (arm64_dma_phys_limit - 1) diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c index a38f54cd638c..956cab3ade11 100644 --- a/arch/arm64/mm/mmap.c +++ b/arch/arm64/mm/mmap.c @@ -38,3 +38,36 @@ int valid_mmap_phys_addr_range(unsigned long pfn, size_t= size) { return !(((pfn << PAGE_SHIFT) + size) & ~PHYS_MASK); } + +unsigned long arch_get_mmap_end(unsigned long addr) +{ +#ifdef CONFIG_COMPAT + if (in_compat_syscall()) + return TASK_SIZE_32; +#endif /* CONFIG_COMPAT */ +#ifndef CONFIG_ARM64_FORCE_52BIT + if (addr > DEFAULT_MAP_WINDOW_64) + return TASK_SIZE_64; +#endif /* CONFIG_ARM64_FORCE_52BIT */ + return DEFAULT_MAP_WINDOW_64; +} +unsigned long arch_get_mmap_base(unsigned long addr) +{ +#ifdef CONFIG_COMPAT + if (in_compat_syscall()) + return current->mm->mmap_compat_base; +#endif /* CONFIG_COMPAT */ + return current->mm->mmap_base; +} +unsigned long arch_get_mmap_base_topdown(unsigned long addr) +{ +#ifdef CONFIG_COMPAT + if (in_compat_syscall()) + return current->mm->mmap_compat_base; +#endif /* CONFIG_COMPAT */ +#ifndef CONFIG_ARM64_FORCE_52BIT + if (addr > DEFAULT_MAP_WINDOW_64) + return current->mm->mmap_base + TASK_SIZE - DEFAULT_MAP_WINDOW_64; +#endif /* CONFIG_ARM64_FORCE_52BIT */ + return current->mm->mmap_base; +} --=20 2.31.1