From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.2 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 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 2DC29C433EF for ; Fri, 24 Sep 2021 05:21:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 EE089610C7 for ; Fri, 24 Sep 2021 05:21:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EE089610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QvHv5xiKNzuRF7zIY5f17RSwqDZa9zgtuBbY2lFr1fA=; b=aIgZ72V7pNmaZU KNb8sR7ryLyOTOotaarBhxEUouH0LotNGvk3gQDDgetszIpnI4wi5Co+FP4gsvqCZV13O53A0mSoq GVw2+jrQBFZewvg4a31dIJhg4GnwTJ5u44AyC+2mGZvaNOPOm1jzZSEneRi/5X5dUAERNUvWMvAHk gTy2dxnQSmbbbjuFR2yz3Wy9EwqehUB874jgcNnJP5mraaXPn6i03wLKDGmZtbSX3xSU+dIZT/phb ZoGbx3EIS/dVKHRQqOnQ9B3TWlEIraRmeQC5V4TF6Canl3h8rQBWQvPKgSA9RFudxVXWbP/+rMc80 12OLDwdZGmgNIrX67P/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTdc7-00D6pZ-RD; Fri, 24 Sep 2021 05:19:12 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTdc3-00D6om-HL for linux-arm-kernel@lists.infradead.org; Fri, 24 Sep 2021 05:19:09 +0000 Received: by mail-lf1-x130.google.com with SMTP id t10so35428184lfd.8 for ; Thu, 23 Sep 2021 22:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ifWkwX7JCoVIJ4c5r2rky++BfvxJwbQVONOFF3jbrB0=; b=K65ImhUNJsOnQs+RT6OD8n7Dum1t8Pr4Avere7qpXPP7vRebDFeXJw/V5p4WWQvqnH Ltp7PX0FnhpeSpPw+zMlkjJ/I4BfLDsdt4dkRseX7fvk2HJyXFPZNQpakNQftIVsIO1d T2SoxqvSQPsspx70of5M6jTr0B2xU6yykCONaNAVnCVtqbLsZzvfMAvW6Du+hLmHFYKX Kk5shJzlTezWiYsAODLsngXvpx+71lOlEt+5h/waO+77W0q7FUaZeYDAL0pqIdE5ijtX KErKODJKBiZ8hqMNMbEK6cf6BGhPm5TjmxqHUby31hTdppTWkebB1EMiey+4yWQhGgDb TYHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ifWkwX7JCoVIJ4c5r2rky++BfvxJwbQVONOFF3jbrB0=; b=YJaqqOSIEWPayptP6c4/V6mR87qsyy59tcdiz8GNQ3YV1zjrX2VLBavujwUrfE45Zz mB4rj3DjCWT9WoJmjFaSxY7NehzvCX71q40FfAsNEQPHREW2n0MSBhajGgy3R5DLAekt OFWf9ehrdQNkBES1llSzrSTL4xCnJX/1clfqLv1SvOGQMYNd9Alpaywdhv2sz/4Ji8sT JdSkdRzYugyhPQqYVMgG7bRizgwSa9Ei4jSB0V2lvS4l9IEKiinCuDfIwRZTXGM7gsbI IzooRFrAjYogbEPC/J6xi9QJlEX48zrXKKrGmP+/O5iZPHf4o1iSysp+sRotbeZQMFHd +ILA== X-Gm-Message-State: AOAM532Vam7o/D/S9fymB1DQ5/4ja+I1AbPJkSsFjdfvsIEhpYQnYCUf 1usU835qvls6tvXYfifcO8WUDU64vWKPATNIDtbU/g== X-Google-Smtp-Source: ABdhPJxUwmHGFnPv4tPRyb1H3+40Os4sF2P5m0jXUix+1E7Q3WnwnjggRpQO9GJqFKD6YEqjkcn7ADt4Ep60RXc+yaU= X-Received: by 2002:ac2:4ac6:: with SMTP id m6mr7394584lfp.513.1632460744320; Thu, 23 Sep 2021 22:19:04 -0700 (PDT) MIME-Version: 1.0 References: <20210923140951.35902-1-kernelfans@gmail.com> <20210923140951.35902-5-kernelfans@gmail.com> In-Reply-To: From: Sumit Garg Date: Fri, 24 Sep 2021 10:48:51 +0530 Message-ID: Subject: Re: [PATCHv2 4/4] arm64: Enable perf events based hard lockup detector To: Pingfan Liu Cc: Linux ARM , Catalin Marinas , Will Deacon , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Marc Zyngier , Kees Cook , Masahiro Yamada , Sami Tolvanen , Petr Mladek , Andrew Morton , Wang Qing , "Peter Zijlstra (Intel)" , Santosh Sivaraj , LKML X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210923_221907_615336_286D5FA8 X-CRM114-Status: GOOD ( 43.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Pingfan, On Thu, 23 Sept 2021 at 19:59, Pingfan Liu wrote: > > On Thu, Sep 23, 2021 at 10:10 PM Pingfan Liu wrote: > > > > From: Sumit Garg > > > To Sumit, I think credits should go to you and keep you as the author. > Thanks, I am fine with it. If you like then you can add your "Co-developed-by" as well. > Please let me know if you dislike it. > > Thanks, > > Pingfan > > 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. This needs to be updated to reflect delayed initialization instead. -Sumit > > > > [1]: http://lore.kernel.org/linux-arm-kernel/1610712101-14929-1-git-send-email-sumit.garg@linaro.org > > > > Signed-off-by: Sumit Garg > > (Pingfan: adapt it to watchdog_hld async model based on [1]) > > Signed-off-by: Pingfan Liu > > Cc: Catalin Marinas > > Cc: Will Deacon > > Cc: Ingo Molnar > > Cc: Arnaldo Carvalho de Melo > > Cc: Mark Rutland > > Cc: Alexander Shishkin > > Cc: Jiri Olsa > > Cc: Namhyung Kim > > Cc: Marc Zyngier > > Cc: Kees Cook > > Cc: Masahiro Yamada > > Cc: Sami Tolvanen > > Cc: Petr Mladek > > Cc: Andrew Morton > > Cc: Wang Qing > > Cc: "Peter Zijlstra (Intel)" > > Cc: Santosh Sivaraj > > Cc: linux-kernel@vger.kernel.org > > To: linux-arm-kernel@lists.infradead.org > > --- > > arch/arm64/Kconfig | 2 ++ > > arch/arm64/kernel/Makefile | 1 + > > arch/arm64/kernel/perf_event.c | 11 ++++++++-- > > arch/arm64/kernel/watchdog_hld.c | 36 ++++++++++++++++++++++++++++++++ > > drivers/perf/arm_pmu.c | 5 +++++ > > include/linux/perf/arm_pmu.h | 2 ++ > > 6 files changed, 55 insertions(+), 2 deletions(-) > > create mode 100644 arch/arm64/kernel/watchdog_hld.c > > > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > > index 5c7ae4c3954b..8287e9e1d28d 100644 > > --- a/arch/arm64/Kconfig > > +++ b/arch/arm64/Kconfig > > @@ -189,6 +189,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/Makefile b/arch/arm64/kernel/Makefile > > index 3f1490bfb938..789c2fe5bb90 100644 > > --- a/arch/arm64/kernel/Makefile > > +++ b/arch/arm64/kernel/Makefile > > @@ -46,6 +46,7 @@ obj-$(CONFIG_MODULES) += module.o > > obj-$(CONFIG_ARM64_MODULE_PLTS) += module-plts.o > > obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o > > obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o > > +obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_hld.o > > obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o > > obj-$(CONFIG_CPU_PM) += sleep.o suspend.o > > obj-$(CONFIG_CPU_IDLE) += cpuidle.o > > diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c > > index b4044469527e..a34343d0f418 100644 > > --- a/arch/arm64/kernel/perf_event.c > > +++ b/arch/arm64/kernel/perf_event.c > > @@ -23,6 +23,7 @@ > > #include > > #include > > #include > > +#include > > > > /* ARMv8 Cortex-A53 specific event types. */ > > #define ARMV8_A53_PERFCTR_PREF_LINEFILL 0xC2 > > @@ -1284,10 +1285,16 @@ 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); > > + > > + hld_detector_delay_initialized = true; > > + wake_up(&hld_detector_wait); > > + return ret; > > } > > device_initcall(armv8_pmu_driver_init) > > > > diff --git a/arch/arm64/kernel/watchdog_hld.c b/arch/arm64/kernel/watchdog_hld.c > > new file mode 100644 > > index 000000000000..379743e0d001 > > --- /dev/null > > +++ b/arch/arm64/kernel/watchdog_hld.c > > @@ -0,0 +1,36 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +#include > > +#include > > +#include > > + > > +/* > > + * 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; > > +} > > + > > +int __init watchdog_nmi_probe(void) > > +{ > > + if (!hld_detector_delay_initialized) > > + return -EBUSY; > > + else if (!arm_pmu_irq_is_nmi()) > > + return -ENODEV; > > + > > + return hardlockup_detector_perf_init(); > > +} > > diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c > > index 3cbc3baf087f..2aecb0c34290 100644 > > --- a/drivers/perf/arm_pmu.c > > +++ b/drivers/perf/arm_pmu.c > > @@ -697,6 +697,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 505480217cf1..bf7966776c55 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); > > -- > > 2.31.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel