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 32505C433FE for ; Thu, 20 Oct 2022 18:14:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A4268E0002; Thu, 20 Oct 2022 14:14:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6547B8E0001; Thu, 20 Oct 2022 14:14:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 543298E0002; Thu, 20 Oct 2022 14:14:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 417AE8E0001 for ; Thu, 20 Oct 2022 14:14:53 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 104B2120868 for ; Thu, 20 Oct 2022 18:14:53 +0000 (UTC) X-FDA: 80042128866.24.67EAC64 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf16.hostedemail.com (Postfix) with ESMTP id 7691C180006 for ; Thu, 20 Oct 2022 18:14:51 +0000 (UTC) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 50BB420477CE; Thu, 20 Oct 2022 11:14:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 50BB420477CE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1666289690; bh=ur8sScAym4ijq/4v4hHXNXCn8sXMfCruhdPnVBD9Zds=; h=From:To:Subject:Date:From; b=aGdm5Sd5dRnM54VEat6X0IA6HURGs2w6iDFe1M5AjRDo+qOYJGIkBoAjhec+7pOXf Su/Ht7+8b0sj4sMAL4q3aqMM6Msd6gKq6Mz0zVOnpT3LvVRocGTUciRTrT43/edgu5 EV+LQBrQHqwS5Ru4noDwXZxPph2C39m+VXqFTBwc= From: Saurabh Sengar To: ssengar@microsoft.com, akpm@linux-foundation.org, yuzhao@google.com, jack@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, jostarks@microsoft.com Subject: [PATCH] mm/gup: fix gup_pud_range() for dax Date: Thu, 20 Oct 2022 11:14:46 -0700 Message-Id: <1666289686-22798-1-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=aGdm5Sd5; spf=pass (imf16.hostedemail.com: domain of ssengar@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=ssengar@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666289691; a=rsa-sha256; cv=none; b=ZGzjTpoz7XgshpRlzcMDBlJogFkqMn7rLBjw5qi+LnrSEaeV0ae7m5v77ewJ3v+DASjkwK pc0vwF/SJMeF3s+SA6+sMgj74CcvgvMDn7G04NLJybLXjM9aU9KEh5q65QpB1Mm4+CxjSg glvg7IS2t1vGvHgh0PX4xvyjgupYOjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666289691; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=ur8sScAym4ijq/4v4hHXNXCn8sXMfCruhdPnVBD9Zds=; b=wlthIfuUeQhhBnAbBzNJqphzlaCWZDXJwuKDWe3RxO435uaYJ4MRynybmbuJ5lDp3Hi6tg kWSUXp8JsltOjmGvI1Uoz3qPFwC79J6fhbxHQQ+44A0+g6Q3/xhpN2tJo4TxIrMAFcMQt4 Kcp0d7fufGkUhyf6X0AIV8SIHu8GTB8= Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=aGdm5Sd5; spf=pass (imf16.hostedemail.com: domain of ssengar@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=ssengar@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com X-Stat-Signature: tdjregqzbw8u8m11mqtfooif68ecyqpx X-Rspamd-Queue-Id: 7691C180006 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1666289691-443114 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: John Starks For dax pud, pud_huge() returns true on x86. So the function works as long as hugetlb is configured. However, dax doesn't depend on hugetlb. Commit 414fd080d125 ("mm/gup: fix gup_pmd_range() for dax") fixed devmap-backed huge PMDs, but missed devmap-backed huge PUDs. Fix this as well. Fixes: 414fd080d125 ("mm/gup: fix gup_pmd_range() for dax") Signed-off-by: John Starks Signed-off-by: Saurabh Sengar --- mm/gup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index 05068d3d2557..9e07aa54a4cd 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2687,7 +2687,7 @@ static int gup_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr, unsigned lo next = pud_addr_end(addr, end); if (unlikely(!pud_present(pud))) return 0; - if (unlikely(pud_huge(pud))) { + if (unlikely(pud_huge(pud) || pud_devmap(pud))) { if (!gup_huge_pud(pud, pudp, addr, next, flags, pages, nr)) return 0; -- 2.25.1