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 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=unavailable 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 B1737C433B4 for ; Fri, 30 Apr 2021 20:41:31 +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 3D11A61107 for ; Fri, 30 Apr 2021 20:41:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D11A61107 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=S1PeyvqTKNdozuPkvHx7TAp8n QrXm2sW9SkEi3JifT1it8xcURwBgAfNmyW/2WhbR/N/VHpTNFIbTn7o+B09/PbtIiR2TQknKENZW1 oRm518fsf3U45QsQWvfURmKEvbhDmX5EJXCVjU25RHWq7SQX+MGHhu0KnoZFp8wwwMA/QetMIlQxM jsfhbEfdKTtB5/muP1ffJaHA7agG4noDJyUE0Q/oTvu/jxWGqNyuri+mP4aDcIPzhvpZw0jEMVdMm WE6wKVO7aAoT0skBlQyQdgtGbidVPZgQKa6BuZcvtT/M3gBdOWSqxh5OYlr0v6SdzrLtB0V9Z+j4R IPly121Vg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcZuK-008YHs-4E; Fri, 30 Apr 2021 20:38:40 +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 1lcZtt-008YDc-VZ for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 20:38:14 +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=1shIlMgMCxHpxVZvtGhkQRyQZa DutJQ+te4fkd/7rEsZL6sr2tjopUzHW7bitovaPbvIzus9dJnbVZMcqNF6D7IvAw9Ui2ru8fdbPz8 XLZAf2gr4cMAvIbGfOnGETZwIEWj3RgPNeY4CYgHMD+KDlcnWaMFsCJt/qmNrkIQ7XF3EP6yQahuW IqMEKfcfrGGtcAl2iD2E9E7McoWOLedBsljEd4oD7YmcKXqBLcNKRjWQzcXcx+6fbEowgEO3Wq+4t BCkOm4m0YxmclBc6B/JWnkd6csaQZCCwDXi7mUpcag4LyZaPhLqTNAR1JDo4i2BeRpAzMCZgXgzMG OFgbMscg==; Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcZtr-001ejY-5z for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 20:38:12 +0000 Received: by mail-wm1-x32b.google.com with SMTP id o26-20020a1c4d1a0000b0290146e1feccdaso2429592wmh.0 for ; Fri, 30 Apr 2021 13:38:11 -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=CvdqY8NoDzxfaCjWuYW52uyx4VI6KnVFObEuc3VwxhMsaIB9+Yv4+tJ5vc+CKkqAqu DFkD9Wcz40fDhJ13BMexOvdyFJi/ugtuNbpRM/8SojpBgKf5T301Aj2LahPVu6h4woLr Z4SyIObMmCfvJyxIb5GJ/DCusmZsPi6dyAz06/2rJIErg6bJYwvf9+NnQbk3kd/iTePY PzvnOkdUkdlNid5s3MOumUi0p7ubnfX7B/yfi+1MBfOz8diWX973CqtmcNPRnEfws7jw tDB8391tY7H+oDnzgGjAlaDvbw55Cbo1Ci+hOxA8xaADWlH9cTu3BKhqLrlX93d0+t0Y eRjg== 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=UGmTldAbszHlf5vFWNGH2LRjYZkZZlXsx9P1GoVQn1AH5G34XJCAjbPALm85HoQOjM Kuv+egq4MoRykE7xif39NFKUeHGy3jjBmIFgd45oQK1ayw2W0Ui01XRwTOJW6giCTntu qkDMAb6eCbBOsiecfqRWxUhS6RPxlphnkF10hNa5QyxeIeL5WKiJs/k16IgH1yGhxwX+ uyExdLVnMygVbNo7h21eEWGHWwcUSX1RM7OGadf41xGp6tiNSGFlUOJ+ggpFqKJmEado qLqBX5gUrIJT37d/0EmTnahVftRUpsaie1ahAscU7Fi/KB3HF5bst1zAyEKBC588QJc6 VV0A== X-Gm-Message-State: AOAM531L0DmZvnzvyPUM61hNWDhc0sOTMt/eM6L427PrMvz1bClU0bpN tHrYIgdJbLb8S/Cfo7w6KwM= X-Google-Smtp-Source: ABdhPJysbnsaEfcFI4I+IvQaI7Ctl179Unq6uDAJ8B1wNG4pOThSvlUXxu5oi9Ui1o6zwCcJ8cL5Eg== X-Received: by 2002:a1c:7f4a:: with SMTP id a71mr18087171wmd.60.1619815089943; Fri, 30 Apr 2021 13:38:09 -0700 (PDT) Received: from amanieu-desktop.home ([2a00:23c6:f081:f801:93ef:94e:9f8:1f0]) by smtp.gmail.com with ESMTPSA id r5sm4384239wmh.23.2021.04.30.13.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 13:38:09 -0700 (PDT) From: Amanieu d'Antras To: 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: [PATCH v4 3/8] mm: Support mmap_compat_base with the generic layout Date: Fri, 30 Apr 2021 21:37:52 +0100 Message-Id: <20210430203757.47653-2-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210430202810.44092-1-amanieu@gmail.com> References: <20210430202810.44092-1-amanieu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210430_133811_241661_A0EE8B77 X-CRM114-Status: GOOD ( 17.27 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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; } } -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel