From patchwork Tue Sep 12 04:38:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balbir Singh X-Patchwork-Id: 812687 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xrshj3Y6Hz9s1h for ; Tue, 12 Sep 2017 14:47:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XDid6j22"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xrshj22LjzDqYV for ; Tue, 12 Sep 2017 14:47:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XDid6j22"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::243; helo=mail-pf0-x243.google.com; envelope-from=bsingharora@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XDid6j22"; dkim-atps=neutral Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xrsWv1X1dzDrFM for ; Tue, 12 Sep 2017 14:39:23 +1000 (AEST) Received: by mail-pf0-x243.google.com with SMTP id e69so3997445pfg.4 for ; Mon, 11 Sep 2017 21:39:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iywKuPgUibNPv4DNzC66PNh35dvLVxcnan3KIb7mHLY=; b=XDid6j22IiV2lzV85rF1mw72JsXaz3GqqXNTvFa8eTw4yIzfNPCeooUC72lMKjWF3h Y/Vsn6rw1bFSd3o/UnbQwIO5Nb7Clpgz7ekShOWD9XK0uKcg/v8N9WsxTy2xT64O5UO0 cMpX5ou9BofNQBcO+77lt7V/a+ldaZ0/5m1598y8Dt3Nrt27Qiz/j0/4JiK3tFxkhfWu +XyLeEJDTfPvs98J4KV2x9X6i/qT+j8ZstQiLZthEwbgPPC1MggB9+y9KCiG8ZEw2l4s E5hPX4OrfXj1RHiXLRRb9USoBADup5lVZoFLW7MadL3MHDfijCwfECgW4wq/+pXlW2nX +Q3Q== 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; bh=iywKuPgUibNPv4DNzC66PNh35dvLVxcnan3KIb7mHLY=; b=Ndt43pUMGVsqUreCayXCHyC7E15aHJDrlsLaFjGCwInNNJB60okZXINx8X7kAYdMfF vIKX5RZrFsxRakxVEV1b+Z/EBfoAwq5Z4znJYjjXbbqHCSvV5vvIiNlOckXI9MJPWf2y SvFcFMUOD9tOT0ee1do5pNDFTVr7+LtvdtUaGhkfJjiKJZnlU3KexNEBY281vs9frx7R RuX9Q3RFfVYMxVhN/NLC4h33MXTasrCIYs1vA9VyFx8WpXttU4cZA8TRA9MdtqofWUd9 eUE5rDnD09ajzzBrLoyVzDUKd3xIAOVkYrzjkei8SaqbOvHkWwDEKIWUg7BK2/9ecnNN L/5g== X-Gm-Message-State: AHPjjUis99nCYoyr3vRKkDMba7o3esPwTObPbFUZUnrmGU5aPJwmEhd2 rpgIzvQMlvJSvQ== X-Google-Smtp-Source: ADKCNb5i7t2XBbUAttMzgCR4u9ngNsX4+l1rMeu/nCua5cYeiTkWPgwEaDuZA8NnwjWS5isvmoOXaw== X-Received: by 10.84.248.7 with SMTP id p7mr15686427pll.237.1505191161412; Mon, 11 Sep 2017 21:39:21 -0700 (PDT) Received: from firefly.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id c62sm1165226pfl.84.2017.09.11.21.39.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 21:39:20 -0700 (PDT) From: Balbir Singh To: mpe@ellerman.id.au Subject: [PATCH v1 3/4] powerpc/mce: Hookup ierror (instruction) UE errors Date: Tue, 12 Sep 2017 14:38:58 +1000 Message-Id: <20170912043859.32473-4-bsingharora@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170912043859.32473-1-bsingharora@gmail.com> References: <20170912043859.32473-1-bsingharora@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mahesh@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hookup instruction errors (UE) for memory offling via memory_failure() in a manner similar to load/store errors (derror). Since we have access to the NIP, the conversion is a one step process in this case. Signed-off-by: Balbir Singh --- arch/powerpc/kernel/mce_power.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c index 956dadc..e0a7b1c 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -490,7 +490,8 @@ static int mce_find_instr_ea_and_pfn(struct pt_regs *regs, uint64_t *addr, static int mce_handle_ierror(struct pt_regs *regs, const struct mce_ierror_table table[], - struct mce_error_info *mce_err, uint64_t *addr) + struct mce_error_info *mce_err, uint64_t *addr, + uint64_t *phys_addr) { uint64_t srr1 = regs->msr; int handled = 0; @@ -542,8 +543,23 @@ static int mce_handle_ierror(struct pt_regs *regs, } mce_err->severity = table[i].severity; mce_err->initiator = table[i].initiator; - if (table[i].nip_valid) + if (table[i].nip_valid) { *addr = regs->nip; + if (mce_err->severity == MCE_SEV_ERROR_SYNC && + table[i].error_type == MCE_ERROR_TYPE_UE) { + unsigned long pfn; + struct mm_struct *mm; + + if (user_mode(regs)) + mm = current->mm; + else + mm = &init_mm; + + pfn = addr_to_pfn(mm, regs->nip); + if (pfn != ULONG_MAX) + *phys_addr = pfn; + } + } return handled; } @@ -671,7 +687,8 @@ static long mce_handle_error(struct pt_regs *regs, handled = mce_handle_derror(regs, dtable, &mce_err, &addr, &phys_addr); else - handled = mce_handle_ierror(regs, itable, &mce_err, &addr); + handled = mce_handle_ierror(regs, itable, &mce_err, &addr, + &phys_addr); if (!handled && mce_err.error_type == MCE_ERROR_TYPE_UE) handled = mce_handle_ue_error(regs);