From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934930AbcATSSM (ORCPT ); Wed, 20 Jan 2016 13:18:12 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:52143 "EHLO e06smtp17.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934613AbcATSSJ (ORCPT ); Wed, 20 Jan 2016 13:18:09 -0500 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: holzheu@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-mm@vger.kernel.org From: Michael Holzheu To: Andrew Morton Cc: Martin Schwidefsky , Heiko Carstens , Gerald Schaefer , linux-mm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] numa: fix /proc//numa_maps on s390 Date: Wed, 20 Jan 2016 19:17:59 +0100 Message-Id: <1453313879-62521-1-git-send-email-holzheu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.3.9 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16012018-0005-0000-0000-00000A11E128 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When working with huge page pmds in general is not valid to directly use pte functions like pte_present() because the hardware bit layout of pmds and ptes can be different. This is the case on s390. Therefore we have to convert the pmds first into a valid pte encoding with huge_ptep_get(). So add the two missing functions calls to do this. Reviewed-by: Gerald Schaefer Signed-off-by: Michael Holzheu --- fs/proc/task_mmu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 65a1b6c..e287e32 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1520,7 +1520,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, pte_t *pte; if (pmd_trans_huge_lock(pmd, vma, &ptl)) { - pte_t huge_pte = *(pte_t *)pmd; + pte_t huge_pte = huge_ptep_get((pte_t *)pmd); struct page *page; page = can_gather_numa_stats(huge_pte, vma, addr); @@ -1548,18 +1548,19 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, static int gather_hugetlb_stats(pte_t *pte, unsigned long hmask, unsigned long addr, unsigned long end, struct mm_walk *walk) { + pte_t huge_pte = huge_ptep_get(pte); struct numa_maps *md; struct page *page; - if (!pte_present(*pte)) + if (!pte_present(huge_pte)) return 0; - page = pte_page(*pte); + page = pte_page(huge_pte); if (!page) return 0; md = walk->private; - gather_stats(page, md, pte_dirty(*pte), 1); + gather_stats(page, md, pte_dirty(huge_pte), 1); return 0; } -- 2.3.9