From nobody Mon Jun 8 12:11:59 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 3D2C23E1221 for ; Fri, 29 May 2026 12:41:08 +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=1780058469; cv=none; b=VSIFmyZy72l9LWefB6ooAHlNkN2Pxpc3NJWB1LzbA46aXiM2YaFTgwma6yUSwI+I8H4G2ffkupwrrkKHPToEBMbUbgChHShHkfYqDevxA93x1KbNcfQ3ra6WqVMmmYXjIAxRIouDVHdOZcmHNDAbno6QImYtydXScdrlRLbVchI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780058469; c=relaxed/simple; bh=FPgQqj/qS+1RngDKwHnNDHyK0tOz3cZhOb7o2XGPwhE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N8eq5qYTErLeEB0VI8wxUiX38UTXQ9PZBHCMue+jKLfq7weRAs8qlrP1wNhkpyP78WGNu2I2SLSBC0K2QGuHSQR7LcXrhwJ2pXKrVGwrdlMt3OzoGXoRhHUKBkgpT2WoB7MGO6c1n2T8gG695urjfrY6gSunxRencvZVs0QyziI= 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=hio5bIz5; 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="hio5bIz5" 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 64TBaP5A1467859; Fri, 29 May 2026 12:40:59 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=10wEjxb/3eCHVCavX Pjmux72EYEyL2u7FlboiX34A+w=; b=hio5bIz5JdwYrHGrYxcLMsAHtSYw1q5dl hYJGzVPsmTqLPfnLEKyaUVzvqJQ4885WgW7Ts1GywthhwvQpPX0k00hl1jrx2xAt R2Kvbjg72tyL6dIwLsXpdYuYmFRMOVHl4RXA6x6NQJaZlIRJaUC8Xl9KW7f8xYRX KOGc3gW/oqGpDEg5J/GVHDt28h5nmQHU0bSLRuvEd42GWYSmwwypkAOOmaNJaVvW WG+p/LtqjKqAgBh16Lp4nBqNwwR5Mo7D1sdS2V6c5VJUXI2/6bgA2NbJ7GZ4puIi 1S84FktxboHsBcpM1oP6jUtqQW0gBwv9bPNBLC9In5X9/2k3E+0/g== 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 4ee886gnbs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 May 2026 12:40:59 +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 64TCdCu5021891; Fri, 29 May 2026 12:40:58 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4edjrc5jb5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 May 2026 12:40:58 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64TCesZg40567294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 May 2026 12:40:54 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F65020043; Fri, 29 May 2026 12:40:54 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A33220040; Fri, 29 May 2026 12:40:52 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.124.221.69]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 29 May 2026 12:40:52 +0000 (GMT) From: Shrikanth Hegde To: christophe.leroy@csgroup.eu, maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, tglx@kernel.org Cc: sshegde@linux.ibm.com, linux-kernel@vger.kernel.org, "Christophe Leroy (CS GROUP)" Subject: [PATCH v2 1/3] powerpc/irq: Move __softirq_pending out of irq_stat Date: Fri, 29 May 2026 18:10:43 +0530 Message-ID: <20260529124045.1208539-2-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260529124045.1208539-1-sshegde@linux.ibm.com> References: <20260529124045.1208539-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: hsRpgoWojZGJXdh_iL2ff081RmoIG608 X-Authority-Analysis: v=2.4 cv=Z8Dc2nRA c=1 sm=1 tr=0 ts=6a19895b cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=C94dUP7i7d1QJr0i2-sA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI5MDEyNiBTYWx0ZWRfX0JssiNn09OC4 eske5VSmW/c7nhXIKV4S212jLdFFbDP+6tiEJrr0W/K4fdJDsI7lDZzPtoVdRkW054q51+xrsg6 7ulAk9P1HB7Frayjlha5cVZVmBF7gwu+i2nCUY5FD5ss1ZrVrlZU4G3JLr5pg6uT28Nju9m7Z2z 34JMfbM9cKBPbLjfO913Isxg7fLcp22ruzkajEs/sMDrWvKygZinN5Jm5KP2mjFxDYPhYrAEsiT UcDNE2P+4I0A0WfQTFH9KnxmixQxj8d4ie5BZdvJv6HCq0PZM4HFWeehpiZHOMFm5swtupnctWk 3sPZ8cU2PPvEuxveAWHnYGlVQL7FNFW1Tie3qyNJ0TKNYVM3gH4RG1jIXjDHy4lFzCSRbOY/GRZ aHe0MixgaxVY7KaLEsCHx45uWPNSipY513d4ILCRvS5AJ4dKawrX7LgUBiaaqJSUS9xmukrE+fS zX/BZ78QhBkWZbk8wVw== X-Proofpoint-ORIG-GUID: hsRpgoWojZGJXdh_iL2ff081RmoIG608 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-29_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 phishscore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605290126 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. Move it out of irq_cpustat_t. This makes it simple to make irq_cpustat_t array based approach. Reviewed-by: Christophe Leroy (CS GROUP) 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 Mon Jun 8 12:11:59 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 9A79A3E1200 for ; Fri, 29 May 2026 12:41:15 +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=1780058477; cv=none; b=TAPiaEdKjQvtp08bo2pxLWgJGkr6fclC7vmiUwwUG+eElvBFConCHdIUluqDizJmqyWGpFyd9SHld0zKB1TmKRFYCzHoCq8UhrXGj9y9TWGqjac14X/ry2r2v8laJOgUmvhKKJ9bm2Wb6KOe8oWxniwtavprk2RcmvSrVA3ygcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780058477; c=relaxed/simple; bh=H8f1G/NOaTBAX/Ih1gRGYRbEKEjLToHfc8cLj19SQek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NvEhie8h9z4+WCIQXJD7NMbnznQDp4BgTjHodsVy7tb6MrGDW/yXuVgjJFfHbd1f9/yGx7ohjUzw1TiJEF2h7Uwrb8swiD+Ld75KUKJY4KopwK+cGP3jvHWPJsp1AwVWsm8TjPeXB1QCbROCNmm7tj/xv2l3pqzpa5PL4HKVJHM= 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=gVUYLs5H; 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="gVUYLs5H" 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 64TAQPll2776276; Fri, 29 May 2026 12:41:01 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=LP+5jBze7U2XVcMEW 98Vu9lKHhwwdgz0zWVCWBdi3Y4=; b=gVUYLs5H/uZ35Bq0qLqSGx+NCnRRificL stX5njSvSVJipLo2LoqLUQhFSVTtZywE4TKYWLSRWPHpKw7dKmyuIhX/6kM6g1ok Jhib9uSPgNV+sNmVCxUaw1neWNQRoJZQpqPkuiLjf1ZWK6YNQZLeKIPD0RwAUKNV fnNQpD+dNsdioEZokKfAvqqn5TxnFdzgjBR2FAfTpwOxpkL3RCPEyX1E04/qhDp+ fEwZrUDHbKjoM4sBGDtT/l9z/I/4WK8NhCxT78cBHrMspT0CdPlWXkXEdr6gZusm kSgvWRqeKDklD5FKw+Jumb99Ne1C5ezDrlLjRKkzLfGMsl2dHUsXA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4ee889g96v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 May 2026 12:41:01 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64TCd9RN016767; Fri, 29 May 2026 12:41:00 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4edjrbwjsx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 May 2026 12:41:00 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64TCev8f13762818 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 May 2026 12:40:57 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EAC3220040; Fri, 29 May 2026 12:40:56 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0462220043; Fri, 29 May 2026 12:40:55 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.124.221.69]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 29 May 2026 12:40:54 +0000 (GMT) From: Shrikanth Hegde To: christophe.leroy@csgroup.eu, maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, tglx@kernel.org Cc: sshegde@linux.ibm.com, linux-kernel@vger.kernel.org, "Christophe Leroy (CS GROUP)" Subject: [PATCH v2 2/3] powerpc/irq: Make irqstats array based Date: Fri, 29 May 2026 18:10:44 +0530 Message-ID: <20260529124045.1208539-3-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260529124045.1208539-1-sshegde@linux.ibm.com> References: <20260529124045.1208539-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-ORIG-GUID: mwDugPUT38qW5Oe7Flgl_FowcOdKmEo7 X-Proofpoint-GUID: mwDugPUT38qW5Oe7Flgl_FowcOdKmEo7 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a19895d cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=Nt6gJGhAC5hH5tf_ggoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI5MDEyNiBTYWx0ZWRfXyrIhL2WA7NJu eixPNRfhCFuUuzgbud8U4HVd1mKK7rh6PoMCwh33ggTkF5cYlhhgzmveDwpGSHWPrvfaORCURnr 9rLacZ7MUmyzCpC1H/HhatBbLc6tHcAtZ6RE9//FrOUsAfJPuNbllusGeL4G/7qo2yIWJQouNLM a+jKSa4uZTQy+KHrRE4k3hNOXVPoUzPjy0WDspMHk24rTv/s14kzkXbhRWlSgGqeO3fjy+fwFte Jyw2qNs+xN/F0WsTPCLlDex5kbC/S6AH+ogPdhYikkMMgiX5GXk0RoOtJ1qj3E/cmHSILO44o8n 3mPxyhLklcb18LqXMnwWxSXgn2AJBHOIN172H15yz48xJ79ASO4tb+f9YIQB7+bZjSieIK2dwXu 3WeOoPnN0nZo9S8VlUYiRDxodXoaDaHa3K/Hca1fxV23Bt/E76dUyGFrhwj59W1RjUaw90Elh0r Pavz5R8tQgpbHiwgccA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-29_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 impostorscore=0 adultscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605290126 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 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. Reviewed-by: Christophe Leroy (CS GROUP) 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 b4472288e0d4..5794adc2e8df 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -574,13 +574,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); @@ -593,7 +593,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 Mon Jun 8 12:11:59 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 B20253E121E for ; Fri, 29 May 2026 12:41:10 +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=1780058471; cv=none; b=OlMmnuRjJlUzTOnFsPAfTozxKF3kJwCwHu9Fy0pL2LbWxh2RynFfHhDKWECTvNSmKjYzyqe3rbkLRA+YoUKYa5qXxOwEJwtIA0dLZCDcDaaVn8OgwywMTfeVIpBuowQi7Fvy/uDHphovGJJAh83nZUfFCOq1gM0YfLIrHJO7470= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780058471; c=relaxed/simple; bh=KZ2/enqL6juiGyMaIjVHdXtx0OKPOLM6Wa0WYXaKDHA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J/IFiwxYM1hQU+QKYukgoiBMjtpdTGieBLiAyuVMdUOaLqwkRyFIKxzeNOR8fH9J2t3KKiNfxFsEcNetrgD5K47jF/64/HOBiBrlkMk7mOuHEg0J6yvAsLjIeGULvavQnh3SfR0/SP4CP5+9eNk1ghIOlu0dcBx9rj+5j/L7RqQ= 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=CTCj+lTF; 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="CTCj+lTF" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64TAhwiJ2418247; Fri, 29 May 2026 12:41:04 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=YU5lUSO2/RzWbFB82 +LUZ7LUD5/dK4LtprR/6hPghzc=; b=CTCj+lTFrXmdK8HxAROOjbS2fX32HSNzO XhEAn2eMKOc/cQCDl2loYcmCCa01IL3JOiFHnGawbcwsQGt+jNkYIRI3bzFm2oNY M7QpJZ3vr3aeELDfvK+nHenXvcAGabn368VUAJbG49dWgt+B3E4eUd8ljUU5eAkB B2kXB3RsBz97FXLCHw1heLs3rmZ9FpyEcoXSYSj7pTl4aOdlPm82ueGsuKahSaBd +t6l6TdSXx0kimFI16KkMwQitxWQGoSsrSimek7SXwNlkN+GAZmIP2ZOHQvLzgSv rJBq5Q7kVBbFJ8K6lDW8sSWC5huGoUHOA5Nb0dUBz257v2oAvf8jQ== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4ee884rp2f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 May 2026 12:41:04 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64TCdBgU016770; Fri, 29 May 2026 12:41:02 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4edjrbwjt1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 May 2026 12:41:02 +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 64TCexFL26607912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 May 2026 12:40:59 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1C31A20043; Fri, 29 May 2026 12:40:59 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5C1CE20040; Fri, 29 May 2026 12:40:57 +0000 (GMT) Received: from li-7bb28a4c-2dab-11b2-a85c-887b5c60d769.ibm.com.com (unknown [9.124.221.69]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 29 May 2026 12:40:57 +0000 (GMT) From: Shrikanth Hegde To: christophe.leroy@csgroup.eu, maddy@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, tglx@kernel.org Cc: sshegde@linux.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] powerpc/irq: Suppress unlikely interrupt stats by default Date: Fri, 29 May 2026 18:10:45 +0530 Message-ID: <20260529124045.1208539-4-sshegde@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260529124045.1208539-1-sshegde@linux.ibm.com> References: <20260529124045.1208539-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=L4MtheT8 c=1 sm=1 tr=0 ts=6a198960 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=HwhMAjjRhnxDVlPREfwA:9 X-Proofpoint-ORIG-GUID: PAV-6-Ot_Aw9KfM20SDoMXTYyojfAlk0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI5MDEyNiBTYWx0ZWRfX45AGDvuIbZf0 2Ul7z2VANi5/wtqM5gfLpSphbjt/K5tb7iPfwa+y1Y2kbXq79yMZpB56/KEi1Qkft6zOyiiA5sw B+lZZviPlumFnyq6cC2Ioiz5sfCanF6WmmBZQkyUhDYCIqCAW9j1ScoocfV9XcVNm8JDqw+8/Yu c0w2/VjH0MJtZjOWb9fP6uaYAv20gbfN/DIXNXTca5cs3G/EkucK42cfcN9vRJqHUWBlN70Cz6U YYjz08SPJwipestScjO+lyX6U8i+6aybeBROmvXx1fF0EydlViuLzQcIABHkC/sQJ2n9xSFvFbS Mcag/tcTmu1UVxhP98t8Qqz7+BvhZ4cZqjz0ugBPp7wO8Ht1Rwra6qTe30e0XRvESs559Urb/fn VsKoQdZjcdKcTKv8YPMh2jFoXB5M4hSvxQpHV4LjGKrpAOhPx/QjcRG1LHSM/AnHB/ubiXwBi0F YW9kWpFTIYLUWyiTZ0Q== X-Proofpoint-GUID: PAV-6-Ot_Aw9KfM20SDoMXTYyojfAlk0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-29_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 malwarescore=0 bulkscore=0 impostorscore=0 adultscore=0 priorityscore=1501 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605290126 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..0a6a0e707fe8 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 optional; }; =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, .optional =3D 0} +#define ISC(idx, sym, txt)[IRQ_COUNT_##idx] =3D { .symbol =3D sym, .text = =3D txt, .optional =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 (info->optional && !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->optional =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