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,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 E8BF0C43461 for ; Tue, 18 May 2021 09:10:23 +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 74BC361353 for ; Tue, 18 May 2021 09:10:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 74BC361353 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=DG6Jed6QrXcdnOeEajlQlM9/Q3qYSiwZT5I+ijUuDBo=; b=ZoC/Mk+3Uh/ouyjy+CGInOKwC qXpN3rvZUQuc0zNosBdmlwgOGaF5QA963Qg7DR+BK3NX+cL7qvvxHFBm4YA8eNVlPoQTSQXToKXwf l6JPzkgyZ6zcPPAepUDoo5/Gul7vWqPoEQqWtrSyTRm1srtgNOHl6WBrP377IA562FBlbwV804dUL mPcYl3eQFzRAAyK5FxchDXdoZWGS2vP7/xZGPHYClfrY+g4HrY6d5HhD2qKmu5G/p1xQ2uMbl5ptx HP1kueEJnpVdvvkw2R0cMwNb2IF/kqr9/v/iUKvyPevAci2DlMEWiI8MI853tS9rVLMPvw5O2HhnX NaciwzAPw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1livhn-0002px-NA; Tue, 18 May 2021 09:08:00 +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 1livh4-0002Zy-6n for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:07: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=DEq0/bKuKyVdL1JH6Xf7qoLNGy26OvZqXWZScmfZsZ4=; b=22Xk+InIoTWkcMS7G5VixFf+vi ckPEoggn0f1BpDCdtZm9F4QQ6tO5ZOsXcr9JwVmG4rsz3jTdnyNYV6C/iV4Urlha74L65rRh3arOp 331jKolXtYuSaUzjxDUh0vYo5vK7Pe8iZzHq1fzwV66fo2x3Jor9YWuANZj9UpBMyXZg6qXdzvYBO +8jIf9+dtZJlC0AvvDkgIpOYmeNtFVVfHFe+wdxQlSd+6upKgN99MrDmAjzytjDZC0FeCXv4xXfx0 GKMG4mP8GLJsXRqk8EU0M/Jr5MHW7bSoP5O9nNanLhXeq3Avh6KvdijDn+l3tk91dAanOhVLTpvrm IgxFVxiw==; 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 1livh0-00EUUZ-Fy for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:07:12 +0000 Received: by mail-wm1-x32b.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so1059505wmk.1 for ; Tue, 18 May 2021 02:07:09 -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=DEq0/bKuKyVdL1JH6Xf7qoLNGy26OvZqXWZScmfZsZ4=; b=YXX3VRZhOsfkB4tqu4Q6tAruc141WxgNYT2vTPahITkoBVW62BQbI/sBbFkSqseuNC mhbNcHMeCuLCBI+BiUFrst6wUM5jKxPuY8C8rgZPqXRiDptgfsiJcKEK5lzgkfWq4ciG 5o4kXqCM3YDFxvy4g6lHD4PG5hwsK9baR2Eo2C6jL7D/oSRm1/VSxks0nAEuNwAsAbPR YmiKvgRJK4ZFprotrlEM+uXJxVpewBXcVsCX0MvgzEIx0/Y+G7KEweH6FbNsMCCkwntb 8+vvaCFdK1xbWXWC6Hlz71OwNNETAee3JejQ6tL9+YqsQB/JqPPb5lhQUI69AJ1YNLxD 0P3w== 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=DEq0/bKuKyVdL1JH6Xf7qoLNGy26OvZqXWZScmfZsZ4=; b=E216ASggO2RjEy5u0vG1EbJg5plF9rnQMO+tukE9GAwJygHaZohCHQ49yIfFhjaDX5 wV4JhrNRZYYr8Id46ZaTcRwdD9zUXLtdGES99owyAkGJ0yUzIA4zWczjQweU8eIuJKB/ 8LFF03V0aEMnkPyjhm2qfcMOoG8XuQ0ppp74C8LjTNRNSb3K9DpvYkFPXPtlD/KVHnha tEw4Ky+qB/RtJacEC5lRhMiUxOCClBSWx1y61A5yaAhM2+MeXRPEysLvQ0k7upnLAgcc z2IGDloFrqe6mPy2ogLeJmB46bJzAoCjIaNPzIOp6bdhKtv2OhbyKAWDS3HNOx6dIR0j u6pw== X-Gm-Message-State: AOAM530TmQcnF5Pbkfxl4tUFxoCKyKtoR7PdeUyMwwOS3zMby45ck0MY 2aoGQ1XH0JU2g0C4vJtuh8U= X-Google-Smtp-Source: ABdhPJypDI4jFTUNpyCBGcVWEB+Qc4Mg9AKECPAD92Z3ZLvuiLmU/GmFHaNdYqqF00Froa1hujNP4w== X-Received: by 2002:a1c:dd08:: with SMTP id u8mr3757709wmg.62.1621328828723; Tue, 18 May 2021 02:07:08 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 02:07:08 -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: [RESEND PATCH v4 2/8] hugetlbfs: Use arch_get_mmap_* macros Date: Tue, 18 May 2021 10:06:52 +0100 Message-Id: <20210518090658.9519-3-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_020710_552714_3D4A5BBA X-CRM114-Status: GOOD ( 13.06 ) 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 hugetlb_get_unmapped_area should obey the same arch-specific constraints as mmap when selecting an address. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- fs/hugetlbfs/inode.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 701c82c36138..526ccb524329 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -191,6 +191,18 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) */ #ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA +#ifndef arch_get_mmap_end +#define arch_get_mmap_end(addr) (TASK_SIZE) +#endif + +#ifndef arch_get_mmap_base +#define arch_get_mmap_base(addr) (current->mm->mmap_base) +#endif + +#ifndef arch_get_mmap_base_topdown +#define arch_get_mmap_base_topdown(addr) (current->mm->mmap_base) +#endif + static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) @@ -200,8 +212,8 @@ hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr, info.flags = 0; info.length = len; - info.low_limit = current->mm->mmap_base; - info.high_limit = TASK_SIZE; + info.low_limit = arch_get_mmap_base(addr); + info.high_limit = arch_get_mmap_end(addr); info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; return vm_unmapped_area(&info); @@ -217,7 +229,7 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr, info.flags = VM_UNMAPPED_AREA_TOPDOWN; info.length = len; info.low_limit = max(PAGE_SIZE, mmap_min_addr); - info.high_limit = current->mm->mmap_base; + info.high_limit = arch_get_mmap_base_topdown(addr); info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; addr = vm_unmapped_area(&info); @@ -231,8 +243,8 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr, if (unlikely(offset_in_page(addr))) { VM_BUG_ON(addr != -ENOMEM); info.flags = 0; - info.low_limit = current->mm->mmap_base; - info.high_limit = TASK_SIZE; + info.low_limit = arch_get_mmap_base(addr); + info.high_limit = arch_get_mmap_end(addr); addr = vm_unmapped_area(&info); } -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel