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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B365C433F5 for ; Fri, 4 Feb 2022 20:22:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DC808D000F; Fri, 4 Feb 2022 15:21:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 33B8B8D0007; Fri, 4 Feb 2022 15:21:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DAC78D000F; Fri, 4 Feb 2022 15:21:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id 0072C8D0007 for ; Fri, 4 Feb 2022 15:21:41 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id B89E681D2DCE for ; Fri, 4 Feb 2022 20:21:41 +0000 (UTC) X-FDA: 79106218002.30.838D54E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 4DFF720006 for ; Fri, 4 Feb 2022 20:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=aZV4KjJe9UITXvs3JOGFThAqZrlL3K+XXAgTUp8kRhc=; b=J/bG/JTM1oH0ytlgn86jsZMgSA upUR/CMX/QwWFgRoYIWrQOJGRc7CkSSWdzW339Pd2h1/YJ4dRPg9taM9w0Jj7CucT0ub+lwmmWFzV JE9nEDkKwhE4OGA1f2b2KQw3fYjJB524SAvW7q8wqizvJwCIWA7brYKSGUZcVWCykd2SKDa5ffR9u 8Ukpyu0Zhg5GaCYQ8obo5JLK3PT5f/+GoMF2v1bn9FvsNzb1zjCkOwxuqXS0zvAEnbrzx668gaBCs 6sjj+Zg1Hvlkm8/HkPzCq/ObouiGfuooQPSs6BQozcEZIrGvdA/Ckg+PYsq72EDWI27erEEpY/5jm mTg3tZ7A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jc-007LrZ-2k; Fri, 04 Feb 2022 19:59:08 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: William Kucharski , linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH 72/75] mm/readahead: Align file mappings for non-DAX Date: Fri, 4 Feb 2022 19:58:49 +0000 Message-Id: <20220204195852.1751729-73-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220204195852.1751729-1-willy@infradead.org> References: <20220204195852.1751729-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: nil X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 4DFF720006 X-Stat-Signature: 687xxd4b7rgp9hntn9pefrsyqot5tqz9 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="J/bG/JTM"; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1644006101-228370 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: William Kucharski When we have the opportunity to use PMDs to map a file, we want to follow the same rules as DAX. Signed-off-by: William Kucharski Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a80d0408ebf4..dd3e14700220 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -582,13 +582,10 @@ unsigned long thp_get_unmapped_area(struct file *fi= lp, unsigned long addr, unsigned long ret; loff_t off =3D (loff_t)pgoff << PAGE_SHIFT; =20 - if (!IS_DAX(filp->f_mapping->host) || !IS_ENABLED(CONFIG_FS_DAX_PMD)) - goto out; - ret =3D __thp_get_unmapped_area(filp, addr, len, off, flags, PMD_SIZE); if (ret) return ret; -out: + return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags); } EXPORT_SYMBOL_GPL(thp_get_unmapped_area); --=20 2.34.1