From patchwork Fri Sep 4 07:26:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 11756125 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33FB1138E for ; Fri, 4 Sep 2020 07:27:18 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2E2A206D4 for ; Fri, 4 Sep 2020 07:27:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i2Scdv1P"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ub0W/dvo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2E2A206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=evyd1NHKHfzRIoQIBLT/wz//Ng9hu0EAzJi45sNAIB4=; b=i2Scdv1PXHsrYOKnOG0kEGRTId zxuTgH1D417vVUya878ETAFa/hiNpzTo4wuEdMAoxOIxvgHQrBSJjJXEmQ1+PSlrJ/B9V0Y9hjoSr 1otMZkLiyNEBWxA4dyUORKtuFgfOyUiKwtGGfKPvjYjrOhyDKQiKmuI85JM+QSBZsZ1jWcW6u6T+G kq4ySqkMTOBB4v8hRBmireHjpB5F0j5NaqhbnSJX3HHOiONwuNGr76wR6CMFbvkFXSL9ccrZa07Il Qr8Cof3PTVA07JYvoBytM7vu1o7VveIhdBlIeUrI12Gmy6IfKaGTIbaSl1SlWVXmakTyhMvDiDXIF ryVI+yag==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kE67k-0008Gx-7h; Fri, 04 Sep 2020 07:27:04 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kE67g-0008G4-BP for linux-arm-kernel@lists.infradead.org; Fri, 04 Sep 2020 07:27:01 +0000 Received: by mail-pj1-x1044.google.com with SMTP id np15so4834798pjb.0 for ; Fri, 04 Sep 2020 00:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=TgEt8H+NBD+F8URPekcdTaS5rZdyCM+EvxLWR30FOiA=; b=ub0W/dvoBg2zKUB/J4dDvyf19oZE3EkMDnRw4FZgPqqlPFLm1iQzIGfIB1DWfeO8fg Tin+64HGWfR4pM1VeZiYH8QnsfSSBb9bhDDdCk01easF3GYcf3/gI4EDyPuzhrLmN251 tbiP3Hv++EwyBvIwIpqiMrkaGKsW8RyrFYAKUH596QftZuwk9KdVxIESSy0O1iu1EAKr PqXfM+v/AI5ZV0ZYDFcgVn5qk3dKUhmAIuFj87rmRIOAZQkWUUCi6ItuM9eyKUEEDcz5 knYk12++G1ww/BE7Agqddk85UEZDzVK4Q6ZUtbctRIkLtsRbDuh+hRgrtW2T1ZyD/ihQ 9ueA== 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; bh=TgEt8H+NBD+F8URPekcdTaS5rZdyCM+EvxLWR30FOiA=; b=dE8l2n+aR7q5EHkmHYD6PcV5hc3d5SCTJOuEDKslfUxBKBZ/JLh4tGkQAf1+vYfmBg a8pcUebOGWZEWC7yCho9DNz/nnODJALikUu/h0AYtkKIgQaAtaKm+eVyw856Sqtwbxfg oJ2JXBz16jZ+1QyVeGKp+YsugBkhu3GHRj7fvWZ5PJVDvOJP4gjqMy8/BtvuA47fDyCe k4B8pUdFyg+oIdgzRE8h8eQ4RTGwygeXmLkZbCgNlZypQPJHcYF7LPt5xM1YHZeVjqoB lzQC7+7tFxvf5HMHx2ep7Hv7Bfk7NfnlfLBQO9mU3RYlVRKTWSflvUDe8PJE3/qDborx Ui4Q== X-Gm-Message-State: AOAM533gJ9X65mmHlFCBVlbdi0nIQK4nbpWLyfFdjDQdTKNEW4Wc21k2 4XwuaaYWi9o3XXQXi5n/B66Y9g61B9il3Q== X-Google-Smtp-Source: ABdhPJyjjtV1valstzHz0BYLGZIfySHbd7ltGIEe28CxXX0EFcVviI7rTZ+13BEFAtXJ7L2f70f+NQ== X-Received: by 2002:a17:902:e789:: with SMTP id cp9mr7492899plb.215.1599204417823; Fri, 04 Sep 2020 00:26:57 -0700 (PDT) Received: from localhost.localdomain ([117.210.209.248]) by smtp.gmail.com with ESMTPSA id bj2sm4540160pjb.20.2020.09.04.00.26.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2020 00:26:57 -0700 (PDT) From: Sumit Garg To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3] arm64: Enable perf events based hard lockup detector Date: Fri, 4 Sep 2020 12:56:37 +0530 Message-Id: <1599204397-17596-1-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200904_032700_671012_1AEF3C19 X-CRM114-Status: GOOD ( 24.86 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1044 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, Sumit Garg , daniel.thompson@linaro.org, linux-kernel@vger.kernel.org, peterz@infradead.org, catalin.marinas@arm.com, jolsa@redhat.com, alexandru.elisei@arm.com, dianders@chromium.org, acme@kernel.org, swboyd@chromium.org, alexander.shishkin@linux.intel.com, mingo@redhat.com, namhyung@kernel.org, tglx@linutronix.de, will@kernel.org, julien.thierry.kdev@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org With the recent feature added to enable perf events to use pseudo NMIs as interrupts on platforms which support GICv3 or later, its now been possible to enable hard lockup detector (or NMI watchdog) on arm64 platforms. So enable corresponding support. One thing to note here is that normally lockup detector is initialized just after the early initcalls but PMU on arm64 comes up much later as device_initcall(). So we need to re-initialize lockup detection once PMU has been initialized. Signed-off-by: Sumit Garg --- Changes in v3: - Rebased to latest pmu NMI patch-set [1]. - Addressed misc. comments from Stephen. [1] https://lkml.org/lkml/2020/8/19/671 Changes since RFC: - Rebased on top of Alex's WIP-pmu-nmi branch. - Add comment for safe max. CPU frequency. - Misc. cleanup. arch/arm64/Kconfig | 2 ++ arch/arm64/kernel/perf_event.c | 41 +++++++++++++++++++++++++++++++++++++++-- drivers/perf/arm_pmu.c | 9 +++++++++ include/linux/perf/arm_pmu.h | 2 ++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6d23283..b5c2594 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -167,6 +167,8 @@ config ARM64 select HAVE_NMI select HAVE_PATA_PLATFORM select HAVE_PERF_EVENTS + select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI + select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 5bf2835..2fb5b60 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include /* ARMv8 Cortex-A53 specific event types. */ #define ARMV8_A53_PERFCTR_PREF_LINEFILL 0xC2 @@ -1221,10 +1223,21 @@ static struct platform_driver armv8_pmu_driver = { static int __init armv8_pmu_driver_init(void) { + int ret; + if (acpi_disabled) - return platform_driver_register(&armv8_pmu_driver); + ret = platform_driver_register(&armv8_pmu_driver); else - return arm_pmu_acpi_probe(armv8_pmuv3_init); + ret = arm_pmu_acpi_probe(armv8_pmuv3_init); + + /* + * Try to re-initialize lockup detector after PMU init in + * case PMU events are triggered via NMIs. + */ + if (arm_pmu_irq_is_nmi()) + lockup_detector_init(); + + return ret; } device_initcall(armv8_pmu_driver_init) @@ -1282,3 +1295,27 @@ void arch_perf_update_userpage(struct perf_event *event, userpg->cap_user_time_zero = 1; userpg->cap_user_time_short = 1; } + +#ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF +/* + * Safe maximum CPU frequency in case a particular platform doesn't implement + * cpufreq driver. Although, architecture doesn't put any restrictions on + * maximum frequency but 5 GHz seems to be safe maximum given the available + * Arm CPUs in the market which are clocked much less than 5 GHz. On the other + * hand, we can't make it much higher as it would lead to a large hard-lockup + * detection timeout on parts which are running slower (eg. 1GHz on + * Developerbox) and doesn't possess a cpufreq driver. + */ +#define SAFE_MAX_CPU_FREQ 5000000000UL // 5 GHz +u64 hw_nmi_get_sample_period(int watchdog_thresh) +{ + unsigned int cpu = smp_processor_id(); + unsigned long max_cpu_freq; + + max_cpu_freq = cpufreq_get_hw_max_freq(cpu) * 1000UL; + if (!max_cpu_freq) + max_cpu_freq = SAFE_MAX_CPU_FREQ; + + return (u64)max_cpu_freq * watchdog_thresh; +} +#endif diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index dd9d7f6..2cd0f40 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -718,6 +718,15 @@ static int armpmu_get_cpu_irq(struct arm_pmu *pmu, int cpu) return per_cpu(hw_events->irq, cpu); } +bool arm_pmu_irq_is_nmi(void) +{ + const struct pmu_irq_ops *irq_ops; + + irq_ops = *this_cpu_ptr(&cpu_irq_ops); + + return irq_ops == &pmunmi_ops || irq_ops == &percpu_pmunmi_ops; +} + /* * PMU hardware loses all context when a CPU goes offline. * When a CPU is hotplugged back in, since some hardware registers are diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index 5b616dd..5765069 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -160,6 +160,8 @@ int arm_pmu_acpi_probe(armpmu_init_fn init_fn); static inline int arm_pmu_acpi_probe(armpmu_init_fn init_fn) { return 0; } #endif +bool arm_pmu_irq_is_nmi(void); + /* Internal functions only for core arm_pmu code */ struct arm_pmu *armpmu_alloc(void); struct arm_pmu *armpmu_alloc_atomic(void);