From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (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 9A2BC480338 for ; Tue, 15 Sep 2026 08:25:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460748; cv=none; b=Ymc0FyExPhsqUB8vtaEKvvnCfzyfP/BplG6sy7XVeWmfsRWzqpBKobm0+gwS0hZS4wY0NumZ2Vo934b+DUBa7HNXv2tSKNsgRasGCGwzWY4Vh1v0/DCVrFTplzuG2Bi3WR3sR+75JLAYVgqlFJeyGM6tsZCjPPQUL6JV5LawRTU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460748; c=relaxed/simple; bh=F9i32u7X67i3rjTFL62V2TeKyR+ixZjqL6I2EccGRRA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iwvKcvBfuJJJ9qiS5XkhS2yhgW+A+OI0b8Q+EhvdpSdXITyY4xuqxYuqI6ulBsV4ImEshxLd/kOxiGXZBauy1dCQOY06xNsee/YpRsYw9VPbY8ByRP9NuCOM2VdpHtIYJeykPNmDh1tGVWFyedYQNHrgm2h/scWzDsYf0UD5rEQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ch0Gv9n7; arc=none smtp.client-ip=209.85.160.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ch0Gv9n7" Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-530f49fc5ffso79427441cf.2 for ; Tue, 15 Sep 2026 01:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460745; x=1790065545; darn=vger.kernel.org; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=CSHzy5Fr+v+g78gtgBhpLtU/5VBe17dtS9vTkuvViHg=; b=ch0Gv9n7We2CcjBiKJt7N8wxYVjhfnJp+fHrxypLxLEdDQrexFqNcn6Piha2xUVz2z nnGIyZDRxYdf7KgnUB81fhyoOXxW9cmuJltUSej1B3TgKXNxpDaf5I1lvQyrtJKyY4R9 sDODg7U1hpJhE68jru9dGUEiMw20akdXp4cHY2oNE/q6hFyONCyCG8tCqrKKVtJZoKrH vgbGjGviNcadV4gxZNgTcq6yQheENExlrSPQFqX3YOtQVRDbuDdfEqeHPb+viZAkcNl8 i9SeQ96WI8HnMeK5FenRrVHjOtuU5h8zOTEzBqcGiqQGbW0V2DlBK2eaSBLlmCJa3O8r vKIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460745; x=1790065545; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CSHzy5Fr+v+g78gtgBhpLtU/5VBe17dtS9vTkuvViHg=; b=s8WaEsn0gArsMMdfEkBcuinJpUTpZcNf+vJwRzgpCIdpAqLaEedoas/oVXKuHeTZZo 2wxv598ixj2gHMebquTM8OhpFVtmSIyJypBrM254Jl9TLD20UohfO/nmxAX1mlAUdpCe ehNl25FZCHHBxuWpWAHGvz0zI3AC7qvfNoQ2pWkcNeVT5mCij1R4JxTHebnyREvHmIOf q6V+XMNYmRDptEELSmWYyqwkjj0HXXXRy3/BKB80jSUdFFY3+N5RJFMrbeopj1Ms3hLl 69HbANGn3sClzA8nGXwAHsKhoPS9Lle7aE2zNZzMVljjZRL4Mwlv+gaRVvCsZDB32IMU Po/g== X-Forwarded-Encrypted: i=1; AKwUvBwOABRMS+g+OgMv739gN6X0pC34cCdCZVs2qWPb0AqpVprjWL6fR489rVcpqvRBFvr1n1UKQmOZz8sh7nw=@vger.kernel.org X-Gm-Message-State: AFuF++k5dP+Y+J08Og/wDqiDsv09fSz3fkCq7C4LgpqzytwgzKIT9oeK wOk1dPYNlDT/kqsBZJ+e1pmQF4oMVOfCqe1h+E/38Xd6f96yGAKWuJJvn0GXhYOVcKbk/b/bmcJ e X-Received: from plky9.prod.google.com ([2002:a17:902:7009:b0:2dd:3c92:b0a2]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:8c5:b0:2c6:90ec:f601 with SMTP id d9443c01a7336-2dd6c5f3422mr125997365ad.8.1789460416594; Tue, 15 Sep 2026 01:20:16 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:42 +0000 In-Reply-To: <20260915081910.4142719-1-morbo@google.com> Precedence: bulk X-Mailing-List: linux-parisc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260915081910.4142719-1-morbo@google.com> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog Message-ID: <20260915081910.4142719-26-morbo@google.com> Subject: [PATCH 25/28] EDAC/thunderx: Replace strlcat() with seq_buf From: Bill Wendling To: linux-kernel@vger.kernel.org Cc: Bill Wendling , codemender-patching+linux@google.com, Russell King , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Ian Abbott , H Hartley Sweeten , Tony Luck , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matthew Brost , "=?UTF-8?q?Thomas=20Hellstr=C3=B6m?=" , Rodrigo Vivi , Dmitry Torokhov , Matthias Schwarzott , Mauro Carvalho Chehab , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Arend van Spriel , Rob Herring , Saravana Kannan , Krzysztof Kozlowski , Sylwester Nawrocki , Peter Griffin , Alim Akhtar , Linus Walleij , Anil Gurumurthy , Sudarsana Kalluru , "Martin K. Petersen" , Trond Myklebust , Anna Schumaker , Mike Marshall , Martin Brandenburg , Kees Cook , Jiri Pirko , Simon Horman , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jaroslav Kysela , Takashi Iwai , Andrew Morton , "Mike Rapoport (Microsoft)" , Kanglong Wang , Tiezhu Yang , Qiang Ma , Randy Dunlap , Pengpeng Hou , Ard Biesheuvel , Breno Leitao , Thorsten Blum , Harshit Mogalapalli , Greg Kroah-Hartman , Lyude Paul , Ashutosh Desai , Imre Deak , Dmitry Baryshkov , Johan Hovold , Johannes Berg , Miri Korenblit , Alexander Stein , Cryolitia PukNgae , Jiaming Zhang , Will Porter , Cen Zhang , "=?UTF-8?q?C=C3=A1ssio=20Gabriel?=" , Rong Zhang , Arun Raghavan , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-edac@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-input@vger.kernel.org, linux-media@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-scsi@vger.kernel.org, linux-nfs@vger.kernel.org, devel@lists.orangefs.org, linux-hardening@vger.kernel.org, linux-sound@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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] =3D '\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@google.com Assisted-by: AI:Claude-3-5-Sonnet [editor_update_file, shell_command_run] Signed-off-by: Bill Wendling --- Cc: Russell King Cc: Huacai Chen Cc: WANG Xuerui Cc: Thomas Bogendoerfer Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: Ian Abbott Cc: H Hartley Sweeten Cc: Tony Luck Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: Matthew Brost Cc: "Thomas Hellstr=C3=B6m" Cc: Rodrigo Vivi Cc: Dmitry Torokhov Cc: Matthias Schwarzott Cc: Mauro Carvalho Chehab Cc: Tony Nguyen Cc: Przemek Kitszel Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Arend van Spriel Cc: Rob Herring Cc: Saravana Kannan Cc: Krzysztof Kozlowski Cc: Sylwester Nawrocki Cc: Peter Griffin Cc: Alim Akhtar Cc: Linus Walleij Cc: Anil Gurumurthy Cc: Sudarsana Kalluru Cc: "Martin K. Petersen" Cc: Trond Myklebust Cc: Anna Schumaker Cc: Mike Marshall Cc: Martin Brandenburg Cc: Kees Cook Cc: Jiri Pirko Cc: Simon Horman Cc: Chuck Lever Cc: Jeff Layton Cc: NeilBrown Cc: Olga Kornievskaia Cc: Dai Ngo Cc: Tom Talpey Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Bill Wendling Cc: Andrew Morton Cc: "Mike Rapoport (Microsoft)" Cc: Kanglong Wang Cc: Tiezhu Yang Cc: Qiang Ma Cc: Randy Dunlap Cc: Pengpeng Hou Cc: Ard Biesheuvel Cc: Breno Leitao Cc: Thorsten Blum Cc: Harshit Mogalapalli Cc: Greg Kroah-Hartman Cc: Lyude Paul Cc: Ashutosh Desai Cc: Imre Deak Cc: Dmitry Baryshkov Cc: Johan Hovold Cc: Johannes Berg Cc: Miri Korenblit Cc: Alexander Stein Cc: Cryolitia PukNgae Cc: Jiaming Zhang Cc: Will Porter Cc: Cen Zhang Cc: "C=C3=A1ssio Gabriel" Cc: Rong Zhang Cc: Arun Raghavan Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-edac@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: brcm80211@lists.linux.dev Cc: brcm80211-dev-list.pdl@broadcom.com Cc: devicetree@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-nfs@vger.kernel.org Cc: devel@lists.orangefs.org Cc: linux-hardening@vger.kernel.org Cc: linux-sound@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 #include #include +#include =20 #include =20 @@ -47,12 +48,17 @@ static void decode_register(char *str, size_t size, { int ret =3D 0; =20 + if (size > 0) + str[0] =3D '\0'; + while (descr->type && descr->mask && descr->descr) { if (reg & descr->mask) { ret =3D snprintf(str, size, "\n\t%s, %s", descr->type =3D=3D ERR_CORRECTED ? "Corrected" : "Uncorrected", descr->descr); + if (ret < 0 || ret >=3D size) + break; str +=3D ret; size -=3D ret; } @@ -1115,35 +1121,37 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(in= t irq, void *irq_id) =20 while (CIRC_CNT(ocx->com_ring_head, ocx->com_ring_tail, ARRAY_SIZE(ocx->com_err_ctx))) { + struct seq_buf s; + tail =3D ring_pos(ocx->com_ring_tail, ARRAY_SIZE(ocx->com_err_ctx)); ctx =3D &ocx->com_err_ctx[tail]; =20 - 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); =20 decode_register(other, OCX_OTHER_SIZE, ocx_com_errors, ctx->reg_com_int); =20 - strlcat(msg, other, OCX_MESSAGE_SIZE); + seq_buf_puts(&s, other); =20 for (lane =3D 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]); =20 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); } =20 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)); =20 ocx->com_ring_tail++; } @@ -1196,25 +1204,28 @@ static irqreturn_t thunderx_ocx_lnk_threaded_isr(in= t irq, void *irq_id) =20 while (CIRC_CNT(ocx->link_ring_head, ocx->link_ring_tail, ARRAY_SIZE(ocx->link_err_ctx))) { + struct seq_buf s; + tail =3D ring_pos(ocx->link_ring_head, ARRAY_SIZE(ocx->link_err_ctx)); =20 ctx =3D &ocx->link_err_ctx[tail]; =20 - 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); =20 decode_register(other, OCX_OTHER_SIZE, ocx_com_link_errors, ctx->reg_com_link_int); =20 - strlcat(msg, other, OCX_MESSAGE_SIZE); + seq_buf_puts(&s, other); =20 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)); =20 ocx->link_ring_tail++; } @@ -1880,22 +1891,25 @@ static irqreturn_t thunderx_l2c_threaded_isr(int ir= q, void *irq_id) =20 while (CIRC_CNT(l2c->ring_head, l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx))) { + struct seq_buf s; + tail =3D ring_pos(l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx)); ctx =3D &l2c->err_ctx[tail]; =20 - 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); =20 decode_register(other, L2C_OTHER_SIZE, l2_errors, ctx->reg_int); =20 - strlcat(msg, other, L2C_MESSAGE_SIZE); + seq_buf_puts(&s, other); =20 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)); =20 l2c->ring_tail++; } --=20 2.55.0.1032.g73a4cd73de-goog