From nobody Sun May 24 18:41:56 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6908518D658 for ; Sat, 23 May 2026 17:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779558055; cv=none; b=BJpqRyJgoFNNLDB+lDgeazj4eKP6hxy3x0qlZ5Q/uXT5gaQdGZp3E4waM5YQGg0xvRxFanb1jjA+4hfXnBO0sfxWyVOguLbbRACrUdxJ5PYOR8mxSNf+yEeShgdhKgeZlMuSpUd5YHpCwud6N6ZWpu4o4l0lgOOD/34Ua0D97c0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779558055; c=relaxed/simple; bh=WmzRnKktDxYZ0zcIiLv7LGekAqZgkU4xay9tbfcXRIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tjCkr0DD2mXUDWFpKD9zga4FlH6UX+eGWazZn4ry9Wje8wD777ZtPnrIcM1F73nXI9xJ5BfDFif4m9MTnJsAsrpBORK0shfqpgj638TGnylCkC6wXvMypsKGQ6O0R4zrD6OlU3HhIN2ne7TEvY0FXH7attxwHMzCcppbBx4GWmQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=LLe0dQO+; arc=none smtp.client-ip=148.163.158.5 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.b="LLe0dQO+" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64N3mebo2452222; Sat, 23 May 2026 17:40:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=ZbxDH40rz6mpWxjdf zWTtSCOuAdoPUNo8un4bsQPEYQ=; b=LLe0dQO+RsUGukSAnALxGukPNWwoe5vBX n2NvCcPVaS59sVKB4jRNCXZjZVvStCO7VsM/OTep6VPb55wYE6VPv3K0naBMqGPE GzQu8S/ZzZGR3E2Hqc0N/XU+jCjGzZjNhu0OCdal9oCygGU5NusbxibHfkKMggG6 +RwesbfTr+D+Ln9YPOkOVnun5YyX+6cQqtFH0rSqgYtfZEjBAkjg4y1HGHBHXWvh VA+lSTORSTbCL1Ftydt8gdEf+qCjO3RN0nSpxNpT3cvXg1o4wj4eQOkFb5D4bNrW yZEeVdQjWEiz6MACowo9TjjrfsyfWeIOojMk1XYWDmDJPNTULqEew== 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 4eb4nbshaw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 May 2026 17:40:43 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64NHd8Mq026028; Sat, 23 May 2026 17:40:42 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4eb46nhyap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 May 2026 17:40:42 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64NHedQa57344356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 23 May 2026 17:40:39 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5241E20043; Sat, 23 May 2026 17:40:39 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A3DDC20040; Sat, 23 May 2026 17:40:37 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.39.18.40]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Sat, 23 May 2026 17:40:37 +0000 (GMT) From: Shrikanth Hegde To: maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, tglx@kernel.org Cc: sshegde@linux.ibm.com, christophe.leroy@csgroup.eu, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] powerpc/irq: Move __softirq_pending out of irq_stat Date: Sat, 23 May 2026 23:10:14 +0530 Message-ID: <20260523174016.999456-2-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260523174016.999456-1-sshegde@linux.ibm.com> References: <20260523174016.999456-1-sshegde@linux.ibm.com> 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 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=VvYTxe2n c=1 sm=1 tr=0 ts=6a11e69b cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=C94dUP7i7d1QJr0i2-sA:9 X-Proofpoint-ORIG-GUID: tUlOoTi2SuESh5xW1gaEqK_Z1vRfi8QV X-Proofpoint-GUID: tUlOoTi2SuESh5xW1gaEqK_Z1vRfi8QV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIzMDE4MCBTYWx0ZWRfX5kcRR6UTnzKv e60oD4p5Kia6HSIWOnrCwh5WqEYj/LtH1/mOmX5QKBjW8oMYfeh+cnVZh01EVS3fR2PsWPlotA2 yyGimbp0A4mv++uZlzgBvg1zJwj7ubSzUq26Llv36H98xm5nfSyQ+VTH/Hxu//DhQMhXfCe71el rkpcRz3FRPiJFQ4iUVVPyd0Pu7b0esqKX3WS/UAeRvjHCMTAfVqD91HohKyLTzP1AY1K9aLRblr HkwjzUIhqmVga5vGSaldYm0Du6J/RLDp6qzhBu7WhEyH9poj30RcF+Z/6WqtRNNMNIEfoGHfw26 E+mVApWa6U9TVIff9L2Cvwbs8hjI9tAwaPp0AGtN3UhIXIj8dlej/BWOcoIv+U+CraqoAiYOIto XYLaupy+0V60QawrLQy1qLgyj/a/chle4TZS5VdFFOodtXhYfbywa6YZMhyNHCcOtmzvPDd6oBB CPwP7ZRC2JEg+XzkCMQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-23_05,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605230180 Content-Type: text/plain; charset="utf-8" __softirq_pending isn't part of arch specific irq_stats. It is used by softirq core for various decision making such as whether to kick off ksoftirqd.=20 Move it out of irq_cpustat_t. This makes it simple to make irq_cpustat_t array based approach. Signed-off-by: Shrikanth Hegde --- arch/powerpc/include/asm/hardirq.h | 3 ++- arch/powerpc/kernel/irq.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/= hardirq.h index f133b5930ae1..bf3926a0c69c 100644 --- a/arch/powerpc/include/asm/hardirq.h +++ b/arch/powerpc/include/asm/hardirq.h @@ -6,7 +6,6 @@ #include =20 typedef struct { - unsigned int __softirq_pending; unsigned int timer_irqs_event; unsigned int broadcast_irqs_event; unsigned int timer_irqs_others; @@ -23,6 +22,8 @@ typedef struct { } ____cacheline_aligned irq_cpustat_t; =20 DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); +DECLARE_PER_CPU(unsigned int, __softirq_pending); +#define local_softirq_pending_ref __softirq_pending =20 #define __ARCH_IRQ_STAT #define __ARCH_IRQ_EXIT_IRQS_DISABLED diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index a0e8b998c9b5..f33df5e5c23f 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -73,6 +73,7 @@ =20 DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); EXPORT_PER_CPU_SYMBOL(irq_stat); +DEFINE_PER_CPU(unsigned int, __softirq_pending); =20 #ifdef CONFIG_PPC32 atomic_t ppc_n_lost_interrupts; --=20 2.47.3 From nobody Sun May 24 18:41:56 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C615348875 for ; Sat, 23 May 2026 17:41:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779558066; cv=none; b=J4p8J43D3CWfsSr5AYNWFZr2F5CtNkvPrZvvLPtXVQZoD+2RLmdKYuWZqDjFX3whuSbuJH4Ea88dN6eWU9FJOyTI3gkMMpaL1DoL2BvCD2ntHACSd/N6wAxjUqJHi7wU8Ere7E+5njOywF8UDdaXnAHHzYUp3ar4wS5aEeS3IOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779558066; c=relaxed/simple; bh=PVe26lFOpm4xmbyb9I8Y7ymPzNYOWL3td8UPXYBuAlo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HLLGPDGkIgSSv9Brw+F/4WeAJNesu8rqhk8nH4ubynFtISlHuYvlB+bXdRYoxy2Jh+Rpm83b6mb9pktIvtu+GxKED+cK+NumXFrUO0xUo99r9D3d4OTgKDjzq/4G4QvpeG8SGpV8wTFBPvBHmdVcFiE+7+QrzuAi2zjwSlcHwxs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=RKk6ElGQ; arc=none smtp.client-ip=148.163.156.1 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.b="RKk6ElGQ" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64N5EIhh1015074; Sat, 23 May 2026 17:40:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=U26ljf0vw4RAPiu2Z YO2s1FROKl1S18MXj3Ka8MPkjM=; b=RKk6ElGQK2uAHs9NSVfRqGPPrmh/rmqWX j+k+hlcsadPloOW9mYapyYLBhyy+kOwNnNtQYFZZFkgemJnZhuFC03xaRsKTyREh sXB+lEXrbaSgxhkNRHR4fuCb1M40IomS8Lj9XmJYhWlJ463J1ejOSbAdAVJ3W0f5 f1kyUH2ue7fKF6B3uwVsSvcsL2hzvlf+af08/4hrpJlcLAzAEAtxQkRiPm3IeHMf cb2wiSZSHv9FYW57HS10n5dSrnG8eE+5O5+0n02jZImGY/qbj9f52hgJvj8vwOf2 3z6I7VB1AZRi8TBFvwN3d+WVvbKtX4rkZb+EyvpE6oyFBhIpWYgUQ== 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 4eb4s21pnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 May 2026 17:40: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.7/8.18.1.7) with ESMTP id 64NHd5Ta026008; Sat, 23 May 2026 17:40:45 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4eb46nhyas-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 May 2026 17:40:45 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64NHefPb56492312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 23 May 2026 17:40:41 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7A07E20043; Sat, 23 May 2026 17:40:41 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B66EC20040; Sat, 23 May 2026 17:40:39 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.39.18.40]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Sat, 23 May 2026 17:40:39 +0000 (GMT) From: Shrikanth Hegde To: maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, tglx@kernel.org Cc: sshegde@linux.ibm.com, christophe.leroy@csgroup.eu, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] powerpc/irq: Make irqstats array based Date: Sat, 23 May 2026 23:10:15 +0530 Message-ID: <20260523174016.999456-3-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260523174016.999456-1-sshegde@linux.ibm.com> References: <20260523174016.999456-1-sshegde@linux.ibm.com> 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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: rjvz7_ANmWO5yh2KoXZBAMmSQrWQEZNw X-Authority-Analysis: v=2.4 cv=Sq2gLvO0 c=1 sm=1 tr=0 ts=6a11e69e cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=Nt6gJGhAC5hH5tf_ggoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIzMDE4MCBTYWx0ZWRfX/p+pVFfKMlu5 3CsjgEN7JKd1yjdiRCe+qY/egSg9YcnQlb+CIKTrZk/NaJPcvAUhnIKNTeBZ8bZhB0hKmGAZM+F eGK7soxf9QROmKKnqQhKpi20yptlkB67nUn/J1DFzgnuDCuPJF6xethAt+W0kX1ngXXeHTa/loq WYFD75k18FCaWEACAPeZWxw+sop+poC1J9Kdv2EQBs1Ip30sB/+wUrBSxzoUUVY2QBWvmwtHNZq hRMeM/Ph+PsReztkD/PcyqhuZJw3JF++SZxOOf3EaggKp4q0Drfe+aTeN0AXsR+3pLgolGeW7Hq HiRWw660Iyh1Sm9P1DbOLgDOLYo45wyuy0s3yHyIsv0i0+fQ4J4hs9A/oujQOpbce2VqPOz2hjU uGqgndANzoFLbfGjT9zJK6fNaVvQjSRwEhQA/97Js8B1TxUqsd8kw+drGKTsU8Qlg/LZQ8AKerN xasiby7m//YRxlGn6UQ== X-Proofpoint-ORIG-GUID: rjvz7_ANmWO5yh2KoXZBAMmSQrWQEZNw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-23_05,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 phishscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605230180 Content-Type: text/plain; charset="utf-8" Current irq_cpustat_t has separate member for handling each arch specific interrupt type. The same can be achieved with array instead indexed by corresponding irq counter type. This helps to, - Make it easy to integrate into genirq improvements by calling=20 genirq provided irq_proc_emit_counts. That speeds up quite a bit by printing all 0's once as much as possible. - Adding a new vector or software counter only requires to update the table and everything just works - Remove ifdef usage a bit. - Instead of going through each member, it simply becomes an array traversal. Time taken to read /proc/interrupts 1000 times. Base and v6 details can be found in cover-letter. Base : 103us v6 : 63us v6+this_patch : 57us A Decent 10% reduction can be seen in a system 240 CPUs. As the system size increases the gain would be more as emitting 0 would reduce more and more.=20 Signed-off-by: Shrikanth Hegde --- arch/powerpc/include/asm/hardirq.h | 27 +++++--- arch/powerpc/kernel/dbell.c | 2 +- arch/powerpc/kernel/irq.c | 107 ++++++++++------------------- arch/powerpc/kernel/time.c | 6 +- arch/powerpc/kernel/traps.c | 11 ++- arch/powerpc/kernel/watchdog.c | 2 +- 6 files changed, 64 insertions(+), 91 deletions(-) diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/= hardirq.h index bf3926a0c69c..38098e35b241 100644 --- a/arch/powerpc/include/asm/hardirq.h +++ b/arch/powerpc/include/asm/hardirq.h @@ -5,26 +5,33 @@ #include #include =20 -typedef struct { - unsigned int timer_irqs_event; - unsigned int broadcast_irqs_event; - unsigned int timer_irqs_others; - unsigned int pmu_irqs; - unsigned int mce_exceptions; - unsigned int spurious_irqs; - unsigned int sreset_irqs; +enum irq_stat_counts { + IRQ_COUNT_LOC_TIMER, + IRQ_COUNT_BCT_TIMER, + IRQ_COUNT_OTHER_TIMER, + IRQ_COUNT_SPURIOUS, + IRQ_COUNT_PMI, + IRQ_COUNT_MCE, + IRQ_COUNT_NMI_SRESET, #ifdef CONFIG_PPC_WATCHDOG - unsigned int soft_nmi_irqs; + IRQ_COUNT_WATCHDOG, #endif #ifdef CONFIG_PPC_DOORBELL - unsigned int doorbell_irqs; + IRQ_COUNT_DOORBELL, #endif + IRQ_COUNT_MAX, +}; + +typedef struct { + unsigned int counts[IRQ_COUNT_MAX]; } ____cacheline_aligned irq_cpustat_t; =20 DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); DECLARE_PER_CPU(unsigned int, __softirq_pending); #define local_softirq_pending_ref __softirq_pending =20 +#define inc_irq_stat(index) __this_cpu_inc(irq_stat.counts[IRQ_COUNT_##ind= ex]) + #define __ARCH_IRQ_STAT #define __ARCH_IRQ_EXIT_IRQS_DISABLED =20 diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c index 5712dd846263..f5e298a4c4c0 100644 --- a/arch/powerpc/kernel/dbell.c +++ b/arch/powerpc/kernel/dbell.c @@ -31,7 +31,7 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(doorbell_exception) do_hard_irq_enable(); =20 kvmppc_clear_host_ipi(smp_processor_id()); - __this_cpu_inc(irq_stat.doorbell_irqs); + inc_irq_stat(DOORBELL); =20 smp_ipi_demux_relaxed(); /* already performed the barrier */ =20 diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index f33df5e5c23f..e67a18f62142 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -84,79 +84,57 @@ u32 tau_interrupts(unsigned long cpu); #endif #endif /* CONFIG_PPC32 */ =20 +struct irq_stat_info { + const char *symbol; + const char *text; +}; + +#define ISE(idx, sym, txt)[IRQ_COUNT_##idx] =3D { .symbol =3D sym, .text = =3D txt} + +static struct irq_stat_info irq_stat_info[IRQ_COUNT_MAX] __ro_after_init = =3D { + ISE(LOC_TIMER, "LOC", " Local timer interrupts for timer event device\n= "), + ISE(BCT_TIMER, "BCT", " Broadcast timer interrupts for timer event devi= ce\n"), + ISE(OTHER_TIMER, "LOC", " Local timer interrupts for others\n"), + ISE(SPURIOUS, "SPU", " Spurious interrupts\n"), + ISE(PMI, "PMI", " Performance monitoring interrupts\n"), + ISE(MCE, "MCE", " Machine check exceptions\n"), + ISE(NMI_SRESET, "NMI", " System Reset interrupts\n"), +#ifdef CONFIG_PPC_WATCHDOG + ISE(WATCHDOG, "WDG", " Watchdog soft-NMI interrupts\n"), +#endif +#ifdef CONFIG_PPC_DOORBELL + ISE(DOORBELL, "DBL", " Doorbell interrupts\n"), +#endif +}; + int arch_show_interrupts(struct seq_file *p, int prec) { - int j; + const struct irq_stat_info *info =3D irq_stat_info; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(irq_stat_info); i++, info++) { + seq_printf(p, "%*s:", prec, info->symbol); + irq_proc_emit_counts(p, &irq_stat.counts[i]); + seq_puts(p, info->text); + } =20 #if defined(CONFIG_PPC32) && defined(CONFIG_TAU_INT) if (tau_initialized) { + int j; seq_printf(p, "%*s:", prec, "TAU"); for_each_online_cpu(j) seq_put_decimal_ull_width(p, " ", tau_interrupts(j), 10); seq_puts(p, " PowerPC Thermal Assist (cpu temp)\n"); } #endif /* CONFIG_PPC32 && CONFIG_TAU_INT */ - - seq_printf(p, "%*s:", prec, "LOC"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).timer_irqs_event,= 10); - seq_printf(p, " Local timer interrupts for timer event device\n"); - - seq_printf(p, "%*s:", prec, "BCT"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).broadcast_irqs_ev= ent, 10); - seq_printf(p, " Broadcast timer interrupts for timer event device\n"); - - seq_printf(p, "%*s:", prec, "LOC"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).timer_irqs_others= , 10); - seq_printf(p, " Local timer interrupts for others\n"); - - seq_printf(p, "%*s:", prec, "SPU"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).spurious_irqs, 10= ); - seq_printf(p, " Spurious interrupts\n"); - - seq_printf(p, "%*s:", prec, "PMI"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).pmu_irqs, 10); - seq_printf(p, " Performance monitoring interrupts\n"); - - seq_printf(p, "%*s:", prec, "MCE"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).mce_exceptions, 1= 0); - seq_printf(p, " Machine check exceptions\n"); - #ifdef CONFIG_PPC_BOOK3S_64 if (cpu_has_feature(CPU_FTR_HVMODE)) { + int j; seq_printf(p, "%*s:", prec, "HMI"); for_each_online_cpu(j) seq_put_decimal_ull_width(p, " ", paca_ptrs[j]->hmi_irqs, 10); seq_printf(p, " Hypervisor Maintenance Interrupts\n"); } #endif - - seq_printf(p, "%*s:", prec, "NMI"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).sreset_irqs, 10); - seq_printf(p, " System Reset interrupts\n"); - -#ifdef CONFIG_PPC_WATCHDOG - seq_printf(p, "%*s:", prec, "WDG"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).soft_nmi_irqs, 10= ); - seq_printf(p, " Watchdog soft-NMI interrupts\n"); -#endif - -#ifdef CONFIG_PPC_DOORBELL - if (cpu_has_feature(CPU_FTR_DBELL)) { - seq_printf(p, "%*s:", prec, "DBL"); - for_each_online_cpu(j) - seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, j).doorbell_irqs, 1= 0); - seq_printf(p, " Doorbell interrupts\n"); - } -#endif - return 0; } =20 @@ -165,24 +143,15 @@ int arch_show_interrupts(struct seq_file *p, int prec) */ u64 arch_irq_stat_cpu(unsigned int cpu) { - u64 sum =3D per_cpu(irq_stat, cpu).timer_irqs_event; + irq_cpustat_t *p =3D per_cpu_ptr(&irq_stat, cpu); + u64 sum =3D 0; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(irq_stat_info); i++) + sum +=3D p->counts[i]; =20 - sum +=3D per_cpu(irq_stat, cpu).broadcast_irqs_event; - sum +=3D per_cpu(irq_stat, cpu).pmu_irqs; - sum +=3D per_cpu(irq_stat, cpu).mce_exceptions; - sum +=3D per_cpu(irq_stat, cpu).spurious_irqs; - sum +=3D per_cpu(irq_stat, cpu).timer_irqs_others; #ifdef CONFIG_PPC_BOOK3S_64 sum +=3D paca_ptrs[cpu]->hmi_irqs; #endif - sum +=3D per_cpu(irq_stat, cpu).sreset_irqs; -#ifdef CONFIG_PPC_WATCHDOG - sum +=3D per_cpu(irq_stat, cpu).soft_nmi_irqs; -#endif -#ifdef CONFIG_PPC_DOORBELL - sum +=3D per_cpu(irq_stat, cpu).doorbell_irqs; -#endif - return sum; } =20 @@ -248,7 +217,7 @@ static void __do_irq(struct pt_regs *regs, unsigned lon= g oldsp) =20 /* And finally process it */ if (unlikely(!irq)) - __this_cpu_inc(irq_stat.spurious_irqs); + inc_irq_stat(SPURIOUS); else generic_handle_irq(irq); =20 diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 4bbeb8644d3d..44da7be36199 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -572,13 +572,13 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt) now =3D get_tb(); if (now >=3D *next_tb) { evt->event_handler(evt); - __this_cpu_inc(irq_stat.timer_irqs_event); + inc_irq_stat(LOC_TIMER); } else { now =3D *next_tb - now; if (now > decrementer_max) now =3D decrementer_max; set_dec_or_work(now); - __this_cpu_inc(irq_stat.timer_irqs_others); + inc_irq_stat(OTHER_TIMER); } =20 trace_timer_interrupt_exit(regs); @@ -591,7 +591,7 @@ EXPORT_SYMBOL(timer_interrupt); void timer_broadcast_interrupt(void) { tick_receive_broadcast(); - __this_cpu_inc(irq_stat.broadcast_irqs_event); + inc_irq_stat(BCT_TIMER); } #endif =20 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index cb8e9357383e..a8f15154bd9a 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -459,8 +459,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(system_reset_exception) } =20 hv_nmi_check_nonrecoverable(regs); - - __this_cpu_inc(irq_stat.sreset_irqs); + inc_irq_stat(NMI_SRESET); =20 /* See if any machine dependent calls */ if (ppc_md.system_reset_exception) { @@ -817,7 +816,7 @@ static void __machine_check_exception(struct pt_regs *r= egs) { int recover =3D 0; =20 - __this_cpu_inc(irq_stat.mce_exceptions); + inc_irq_stat(MCE); =20 add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE); =20 @@ -1932,8 +1931,7 @@ DEFINE_INTERRUPT_HANDLER(vsx_unavailable_tm) DECLARE_INTERRUPT_HANDLER_NMI(performance_monitor_exception_nmi); DEFINE_INTERRUPT_HANDLER_NMI(performance_monitor_exception_nmi) { - __this_cpu_inc(irq_stat.pmu_irqs); - + inc_irq_stat(PMI); perf_irq(regs); =20 return 0; @@ -1943,8 +1941,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(performance_monitor_exce= ption_nmi) DECLARE_INTERRUPT_HANDLER_ASYNC(performance_monitor_exception_async); DEFINE_INTERRUPT_HANDLER_ASYNC(performance_monitor_exception_async) { - __this_cpu_inc(irq_stat.pmu_irqs); - + inc_irq_stat(PMI); perf_irq(regs); } =20 diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c index 764001deb060..f516eeccc9f6 100644 --- a/arch/powerpc/kernel/watchdog.c +++ b/arch/powerpc/kernel/watchdog.c @@ -381,7 +381,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt) if (!cpumask_test_cpu(cpu, &wd_cpus_enabled)) return 0; =20 - __this_cpu_inc(irq_stat.soft_nmi_irqs); + inc_irq_stat(WATCHDOG); =20 tb =3D get_tb(); if (tb - per_cpu(wd_timer_tb, cpu) >=3D wd_panic_timeout_tb) { --=20 2.47.3 From nobody Sun May 24 18:41:56 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74D0D3451AF for ; Sat, 23 May 2026 17:40:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779558058; cv=none; b=c4adBgbSJ5XqN/I0oIquNcHGwGMwuC4D7d0nE0k5ZOgW2x/7vrQqubpEF0fH+g0BSVjyCHdNrm9+y9J8WFxrgiKN1IEHCzAk7bA/1OQwVZptF0W/svxNfT5xmaapGCXuE8zGFx1B1+0n6DkFoDTVCYCrztTrrJRT5ntO8Gxjclk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779558058; c=relaxed/simple; bh=VSQGNkIi2VZ+EyxSfSCBBnZOP6wpMc2GZk7pLEvxDbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NR0njvh0pSUjkWPydyaw1Km7KWrzm7+lNe2foHtNIRqdurbir45BdnVSy7xPsrxEnELaeuJiyiiwPybN4axAYNh475H6Rq/80SQPgqsxPl59Qu4rj/NUZy8DTCMLJKsgcDLDCwrcKuZpH0Yyk3olcnZEJ2GRaPcGvoHIRILFL5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=CQCVg4OL; arc=none smtp.client-ip=148.163.158.5 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.b="CQCVg4OL" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64N3mqT51978085; Sat, 23 May 2026 17:40:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=hDFOOcJhSuyizETQf 6yoDI1cLDwjEm0v/CRgTa+RZdU=; b=CQCVg4OLWt984gtMGLXOvYX/G2d3VsVdx GJDGOALwt8uWcaLmYgwmuaF9AjVVrhS6f5krO1tcAG4UKfLAy6+vmk4jJhiDlWnN hIyJE7R1u2c8YdTTme2H6m7ZM9b2phZD3+TxRSNuvL8wGpH/NeF7kOKelqz2jCEE rIF6f3aLzbPAYV8D0fQMXTls5Cz7sGd6VrXXuI/POPu/ZIOTcfaBmCee5f9xHImL jaPhVwrbPZV6LSFQkYuTh+5j+WQFQzTTXKgvPosTe6C+ECdBYhYEFb5rqK10EfZa 3yT7CRO4rvC8KFWZmpssAcVHT1EpxKZgxQNmPbsVd1s1IJZ7RQ8MQ== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eb4npshpv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 May 2026 17:40:47 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64NHd9Cn032444; Sat, 23 May 2026 17:40:47 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4eb480hxux-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 May 2026 17:40:47 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64NHehDc23462188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 23 May 2026 17:40:43 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 74E6720040; Sat, 23 May 2026 17:40:43 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D723D20043; Sat, 23 May 2026 17:40:41 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.39.18.40]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Sat, 23 May 2026 17:40:41 +0000 (GMT) From: Shrikanth Hegde To: maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, tglx@kernel.org Cc: sshegde@linux.ibm.com, christophe.leroy@csgroup.eu, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] powerpc/irq: Suppress unlikely interrupt stats by default Date: Sat, 23 May 2026 23:10:16 +0530 Message-ID: <20260523174016.999456-4-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260523174016.999456-1-sshegde@linux.ibm.com> References: <20260523174016.999456-1-sshegde@linux.ibm.com> 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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 7AhSeokbQJrBooYaWg36YY_FAd5ogxgb X-Proofpoint-ORIG-GUID: 7AhSeokbQJrBooYaWg36YY_FAd5ogxgb X-Authority-Analysis: v=2.4 cv=QIJYgALL c=1 sm=1 tr=0 ts=6a11e6a0 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=HwhMAjjRhnxDVlPREfwA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIzMDE4MCBTYWx0ZWRfX4PfUxlg4qNp7 VC/OcSZinslGHqLAqzkFJ+vMCp0abYpBkyvkcXEsm+9FiUw/bElyZowSdZT2tIQhPZx7v9kGdaS yT/4F9Olll5SGIc37vba7/suXesmpJrBxm+XOHkiI9seeTrMxlHKff5Jf32c0UItbOd/USfyq87 KW5Qr5GJ1H2tFsTsF7uwhRNlabQ8cmlsidfiI9GzCC5eFkoIzmMeZi0wcMTGJPFlEhLJTHDLWiG hsH3kGqPCEhyDVGk2hCuXw35mNCHgIsZvtxsprMaK58b1TTYUe1gvkdP2kuDrxXXYDKhJUEuIXw WjSCQvXSBkYicjGUUD4EjfpbMOZnvisKVGpybgPuo0vrFbbK+ki4yBrSq0TT4otzCIpDKh4eqJM 4o+UgSen4HnHG3UgQMH8/Ih8OJvtWUuWusxvIuut6xWwi0dVaMSK8+4lFMhf6+gf/J8063uZsPV 0waxgMnEP0zSSmCcXRw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-23_05,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605230180 Content-Type: text/plain; charset="utf-8" Some interrupts are always zero and that is expected since they occur very rarely and are mostly error indications. Don't print them by default. "MCE" - "Machine check exceptions" "NMI" - "System Reset interrupts" Print them if they occur once. Maintain a bitmap to know which interrupts are to be printed. Time taken to read /proc/interrupts 1000 times. Base and v6 details can be found in cover-letter. Base : 103us v6 : 63us v6+patch 1+2 : 57us v6+patch 1+2+3 : 54us Patch 3 shows an additional 5% gain compared to patch 1+2. So it does make sense to print them only if they are ever set. Note: Since /proc/interrupts depend on kconfig and arch dependent, userspace tools don't make explicit assumptions. Signed-off-by: Shrikanth Hegde --- arch/powerpc/include/asm/hardirq.h | 1 + arch/powerpc/kernel/irq.c | 37 +++++++++++++++++++++++++++--- arch/powerpc/kernel/traps.c | 4 ++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/= hardirq.h index 38098e35b241..be6cd5aab016 100644 --- a/arch/powerpc/include/asm/hardirq.h +++ b/arch/powerpc/include/asm/hardirq.h @@ -31,6 +31,7 @@ DECLARE_PER_CPU(unsigned int, __softirq_pending); #define local_softirq_pending_ref __softirq_pending =20 #define inc_irq_stat(index) __this_cpu_inc(irq_stat.counts[IRQ_COUNT_##ind= ex]) +void inc_irq_stat_and_enable(enum irq_stat_counts which); =20 #define __ARCH_IRQ_STAT #define __ARCH_IRQ_EXIT_IRQS_DISABLED diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index e67a18f62142..048ddfa66fc4 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -87,9 +87,13 @@ u32 tau_interrupts(unsigned long cpu); struct irq_stat_info { const char *symbol; const char *text; + int skip; }; =20 -#define ISE(idx, sym, txt)[IRQ_COUNT_##idx] =3D { .symbol =3D sym, .text = =3D txt} +/* ISE - IRQ STAT ENABLED, ISC - IRQ STAT CONDITIONAL */ +#define ISE(idx, sym, txt)[IRQ_COUNT_##idx] =3D { .symbol =3D sym, .text = =3D txt, .skip =3D 0} +#define ISC(idx, sym, txt)[IRQ_COUNT_##idx] =3D { .symbol =3D sym, .text = =3D txt, .skip =3D 1} + =20 static struct irq_stat_info irq_stat_info[IRQ_COUNT_MAX] __ro_after_init = =3D { ISE(LOC_TIMER, "LOC", " Local timer interrupts for timer event device\n= "), @@ -97,8 +101,8 @@ static struct irq_stat_info irq_stat_info[IRQ_COUNT_MAX]= __ro_after_init =3D { ISE(OTHER_TIMER, "LOC", " Local timer interrupts for others\n"), ISE(SPURIOUS, "SPU", " Spurious interrupts\n"), ISE(PMI, "PMI", " Performance monitoring interrupts\n"), - ISE(MCE, "MCE", " Machine check exceptions\n"), - ISE(NMI_SRESET, "NMI", " System Reset interrupts\n"), + ISC(MCE, "MCE", " Machine check exceptions\n"), + ISC(NMI_SRESET, "NMI", " System Reset interrupts\n"), #ifdef CONFIG_PPC_WATCHDOG ISE(WATCHDOG, "WDG", " Watchdog soft-NMI interrupts\n"), #endif @@ -107,11 +111,25 @@ static struct irq_stat_info irq_stat_info[IRQ_COUNT_M= AX] __ro_after_init =3D { #endif }; =20 +/* + * Used for default disabled counters to increment the stats and to enable= the + * entry for /proc/interrupts output. + */ +static DECLARE_BITMAP(irq_stat_count_show, IRQ_COUNT_MAX) __read_mostly; +void inc_irq_stat_and_enable(enum irq_stat_counts which) +{ + __this_cpu_inc(irq_stat.counts[which]); + set_bit(which, irq_stat_count_show); +} + int arch_show_interrupts(struct seq_file *p, int prec) { const struct irq_stat_info *info =3D irq_stat_info; =20 for (unsigned int i =3D 0; i < ARRAY_SIZE(irq_stat_info); i++, info++) { + if (!test_bit(i, irq_stat_count_show)) + continue; + seq_printf(p, "%*s:", prec, info->symbol); irq_proc_emit_counts(p, &irq_stat.counts[i]); seq_puts(p, info->text); @@ -138,6 +156,19 @@ int arch_show_interrupts(struct seq_file *p, int prec) return 0; } =20 +static int __init irq_init_stats(void) +{ + struct irq_stat_info *info =3D irq_stat_info; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(irq_stat_info); i++, info++) { + if (info->skip =3D=3D 0) + set_bit(i, irq_stat_count_show); + } + + return 0; +} +late_initcall(irq_init_stats); + /* * /proc/stat helpers */ diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index a8f15154bd9a..3eacbd20fc80 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -459,7 +459,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(system_reset_exception) } =20 hv_nmi_check_nonrecoverable(regs); - inc_irq_stat(NMI_SRESET); + inc_irq_stat_and_enable(IRQ_COUNT_NMI_SRESET); =20 /* See if any machine dependent calls */ if (ppc_md.system_reset_exception) { @@ -816,7 +816,7 @@ static void __machine_check_exception(struct pt_regs *r= egs) { int recover =3D 0; =20 - inc_irq_stat(MCE); + inc_irq_stat_and_enable(IRQ_COUNT_MCE); =20 add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE); =20 --=20 2.47.3