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 49252C433B4 for ; Fri, 30 Apr 2021 20:41:10 +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 C340A60C3E for ; Fri, 30 Apr 2021 20:41:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C340A60C3E 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=KwCQdvMzkG/r8D6PAf5fassw5 UMo4jPCHUxhgov2lsctf5Z+vPMfO4iynQMQL+Mhbt7dKfSE5qopF7RnwTJ1vtRhGJV5Qfl1ss6YSf IHWoyqaxmQpjUBWDm4Sry8DKLeytI9ppZzVZNMy1U7Q/KN9NgDOVOjAhtxPajdVXg8IZNSSSQYiwp gDVzn4tdx3o3PyrzzI1HauvwyW+qNwr81UuzkOK7Ff3Kppka94/RTnn/MsFjF4iPoaecx0nmARU+J 6emAQQBV35DhwBW6iy5k0DzT9FiRzPNGm+uyHNEk4aA+vOyxozEZK6INypMg9cftPKUFoMvrFSVyK OtRHkQVxw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcZu0-008YE0-98; Fri, 30 Apr 2021 20:38:21 +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 1lcZts-008YDO-Tv for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 20:38:13 +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=vzKlx+1LwPO3fuDJdwsG+6krKb N2sdiEfflexvkpDcEjBXBrQQO+KOkSx7EBMMNOD4reU3dsEm+XBtwgZbBNB5juVQTRpR7DcnNmyaU obgpfwEd5aTEjngdotSUORQPHVdGjBVVUTGLFUgpm6gqzcu9kXeCAp/1ieAnbK+kU80dJKonCykbe 4eVM0a9S/NXT7RGrw+Ewhp7RsxjZl4mABN/4ZBjIUoEAWwJl9mSr1WxMnbhwGQwNuy68ryadjNXui kW8PMg9DMMgcVutNZ4yaOX4iTj2hSMpB77g1+ISHBmGYiLamOFAOtWxBE/J+bV/beri99Rnrfu/gQ 79HuBm2w==; 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 1lcZtq-001ejK-20 for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 20:38:11 +0000 Received: by mail-wm1-x333.google.com with SMTP id 4-20020a05600c26c4b0290146e1feccd8so2296968wmv.1 for ; Fri, 30 Apr 2021 13:38: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=I0VCihY9/Yzgm/gCe6zh6hq4ak+g7rW7WwWNXOZLJwv3HS3q0LwY+uzRRU+GDnGnwU Dfsr9wtVZZqei7Pm45e5k9igK9KbjtsJIspFn5T2ktkjRepnnfZdQQvZArGDh+5HKQXD kuly2T25iQN1F5yHFGu+RFM4tsnKPROSuc5VZin4RzNXdLdRHBSTDl3kDDoHwugOuAPi 0+Y+wzZ5IEnYgFL+Ymzo8OXo+u8oHws3UDy33mRUJgyRLI+MaQkhlrqeeDJM5u1NjXNK UXlJLLFUnEW4jprVbwuej2R6LJd5nimX1Eui0/9A1XVCVB+6q/kmhmk6P8pB/etduWRJ WDZw== 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=AfVgy09ohDcy3n1Yxrwh+bAtLOKIgfJSiKqZz3z2PrIrgTZmTQl+AhVOEpcR5TOezo c4PeO2APgQsT6RHzrFRrmYRkd+SNFOYqrtlqiASECN9o7HdFOSyNTiBrfvTKUyw30sBX ZeX05kq5K+B5YhyR+OYYNlNb+g2hlOuH0Srw18HHqsFJyIKSgXoAUQnZ5Yap6owWik5F muVr/63wjpeGXPJLTaeS9GQJ2YxzDVKZIrAkNjvk+YEVdrPl6AwKfFzNa4ZN4i+W5eSb rFJFZ8SoAoXESqwF5Tz0Rk8Y4U5VcMGaRWNHWU6zc+jYwjeaXUrzkph8PaWmCwRRzIu1 L+Sg== X-Gm-Message-State: AOAM531fp6Ybaz6NwDfzKcvJirjHsHcF8pJy7ojaaHZgC9zbCX1e7DZN ejsJ2YXAvBoT2ubI4JYoCfk1aSv9ijXC75P7 X-Google-Smtp-Source: ABdhPJwpWgPw/hEcwnrnkgZN1FYmu83wrXI+9Z4H4NQtFJEKT9jTEWCNqWFNvppzg+i5y9ogbxbJHg== X-Received: by 2002:a7b:c156:: with SMTP id z22mr18616237wmi.86.1619815088327; Fri, 30 Apr 2021 13:38:08 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 13:38: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: [PATCH v4 2/8] hugetlbfs: Use arch_get_mmap_* macros Date: Fri, 30 Apr 2021 21:37:51 +0100 Message-Id: <20210430203757.47653-1-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_133810_115876_7815EFE9 X-CRM114-Status: GOOD ( 12.93 ) 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