From patchwork Fri Jan 15 12:01:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 12022363 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88CF9C433E0 for ; Fri, 15 Jan 2021 12:03:50 +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 47F3B23128 for ; Fri, 15 Jan 2021 12:03:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47F3B23128 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+linux-arm-kernel=archiver.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=8uPduQ9t59/rfTZgu7BdpDyAHs6HprAhc1t3DItkZ8g=; b=e6dqMZb8dzQqubnrhXKUaOsHH9 y/wzUJ5TbiB5wSrYiou6CDpu2Je170fwFsm6sQoQNYIuE6JpunX4lT5/e8DaJQilCPMnXCAAksJvH 4ENIqY6Js8urIexVxAJ5NeTRpH9Tib0oVmMx05Fv63WXgP5SZHL1Ul9dkeeD6clMJbWlFWkkz6oSa 3qD/oK4GR9XA6P9+wLP0tzq5h/GjQhwnLNsFN8piw+78hmNtuFiDM+1jKb0r07niDyqOUcfcyyeOy E9N2SAqlS69Z4WJAHGM0brvlfhWf29uNHm5+3RKDcYFX4ua4JCluX74R8gwxl8JQ6xKXpNDm+PKuU aHyMCRZw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0No1-0005NL-EM; Fri, 15 Jan 2021 12:02:17 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l0Nnx-0005Lq-Tm for linux-arm-kernel@lists.infradead.org; Fri, 15 Jan 2021 12:02:15 +0000 Received: by mail-pf1-x42b.google.com with SMTP id c79so5365472pfc.2 for ; Fri, 15 Jan 2021 04:02:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=vXdisx8OAH7gMWMzyAsECYXynohbi+7y0YBTv0zBkaE=; b=msLlb356eSmdzJxJQC3YCwf3OL0Urb2poVeYI32hMcHdo8y1dlpNBZr/UEgR/siejX NnPrXcGoFUlHdU0tFgM+PWNzib5BtuHQn2rL2Q/T+GN5+kT3t0WMgF2c7CNSdRiqXVlg K133/vDgaQI2gtT4xMS/PkMurkA2bNWV+OzzoK6EKIYfofzvAssaGQXgrEDgKvsr/9qt AgpuByNPJMIW/Obn3m7+stW/aeG7BLqotsB0w6h5pRTGT6t87tNvlqdKFCJuzgC2J2iQ LlOOYLCOv2yix7x5rGcEKAA4/NgyK/krLo5k4V3R/7ZhQ7tkIH/myHuudqZ78wtcBAD9 f07A== 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=vXdisx8OAH7gMWMzyAsECYXynohbi+7y0YBTv0zBkaE=; b=UXnWThevACRvghPQH4XLxsg50eGcDbasM8C7AAdfLIM4ExGZ2o/PoArvyc7jcqb8S2 dDi4m5vGBhZJKUhPXN0CIDmv41+o8+YjLEBTzSNKRK6oM8HPLVCy/jtEKk4dm1DhR3K/ YnHKT65E0Y2ffDa13aB0ZxuCcDAJ3nhLSO6x9s40oedPtaYN53Ncn7Dv6DoAFDV+tjaP nSCK3OD9/1Qx0bq/hFz6EvN9qVPk4ZyUUTZTqA49SRs4RswuMsxzrG2UXRmkxplOa38G w8GU6mRoxL7HLpJeKi9yu0dulMQ+9ziA3CBczNSe+MvmO/hD5Bf21dR2IpV/KMi3q0Ul zeiA== X-Gm-Message-State: AOAM532tlffO6tOaxgAVVC00QYZuZAt2l3TaSUOSZSVjd/huY7876y9r Gp9ngR5I1aFeJpfOyJnh/JPXkQTLglTOow== X-Google-Smtp-Source: ABdhPJxuiSyUTAZHncCy6gFM/d+XxL6RnvPOI1V7NJCRTXuOvWwa/edF5hqqihlAtBudYXv9bwrLXQ== X-Received: by 2002:a62:b50f:0:b029:19e:2974:b7a4 with SMTP id y15-20020a62b50f0000b029019e2974b7a4mr12287146pfe.61.1610712131538; Fri, 15 Jan 2021 04:02:11 -0800 (PST) Received: from localhost.localdomain ([122.181.106.9]) by smtp.gmail.com with ESMTPSA id d19sm7623386pjw.37.2021.01.15.04.02.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2021 04:02:10 -0800 (PST) From: Sumit Garg To: will@kernel.org, mark.rutland@arm.com, lecopzer.chen@mediatek.com Subject: [PATCH v5] arm64: Enable perf events based hard lockup detector Date: Fri, 15 Jan 2021 17:31:41 +0530 Message-Id: <1610712101-14929-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-20210115_070214_055013_6622B3EF X-CRM114-Status: GOOD ( 26.05 ) 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: Sumit Garg , daniel.thompson@linaro.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, dianders@chromium.org, swboyd@chromium.org, alexandru.elisei@arm.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.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 Tested-by: Huang Shijie --- Changes in v5: - Fix lockup_detector_init() invocation to be rather invoked from CPU binded context as it makes heavy use of per-cpu variables and shouldn't be invoked from preemptible context. 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 | 48 ++++++++++++++++++++++++++++++++++++++++-- drivers/perf/arm_pmu.c | 5 +++++ include/linux/perf/arm_pmu.h | 2 ++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index f39568b..05e1735 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -174,6 +174,8 @@ config ARM64 select HAVE_NMI select HAVE_PATA_PLATFORM select HAVE_PERF_EVENTS + select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI && HW_PERF_EVENTS + 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 3605f77a..bafb7c8 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 @@ -1246,12 +1248,30 @@ static struct platform_driver armv8_pmu_driver = { .probe = armv8_pmu_device_probe, }; +static int __init lockup_detector_init_fn(void *data) +{ + lockup_detector_init(); + return 0; +} + 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()) + smp_call_on_cpu(raw_smp_processor_id(), lockup_detector_init_fn, + NULL, false); + + return ret; } device_initcall(armv8_pmu_driver_init) @@ -1309,3 +1329,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 5054802..bf79667 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -163,6 +163,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);