From patchwork Wed Sep 20 07:15:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balbir Singh X-Patchwork-Id: 816086 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 3xxrq340k8z9s81 for ; Wed, 20 Sep 2017 17:24:47 +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="M4qC42N1"; 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 3xxrq32syCzDqZ9 for ; Wed, 20 Sep 2017 17:24:47 +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="M4qC42N1"; 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:c05::244; helo=mail-pg0-x244.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="M4qC42N1"; dkim-atps=neutral Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) (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 3xxrcT4SKrzDqYR for ; Wed, 20 Sep 2017 17:15:37 +1000 (AEST) Received: by mail-pg0-x244.google.com with SMTP id i130so1197339pgc.0 for ; Wed, 20 Sep 2017 00:15:37 -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=1Pa3hMDuWuKFStaaiUNRgk+cr5kawv9X9bpWwLOdjEw=; b=M4qC42N1dIvvdSFMgj7lDh/tNFnp5n0YK4ZnJdAMgEMrTTV68p3D+/vd1AROELmJfO /658qjifUXUNd4MbamuO9dWVJBF7X0SsoaK9egSF6tct5ULZyo3jLChvwRbmViKiHa/S cRLVyPv1d7UFf+iIvx36b/vSl0TGR3kVXZn2Rwlz6aMN5mfXkHrfgyf+pY/35+0jbhbS 9PG5jGcr3O4LhQ7lhsPeRsY0ez/dNxB+04Q61nzyGgdXWmksIq1NRFHvNhIDvWQkclXP 6Wx9AD6JCWf5HAGFAgsSiqtNZwBVi5jbWrnDfkdxG0Jpf8C/0keqI6Wk+bm3dybq7Ws4 k1XQ== 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=1Pa3hMDuWuKFStaaiUNRgk+cr5kawv9X9bpWwLOdjEw=; b=BbeTKcDnok8wh7PrAppZYmf2FeLMr6A0yYzvlRtnN0VgGXREE9im3HslRU6pBCFqoE fw6igWgzdBYA6KHT6DaBXO6zJj8yqmxY92PSgBaYmbv80rq/xKjfVd3F2TRz+66yu/J/ EvwM8cDaZ3Ho1SI3Pd8t6Zggu1y676xdvvT7R9l1/6b1E0Ou2VM7L20EPRgFcPRvbgd3 QG6Sq6q9sYkY6FyxjlZ1uzI9cqyKlc9NltHjDww3bVAN/Xy7deeiBeaFaI0SOaesJmSy Rt6A4mgGdYtGlDU13oGSD2q3Iz3scqOphiMg2Eep441emOM6hZdJb4XJ83Xf/7vaMDZO 5bWw== X-Gm-Message-State: AHPjjUiplFl3XyJf23tojhxh3zlv6eQTQLhiXcVWl0TP3VP+jDRfhBCP y5noJOeFY/ujl+2U7qwyqV4= X-Google-Smtp-Source: AOwi7QC/yqG67q+EVXBV5v2qd13W77NmKEwHgBVbeYYM2kc773tUiUdW5C5vu9aRosCKXkRUen3pbA== X-Received: by 10.99.132.199 with SMTP id k190mr1238178pgd.25.1505891735936; Wed, 20 Sep 2017 00:15:35 -0700 (PDT) Received: from firefly.ozlabs.ibm.com.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id s68sm7482771pfd.72.2017.09.20.00.15.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 00:15:35 -0700 (PDT) From: Balbir Singh To: mpe@ellerman.id.au Subject: [PATCH v3 4/5] powerpc/mce: Hookup ierror (instruction) UE errors Date: Wed, 20 Sep 2017 17:15:11 +1000 Message-Id: <20170920071512.19522-5-bsingharora@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170920071512.19522-1-bsingharora@gmail.com> References: <20170920071512.19522-1-bsingharora@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 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 66b0a5d..31ec893 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -488,7 +488,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; @@ -540,8 +541,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; } @@ -675,7 +691,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);