From: Jakub Kicinski <kuba@kernel.org>
To: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Jamie Bainbridge <jamie.bainbridge@gmail.com>,
Eric Dumazet <edumazet@google.com>,
"David S . Miller" <davem@davemloft.net>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
David Ahern <dsahern@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Chris Down <chris@chrisdown.name>,
Stephen Hemminger <stephen@networkplumber.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next] tcp: Fix tcp_syn_flood_action() if CONFIG_IPV6=n
Date: Wed, 16 Nov 2022 12:31:15 -0800 [thread overview]
Message-ID: <20221116123115.6b49e1b8@kernel.org> (raw)
In-Reply-To: <d1ecf500f07e063d4e8e34f4045ddca55416c686.1668507036.git.geert+renesas@glider.be>
On Tue, 15 Nov 2022 11:12:16 +0100 Geert Uytterhoeven wrote:
> If CONFIG_IPV6=n:
>
> net/ipv4/tcp_input.c: In function ‘tcp_syn_flood_action’:
> include/net/sock.h:387:37: error: ‘const struct sock_common’ has no member named ‘skc_v6_rcv_saddr’; did you mean ‘skc_rcv_saddr’?
> 387 | #define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr
> | ^~~~~~~~~~~~~~~~
> include/linux/printk.h:429:19: note: in definition of macro ‘printk_index_wrap’
> 429 | _p_func(_fmt, ##__VA_ARGS__); \
> | ^~~~~~~~~~~
> include/linux/printk.h:530:2: note: in expansion of macro ‘printk’
> 530 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
> | ^~~~~~
> include/linux/net.h:272:3: note: in expansion of macro ‘pr_info’
> 272 | function(__VA_ARGS__); \
> | ^~~~~~~~
> include/linux/net.h:288:2: note: in expansion of macro ‘net_ratelimited_function’
> 288 | net_ratelimited_function(pr_info, fmt, ##__VA_ARGS__)
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/net.h:288:43: note: in expansion of macro ‘sk_v6_rcv_saddr’
> 288 | net_ratelimited_function(pr_info, fmt, ##__VA_ARGS__)
> | ^~~~~~~~~~~
> net/ipv4/tcp_input.c:6847:4: note: in expansion of macro ‘net_info_ratelimited’
> 6847 | net_info_ratelimited("%s: Possible SYN flooding on port [%pI6c]:%u. %s.\n",
> | ^~~~~~~~~~~~~~~~~~~~
>
> Fix this by using "#if" instead of "if", like is done for all other
> checks for CONFIG_IPV6.
>
> Fixes: d9282e48c6088105 ("tcp: Add listening address to SYN flood message")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Sorry for the late reaction, this now conflicts with bf36267e3ad3df8
I was gonna hand edit but perhaps we can do better with the ifdef
formation.
Instead of
#ifdef v6
if (v6) {
expensive_call6();
} else // d k
#endif // o i
{ // o e
expensive_call4();
}
Can we go with:
#ifdef v6
if (v6)
expensive_call6();
else
#endif
expensive_call4();
or
if (v4) {
expensive_call4();
#ifdef v6
} else {
expensive_call6();
#endif
}
or
if (v6) {
#ifdef v6
expensive_call6();
#endif
} else {
expensive_call6();
}
I know you're just going with the most obviously correct / smallest diff
way, but the broken up else bracket gives me flashbacks of looking at
vendor code :S
next prev parent reply other threads:[~2022-11-16 20:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 10:12 [PATCH net-next] tcp: Fix tcp_syn_flood_action() if CONFIG_IPV6=n Geert Uytterhoeven
2022-11-15 11:37 ` Matthieu Baerts
2022-11-16 20:31 ` Jakub Kicinski [this message]
2022-11-16 21:39 ` Jamie Bainbridge
2022-11-16 22:15 ` Jakub Kicinski
2022-11-18 1:45 ` Jamie Bainbridge
2022-11-18 8:29 ` Geert Uytterhoeven
2022-11-18 16:19 ` Jakub Kicinski
2022-11-21 22:44 ` Saeed Mahameed
2022-11-22 3:52 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221116123115.6b49e1b8@kernel.org \
--to=kuba@kernel.org \
--cc=chris@chrisdown.name \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=geert+renesas@glider.be \
--cc=jamie.bainbridge@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stephen@networkplumber.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).