From nobody Sat Feb 7 08:23:34 2026 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 9A754258CE7 for ; Wed, 28 Jan 2026 14:34:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769610846; cv=none; b=VfVvVAtXxEiPu2x+nOX/ncx9d+D8mnuM/aCY85HSXGCwvCjYQJhbvpgK7cVlFLwJyAGvaxFTuTlltjp0Es71GlSPEGJQLdRA8w3rru+EZK5bB+Vk5pDWFWTOnsUaDc0cjUx90UY7qdu1BOrl3J84vaBSxR7oK3mR4yRjAaSCNlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769610846; c=relaxed/simple; bh=e4Y0gnq911FKNdWWWGAQnFXylREVdGWOawghZntWz9g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hjhrt8oHiPRnlIh20r2oKIQXt00Rj+TZNg0VF6qG8H4dSwoB1Eyw87KzMVFAeERKn1P+zLAsQ0SvznQZF28zzGT5cmBhLL2UpXNrZ2Xj43jec0Jdod7/0KAEUR8Ya4/8QwcCx/gHgRjbe/K+arJv5uYLilY7PLBINM9ZiOWVjLY= 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=fa484ENS; arc=none smtp.client-ip=209.85.160.175 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="fa484ENS" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-5013d163e2fso77873561cf.0 for ; Wed, 28 Jan 2026 06:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769610843; x=1770215643; 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=NvwAkydsJHGg+bpnKIjXBjgXWCnzFDla2aq6C1Z3aaY=; b=fa484ENSqtm4Br5s+YrcnJP3y4HMehQ67yJBFKu3O5QSXkptaIt7AwL3HHwRP7O4r9 gbBaFdBfQTt0oA+dEuvB/vVuZXA+8daylIfHb6O2DxyH4nxA7iXN6LoQfahukMdX4bTr wUC0ccQZ/4Yha+ZrtBW2Q6rp5DUUxguy8y0dIwo8BmWrI7LZvhSJVjc/tgwW2K0sZGDj q4PBfsnZlNn58gp4D5NnMLSfPCOtAVTwZEja8MQQBdEjQbxauX2cWOSGQnThevpcE8a/ EnHZlTk561SWjFAvXu9BnCpN9ozNDkVIc3RLmeEMKwi3MJ5sunhdkpYC4yad/c4mIEEW Er0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769610843; x=1770215643; 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=NvwAkydsJHGg+bpnKIjXBjgXWCnzFDla2aq6C1Z3aaY=; b=KCjhaXKwm2k2w7u0UhOUIvOsh2uXBO9n7Cd4SyF+LpS4uWniujzbvoitv5uiXVi5FY 9+Phg682tKyOAog88q15PT96fwcUCbVt6JaXIwntg+Y9gVG/Jl+mTRd1DjHNpZwixq1d /OorqzRg//Kb8Wl9dPUfF5OHtlcYx6VFlvwxEdksO/LYkE2+uk+ZzgtG2d3q5+CkU55T +sbtSDEDW9ZzeTfTKeoo2hn5LvCEkDDuuWb/YZZzSVeqf/SnK2iJBD9UhqeD8jhozy/Z kLbeBhF0j+/1VQF1LwGdoNY7fOK08NWx3gHJI4F5BEfj7UcildurV2IxvObjBpf5RIHn +wHA== X-Forwarded-Encrypted: i=1; AJvYcCX+pYufAzya4iyTBUG7h6u7bRtxDxl6j0kN22c/flFHjnXjaGDuheiWS9xUDsocRn+uRNmKvpPbfySCuz0=@vger.kernel.org X-Gm-Message-State: AOJu0YwptFlKKsI2mCZdzlBnxl1RCJyQiaH2eJSC0TGmiju/ZivjR/E9 vOZhD3em4aqbk59JxNhArxx3pZjZJYqrI+AN0hoBUUM3Iry1/z8X6vgDW91mgYFQ X-Gm-Gg: AZuq6aK/8dnfbELoqYbN1aTRVtB04yxZQiMBOMsxykxSschP0P17fDZC4YjmvPDblP3 iXw1psYIsVM2jK+CRilMg/mXlQ+KcmLaBwfuqIfOzjphGUPVnhZt3ZAi+FWYITglZVgQpPNtd9f BGjM6PVPuQaxGSR9Xdmn9mck6WgD2Q0nmQMNaCVh9TldebW/xl26uTvbz62MyycK0fkH8a1t2cs bqhJTj4DhQrsN+bcvkcO/wi7IT/GfNTyursEnhWAj98Z4qCM/4R/iezYNmwmvACdQqNTaOghLa5 CoOfZbS95+CgnrPzoCaPuEnarK+hfhcBTmmIhMyEjTb6wYPwiLfeURT5oQnYs5QC6gV62dq7yX2 9THt4f0VZFKzb82gYwJB9QQrLDKDRotkBgHy3A36rVTGzQ/xv372LG+XXNl0YGiiw/OpIcJFKlU V9yxQ= X-Received: by 2002:a05:7022:6728:b0:11b:9386:a3bf with SMTP id a92af1059eb24-124a0129edfmr3289311c88.42.1769605012180; Wed, 28 Jan 2026 04:56:52 -0800 (PST) Received: from debian ([74.48.213.230]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-124a9efb4casm2192986c88.16.2026.01.28.04.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 04:56:51 -0800 (PST) From: Qiliang Yuan To: Qiliang Yuan , Andrew Morton , Li Huafei , Ingo Molnar , "Yury Norov (NVIDIA)" , Jinchao Wang , Yicong Yang , Thorsten Blum Cc: linux-watchdog@vger.kernel.org, mm-commits@vger.kernel.org, Shouxin Sun , Junnan Zhang , Qiliang Yuan , Douglas Anderson , Song Liu , linux-kernel@vger.kernel.org Subject: [PATCH v8] watchdog/hardlockup: simplify perf event probe and remove per-cpu dependency Date: Wed, 28 Jan 2026 07:56:25 -0500 Message-ID: <20260128125639.1767682-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 Signed-off-by: Qiliang Yuan Cc: Douglas Anderson Cc: Song Liu Cc: Jinchao Wang --- v8: - Add Signed-off-by with work email. - v7 link: https://lore.kernel.org/all/20260128060833.1715622-1-realwujing@= gmail.com/ 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