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=-9.5 required=3.0 tests=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 33188C433DF for ; Fri, 29 May 2020 02:59:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E25D52075F for ; Fri, 29 May 2020 02:59:23 +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="skBzEUGm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E25D52075F 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 52F78800CF; Thu, 28 May 2020 22:58:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85B01800CB; Thu, 28 May 2020 22:58:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34E4B800CD; Thu, 28 May 2020 22:58:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0181.hostedemail.com [216.40.44.181]) by kanga.kvack.org (Postfix) with ESMTP id 05815800CF for ; Thu, 28 May 2020 22:58:32 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C70FC180AD822 for ; Fri, 29 May 2020 02:58:31 +0000 (UTC) X-FDA: 76868248422.25.hill81_1035e1475d750 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id A3EBC1804E3A1 for ; Fri, 29 May 2020 02:58:31 +0000 (UTC) X-HE-Tag: hill81_1035e1475d750 X-Filterd-Recvd-Size: 2653 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 02:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=quJ3RC3U+b/nyG816tgLa2xDrJqk5JH49/UwuAMJF44=; b=skBzEUGmPctWWpVrNKDkxMoOgD pyLFnANfiPTVJnun523pYwSVbPS5oYdL4zUo5GK7YbNHR4dJ5hPw2n07akxr3SMTWlj1Gnbau20ZE e+WTO0bM8cGyMppUzZsZlCs6zY5NiuoRCqnsNpTfTSYGXaGTx6kHxQnvd0A/3k4Zuo9apOPYPKxuJ k8ek7/17oH6r/mOao76YstwOyFtDVHpM7vfiTB3Px23F6UpZr2lvHgpcxHuwYiE4aS0XymW3Dts7z ORMBjmpY3Vr/rZco1GwFqdfCCqd0REfBLcslUA5QqCAW310QdCMIqEO3nKk9vWOkUPGPMVmeECQKf 9cW8aofg==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeVE4-0008UA-3W; Fri, 29 May 2020 02:58:28 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: William Kucharski , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v5 39/39] mm: Align THP mappings for non-DAX Date: Thu, 28 May 2020 19:58:24 -0700 Message-Id: <20200529025824.32296-40-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200529025824.32296-1-willy@infradead.org> References: <20200529025824.32296-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: A3EBC1804E3A1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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 4c4f92349829..9b6f7b86bac7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -577,13 +577,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.26.2