From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794930239; b=rcxhNzF8T+A2mjJtPY3S+KL4guSrFIrfjtpFgzTvAQvOUbxegadWGI7Sqdj5/cCGipbt OueABNDT2q9w6KajRbm7xyXcki423l59YlsJJCFM9JFZJx3JU+H/nvEXimWJoLMb9IERL BjG09fRT+A4pvUFSk4lHrznBu1/X9lz1bMskonV+N+fH1jrzGUMVtYGe90kWRQTZBWIzA 2OaDDrRSKLszX3oowOvORWkL/UVX3bEKxdntGtPJ4LuprjCIDhTeOZbeTHKxmu0OuKXny 5yOiMx1gc+WElV/AbTB/uQ5n7T1jdozBRihn6vPfTKpIkpdBH8jF0BfBvf5wZ2R/EEQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794930239; h=DMARC-Filter:Received:DKIM-Signature:Received:Received:Received: Received:Received:Received:Received:Message-ID:Date:MIME-Version: User-Agent:Subject:To:Cc:References:Content-Language:From:In-Reply-To: Content-Type:Content-Transfer-Encoding:X-TM-AS-GCONF: X-Proofpoint-Reinject:X-Proofpoint-Spam-Info:X-Proofpoint-ORIG-GUID: X-Proofpoint-GUID:X-Authority-Analysis:X-Proofpoint-Spam-Details-Enc: X-Proofpoint-Virus-Version:X-Proofpoint-Spam-Details; bh=rmlNl+cN1v4ObBPuPGFVK0GCt9dkXWFacMXpgZLubfc=; b=eOCEDglz+m4VnZzQ8fAyPppPx4WdlDQuo/8UZlz8eh1Lo22CrXXn4cw2fgl8cVaWVtvb cdnwIUGmzEuLkoHF23hphoFphMjhJ/qwuRswT/iWRej1qIkfJr2Tk0Nl4cy/6iD/Xsd0L 8NEnjX5hkk7elm31dKexr0WeZ6Rr9i/NlLzbF6o/CT9BRsLmaY8nIeRlSUPT2SqZL0pcl zbeNPAZR2q/TjOKzop5V6qLbK0htkLkODUHT1vbhaXZbM7v172WFHFgyBMmb+FB8gmir7 mSxdN9yk4FCb24iz0jd0Zu6oQrBpTOEOJ2KLNm1lJ3nC5To68po3CoX8bJmeEV3DM0w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=Q2Jl2sdW; arc=none smtp.remote-ip=148.163.156.1 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49A90606A31C; Tue, 17 Nov 2026 15:43:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 49A90606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=Q2Jl2sdW Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AHFQV0E1096766; Tue, 17 Nov 2026 15:43:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=rmlNl+ cN1v4ObBPuPGFVK0GCt9dkXWFacMXpgZLubfc=; b=Q2Jl2sdW7R/r+rRsLKXYJD nAc+mng8ZG27UM+XVUSbUqXSPgBC3rPO7YgOQX+oQbLjRa7ycJd9T6eoNTOOkAU4 JzFuMUjM0O/Kk713/wrYYlXnNypnEknghpD+N49++ObMjGh2Pr6Q+CFR8+LbDDbq Tx6p+LXYabDlJxOceNRW2u61MOY9G59uQ2NveRTzt/uFO/7UMbqlGDI/4+luvocY vwSVTbTeOXdG+gqtOkzvr7pPFrmvGHddFY4NzRDYQr9tqMYW+v536emLnUxpXeRK yQkwY/6vB73NFK1i8+vl8SPKuzCUwBYts8ksRt6yzoPFRfjbzX0Z293/aUZINIrA == Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4hxfat43c3-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 17 Nov 2026 15:43:46 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 6AHFYutg713417; Tue, 17 Nov 2026 15:43:46 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4j02dfdjxa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2026 15:43:46 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 6AHFhgAA44040666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Nov 2026 15:43:42 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3D19C20040; Tue, 17 Nov 2026 15:43:42 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0D2E2004B; Tue, 17 Nov 2026 15:43:39 +0000 (GMT) Received: from [9.124.217.181] (unknown [9.124.217.181]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 17 Nov 2026 15:43:39 +0000 (GMT) Message-ID: <4b5c9a61-5876-4508-87a2-5451d363a181@linux.ibm.com> Date: Tue, 17 Nov 2026 21:13:38 +0530 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCHv2 2/4] powerpc/watchdog: Disable preemption in arch_touch_nmi_watchdog() To: "Ritesh Harjani (IBM)" , linuxppc-dev@lists.ozlabs.org Cc: Madhavan Srinivasan , Venkat Rao Bagalkote , linux-kernel@vger.kernel.org, chleroy@kernel.org, Michael Ellerman , Nicholas Piggin , Mukesh Kumar Chaurasiya , stable@vger.kernel.org References: <3cb2893bf883be87ea1c3712344ac03f727937d0.1794924821.git.ritesh.list@gmail.com> Content-Language: en-US From: Shrikanth Hegde In-Reply-To: <3cb2893bf883be87ea1c3712344ac03f727937d0.1794924821.git.ritesh.list@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE3MDA2MSBTYWx0ZWRfX5zMOjNZaoSCU sOrqbYEexznfceCYddY+QiLKtxOkgTHsl8W360ARlCOVGBnNtyuu6XGShSNDS8HS4Xlwj7x5zHt BKm/vetgkzKZbftZZVm5nxEN7SKfNvw= X-Proofpoint-ORIG-GUID: h-wmP1IUSblYLkRfDfVYj5uljJtAMwN6 X-Proofpoint-GUID: W-TGwsihpCE7ooHZ-hsMEY16rcbokUKZ X-Authority-Analysis: v=2.4 cv=IaESymqa c=1 sm=1 tr=0 ts=6afc7633 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=IkcTkHD0fZMA:10 a=zJRp6_cAMcgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=VnNF1IyMAAAA:8 a=_Q28vid90O0EagN2oV8A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE3MDA2MSBTYWx0ZWRfX4fAeVGJSlOR/ 3Le4Gbt7cvGgu8g6yggHeUAbDUaPFUaqOSaPUcVdZwsgTFvJyMRXW/nHjRbYgOs+pvLrCOc57LM h4Ze3djpVXjhCLy0/qnUj2ygmQfFb6cbRaM+rDZXn+rpufJVxjNpdfChrmRxOh8RszRT4MERs3+ /FNW/j380uLXbDEVQWV6ycOiiTrXeOrWkGW+m181TQzEH4XbUIHuBfcw5E/5ZTWXag709DhK6ve oetIb0O4BLp3ptaJJUaJmiIrRu7eqAJx+raY0KfzvPUFfvjhxGZXL5wCef9/1ny5DYUTrSKz6p5 3xxMW4/cjhuAmYYaht9H+OaSUJ5FRpqpg2/YiXtGOcz/eogIWqdAvlp03ojZHzTxPPVg/DQZAtm oQhHoPaw0xzJEvpCKqmd/WpjPkAcYQMZdeOzpF7eFA8OKZsNCT6euJz9EjJ5qvyXTGRgTnQXsV5 MUq8M7KjPBPkX+eHdfQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-17_03,2026-11-16_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 malwarescore=0 bulkscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611170061 On 11/17/26 7:55 PM, Ritesh Harjani (IBM) wrote: > touch_nmi_watchdog() can be called from preemptible context, e.g. > sysrq-w via /proc/sysrq-trigger. The powerpc implementation uses > smp_processor_id(), so with DEBUG_PREEMPT we get: > > root@buildroot:/# echo w > /proc/sysrq-trigger > sysrq: Show Blocked State > BUG: using smp_processor_id() in preemptible [00000000] code: bash/238 > caller is arch_touch_nmi_watchdog+0x3c/0xd4 > CPU: 0 UID: 0 PID: 238 Comm: bash Not tainted 7.4.0-rc2-00029-g7664547149ae-dirty #126 PREEMPT > Call Trace: > dump_stack_lvl+0x138/0x150 (unreliable) > check_preemption_disabled+0x120/0x158 > arch_touch_nmi_watchdog+0x3c/0xd4 > show_state_filter+0xf0/0x338 > sysrq_handle_showstate_blocked+0x24/0x38 > __handle_sysrq+0x134/0x3a8 > write_sysrq_trigger+0x178/0x22c > proc_reg_write+0xf4/0x150 > vfs_write+0xfc/0x71c > ksys_write+0x8c/0x150 > system_call_exception+0x310/0x590 > system_call_vectored_common+0x15c/0x2ec > ---- interrupt: 3000 at 0x7ffd01755b98 > > Unlike the generic version, which only sets a flag, we update the CPU's > timebase stamp and its SMP watchdog pending bit, so a migration in > between touches the state of a CPU we are no longer on. > > Disable preemption across the update. While at it, let's also mark the > function as notrace (since we might be within a tracer when this > function gets called). > > Fixes: 2104180a5369 ("powerpc/64s: implement arch-specific hardlockup watchdog") > Cc: stable@vger.kernel.org > Signed-off-by: Ritesh Harjani (IBM) Reviewed-by: Shrikanth Hegde > --- > arch/powerpc/kernel/watchdog.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c > index 44f178e07531..32d4e716cb0a 100644 > --- a/arch/powerpc/kernel/watchdog.c > +++ b/arch/powerpc/kernel/watchdog.c > @@ -456,12 +456,16 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) > return HRTIMER_RESTART; > } > > -void arch_touch_nmi_watchdog(void) > +notrace void arch_touch_nmi_watchdog(void) > { > unsigned long ticks = tb_ticks_per_usec * wd_timer_period_ms * 1000; > - int cpu = smp_processor_id(); > + int cpu; > u64 tb; > > + /* Callers may be preemptible. Stay on this CPU for the update. */ > + guard(preempt_notrace)(); > + cpu = raw_smp_processor_id(); > + > if (!cpumask_test_cpu(cpu, &watchdog_cpumask)) > return; > > -- > 2.39.5 >