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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3524EC433FF for ; Mon, 5 Aug 2019 06:22:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F409520B1F for ; Mon, 5 Aug 2019 06:22:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=fossix-org.20150623.gappssmtp.com header.i=@fossix-org.20150623.gappssmtp.com header.b="syATBiEy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbfHEGWr (ORCPT ); Mon, 5 Aug 2019 02:22:47 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39400 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726375AbfHEGWq (ORCPT ); Mon, 5 Aug 2019 02:22:46 -0400 Received: by mail-pf1-f195.google.com with SMTP id f17so35089187pfn.6 for ; Sun, 04 Aug 2019 23:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fossix-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QeuUeEGe1/vHoSUVD7CZG3g0CzW19Ib+t17yb0VRxVM=; b=syATBiEyqFFzlHCvwI/ps599/hUVwXBIbA7fetPtKeazCKPgY/HXhVRheegtC/WAuf wTSLUJja6wv7ZE0/n7CXJJhM24uEr1QkntDLK5/GWV2KIwhMtK7rrByCQnHXwLKe70xx HgTH5kXy1p1NWMaLJMttZKdrYZL859yAZoNYgXNbbFmVnCIVjAY9GWLZhOhJK/+8yRjv 9sTK2GG/tEB3e/FBbsQyJH9bUu4k24UNIdytnwh4hN9cRvL+tKkGYpv8W+MzH6zNRh6p cYrNyZEm2KsT3k75pi/avicqpCd55rHwGqiXVDYdJ+LbLc9uGXBA/70SGfwUvcaNo1Qf qEfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QeuUeEGe1/vHoSUVD7CZG3g0CzW19Ib+t17yb0VRxVM=; b=dk51nl+Fn2wI0duEd6J6q25iLH4T+Zc7v6dNtQWR9tITJi86p4q+fgKgGgZh2njnbQ yOSmsEksJ8QfMlpKMYuf1HxJBBoL9hKg+mGKgYBkrfncC2hMfiROUImb2ir453KALrq0 7v9X+XAxNxUk/AtUiRE0w3oifjPh5zdeLZdYReL0969dEXdJZD3Ncu2x6JD3n6drueJJ T4L0d4cIZOQRVutcSqMz8yjWZSM2FzZFdX9FArqJSngf6CHWLAUZI5y73lNzu2bFJ87j vVr8UFPZV5vkY7UNT8I4hHlKiI3JOvxOe3folPl19/xhyhmDlwyDWjiN5+VHrT/o1t4Y +0/A== X-Gm-Message-State: APjAAAVD47IQ2c6nBmbqmwOYhVpNE5GB+9c7tGOaoq+mqgehr29vRH+G Lt6QDWkrFbeHfsCrozWU9LU= X-Google-Smtp-Source: APXvYqyjagZVtFxkj2yva+93yBGpNdtIYP8+2ebSW/krX1YyTF29PE28n5J/QwhAwY328xsDhbMbMA== X-Received: by 2002:aa7:8705:: with SMTP id b5mr19438436pfo.27.1564986165608; Sun, 04 Aug 2019 23:22:45 -0700 (PDT) Received: from santosiv.in.ibm.com ([129.41.84.66]) by smtp.gmail.com with ESMTPSA id i14sm124680082pfk.0.2019.08.04.23.22.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 23:22:45 -0700 (PDT) From: Santosh Sivaraj To: linuxppc-dev , linux-kernel@vger.kernel.org Cc: "Aneesh Kumar K.V" , Mahesh Salgaonkar , Reza Arbab , Balbir Singh , Chandan Rajendra , Michael Ellerman , Nicholas Piggin , christophe leroy Subject: [PATCH v7 3/7] powerpc/mce: Fix MCE handling for huge pages Date: Mon, 5 Aug 2019 11:52:21 +0530 Message-Id: <20190805062225.4354-4-santosh@fossix.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190805062225.4354-1-santosh@fossix.org> References: <20190805062225.4354-1-santosh@fossix.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Balbir Singh The current code would fail on huge pages addresses, since the shift would be incorrect. Use the correct page shift value returned by __find_linux_pte() to get the correct physical address. The code is more generic and can handle both regular and compound pages. Fixes: ba41e1e1ccb9 ("powerpc/mce: Hookup derror (load/store) UE errors") Signed-off-by: Balbir Singh [arbab@linux.ibm.com: Fixup pseries_do_memory_failure()] Signed-off-by: Reza Arbab [santosh: return physical address instead of pfn; change commit log] Signed-off-by: Santosh Sivaraj --- arch/powerpc/include/asm/mce.h | 2 +- arch/powerpc/kernel/mce_power.c | 50 ++++++++++++++-------------- arch/powerpc/platforms/pseries/ras.c | 9 ++--- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/arch/powerpc/include/asm/mce.h b/arch/powerpc/include/asm/mce.h index a4c6a74ad2fb..f3a6036b6bc0 100644 --- a/arch/powerpc/include/asm/mce.h +++ b/arch/powerpc/include/asm/mce.h @@ -209,7 +209,7 @@ extern void release_mce_event(void); extern void machine_check_queue_event(void); extern void machine_check_print_event_info(struct machine_check_event *evt, bool user_mode, bool in_guest); -unsigned long addr_to_pfn(struct pt_regs *regs, unsigned long addr); +unsigned long addr_to_phys(struct pt_regs *regs, unsigned long addr); #ifdef CONFIG_PPC_BOOK3S_64 void flush_and_reload_slb(void); #endif /* CONFIG_PPC_BOOK3S_64 */ diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c index a814d2dfb5b0..bed38a8e2e50 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -20,13 +20,14 @@ #include /* - * Convert an address related to an mm to a PFN. NOTE: we are in real - * mode, we could potentially race with page table updates. + * Convert an address related to an mm to a physical address. + * NOTE: we are in real mode, we could potentially race with page table updates. */ -unsigned long addr_to_pfn(struct pt_regs *regs, unsigned long addr) +unsigned long addr_to_phys(struct pt_regs *regs, unsigned long addr) { - pte_t *ptep; - unsigned long flags; + pte_t *ptep, pte; + unsigned int shift; + unsigned long flags, phys_addr; struct mm_struct *mm; if (user_mode(regs)) @@ -35,14 +36,21 @@ unsigned long addr_to_pfn(struct pt_regs *regs, unsigned long addr) mm = &init_mm; local_irq_save(flags); - if (mm == current->mm) - ptep = find_current_mm_pte(mm->pgd, addr, NULL, NULL); - else - ptep = find_init_mm_pte(addr, NULL); + ptep = __find_linux_pte(mm->pgd, addr, NULL, &shift); local_irq_restore(flags); + if (!ptep || pte_special(*ptep)) return ULONG_MAX; - return pte_pfn(*ptep); + + pte = *ptep; + if (shift > PAGE_SHIFT) { + unsigned long rpnmask = (1ul << shift) - PAGE_SIZE; + + pte = __pte(pte_val(pte) | (addr & rpnmask)); + } + phys_addr = pte_pfn(pte) << PAGE_SHIFT; + + return phys_addr; } /* flush SLBs and reload */ @@ -354,18 +362,16 @@ static int mce_find_instr_ea_and_pfn(struct pt_regs *regs, uint64_t *addr, * faults */ int instr; - unsigned long pfn, instr_addr; + unsigned long instr_addr; struct instruction_op op; struct pt_regs tmp = *regs; - pfn = addr_to_pfn(regs, regs->nip); - if (pfn != ULONG_MAX) { - instr_addr = (pfn << PAGE_SHIFT) + (regs->nip & ~PAGE_MASK); + instr_addr = addr_to_phys(regs, regs->nip) + (regs->nip & ~PAGE_MASK); + if (instr_addr != ULONG_MAX) { instr = *(unsigned int *)(instr_addr); if (!analyse_instr(&op, &tmp, instr)) { - pfn = addr_to_pfn(regs, op.ea); *addr = op.ea; - *phys_addr = (pfn << PAGE_SHIFT); + *phys_addr = addr_to_phys(regs, op.ea); return 0; } /* @@ -440,15 +446,9 @@ static int mce_handle_ierror(struct pt_regs *regs, *addr = regs->nip; if (mce_err->sync_error && table[i].error_type == MCE_ERROR_TYPE_UE) { - unsigned long pfn; - - if (get_paca()->in_mce < MAX_MCE_DEPTH) { - pfn = addr_to_pfn(regs, regs->nip); - if (pfn != ULONG_MAX) { - *phys_addr = - (pfn << PAGE_SHIFT); - } - } + if (get_paca()->in_mce < MAX_MCE_DEPTH) + *phys_addr = addr_to_phys(regs, + regs->nip); } } return handled; diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index f16fdd0f71f7..5743f6353638 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c @@ -739,13 +739,10 @@ static void pseries_do_memory_failure(struct pt_regs *regs, if (mce_log->sub_err_type & UE_LOGICAL_ADDR_PROVIDED) { paddr = be64_to_cpu(mce_log->logical_address); } else if (mce_log->sub_err_type & UE_EFFECTIVE_ADDR_PROVIDED) { - unsigned long pfn; - - pfn = addr_to_pfn(regs, - be64_to_cpu(mce_log->effective_address)); - if (pfn == ULONG_MAX) + paddr = addr_to_phys(regs, + be64_to_cpu(mce_log->effective_address)); + if (paddr == ULONG_MAX) return; - paddr = pfn << PAGE_SHIFT; } else { return; } -- 2.20.1