From nobody Sat Feb 7 08:02:23 2026 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D2C52C027E for ; Wed, 28 Jan 2026 06:08:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769580523; cv=none; b=o20EQ1Cuoo4gPhBUXnkJP8x1Rg3tRX35EJPE2gsckv3n4WXMz64xk6oqP+hgeTQYZaFRxJ7UKlPHKxml494j47YXDNgiNvIncDaTj5rteW9ceIL1qfwfPf/VjBScjl4lB+FD7r8drPJa/6v0qyVUhc4afaYTkokqpMqZ76irI14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769580523; c=relaxed/simple; bh=nTDMX7ZWxromGef+A1hQrj0FD4zSgy7wQCxsLDWsLLo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oaqi9dEI36/ljsYbuVsj9ggDrdRkbzpUp7yamTeWxyJdni5pJFM+9WNo6KjQELjPicMjWMoaDgzTNSAE3+bOl+klnauyCJuRF7NwHQX/cXiGBRFn8z7vcDf9fde4MM+Eg4Qp4TZ908lqYjgUZUt12rQwAbKcrbp1CCafzfzzKaU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=My+DOeze; arc=none smtp.client-ip=74.125.82.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="My+DOeze" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-11f36012fb2so9244243c88.1 for ; Tue, 27 Jan 2026 22:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769580521; x=1770185321; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dRr4jIl7Bao30zrJYUUg6+SPscP6OcBW6AUU+VZycno=; b=My+DOezeQO2tSDhVUBoehFdWK+aBUl+Vkd572qOtlavCHhXGXbZvHX0eYuuJNJ7K8V lRx9iw7l75R9eCvKLMwa/prbKXLQXUF8/1ypkJ9fx8fodW+rdVDrcnXCRFY+emgrvvJH KrcZC4hhviHESgflfOugvHgj5SIgCYj+Gsx3LDoGZG+7IhDiae3EdF9OUs/4ZJ5QBTmu rwMu1+z0D5UBqwqCtFF0Ev7oMm/16X1SHuW/wwzYlub0HY6cs6gc8bIEXwyGbAEbUI9p EBwlzQ/i8ngrAOT7L3uobBVJSNX0fqw+q0YFKu/kP47VxMMDjotnKQLFus6AhYd3GhC2 KJMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769580521; x=1770185321; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dRr4jIl7Bao30zrJYUUg6+SPscP6OcBW6AUU+VZycno=; b=eRoXYFHc8sjuo99DejHoiIYFfZd0I1za4hF1s6mcKEp9GNvIgBYP5+1dP/YirHXsZw pW1xgPY4Nfxa2wUPRfjuBJr3Nm+NfgzxC+d7yJPBEXHMzTrA+yhNCvJ0gfWL645ggDj2 ywDKvdUqXMQgiPn50rnzsjB9dlhGIP/U8eBZcdiE3xZkCxe0fsdeKiRwcYYVZ6vNEV5m JEaYGDSF1PjqHXYg/1+QGKIDJyqr86hnaQxGQBOYe0s9SfSu5vIPIxlih7ZGNFQOo2Ln kQ9h0WYo0kDQSCkqU4TogmQ1gO07n6JG2iT9M+Ms6ULUpZ8p46dTdK8RojEzw4v6AWpe eSeA== X-Forwarded-Encrypted: i=1; AJvYcCUvIh7YnxkRW++bLVULzo2aiZpUviOa2m0KH1Etl6DFuhQQm+oeu+WwV5+dwQ33YOfzc8c8YQjcu0L3a5k=@vger.kernel.org X-Gm-Message-State: AOJu0YyZaQeXCjPs11rFMw7oXpmSnrTGKLHmrkFgICxh7By0tM2eyn7l FrXo9X92sFsFvanz04TRSwBLMlsMM5JorAWWVBd9eM8Bl2ad2EUtQjb2 X-Gm-Gg: AZuq6aK7Hv9j7JN6f+OI7NlIoHncnt3rr/vmL2i3iJtPw5kBlMJKReNELaYUsVGT8se psscqNXgMCRZW+aOdTFgQxhcrpxQhEomqRg7prH1g6K+YKr79saL+6J/JWr/9cHP/wEkx4svmo1 DFoV7fgLyKlp97TXq6f/g591mloZIjlGp5Hd9uiPIaezW0sCKqKQXuiLJzDyxe8tM1qIuAIOPdC zJ4AbktWQOAUAkqAu4E6QbvENubLvFtHFXdmFfjw+2eEJVvSm91YTc1fbH59PrJPR97+ssIAsVZ cI8OTErK+pZVc+G9MNiFvOeDysHW0mQrOH2QpMCVCzGwn5pf75djlI3svd4IyqGfyN/HbZs2qfR 6slNvyrOkVwPfPNiF5W4JDrAyKg5K9PPsZ4hSHY1d49BJx6T/IZ2GMi+bQRO/V1minwrGGb7TWA GpBAM= X-Received: by 2002:a05:7022:628e:b0:11f:3483:bba8 with SMTP id a92af1059eb24-124a00d193dmr2449710c88.40.1769580521260; Tue, 27 Jan 2026 22:08:41 -0800 (PST) Received: from debian ([74.48.213.230]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-124a9efd3b8sm1140076c88.17.2026.01.27.22.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 22:08:40 -0800 (PST) From: Qiliang Yuan To: Li Huafei , Ingo Molnar , Andrew Morton , Shouxin Sun , "Yury Norov (NVIDIA)" , Yicong Yang , Thorsten Blum , Jinchao Wang , Qiliang Yuan Cc: linux-watchdog@vger.kernel.org, mm-commits@vger.kernel.org, Junnan Zhang , Douglas Anderson , Song Liu , linux-kernel@vger.kernel.org Subject: [PATCH v7] watchdog/hardlockup: simplify perf event probe and remove per-cpu dependency Date: Wed, 28 Jan 2026 01:08:15 -0500 Message-ID: <20260128060833.1715622-1-realwujing@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the hardlockup detector's probe path and remove its implicit dependency on pinned per-cpu execution. Refactor hardlockup_detector_event_create() to be stateless. Return the created perf_event pointer to the caller instead of directly modifying the per-cpu 'watchdog_ev' variable. This allows the probe path to safely manage a temporary event without the risk of leaving stale pointers should task migration occur. Signed-off-by: Shouxin Sun Signed-off-by: Junnan Zhang Signed-off-by: Qiliang Yuan Cc: Douglas Anderson Cc: Song Liu Cc: Jinchao Wang --- v7: - Update Signed-off-by to match author email. - Remove redundant cpu_hotplug_disable() in probe path. - v6 link: https://lore.kernel.org/all/20260128023136.1691973-1-realwujing@= gmail.com/ v6: - Change title to "simplify/cleanup" and remove "Fixes" tag since the issue is not reproducible on mainline. - Rewrite commit message in imperative mood. - Clarify that mainline is safe while this improves robustness. - v5 link: https://lore.kernel.org/all/20260127022238.1182079-1-realwujing@= gmail.com/ v5: - Refine description: clarify that the retry path uses worker threads without PF_PERCPU_THREAD (though mainline is safe due to system_percpu_wq= ). - v4 link: https://lore.kernel.org/all/20260124070814.806828-1-realwujing@g= mail.com/ v4: - Add cpu_hotplug_disable() in watchdog_hardlockup_probe() to stabilize the probe CPU. - Update description to explain the relevance of 4.19 logs. v3: - Refactor hardlockup_detector_event_create() to be stateless by returning the event pointer instead of directly assigning to per-cpu variables. - Restore PMU cycle fallback and unify the enable/probe paths. v2: - Add Cc: stable@vger.kernel.org. v1: - Avoid 'watchdog_ev' in probe path by manually creating and releasing a local perf event. kernel/watchdog_perf.c | 51 ++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/kernel/watchdog_perf.c b/kernel/watchdog_perf.c index d3ca70e3c256..4a798443033b 100644 --- a/kernel/watchdog_perf.c +++ b/kernel/watchdog_perf.c @@ -17,6 +17,7 @@ #include #include #include +#include =20 #include #include @@ -118,18 +119,11 @@ static void watchdog_overflow_callback(struct perf_ev= ent *event, watchdog_hardlockup_check(smp_processor_id(), regs); } =20 -static int hardlockup_detector_event_create(void) +static struct perf_event *hardlockup_detector_event_create(unsigned int cp= u) { - unsigned int cpu; struct perf_event_attr *wd_attr; struct perf_event *evt; =20 - /* - * Preemption is not disabled because memory will be allocated. - * Ensure CPU-locality by calling this in per-CPU kthread. - */ - WARN_ON(!is_percpu_thread()); - cpu =3D raw_smp_processor_id(); wd_attr =3D &wd_hw_attr; wd_attr->sample_period =3D hw_nmi_get_sample_period(watchdog_thresh); =20 @@ -143,14 +137,7 @@ static int hardlockup_detector_event_create(void) watchdog_overflow_callback, NULL); } =20 - if (IS_ERR(evt)) { - pr_debug("Perf event create on CPU %d failed with %ld\n", cpu, - PTR_ERR(evt)); - return PTR_ERR(evt); - } - WARN_ONCE(this_cpu_read(watchdog_ev), "unexpected watchdog_ev leak"); - this_cpu_write(watchdog_ev, evt); - return 0; + return evt; } =20 /** @@ -159,17 +146,26 @@ static int hardlockup_detector_event_create(void) */ void watchdog_hardlockup_enable(unsigned int cpu) { + struct perf_event *evt; + WARN_ON_ONCE(cpu !=3D smp_processor_id()); =20 - if (hardlockup_detector_event_create()) + evt =3D hardlockup_detector_event_create(cpu); + if (IS_ERR(evt)) { + pr_debug("Perf event create on CPU %d failed with %ld\n", cpu, + PTR_ERR(evt)); return; + } =20 /* use original value for check */ if (!atomic_fetch_inc(&watchdog_cpus)) pr_info("Enabled. Permanently consumes one hw-PMU counter.\n"); =20 + WARN_ONCE(this_cpu_read(watchdog_ev), "unexpected watchdog_ev leak"); + this_cpu_write(watchdog_ev, evt); + watchdog_init_timestamp(); - perf_event_enable(this_cpu_read(watchdog_ev)); + perf_event_enable(evt); } =20 /** @@ -263,19 +259,30 @@ bool __weak __init arch_perf_nmi_is_available(void) */ int __init watchdog_hardlockup_probe(void) { + struct perf_event *evt; + unsigned int cpu; int ret; =20 if (!arch_perf_nmi_is_available()) return -ENODEV; =20 - ret =3D hardlockup_detector_event_create(); + if (!hw_nmi_get_sample_period(watchdog_thresh)) + return -EINVAL; =20 - if (ret) { + /* + * Test hardware PMU availability by creating a temporary perf event. + * The event is released immediately. + */ + cpu =3D raw_smp_processor_id(); + evt =3D hardlockup_detector_event_create(cpu); + if (IS_ERR(evt)) { pr_info("Perf NMI watchdog permanently disabled\n"); + ret =3D PTR_ERR(evt); } else { - perf_event_release_kernel(this_cpu_read(watchdog_ev)); - this_cpu_write(watchdog_ev, NULL); + perf_event_release_kernel(evt); + ret =3D 0; } + return ret; } =20 --=20 2.51.0