From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org,
pabeni@redhat.com, edumazet@google.com
Subject: [PATCH nf-next 01/18] netfilter: conntrack: use fallthrough to cleanup
Date: Thu, 21 Jul 2022 01:07:37 +0200 [thread overview]
Message-ID: <20220720230754.209053-2-pablo@netfilter.org> (raw)
In-Reply-To: <20220720230754.209053-1-pablo@netfilter.org>
From: Jackie Liu <liuyun01@kylinos.cn>
These cases all use the same function. we can simplify the code through
fallthrough.
$ size net/netfilter/nf_conntrack_core.o
text data bss dec hex filename
before 81601 81430 768 163799 27fd7 net/netfilter/nf_conntrack_core.o
after 80361 81430 768 162559 27aff net/netfilter/nf_conntrack_core.o
Arch: aarch64
Gcc : gcc version 9.4.0 (Ubuntu 9.4.0-1ubuntu1~20.04.1)
Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_conntrack_core.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 082a2fd8d85b..363c3e8f9d1b 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -329,20 +329,18 @@ nf_ct_get_tuple(const struct sk_buff *skb,
return gre_pkt_to_tuple(skb, dataoff, net, tuple);
#endif
case IPPROTO_TCP:
- case IPPROTO_UDP: /* fallthrough */
- return nf_ct_get_tuple_ports(skb, dataoff, tuple);
+ case IPPROTO_UDP:
#ifdef CONFIG_NF_CT_PROTO_UDPLITE
case IPPROTO_UDPLITE:
- return nf_ct_get_tuple_ports(skb, dataoff, tuple);
#endif
#ifdef CONFIG_NF_CT_PROTO_SCTP
case IPPROTO_SCTP:
- return nf_ct_get_tuple_ports(skb, dataoff, tuple);
#endif
#ifdef CONFIG_NF_CT_PROTO_DCCP
case IPPROTO_DCCP:
- return nf_ct_get_tuple_ports(skb, dataoff, tuple);
#endif
+ /* fallthrough */
+ return nf_ct_get_tuple_ports(skb, dataoff, tuple);
default:
break;
}
--
2.30.2
next prev parent reply other threads:[~2022-07-20 23:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 23:07 [PATCH nf-next 00/18] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2022-07-20 23:07 ` Pablo Neira Ayuso [this message]
2022-07-21 4:10 ` [PATCH nf-next 01/18] netfilter: conntrack: use fallthrough to cleanup patchwork-bot+netdevbpf
2022-07-20 23:07 ` [PATCH nf-next 02/18] netfilter: conntrack: use correct format characters Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 03/18] net/sched: act_ct: set 'net' pointer when creating new nf_flow_table Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 04/18] netfilter: nf_flow_table: count pending offload workqueue tasks Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 05/18] netfilter: nf_conntrack: add missing __rcu annotations Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 06/18] netfilter: nf_conntrack: use rcu accessors where needed Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 07/18] netfilter: h323: merge nat hook pointers into one Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 08/18] netfilter: nft_set_bitmap: Fix spelling mistake Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 09/18] netfilter: nfnetlink: add missing __be16 cast Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 10/18] netfilter: x_tables: use correct integer types Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 11/18] netfilter: nf_tables: use the correct get/put helpers Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 12/18] netfilter: nf_tables: add and use BE register load-store helpers Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 13/18] netfilter: nf_tables: use correct integer types Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 14/18] netfilter: nf_tables: move nft_cmp_fast_mask to where its used Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 15/18] netfilter: nf_nat: in nf_nat_initialized(), use const struct nf_conn * Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 16/18] netfilter: ipvs: Use the bitmap API to allocate bitmaps Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 17/18] netfilter: flowtable: prefer refcount_inc Pablo Neira Ayuso
2022-07-20 23:07 ` [PATCH nf-next 18/18] netfilter: xt_TPROXY: remove pr_debug invocations Pablo Neira Ayuso
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=20220720230754.209053-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
/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).