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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 7D7A1C43381 for ; Mon, 11 Mar 2019 20:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F30B2171F for ; Mon, 11 Mar 2019 20:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334405; bh=2ahr39JG4ahpvgXXMLZcvQGN109+8NUbGczsBU2Hx7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iyvOf/eiVqbke/q1wTMyspMTmjIFWERUNoTo2Z/YF+/AwsnGrcygstrfL1VSMyn9n vkSgWPjVyu8Bc1ESIqPgVRQt/EOXKfFe2o11O6PLLO7zv49HjTHpBGg6kX/c3VcGIF JiZxU5IsauZbUsNCYGGECrXepZfsK6V26aCdkC1o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729735AbfCKUAD (ORCPT ); Mon, 11 Mar 2019 16:00:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729196AbfCKUAA (ORCPT ); Mon, 11 Mar 2019 16:00:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 830FE2064A; Mon, 11 Mar 2019 19:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334400; bh=2ahr39JG4ahpvgXXMLZcvQGN109+8NUbGczsBU2Hx7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oftf0J15CcPizWZ9C6WR5oNE7StelMq+UfdPDnPmGSmzmoV7lh0Y20AAxR6zoYGZk FythV8wA1etlKCuMYRZydtHobOIWS/h6qwXD0Qe+V4c0Sy6Wr17QUjMLL6PAxPaVaA dVeeytRimHRQd4nNetRAj4kx0Z/GuvzzUaN4haog= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yu Zhao , Dan Williams , Huang Ying , Matthew Wilcox , Keith Busch , "Michael S . Tsirkin" , John Hubbard , Wei Yang , Mike Rapoport , Andrea Arcangeli , "Kirill A . Shutemov" , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 3.18 4/6] mm/gup: fix gup_pmd_range() for dax Date: Mon, 11 Mar 2019 15:59:49 -0400 Message-Id: <20190311195951.139741-4-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190311195951.139741-1-sashal@kernel.org> References: <20190311195951.139741-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yu Zhao [ Upstream commit 414fd080d125408cb15d04ff4907e1dd8145c8c7 ] For dax pmd, pmd_trans_huge() returns false but pmd_huge() returns true on x86. So the function works as long as hugetlb is configured. However, dax doesn't depend on hugetlb. Link: http://lkml.kernel.org/r/20190111034033.601-1-yuzhao@google.com Signed-off-by: Yu Zhao Reviewed-by: Jan Kara Cc: Dan Williams Cc: Huang Ying Cc: Matthew Wilcox Cc: Keith Busch Cc: "Michael S . Tsirkin" Cc: John Hubbard Cc: Wei Yang Cc: Mike Rapoport Cc: Andrea Arcangeli Cc: "Kirill A . Shutemov" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/gup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index ce1630bf0b95..29a36fae8624 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -885,7 +885,8 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, if (pmd_none(pmd) || pmd_trans_splitting(pmd)) return 0; - if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd))) { + if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd) || + pmd_devmap(pmd))) { /* * NUMA hinting faults need to be handled in the GUP * slowpath for accounting purposes and so that they -- 2.19.1