From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e28smtp02.in.ibm.com (e28smtp02.in.ibm.com [122.248.162.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e28smtp02.in.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 637AB2C00BA for ; Thu, 21 Mar 2013 06:35:28 +1100 (EST) Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 21 Mar 2013 01:01:11 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id F2E831258062 for ; Thu, 21 Mar 2013 01:06:32 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2KJZKtO7406008 for ; Thu, 21 Mar 2013 01:05:21 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2KJZMb6021211 for ; Wed, 20 Mar 2013 19:35:22 GMT From: "Aneesh Kumar K.V" To: benh@kernel.crashing.org, paulus@samba.org Subject: [PATCH -V4 21/25] powerpc: Handle hugepage in perf callchain Date: Thu, 21 Mar 2013 01:05:06 +0530 Message-Id: <1363808110-25748-22-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1363808110-25748-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1363808110-25748-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Cc: linuxppc-dev@lists.ozlabs.org, "Aneesh Kumar K.V" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Aneesh Kumar K.V" Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/perf/callchain.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index 578cac7..99262ce 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -115,7 +115,7 @@ static int read_user_stack_slow(void __user *ptr, void *ret, int nb) { pgd_t *pgdir; pte_t *ptep, pte; - unsigned shift; + unsigned shift, hugepage; unsigned long addr = (unsigned long) ptr; unsigned long offset; unsigned long pfn; @@ -125,20 +125,30 @@ static int read_user_stack_slow(void __user *ptr, void *ret, int nb) if (!pgdir) return -EFAULT; - ptep = find_linux_pte_or_hugepte(pgdir, addr, &shift, NULL); + ptep = find_linux_pte_or_hugepte(pgdir, addr, &shift, &hugepage); if (!shift) shift = PAGE_SHIFT; - /* align address to page boundary */ - offset = addr & ((1UL << shift) - 1); - addr -= offset; - - if (ptep == NULL) - return -EFAULT; - pte = *ptep; - if (!pte_present(pte) || !(pte_val(pte) & _PAGE_USER)) + if (!ptep) return -EFAULT; - pfn = pte_pfn(pte); + + if (hugepage) { + pmd_t pmd = *(pmd_t *)ptep; + shift = mmu_psize_defs[MMU_PAGE_16M].shift; + offset = addr & ((1UL << shift) - 1); + + if (!pmd_large(pmd) || !(pmd_val(pmd) & PMD_HUGE_USER)) + return -EFAULT; + pfn = pmd_pfn(pmd); + } else { + offset = addr & ((1UL << shift) - 1); + + pte = *ptep; + if (!pte_present(pte) || !(pte_val(pte) & _PAGE_USER)) + return -EFAULT; + pfn = pte_pfn(pte); + } + if (!page_is_ram(pfn)) return -EFAULT; -- 1.7.10