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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 3954DC55178 for ; Thu, 29 Oct 2020 19:34:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A8568206DD for ; Thu, 29 Oct 2020 19:34:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="XBvRw9or" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8568206DD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B66026B0070; Thu, 29 Oct 2020 15:34:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 857056B0082; Thu, 29 Oct 2020 15:34:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54BEC6B0070; Thu, 29 Oct 2020 15:34:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id 16EC56B007D for ; Thu, 29 Oct 2020 15:34:14 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B5D24180AD807 for ; Thu, 29 Oct 2020 19:34:13 +0000 (UTC) X-FDA: 77425963986.21.ice80_290972f27290 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 87AC2180442C7 for ; Thu, 29 Oct 2020 19:34:13 +0000 (UTC) X-HE-Tag: ice80_290972f27290 X-Filterd-Recvd-Size: 2628 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:34:13 +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=JtnSk9FEEgyaxqeuAWYlzwggtFwYiu6sjhMbVnBCTYw=; b=XBvRw9orNd8h9rQjHnBMKhkep1 /jl88pKbWM5jCvFqJfh85I401AZooE3a/C4ejwpp4qhiotrF8dlXGRxLt50GKm1fDAafH/N692M7U 58kez5ZDeU2JvNv7Q5BwvMb26oOJX+UaSRBc+beO+4AG1wEuACpXZlprPy8PS1X8iUi5WbqqqCsY9 m5OmbxHlIeKL7a04gXeGOsiI2S4GGrMdWUZnUX3nxD9BvREQtyJXB3xqjTJqRsKbvQnmQ7xOaIRI2 UlCkxoWNEzimRE6FXMrbj/lkxAZqf4uQfizyDRzR0KAlzU0JooGofizcENtYR8EiKqqVkDb44/c/a bmmlq3Tw==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDgZ-0007cq-Ok; Thu, 29 Oct 2020 19:34:11 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: William Kucharski , Matthew Wilcox Subject: [PATCH 16/19] mm/readahead: Align THP mappings for non-DAX Date: Thu, 29 Oct 2020 19:34:02 +0000 Message-Id: <20201029193405.29125-17-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201029193405.29125-1-willy@infradead.org> References: <20201029193405.29125-1-willy@infradead.org> MIME-Version: 1.0 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 transparent huge pages 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 580afce93d4a..660fe8c29cd9 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -556,13 +556,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.28.0