From patchwork Wed Oct 7 08:51:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 11820215 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 E35ED6CB for ; Wed, 7 Oct 2020 08:53:47 +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 983F721D7A for ; Wed, 7 Oct 2020 08:53:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iVGZJd4U"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="N+fzOCZ3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 983F721D7A 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=Mv7qoOA12I1RGT0jkks/zmz1ImcRKcQnW74IJV1NghA=; b=iVGZJd4UVrstqZRltYUxd9RFV+ HYz0xW+SeqVbR7wzNomrmSO03wwD50aX36HCABncN+9BXToGzJ+cot/PAOcdhVVv4oR6DSVmzfwfd E0a8N0Ibl8jaJygwjaLxM9PQhkFKWuuYwQHGVXvDDxfgDlBY830iDwFsHC7v86iEvVWoeeMXZFgbo bba6IlK09eCiJomvgsthX8ETC4z5f10migOru3hpvhnvn/gruv7YY7LoPWbbV/8r+L0u0sLAYa3nY yUDLa0y3RY0Ni8Kb6+BVjZBhZQjnjptNrEwH6qihhiwd5nMEw5XoPCZ8CHVLkfqGUJAVdumf5Xsf6 VCJwPW6A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQ5BK-0000Sz-J0; Wed, 07 Oct 2020 08:52:18 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQ5BG-0000R5-MU for linux-arm-kernel@lists.infradead.org; Wed, 07 Oct 2020 08:52:15 +0000 Received: by mail-pg1-x544.google.com with SMTP id h6so963810pgk.4 for ; Wed, 07 Oct 2020 01:52:12 -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=9SaoQENls+K3R0JYzMVIqtfhUysjvHP+eNcqf+t0Vhc=; b=N+fzOCZ3Wrf6Ebqd8WSu9deX3xxCX18mFzmyvjRkPYgsYWnipa8N33FyE+bKwpGSfH sk9yT7cUPCauYKpHezvT+sPHOnbK2RFusDQ5TgaE2LSI1Fc0jPO7hKcAQNQSKkmNj6MZ 6iXxkrBIy/Z3EkSiaOvB1KFIUW+iT0+NjNj5V8C2V5GcbbM30Ojb6mDbsdx3dInrz9wL lYXbohlSmTjzIT0BhOnVxZFowsOEBGI/zezfB5rW7vZso2fkiyW0WbPb6CJsthQKyyf1 FtCPT1Ssn9QErJGRmzbf5C38571KRDNrQy50efWLH3YLYtdH74t1Cb3pkyf8V20iSgD5 RI8Q== 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=9SaoQENls+K3R0JYzMVIqtfhUysjvHP+eNcqf+t0Vhc=; b=q1rKJOlmTCZRNaCXXqeVkqLe/liUYo6BiAgnod6BI+swyhiQuHRdc3sDOxBBveACok TEqwOtoZbgi0UvfquQfrGSI6gsATUIQZAPmbWlR3XsEMNscTDDRJ1AOAP2Z7Jp/npqj/ kZXc3NlmCqmr9aYjTEe8drw78EL3EcCI5YELYkFDUjZlmCiDTmRZ8oRpbCKW3eOoUNZH DiePymS09WZW42bj0PePrUiMTE9goB+wVh8fmx6pz3iiYhGwqjbTXyc0Tt+5vpLqPzb3 pE8GIlwKail7LPFgucPWBCCSLSxaWFRAwLv3FFjflv3YvoY5fcKMdH4qXWWQY+YOEoC2 HzvA== X-Gm-Message-State: AOAM532m4SfgpvLBmtzySwynLvIc1GieCIzCnY/Yt0s65PHne1RImB1f QOiWftA7KCCbCfyCuAn3E3NImQ== X-Google-Smtp-Source: ABdhPJwh3jxScYJrthFY6AALREbHLZOq5Jcka1L3HDtj6cj04BJDDOKtzjbnA2+D/SXITLpdiyeHqQ== X-Received: by 2002:a63:2e42:: with SMTP id u63mr2154539pgu.292.1602060730878; Wed, 07 Oct 2020 01:52:10 -0700 (PDT) Received: from localhost.localdomain ([117.252.65.235]) by smtp.gmail.com with ESMTPSA id q8sm2120657pff.18.2020.10.07.01.52.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 01:52:10 -0700 (PDT) From: Sumit Garg To: will@kernel.org, alexandru.elisei@arm.com Subject: [PATCH v4] arm64: Enable perf events based hard lockup detector Date: Wed, 7 Oct 2020 14:21:43 +0530 Message-Id: <1602060704-10921-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-20201007_045214_752562_0CF6C1A0 X-CRM114-Status: GOOD ( 25.87 ) 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:544 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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, dianders@chromium.org, acme@kernel.org, swboyd@chromium.org, alexander.shishkin@linux.intel.com, mingo@redhat.com, julien.thierry.kdev@gmail.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@redhat.com, linux-arm-kernel@lists.infradead.org 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 Acked-by: Alexandru Elisei --- Changes in v4: - Rebased to latest pmu v7 NMI patch-set [1] and in turn use "has_nmi" hook to know if PMU IRQ has been requested as an NMI. - Add check for return value prior to initializing hard-lockup detector. [1] https://lkml.org/lkml/2020/9/24/458 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 | 5 +++++ include/linux/perf/arm_pmu.h | 2 ++ 4 files changed, 48 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 ef206fb..6ad5120 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 @@ -1224,10 +1226,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 (ret == 0 && arm_pmu_irq_is_nmi()) + lockup_detector_init(); + + return ret; } device_initcall(armv8_pmu_driver_init) @@ -1285,3 +1298,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 cb2f55f..794a37d 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -726,6 +726,11 @@ 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) +{ + return has_nmi; +} + /* * 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);