From patchwork Wed Apr 21 19:02:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amanieu d'Antras X-Patchwork-Id: 12216877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF808C433B4 for ; Wed, 21 Apr 2021 19:05:33 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C3456140D for ; Wed, 21 Apr 2021 19:05:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C3456140D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kMTEvAlg34aL+ZhIze1Dg04fo0EFL56RlDwe0KgY03Y=; b=l5lbYGzFfzjUfPjEKEayVK7NE d/HBhRLEybJDfZTMgr1EiDOk652Q96rBS7nIchtdc9/V18+j2DTqZNMzeO5zo5FZcHWBHH+I/VbB2 kZTjhdo1otdq13lE9o9/uPXDbHCC5OnL24YyY8g9Peh0jkmS88WpShhqlCGiXcN6ywQ9KphfuslAw ovgPb2tda8lTf7gHndLhImI7VviPEw7DYvezv+qx+9LDGc2c3k35TFblvBIPU68WXQcdPAZjgEzLT qYBLE0swjbsOFQb0kU7eUbmtyfR+vffuqNO7lmohCXOatFaM3tPvETnmXijivH2q1eYC08d2l18+5 DzYWt2lSA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZI8L-00EzNy-Iy; Wed, 21 Apr 2021 19:03:33 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZI7R-00EzJS-3D for linux-arm-kernel@desiato.infradead.org; Wed, 21 Apr 2021 19:02:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=9rGi608qIyo5wwTAfm/9KSh42lmNIqRVhptkNqcqKak=; b=AF4xUduXnMlKj+VL/crqGNmyO4 fJH4W7CPMgvavU9s/lEj7IGwIbr6JoBnRfYDR09F7yvArzyXQV/8pRJZUZD1t97heGDCjFaUV3UOV LjvQfOpLYu+mCZdcSTNXdaihJ6SJRiSgYbptXE0DTg26yOKi8ljanQDJr/40KMTxyT3HBxMPKv1ek 9gyCdlFKtMatMpsc1LHcTGMbI0UTVlC79exa02PoEMZfz+9v+XabZaCaioX4b4WcZrzyHzBTsk6HE b3heWxtOdDsdaPg5roDS+tYGtPJ0zKRsfJwiK/gPH/Q8tgEtxvqMCNkjWoiJvJm2qUBdU+MzJ/Cxn pWDJPz5g==; Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZI7N-00D7SX-3B for linux-arm-kernel@lists.infradead.org; Wed, 21 Apr 2021 19:02:35 +0000 Received: by mail-wm1-x333.google.com with SMTP id y124-20020a1c32820000b029010c93864955so1845468wmy.5 for ; Wed, 21 Apr 2021 12:02:32 -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=9rGi608qIyo5wwTAfm/9KSh42lmNIqRVhptkNqcqKak=; b=QBE32UQcgYCGBX11I+nqznfqwNvxE36wH86V9XHMyaDvUeIfa9AipZloF8ONUt/+Sq MQsH7zjfaZaaDjWbc53AFT7ungYLfWa3KhAKnXLnLQZmeQHT8di1VdQ4HgYS3J3lPCml 5A498Wq/lYZ+JurbBHXMiTZsu1SmdlR0O3XHJMN6SmQMgvgZmEc+Xe4GjzQhY5dBkWUL KbgxhIh25Tx206V21Q3hMlSDk9TMIXfjgPlVxybN1u4ngA11Ref0VtQOPVG1vi/RlPw6 aKJeGdwaayCF8SbU+aISqkkXLrfGS2ulID7uPab7I4oxbVgGd5+aqLCI/PPb1lSvBuOn 99mQ== 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=9rGi608qIyo5wwTAfm/9KSh42lmNIqRVhptkNqcqKak=; b=dZyAAajG/7gHZFyyyHGzmdu6cJI4E/Y0sifvMZVDxv/31VPJbPhKouBt/i1eTFm52u heJ01zWOYbwDIxbL/7QNpG9ABIUKlhf1dB0UwwMBQhuLuDOeb6GqrV/kIakKaSsjJjRQ PFVsJmKIiyR4yEWMvE+R/rGTpEgOfTZUa7RTwfhgp4DNbuUT+lEpx3CDLRBePWtSZDB9 tyoVUZ2UC+12c+JjWuh62lv3PjTjHjNQULsdRm7e8eB5wn6cmJSNngMI4Rqvutie+gpw sRLG6pQW/ctU3OYBa+9Cy0LEKNgaougLyD0lzqDh5feGGAzLDMIdSBLDI30OOt/N1RPn vM2g== X-Gm-Message-State: AOAM5329BtZGWYE9degr0wr3sohWpCH2mmAt8wpI6m2hw0l1bINH6pCg FjS6jTrZ97XMkgMqBwzp1CUXHKWAfHsjcP5Z X-Google-Smtp-Source: ABdhPJycVqt0AlfYSb5RoZX0XzPyUNprpPCb/Tw9o+Nq8d+ZW/kvPv0hQwPDks/o2EnBTVm4K7drdA== X-Received: by 2002:a1c:f60a:: with SMTP id w10mr11301156wmc.5.1619031751207; Wed, 21 Apr 2021 12:02:31 -0700 (PDT) Received: from amanieu-desktop.home ([2a00:23c6:f081:f801:93ef:94e:9f8:1f0]) by smtp.gmail.com with ESMTPSA id d10sm310829wri.41.2021.04.21.12.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 12:02:30 -0700 (PDT) From: Amanieu d'Antras To: linux-arm-kernel@lists.infradead.org Cc: Amanieu d'Antras , Ryan Houdek , Catalin Marinas , Will Deacon , Mark Rutland , Steven Price , Arnd Bergmann , David Laight , Mark Brown Subject: [RFC PATCH v3 3/8] mm: Support mmap_compat_base with the generic layout Date: Wed, 21 Apr 2021 20:02:02 +0100 Message-Id: <20210421190207.1803139-4-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210421190207.1803139-1-amanieu@gmail.com> References: <20210421190207.1803139-1-amanieu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210421_120233_158633_1D66F6A2 X-CRM114-Status: GOOD ( 17.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This enables architectures using the generic mmap layout to support 32-bit mmap calls from 64-bit processes and vice-versa. Architectures using this must define separate 32-bit and 64-bit versions of STACK_TOP, TASK_UNMAPPED_BASE and STACK_RND_MASK. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- mm/util.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/mm/util.c b/mm/util.c index 54870226cea6..37bd764174b5 100644 --- a/mm/util.c +++ b/mm/util.c @@ -353,12 +353,12 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) return randomize_page(mm->brk, SZ_1G); } -unsigned long arch_mmap_rnd(void) +static unsigned long mmap_rnd(bool compat) { unsigned long rnd; #ifdef CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS - if (is_compat_task()) + if (compat) rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1); else #endif /* CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS */ @@ -367,6 +367,11 @@ unsigned long arch_mmap_rnd(void) return rnd << PAGE_SHIFT; } +unsigned long arch_mmap_rnd(void) +{ + return mmap_rnd(is_compat_task()); +} + static int mmap_is_legacy(struct rlimit *rlim_stack) { if (current->personality & ADDR_COMPAT_LAYOUT) @@ -383,16 +388,17 @@ static int mmap_is_legacy(struct rlimit *rlim_stack) * the face of randomisation. */ #define MIN_GAP (SZ_128M) -#define MAX_GAP (STACK_TOP / 6 * 5) +#define MAX_GAP (stack_top / 6 * 5) -static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) +static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack, + unsigned long stack_top, unsigned long stack_rnd_mask) { unsigned long gap = rlim_stack->rlim_cur; unsigned long pad = stack_guard_gap; /* Account for stack randomization if necessary */ if (current->flags & PF_RANDOMIZE) - pad += (STACK_RND_MASK << PAGE_SHIFT); + pad += (stack_rnd_mask << PAGE_SHIFT); /* Values close to RLIM_INFINITY can overflow. */ if (gap + pad > gap) @@ -403,21 +409,45 @@ static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack) else if (gap > MAX_GAP) gap = MAX_GAP; - return PAGE_ALIGN(STACK_TOP - gap - rnd); + return PAGE_ALIGN(stack_top - gap - rnd); } void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack) { unsigned long random_factor = 0UL; +#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES + unsigned long compat_random_factor = 0UL; +#endif - if (current->flags & PF_RANDOMIZE) + if (current->flags & PF_RANDOMIZE) { +#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES + random_factor = mmap_rnd(false); + compat_random_factor = mmap_rnd(true); +#else random_factor = arch_mmap_rnd(); +#endif + } if (mmap_is_legacy(rlim_stack)) { +#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES + mm->mmap_base = TASK_UNMAPPED_BASE_64 + random_factor; + mm->mmap_compat_base = + TASK_UNMAPPED_BASE_32 + compat_random_factor; +#else mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; +#endif mm->get_unmapped_area = arch_get_unmapped_area; } else { - mm->mmap_base = mmap_base(random_factor, rlim_stack); +#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES + mm->mmap_base = mmap_base(random_factor, rlim_stack, + STACK_TOP_64, STACK_RND_MASK_64); + mm->mmap_compat_base = mmap_base(compat_random_factor, + rlim_stack, STACK_TOP_32, + STACK_RND_MASK_32); +#else + mm->mmap_base = mmap_base(random_factor, rlim_stack, STACK_TOP, + STACK_RND_MASK); +#endif mm->get_unmapped_area = arch_get_unmapped_area_topdown; } }