Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806363/?format=api
{ "id": 806363, "url": "http://patchwork.ozlabs.org/api/patches/806363/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170828042719.18197-1-npiggin@gmail.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "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": "<20170828042719.18197-1-npiggin@gmail.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20170828042719.18197-1-npiggin@gmail.com/", "date": "2017-08-28T04:27:19", "name": "powerpc/64: Fix watchdog configuration regressions", "commit_ref": "70412c55d419e971785094e9f7880fdbcd690520", "pull_url": null, "state": "accepted", "archived": false, "hash": "83d84798c696cceb632bb1d859ba18cb4b63a983", "submitter": { "id": 69518, "url": "http://patchwork.ozlabs.org/api/people/69518/?format=api", "name": "Nicholas Piggin", "email": "npiggin@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20170828042719.18197-1-npiggin@gmail.com/mbox/", "series": [ { "id": 69, "url": "http://patchwork.ozlabs.org/api/series/69/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=69", "date": "2017-08-28T04:27:19", "name": "powerpc/64: Fix watchdog configuration regressions", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/69/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806363/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806363/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "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 [103.22.144.68])\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 3xgf0w67lNz9sP3\n\tfor <patchwork-incoming@ozlabs.org>;\n\tMon, 28 Aug 2017 14:29:04 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xgf0w54CkzDqTt\n\tfor <patchwork-incoming@ozlabs.org>;\n\tMon, 28 Aug 2017 14:29:04 +1000 (AEST)", "from mail-pg0-x244.google.com (mail-pg0-x244.google.com\n\t[IPv6:2607:f8b0:400e:c05::244])\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 3xgdz90w64zDqBf\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tMon, 28 Aug 2017 14:27:33 +1000 (AEST)", "by mail-pg0-x244.google.com with SMTP id r133so5452916pgr.2\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tSun, 27 Aug 2017 21:27:33 -0700 (PDT)", "from roar.au.ibm.com (203-219-56-202.tpgi.com.au. [203.219.56.202])\n\tby smtp.gmail.com with ESMTPSA id\n\tq9sm20839294pgs.45.2017.08.27.21.27.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 27 Aug 2017 21:27:30 -0700 (PDT)" ], "Authentication-Results": [ "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"oOAIqXRL\"; dkim-atps=neutral", "lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"oOAIqXRL\"; dkim-atps=neutral", "lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"oOAIqXRL\"; 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;\n\tbh=q3jucfNVPgPV8wf4ZjsZYzOf08xrUtMtyGbdXXqrQyM=;\n\tb=oOAIqXRLsafLuAtqakgjt56VENgYdJ4U1jkjeWslMyDyOPhypBzcHctJ/GNYdvJHcb\n\tFpg5dGMELRlDmfNS/XnLApjKCvqOLcVYRsr+hXaQ+iYUznGf6d4bHRWfeZm+947zKC1U\n\tfYlaOe7Hn8H0p2lPFm1/8lblhS4UHh+Ioi3WBNYcIkr6wGGXXHJLAY6WP5minum+ZSgx\n\tHwfRjq+5cCrL/5laVDYOWdD6FZ7PxlJ+Zy21bG8axriE/6LXdJz/6Kdg7GIW5YCLyqA/\n\tqBgiPjHcrev3xv+VMD9KSy1S121cc+iWUJv6XWF6DZsZhAoBQGwXLVfSV0vjRtK2/b0C\n\tRDVw==", "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;\n\tbh=q3jucfNVPgPV8wf4ZjsZYzOf08xrUtMtyGbdXXqrQyM=;\n\tb=DJg+2xsrMSGYGSalDHVrrtKBTc2Z5CICjl5MOeXtM/mEBXxVYd0UVxrwxwev19aADo\n\tes42lfDqw8VZSJijVgmTQJc22QecMeO/rXkvDC8kj3oiCEYXGq7KRh/iH44Awvav4gmO\n\t8ZQIWivBdUcuBRh7DCLcHq0MJXyFj6NCs6UV4oBPmHKEuu0NVop5lQ/G3wBD3e8ToGjT\n\tDKZAiqOatzyVn++j/4UkpRXavLVTeCn1ah29nXuE2Uh2/ztn05e/R3SoEPYOHWHKenc7\n\txdyZzWNm2G/k6oCIp3vM7YMZJIQXI2eMiJNj8l5fNdV02/KrNJWQWvnq/PtfL6qMtbMP\n\tkMGQ==", "X-Gm-Message-State": "AHYfb5j8jcN4RzgFmqZtcpha6GACPDeKeJI+uKNB/66FOcQSvvwrETzR\n\tIN9NSHzcGAMaTwBJ", "X-Received": "by 10.98.15.209 with SMTP id 78mr6095836pfp.136.1503894451121;\n\tSun, 27 Aug 2017 21:27:31 -0700 (PDT)", "From": "Nicholas Piggin <npiggin@gmail.com>", "To": "linuxppc-dev@lists.ozlabs.org", "Subject": "[PATCH] powerpc/64: Fix watchdog configuration regressions", "Date": "Mon, 28 Aug 2017 14:27:19 +1000", "Message-Id": "<20170828042719.18197-1-npiggin@gmail.com>", "X-Mailer": "git-send-email 2.13.3", "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<linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "Nicholas Piggin <npiggin@gmail.com>", "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org", "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "This fixes a couple more bits of fallout from the new hard lockup watchdog\npatch.\n\nIt restores the required hw_nmi_get_sample_period() function for the\nperf watchdog, and removes some function declarations on 64e that are only\ndefined for 64s. This fixes the 64e build when the hardlockup detector is\nenabled.\n\nIt restores the default behaviour of disabling the perf watchdog, and also\nfixes disabling the 64s watchdog when running as a guest.\n\nFixes: 2104180a53 (\"powerpc/64s: implement arch-specific hardlockup watchdog\")\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\n---\n arch/powerpc/include/asm/nmi.h | 3 +--\n arch/powerpc/kernel/kvm.c | 7 -------\n arch/powerpc/kernel/setup_64.c | 28 ++++++++++++++++++++++++++++\n 3 files changed, 29 insertions(+), 9 deletions(-)", "diff": "diff --git a/arch/powerpc/include/asm/nmi.h b/arch/powerpc/include/asm/nmi.h\nindex 6f8e79cd35d8..3760150a0ff0 100644\n--- a/arch/powerpc/include/asm/nmi.h\n+++ b/arch/powerpc/include/asm/nmi.h\n@@ -1,9 +1,8 @@\n #ifndef _ASM_NMI_H\n #define _ASM_NMI_H\n \n-#ifdef CONFIG_HARDLOCKUP_DETECTOR\n+#ifdef CONFIG_PPC_WATCHDOG\n extern void arch_touch_nmi_watchdog(void);\n-\n extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,\n \t\t\t\t\t bool exclude_self);\n #define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace\ndiff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c\nindex 1086ea37c832..9ad37f827a97 100644\n--- a/arch/powerpc/kernel/kvm.c\n+++ b/arch/powerpc/kernel/kvm.c\n@@ -25,7 +25,6 @@\n #include <linux/kvm_para.h>\n #include <linux/slab.h>\n #include <linux/of.h>\n-#include <linux/nmi.h> /* hardlockup_detector_disable() */\n \n #include <asm/reg.h>\n #include <asm/sections.h>\n@@ -719,12 +718,6 @@ static __init void kvm_free_tmp(void)\n \n static int __init kvm_guest_init(void)\n {\n-\t/*\n-\t * The hardlockup detector is likely to get false positives in\n-\t * KVM guests, so disable it by default.\n-\t */\n-\thardlockup_detector_disable();\n-\n \tif (!kvm_para_available())\n \t\tgoto free_tmp;\n \ndiff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c\nindex af23d4b576ec..da255a6762f2 100644\n--- a/arch/powerpc/kernel/setup_64.c\n+++ b/arch/powerpc/kernel/setup_64.c\n@@ -751,3 +751,31 @@ unsigned long memory_block_size_bytes(void)\n struct ppc_pci_io ppc_pci_io;\n EXPORT_SYMBOL(ppc_pci_io);\n #endif\n+\n+#ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF\n+u64 hw_nmi_get_sample_period(int watchdog_thresh)\n+{\n+\treturn ppc_proc_freq * watchdog_thresh;\n+}\n+#endif\n+\n+/*\n+ * The perf based hardlockup detector breaks PMU event based branches, so\n+ * disable it by default. Book3S has a soft-nmi hardlockup detector based\n+ * on the decrementer interrupt, so it does not suffer from this problem.\n+ *\n+ * It is likely to get false positives in VM guests, so disable it there\n+ * by default too.\n+ */\n+static int __init disable_hardlockup_detector(void)\n+{\n+#ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF\n+\thardlockup_detector_disable();\n+#else\n+\tif (firmware_has_feature(FW_FEATURE_LPAR))\n+\t\thardlockup_detector_disable();\n+#endif\n+\n+\treturn 0;\n+}\n+early_initcall(disable_hardlockup_detector);\n", "prefixes": [] }