From patchwork Mon Oct 16 12:49:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 153371 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3434390vqb; Mon, 16 Oct 2023 05:49:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaAZVgy9qOILJ/Z9uZiPUa0tmaJiOnEZRKsRsAIMmNDWenEMrucd8zs2TooL2+sMPgZIGt X-Received: by 2002:a17:90a:9f83:b0:27c:fbf8:6c43 with SMTP id o3-20020a17090a9f8300b0027cfbf86c43mr16285436pjp.1.1697460576871; Mon, 16 Oct 2023 05:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697460576; cv=none; d=google.com; s=arc-20160816; b=ztA7xOMyqDKlFzb2jFtAOvOMlirvbVgP6MkCao1wnapeOLOsTclAiY2+6xNHMlRKfm d7BvdmX4T8vyR5GOn7/cEzmelvZvCeGZd/KLwaKw0UMIkZU7BW0BHqz9WDrUhv31/g8V 7ivHJJ/vQ9Vy6E5SG4Ek82KutIqQyMyDWRuS2PyKR9IREPMh83UzCx0I6Tgy++FopFPM 83m/WIbln3UMVtDwXlYjMMdUkoyoa16tEtcnWT6aldhiMseudhlbWtjICGFQW4vvOVNV Vc+7bcwJ6YmE1ohiJChws17o+/tNoawkVZcd6zMHbS2slFy/Bg2AbdeciKLcp2Jh8FH7 XIFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=U8veWl1MxjW8+OLXXjg1PPpBuppzKRpxOuDil97+gIg=; fh=O2bUIKjnZvDs1Zh6Q03Ryfom1xBEaTXZ0fNaQBQFeeA=; b=mE79Kegv4jh8UUqlyAVSQ+68z2gk4dpt/H3j/wJ0JyMPdeRatAyQgf9PYm36/zwwsd kOA1GAc2QRUD/QpFZBeW2SR86fGBPpUuZH4/bZ6aCJdS4+I8py938eGXC5gAl6V0Kjq1 U9O8LlBI7r+M1x1IklE8DqiRRMWLSlP4gkZO2WybF46hc+6TIhHGjlSNyHkJAnRZJVm1 FINeRjWSnJs0q7WXuXUC5Gm2ld2jkRPjc2LsYANQoUMB3F4SFCwkkCSJT3YIOtbXGkvt mdqjFeIMtfk6qfNAVBnXW2N1cNFiMVEeiIfrxvqvc5GooyzI28Yh4sMAk7/yrQL7HXr7 yjGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id bw12-20020a056a02048c00b00578e6358053si6976012pgb.269.2023.10.16.05.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 05:49:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 69DA080ACEEA; Mon, 16 Oct 2023 05:49:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233411AbjJPMtN (ORCPT + 18 others); Mon, 16 Oct 2023 08:49:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233468AbjJPMtM (ORCPT ); Mon, 16 Oct 2023 08:49:12 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5B40F3 for ; Mon, 16 Oct 2023 05:49:08 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:ce84:d8c0:f79a:fa0]) by xavier.telenet-ops.be with bizsmtp id ycp52A00G0pDX7N01cp5bl; Mon, 16 Oct 2023 14:49:06 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qsN1q-006jX4-28; Mon, 16 Oct 2023 14:49:05 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qsN1t-00A3uN-Ck; Mon, 16 Oct 2023 14:49:05 +0200 From: Geert Uytterhoeven To: Steven Rostedt , Masami Hiramatsu , "David S . Miller" , David Ahern Cc: linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section Date: Mon, 16 Oct 2023 14:49:04 +0200 Message-Id: <60cb0b0c6266881e225160f80a83884607617921.1697460418.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 16 Oct 2023 05:49:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779916422058648618 X-GMAIL-MSGID: 1779916422058648618 When CONFIG_IPV6=n, and building with W=1: In file included from include/trace/define_trace.h:102, from include/trace/events/neigh.h:255, from net/core/net-traces.c:51: include/trace/events/neigh.h: In function ‘trace_event_raw_event_neigh_create’: include/trace/events/neigh.h:42:34: error: variable ‘pin6’ set but not used [-Werror=unused-but-set-variable] 42 | struct in6_addr *pin6; | ^~~~ include/trace/trace_events.h:402:11: note: in definition of macro ‘DECLARE_EVENT_CLASS’ 402 | { assign; } \ | ^~~~~~ include/trace/trace_events.h:44:30: note: in expansion of macro ‘PARAMS’ 44 | PARAMS(assign), \ | ^~~~~~ include/trace/events/neigh.h:23:1: note: in expansion of macro ‘TRACE_EVENT’ 23 | TRACE_EVENT(neigh_create, | ^~~~~~~~~~~ include/trace/events/neigh.h:41:9: note: in expansion of macro ‘TP_fast_assign’ 41 | TP_fast_assign( | ^~~~~~~~~~~~~~ In file included from include/trace/define_trace.h:103, from include/trace/events/neigh.h:255, from net/core/net-traces.c:51: include/trace/events/neigh.h: In function ‘perf_trace_neigh_create’: include/trace/events/neigh.h:42:34: error: variable ‘pin6’ set but not used [-Werror=unused-but-set-variable] 42 | struct in6_addr *pin6; | ^~~~ include/trace/perf.h:51:11: note: in definition of macro ‘DECLARE_EVENT_CLASS’ 51 | { assign; } \ | ^~~~~~ include/trace/trace_events.h:44:30: note: in expansion of macro ‘PARAMS’ 44 | PARAMS(assign), \ | ^~~~~~ include/trace/events/neigh.h:23:1: note: in expansion of macro ‘TRACE_EVENT’ 23 | TRACE_EVENT(neigh_create, | ^~~~~~~~~~~ include/trace/events/neigh.h:41:9: note: in expansion of macro ‘TP_fast_assign’ 41 | TP_fast_assign( | ^~~~~~~~~~~~~~ Indeed, the variable pin6 is declared and initialized unconditionally, while it is only used and needlessly re-initialized when support for IPv6 is enabled. Fix this by dropping the unused variable initialization, and moving the variable declaration inside the existing section protected by a check for CONFIG_IPV6. Fixes: fc651001d2c5ca4f ("neighbor: Add tracepoint to __neigh_create") Signed-off-by: Geert Uytterhoeven Reviewed-by: Simon Horman Tested-by: Simon Horman # build-tested Reviewed-by: David Ahern --- No changes in generated code. include/trace/events/neigh.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/events/neigh.h b/include/trace/events/neigh.h index 5eaa1fa9917153f6..833143d0992e063b 100644 --- a/include/trace/events/neigh.h +++ b/include/trace/events/neigh.h @@ -39,7 +39,6 @@ TRACE_EVENT(neigh_create, ), TP_fast_assign( - struct in6_addr *pin6; __be32 *p32; __entry->family = tbl->family; @@ -47,7 +46,6 @@ TRACE_EVENT(neigh_create, __entry->entries = atomic_read(&tbl->gc_entries); __entry->created = n != NULL; __entry->gc_exempt = exempt_from_gc; - pin6 = (struct in6_addr *)__entry->primary_key6; p32 = (__be32 *)__entry->primary_key4; if (tbl->family == AF_INET) @@ -57,6 +55,8 @@ TRACE_EVENT(neigh_create, #if IS_ENABLED(CONFIG_IPV6) if (tbl->family == AF_INET6) { + struct in6_addr *pin6; + pin6 = (struct in6_addr *)__entry->primary_key6; *pin6 = *(struct in6_addr *)pkey; }