From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752377AbdFUVue (ORCPT ); Wed, 21 Jun 2017 17:50:34 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:34207 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbdFUVuc (ORCPT ); Wed, 21 Jun 2017 17:50:32 -0400 From: Nitin Gupta To: "David S. Miller" Cc: "David S. Miller" , Nitin Gupta , Lorenzo Stoakes , Jan Kara , Michal Hocko , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] sparc64: Fix gup_huge_pmd Date: Wed, 21 Jun 2017 14:50:09 -0700 Message-Id: <1498081816-179369-1-git-send-email-nitin.m.gupta@oracle.com> X-Mailer: git-send-email 1.7.1 X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function assumes that each PMD points to head of a huge page. This is not correct as a PMD can point to start of any 8M region with a, say 256M, hugepage. The fix ensures that it points to the correct head of any PMD huge page. Signed-off-by: Nitin Gupta --- arch/sparc/mm/gup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/sparc/mm/gup.c b/arch/sparc/mm/gup.c index cd0e32b..9116a6f 100644 --- a/arch/sparc/mm/gup.c +++ b/arch/sparc/mm/gup.c @@ -80,6 +80,8 @@ static int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, refs = 0; head = pmd_page(pmd); page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT); + if (PageTail(head)) + head = compound_head(head); do { VM_BUG_ON(compound_head(page) != head); pages[*nr] = page; -- 2.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nitin Gupta Date: Wed, 21 Jun 2017 21:50:09 +0000 Subject: [PATCH] sparc64: Fix gup_huge_pmd Message-Id: <1498081816-179369-1-git-send-email-nitin.m.gupta@oracle.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: "David S. Miller" Cc: Nitin Gupta , Lorenzo Stoakes , Jan Kara , Michal Hocko , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org The function assumes that each PMD points to head of a huge page. This is not correct as a PMD can point to start of any 8M region with a, say 256M, hugepage. The fix ensures that it points to the correct head of any PMD huge page. Signed-off-by: Nitin Gupta --- arch/sparc/mm/gup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/sparc/mm/gup.c b/arch/sparc/mm/gup.c index cd0e32b..9116a6f 100644 --- a/arch/sparc/mm/gup.c +++ b/arch/sparc/mm/gup.c @@ -80,6 +80,8 @@ static int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, refs = 0; head = pmd_page(pmd); page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT); + if (PageTail(head)) + head = compound_head(head); do { VM_BUG_ON(compound_head(page) != head); pages[*nr] = page; -- 2.9.2