From nobody Sat Feb 7 05:44:27 2026 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 D4445352FA9 for ; Wed, 28 Jan 2026 13:28:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769606888; cv=none; b=W2UhHCXp07Iv18ZYXOt21UVT/qN4AJTNCwae6HD+wSBJPjPB5kf8ctAO76aAk6Vokn3wG0SFd3Bp5qdEo76ImzKntGU3B0+FZgbbBzpU70ZG1/ou9RKR38ALrMua1ZaLC/wwFPCzyM6AUd18OPvDTa7ZnMIM1CRmMnSaIaSARc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769606888; c=relaxed/simple; bh=e4Y0gnq911FKNdWWWGAQnFXylREVdGWOawghZntWz9g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JI2Qq4lgEvUkfTdo4zN3pMRkgwmfnC3eUuxBAQAE0GSR286bR5GNVO8HERMXIStxgXF6S4t3+m876fV27mrftANUt8yBaGERESnPOA79GgR5CD1MT20bMFe4QAbKoSohbbasqheG04sPryDqgclBriLO272CJWqOzLcGqXROBRQ= 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=PaXC4fBm; arc=none smtp.client-ip=74.125.82.178 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="PaXC4fBm" Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-2b6fd5bec41so4556041eec.1 for ; Wed, 28 Jan 2026 05:28:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769606886; x=1770211686; 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=PaXC4fBm+ocmIr5XEtDOL3FKe8ytzK/Qkwl6100IEO72+bzcOziS01R7kluH/qarJv 7XMspksDCMs4XgzsXOwEeExE68xVGfrihzuGZHJHHa/Gq/RPZmgQNCz7nWZETWckUncZ dyifOETSru/dnHz99Dd785b+xp3ptDZaDfSSdf020UoVw2D4Y1gQTjtQgSKSU95h4SMO g1bhlz2Q2Ym9GkVBlVwY+H8AypqEyXhp+RFYA+vRnBOmU5sG9WoEcasB+bk8g0ABEzDB py/ZYV4/6GWQw9/WhhY+v+ojGBg561sflBchqLNRf+mjsVC7xh2uu+uUp9WWi+nD7Icf IBlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769606886; x=1770211686; 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=NGi7u/BlodeBUfajUDESBKdJPjmSlSV8Bmtpdiju5coAKsItm3IribSpLS2+4049dA xvsAoOX3nkX/74N2G9kpnoDUPeKCxy5iZcK5X4ULujVZp233+i5YysPzSnU6mrrN5OWQ wL/NKKpwk40Gmsy9ZvQnim2g5JOrtFLEW+mmkfhbmas1YTOhMAxSOd5w0VaYebdY3uAm P75JA6TiNloOhlLSWnd2JkACipXjXQ8vvg9cJi2wYAkGQAvgA9Qzlyr+4GOj1Ar4I5Vw KJoeUWEiXMgvD5/eHPR0dJO3pmMK4NuVj1Sgu5cGWn2+2JLsPoqtsz8RxG5v1tat+xWg sPhw== X-Forwarded-Encrypted: i=1; AJvYcCUxdOt2FjV3bKNQ14dgDdg95DiVPXsJvDcaytNUoS7yxGzKBVXPA6CXyiSUDWzrMUG/FqPaGYnpJ6nhXYg=@vger.kernel.org X-Gm-Message-State: AOJu0YxAqT1jHhqgRhf+GfWr+WQhxcu9iWDIw69wPmFiHAZojbUOcdZH O0Xb/dahC1ofTE3en6nLK6iGAts2LqIqN4akIxoCN4wID4pyMlU/6H0faeULYSG7 X-Gm-Gg: AZuq6aKy6OjqUan1xY0hRk2A4BcKDoB1LmLn37mlgh63sHitvHhtphvrb/rs70opg4Q 6utbuQRqxawaC1jArjWaid9oT9H/t8spxHAfPMhyWdF8tcdGtJHCd5bXY2y9FRqgnDVTOueFRA0 FgLQVbLD00BCOl/VyiZDmVsGGKiacQtFdr/llaLvhXSe/woK6Uhw4i7yurtBIBhlnADtyF9yheE TKfuuf63VXo+hCqzLIE67tUcy6t3c+K3CTs8anbQWRRBtX0WO1uAp+63xgHBUFnYq7oRBgHWyWz qzCvE5smrFoXecJl/PfTgaUn0JO8E4VIUDBiCQ9MjNLV3XW3XFWy8CXMFHBjk1d8kKwiWACb7dr 9t7i5mYcuKr4TYbQ8TzQ+5BkomzD2PYywpMMYHv8GV7gtsbXgLZHElelD0MKUG1sn+WwUVwoD3c 6Z4XE= X-Received: by 2002:a05:7022:e0e:b0:11e:70d8:5dbb with SMTP id a92af1059eb24-124a005f9damr2907058c88.7.1769601247809; Wed, 28 Jan 2026 03:54:07 -0800 (PST) Received: from debian ([74.48.213.230]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-124a9debe5dsm2173511c88.11.2026.01.28.03.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 03:54:07 -0800 (PST) From: Qiliang Yuan To: Ingo Molnar , Qiliang Yuan , Li Huafei , Andrew Morton , Jinchao Wang , Thorsten Blum , Yicong Yang 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 06:53:44 -0500 Message-ID: <20260128115358.1757147-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 Reviewed-by: Douglas Anderson --- 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