[PATCH 25/28] EDAC/thunderx: Replace strlcat() with seq_buf
Bill Wendling
morbo at google.com
Tue Sep 15 08:18:42 UTC 2026
The threaded ISR handlers (thunderx_ocx_com_threaded_isr(),
thunderx_ocx_lnk_threaded_isr(), and thunderx_l2c_threaded_isr()) build
multi-line error reports by formatting register details into a scratch
buffer and appending them to "msg" with strlcat().
In preparation for removing the deprecated strlcat() API[1], refactor the
ISR handlers to construct error messages using struct seq_buf.
Additionally, fix two bugs in decode_register(): initialize "str[0] = '\0'"
so callers do not append stale buffer contents when no error bits match,
and stop iterating if snprintf() truncates the buffer to avoid
underflowing the remaining "size" counter.
Link: https://github.com/KSPP/linux/issues/370 [1]
Cc: codemender-patching+linux at google.com
Assisted-by: AI:Claude-3-5-Sonnet [editor_update_file, shell_command_run]
Signed-off-by: Bill Wendling <morbo at google.com>
---
Cc: Russell King <linux at armlinux.org.uk>
Cc: Huacai Chen <chenhuacai at kernel.org>
Cc: WANG Xuerui <kernel at xen0n.name>
Cc: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Cc: "James E.J. Bottomley" <James.Bottomley at HansenPartnership.com>
Cc: Helge Deller <deller at gmx.de>
Cc: Thomas Gleixner <tglx at kernel.org>
Cc: Ingo Molnar <mingo at redhat.com>
Cc: Borislav Petkov <bp at alien8.de>
Cc: Dave Hansen <dave.hansen at linux.intel.com>
Cc: x86 at kernel.org
Cc: "H. Peter Anvin" <hpa at zytor.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Cc: Maxime Ripard <mripard at kernel.org>
Cc: Thomas Zimmermann <tzimmermann at suse.de>
Cc: David Airlie <airlied at gmail.com>
Cc: Simona Vetter <simona at ffwll.ch>
Cc: Matthew Brost <matthew.brost at intel.com>
Cc: "Thomas Hellström" <thomas.hellstrom at linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
Cc: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Cc: Matthias Schwarzott <zzam at gentoo.org>
Cc: Mauro Carvalho Chehab <mchehab at kernel.org>
Cc: Tony Nguyen <anthony.l.nguyen at intel.com>
Cc: Przemek Kitszel <przemyslaw.kitszel at intel.com>
Cc: Andrew Lunn <andrew+netdev at lunn.ch>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Eric Dumazet <edumazet at google.com>
Cc: Jakub Kicinski <kuba at kernel.org>
Cc: Paolo Abeni <pabeni at redhat.com>
Cc: Arend van Spriel <arend.vanspriel at broadcom.com>
Cc: Rob Herring <robh at kernel.org>
Cc: Saravana Kannan <saravanak at kernel.org>
Cc: Krzysztof Kozlowski <krzk at kernel.org>
Cc: Sylwester Nawrocki <s.nawrocki at samsung.com>
Cc: Peter Griffin <peter.griffin at linaro.org>
Cc: Alim Akhtar <alim.akhtar at samsung.com>
Cc: Linus Walleij <linusw at kernel.org>
Cc: Anil Gurumurthy <anil.gurumurthy at qlogic.com>
Cc: Sudarsana Kalluru <sudarsana.kalluru at qlogic.com>
Cc: "Martin K. Petersen" <mkp at kernel.org>
Cc: Trond Myklebust <trondmy at kernel.org>
Cc: Anna Schumaker <anna at kernel.org>
Cc: Mike Marshall <hubcap at omnibond.com>
Cc: Martin Brandenburg <martin at omnibond.com>
Cc: Kees Cook <kees at kernel.org>
Cc: Jiri Pirko <jiri at resnulli.us>
Cc: Simon Horman <horms at kernel.org>
Cc: Chuck Lever <cel at kernel.org>
Cc: Jeff Layton <jlayton at kernel.org>
Cc: NeilBrown <neil at brown.name>
Cc: Olga Kornievskaia <okorniev at redhat.com>
Cc: Dai Ngo <Dai.Ngo at oracle.com>
Cc: Tom Talpey <tom at talpey.com>
Cc: Jaroslav Kysela <perex at perex.cz>
Cc: Takashi Iwai <tiwai at suse.com>
Cc: Bill Wendling <morbo at google.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: "Mike Rapoport (Microsoft)" <rppt at kernel.org>
Cc: Kanglong Wang <wangkanglong at loongson.cn>
Cc: Tiezhu Yang <yangtiezhu at loongson.cn>
Cc: Qiang Ma <maqianga at uniontech.com>
Cc: Randy Dunlap <rdunlap at infradead.org>
Cc: Pengpeng Hou <pengpeng at iscas.ac.cn>
Cc: Ard Biesheuvel <ardb at kernel.org>
Cc: Breno Leitao <leitao at debian.org>
Cc: Thorsten Blum <blum at kernel.org>
Cc: Harshit Mogalapalli <harshit.m.mogalapalli at oracle.com>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: Lyude Paul <lyude at redhat.com>
Cc: Ashutosh Desai <ashutoshdesai993 at gmail.com>
Cc: Imre Deak <imre.deak at intel.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov at oss.qualcomm.com>
Cc: Johan Hovold <johan at kernel.org>
Cc: Johannes Berg <johannes.berg at intel.com>
Cc: Miri Korenblit <miriam.rachel.korenblit at intel.com>
Cc: Alexander Stein <alexander.stein at ew.tq-group.com>
Cc: Cryolitia PukNgae <cryolitia at uniontech.com>
Cc: Jiaming Zhang <r772577952 at gmail.com>
Cc: Will Porter <mrwillporter at gmail.com>
Cc: Cen Zhang <zzzccc427 at gmail.com>
Cc: "Cássio Gabriel" <cassiogabrielcontato at gmail.com>
Cc: Rong Zhang <i at rong.moe>
Cc: Arun Raghavan <arunr at valvesoftware.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
Cc: loongarch at lists.linux.dev
Cc: linux-mips at vger.kernel.org
Cc: linux-parisc at vger.kernel.org
Cc: linux-edac at vger.kernel.org
Cc: dri-devel at lists.freedesktop.org
Cc: intel-xe at lists.freedesktop.org
Cc: linux-input at vger.kernel.org
Cc: linux-media at vger.kernel.org
Cc: intel-wired-lan at lists.osuosl.org
Cc: netdev at vger.kernel.org
Cc: linux-wireless at vger.kernel.org
Cc: brcm80211 at lists.linux.dev
Cc: brcm80211-dev-list.pdl at broadcom.com
Cc: devicetree at vger.kernel.org
Cc: linux-samsung-soc at vger.kernel.org
Cc: linux-gpio at vger.kernel.org
Cc: linux-scsi at vger.kernel.org
Cc: linux-nfs at vger.kernel.org
Cc: devel at lists.orangefs.org
Cc: linux-hardening at vger.kernel.org
Cc: linux-sound at vger.kernel.org
---
drivers/edac/thunderx_edac.c | 64 ++++++++++++++++++++++--------------
1 file changed, 39 insertions(+), 25 deletions(-)
diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c
index e7c335ca0c36..4e3781815b6d 100644
--- a/drivers/edac/thunderx_edac.c
+++ b/drivers/edac/thunderx_edac.c
@@ -20,6 +20,7 @@
#include <linux/atomic.h>
#include <linux/bitfield.h>
#include <linux/circ_buf.h>
+#include <linux/seq_buf.h>
#include <asm/page.h>
@@ -47,12 +48,17 @@ static void decode_register(char *str, size_t size,
{
int ret = 0;
+ if (size > 0)
+ str[0] = '\0';
+
while (descr->type && descr->mask && descr->descr) {
if (reg & descr->mask) {
ret = snprintf(str, size, "\n\t%s, %s",
descr->type == ERR_CORRECTED ?
"Corrected" : "Uncorrected",
descr->descr);
+ if (ret < 0 || ret >= size)
+ break;
str += ret;
size -= ret;
}
@@ -1115,35 +1121,37 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id)
while (CIRC_CNT(ocx->com_ring_head, ocx->com_ring_tail,
ARRAY_SIZE(ocx->com_err_ctx))) {
+ struct seq_buf s;
+
tail = ring_pos(ocx->com_ring_tail,
ARRAY_SIZE(ocx->com_err_ctx));
ctx = &ocx->com_err_ctx[tail];
- snprintf(msg, OCX_MESSAGE_SIZE, "%s: OCX_COM_INT: %016llx",
- ocx->edac_dev->ctl_name, ctx->reg_com_int);
+ seq_buf_init(&s, msg, OCX_MESSAGE_SIZE);
+
+ seq_buf_printf(&s, "%s: OCX_COM_INT: %016llx",
+ ocx->edac_dev->ctl_name, ctx->reg_com_int);
decode_register(other, OCX_OTHER_SIZE,
ocx_com_errors, ctx->reg_com_int);
- strlcat(msg, other, OCX_MESSAGE_SIZE);
+ seq_buf_puts(&s, other);
for (lane = 0; lane < OCX_RX_LANES; lane++)
if (ctx->reg_com_int & BIT(lane)) {
- snprintf(other, OCX_OTHER_SIZE,
- "\n\tOCX_LNE_INT[%02d]: %016llx OCX_LNE_STAT11[%02d]: %016llx",
- lane, ctx->reg_lane_int[lane],
- lane, ctx->reg_lane_stat11[lane]);
-
- strlcat(msg, other, OCX_MESSAGE_SIZE);
+ seq_buf_printf(&s,
+ "\n\tOCX_LNE_INT[%02d]: %016llx OCX_LNE_STAT11[%02d]: %016llx",
+ lane, ctx->reg_lane_int[lane],
+ lane, ctx->reg_lane_stat11[lane]);
decode_register(other, OCX_OTHER_SIZE,
ocx_lane_errors,
ctx->reg_lane_int[lane]);
- strlcat(msg, other, OCX_MESSAGE_SIZE);
+ seq_buf_puts(&s, other);
}
if (ctx->reg_com_int & OCX_COM_INT_CE)
- edac_device_handle_ce(ocx->edac_dev, 0, 0, msg);
+ edac_device_handle_ce(ocx->edac_dev, 0, 0, seq_buf_str(&s));
ocx->com_ring_tail++;
}
@@ -1196,25 +1204,28 @@ static irqreturn_t thunderx_ocx_lnk_threaded_isr(int irq, void *irq_id)
while (CIRC_CNT(ocx->link_ring_head, ocx->link_ring_tail,
ARRAY_SIZE(ocx->link_err_ctx))) {
+ struct seq_buf s;
+
tail = ring_pos(ocx->link_ring_head,
ARRAY_SIZE(ocx->link_err_ctx));
ctx = &ocx->link_err_ctx[tail];
- snprintf(msg, OCX_MESSAGE_SIZE,
- "%s: OCX_COM_LINK_INT[%d]: %016llx",
- ocx->edac_dev->ctl_name,
- ctx->link, ctx->reg_com_link_int);
+ seq_buf_init(&s, msg, OCX_MESSAGE_SIZE);
+
+ seq_buf_printf(&s, "%s: OCX_COM_LINK_INT[%d]: %016llx",
+ ocx->edac_dev->ctl_name,
+ ctx->link, ctx->reg_com_link_int);
decode_register(other, OCX_OTHER_SIZE,
ocx_com_link_errors, ctx->reg_com_link_int);
- strlcat(msg, other, OCX_MESSAGE_SIZE);
+ seq_buf_puts(&s, other);
if (ctx->reg_com_link_int & OCX_COM_LINK_INT_UE)
- edac_device_handle_ue(ocx->edac_dev, 0, 0, msg);
+ edac_device_handle_ue(ocx->edac_dev, 0, 0, seq_buf_str(&s));
else if (ctx->reg_com_link_int & OCX_COM_LINK_INT_CE)
- edac_device_handle_ce(ocx->edac_dev, 0, 0, msg);
+ edac_device_handle_ce(ocx->edac_dev, 0, 0, seq_buf_str(&s));
ocx->link_ring_tail++;
}
@@ -1880,22 +1891,25 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)
while (CIRC_CNT(l2c->ring_head, l2c->ring_tail,
ARRAY_SIZE(l2c->err_ctx))) {
+ struct seq_buf s;
+
tail = ring_pos(l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx));
ctx = &l2c->err_ctx[tail];
- snprintf(msg, L2C_MESSAGE_SIZE,
- "%s: %s: %016llx, %s: %016llx",
- l2c->edac_dev->ctl_name, reg_int_name, ctx->reg_int,
- ctx->reg_ext_name, ctx->reg_ext);
+ seq_buf_init(&s, msg, L2C_MESSAGE_SIZE);
+
+ seq_buf_printf(&s, "%s: %s: %016llx, %s: %016llx",
+ l2c->edac_dev->ctl_name, reg_int_name, ctx->reg_int,
+ ctx->reg_ext_name, ctx->reg_ext);
decode_register(other, L2C_OTHER_SIZE, l2_errors, ctx->reg_int);
- strlcat(msg, other, L2C_MESSAGE_SIZE);
+ seq_buf_puts(&s, other);
if (ctx->reg_int & mask_ue)
- edac_device_handle_ue(l2c->edac_dev, 0, 0, msg);
+ edac_device_handle_ue(l2c->edac_dev, 0, 0, seq_buf_str(&s));
else if (ctx->reg_int & mask_ce)
- edac_device_handle_ce(l2c->edac_dev, 0, 0, msg);
+ edac_device_handle_ce(l2c->edac_dev, 0, 0, seq_buf_str(&s));
l2c->ring_tail++;
}
--
2.55.0.1032.g73a4cd73de-goog
More information about the Intel-wired-lan
mailing list