From nobody Sun Apr 19 05:36:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF136C433EF for ; Tue, 5 Jul 2022 22:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232373AbiGEWhr (ORCPT ); Tue, 5 Jul 2022 18:37:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229577AbiGEWhp (ORCPT ); Tue, 5 Jul 2022 18:37:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D50EDDECF; Tue, 5 Jul 2022 15:37:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 27AF461D45; Tue, 5 Jul 2022 22:37:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B98ACC341C7; Tue, 5 Jul 2022 22:37:42 +0000 (UTC) Date: Tue, 5 Jul 2022 18:37:41 -0400 From: Steven Rostedt To: LKML Cc: David Ahern , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH] neighbor: tracing: Have neigh_create event use __string() Message-ID: <20220705183741.35387e3f@rorschach.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Steven Rostedt (Google)" The dev field of the neigh_create event uses __dynamic_array() with a fixed size, which defeats the purpose of __dynamic_array(). Looking at the logic, as it already uses __assign_str(), just use the same logic in __string to create the size needed. It appears that because "dev" can be NULL, it needs the check. But __string() can have the same checks as __assign_str() so use them there too. Cc: David Ahern Cc: David S. Miller Cc: netdev@vger.kernel.org Signed-off-by: Steven Rostedt (Google) Acked-by: Jakub Kicinski Reviewed-by: David Ahern --- [ This is simpler logic than the fib* events, so I figured just convert to __string() instead of a static __array() ] include/trace/events/neigh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/events/neigh.h b/include/trace/events/neigh.h index 62bb17516713..5eaa1fa99171 100644 --- a/include/trace/events/neigh.h +++ b/include/trace/events/neigh.h @@ -30,7 +30,7 @@ TRACE_EVENT(neigh_create, =20 TP_STRUCT__entry( __field(u32, family) - __dynamic_array(char, dev, IFNAMSIZ ) + __string(dev, dev ? dev->name : "NULL") __field(int, entries) __field(u8, created) __field(u8, gc_exempt) --=20 2.35.1