{"id":790842,"url":"http://patchwork.ozlabs.org/api/1.2/patches/790842/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170719065912.19183-4-npiggin@gmail.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<20170719065912.19183-4-npiggin@gmail.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20170719065912.19183-4-npiggin@gmail.com/","date":"2017-07-19T06:59:12","name":"[v2,3/3] powerpc: machine check interrupt is a non-maskable interrupt","commit_ref":"b96672dd840f2231c3e0804842d380c401739733","pull_url":null,"state":"accepted","archived":false,"hash":"f9c6fa13359064496f3b230b3e7027e8a9e21b02","submitter":{"id":69518,"url":"http://patchwork.ozlabs.org/api/1.2/people/69518/?format=json","name":"Nicholas Piggin","email":"npiggin@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170719065912.19183-4-npiggin@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/790842/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/790842/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xC7PR18rkz9rvt\n\tfor ;\n\tWed, 19 Jul 2017 17:06:51 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xC7PQ6pT1zDrVF\n\tfor ;\n\tWed, 19 Jul 2017 17:06:50 +1000 (AEST)","from mail-pf0-x243.google.com (mail-pf0-x243.google.com\n\t[IPv6:2607:f8b0:400e:c00::243])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xC7F56FjmzDrV9\n\tfor ;\n\tWed, 19 Jul 2017 16:59:37 +1000 (AEST)","by mail-pf0-x243.google.com with SMTP id q85so5430822pfq.2\n\tfor ;\n\tTue, 18 Jul 2017 23:59:37 -0700 (PDT)","from roar.ozlabs.ibm.com. ([122.99.82.10])\n\tby smtp.gmail.com with ESMTPSA id\n\th90sm11326422pfh.133.2017.07.18.23.59.33\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 18 Jul 2017 23:59:34 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"TYOlCHey\"; dkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"TYOlCHey\"; dkim-atps=neutral","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"TYOlCHey\"; dkim-atps=neutral"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=YzqI1eCmpChIuRYJ+wjh9wl5CFv6ec+K8QO045idA8w=;\n\tb=TYOlCHeyKQXx5L2Q8tlb4qJ9uQCzQTyy2dTzRAZXGVcS8wqTMh6NWQAetcJmLHSk07\n\tpNbfpDiTOkmCYJr1AWwUGi9+fc99+/LRgCM6mQdEpbXSk9hZpEyXtSzPjKuqsTvc43tq\n\tn5O0V22x2jCb67+r6FWEXLSdiCa/8DU4r8+UPMBqUgpKknbQHrFGaLpvNggaNL35jvaM\n\t2aS0W3COrz0zi+yLxjoSIonk2h918hiV6ZXmhLXgtcTtWWibFf97UVU+Gt9wKlBqTClV\n\t2LAbOjvW3fhOWjSUH9cj2nixENxIZTnRePdQtdQoy3i8n9IrfoqEFfFy6bu73X0RE6Ze\n\t2CDQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=YzqI1eCmpChIuRYJ+wjh9wl5CFv6ec+K8QO045idA8w=;\n\tb=k+NahG+Nd20oUS31UCOeeLwdAK4LW0RlHQeyCS4MVXOiZiS1mOckPRBKC1ksxz8xOz\n\ttt3OUEJhAAFkeOj4qM/0iMUt7t7sRgqdsHFF8bp8lctlPjhKQaK5InM9hU0QMUhEXJNl\n\tu+vSZCUJXf1f9VpOMpD+k28O/17ZmBqN8dARn6TnJX3AqYTZXLc55IYvbOsVzeqvf30n\n\tGdE1lhaNT17vJjsDRNseMyCVOD2TUssBKwNi7HZ9tUeKc3dcjEAMgoGnxkzVL+3wU3SK\n\txFhlMO7HhZg1hCYKlSTbu1yOH2L0JVC6sGPH8Wco4ZdsvbatBYGyBaodRTD5ZtAm02xm\n\tvytg==","X-Gm-Message-State":"AIVw112mWIFuwnv1RdlNUUhfHXYUuVfT5OJsZid9D1TO9YFUCN7Ua0Cg\n\tqCFpxn4QuBrH/ymb","X-Received":"by 10.84.231.207 with SMTP id g15mr1707305pln.146.1500447575846; \n\tTue, 18 Jul 2017 23:59:35 -0700 (PDT)","From":"Nicholas Piggin ","To":"linuxppc-dev@lists.ozlabs.org","Subject":"[PATCH v2 3/3] powerpc: machine check interrupt is a non-maskable\n\tinterrupt","Date":"Wed, 19 Jul 2017 16:59:12 +1000","Message-Id":"<20170719065912.19183-4-npiggin@gmail.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170719065912.19183-1-npiggin@gmail.com>","References":"<20170719065912.19183-1-npiggin@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\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Nicholas Piggin ,\n\tMahesh Jagannath Salgaonkar ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Use nmi_enter similarly to system reset interrupts. This uses NMI\nprintk NMI buffers and turns off various debugging facilities that\nhelps avoid tripping on ourselves or other CPUs.\n\nSigned-off-by: Nicholas Piggin \n---\n arch/powerpc/kernel/traps.c | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)","diff":"diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c\nindex 2849c4f50324..6d31f9d7c333 100644\n--- a/arch/powerpc/kernel/traps.c\n+++ b/arch/powerpc/kernel/traps.c\n@@ -789,8 +789,10 @@ int machine_check_generic(struct pt_regs *regs)\n \n void machine_check_exception(struct pt_regs *regs)\n {\n-\tenum ctx_state prev_state = exception_enter();\n \tint recover = 0;\n+\tbool nested = in_nmi();\n+\tif (!nested)\n+\t\tnmi_enter();\n \n \t__this_cpu_inc(irq_stat.mce_exceptions);\n \n@@ -820,10 +822,11 @@ void machine_check_exception(struct pt_regs *regs)\n \n \t/* Must die if the interrupt is not recoverable */\n \tif (!(regs->msr & MSR_RI))\n-\t\tpanic(\"Unrecoverable Machine check\");\n+\t\tnmi_panic(regs, \"Unrecoverable Machine check\");\n \n bail:\n-\texception_exit(prev_state);\n+\tif (!nested)\n+\t\tnmi_exit();\n }\n \n void SMIException(struct pt_regs *regs)\n","prefixes":["v2","3/3"]}