From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp09.au.ibm.com (e23smtp09.au.ibm.com [202.81.31.142]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e23smtp09.au.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 29AEC2C03BC for ; Tue, 26 Feb 2013 19:06:08 +1100 (EST) Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Feb 2013 17:58:46 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id DA1072BB0052 for ; Tue, 26 Feb 2013 19:06:05 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1Q7rUMf10879388 for ; Tue, 26 Feb 2013 18:53:30 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1Q86434008711 for ; Tue, 26 Feb 2013 19:06:05 +1100 From: "Aneesh Kumar K.V" To: benh@kernel.crashing.org, paulus@samba.org Subject: [PATCH -V1 21/24] powerpc: Handle huge page in perf callchain Date: Tue, 26 Feb 2013 13:35:11 +0530 Message-Id: <1361865914-13911-22-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1361865914-13911-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1361865914-13911-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Cc: linux-mm@kvack.org, 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