| Message ID | cover.1675810210.git.lucien.xin@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | net: move more duplicate code of ovs and tc conntrack into nf_conntrack_ovs | expand |
On Tue, 7 Feb 2023 17:52:05 -0500 Xin Long wrote: > We've moved some duplicate code into nf_nat_ovs in: > > "net: eliminate the duplicate code in the ct nat functions of ovs and tc" > > This patchset addresses more code duplication in the conntrack of ovs > and tc then creates nf_conntrack_ovs for them, and four functions will > be extracted and moved into it: > > nf_ct_handle_fragments() > nf_ct_skb_network_trim() > nf_ct_helper() > nf_ct_add_helper() Hi Pablo, do you prefer to take this or should we?
Jakub Kicinski <kuba@kernel.org> wrote: > On Tue, 7 Feb 2023 17:52:05 -0500 Xin Long wrote: > > We've moved some duplicate code into nf_nat_ovs in: > > > > "net: eliminate the duplicate code in the ct nat functions of ovs and tc" > > > > This patchset addresses more code duplication in the conntrack of ovs > > and tc then creates nf_conntrack_ovs for them, and four functions will > > be extracted and moved into it: > > > > nf_ct_handle_fragments() > > nf_ct_skb_network_trim() > > nf_ct_helper() > > nf_ct_add_helper() > > Hi Pablo, do you prefer to take this or should we? Looks like Pablo is very busy atm, I have no objections if this is applied to net-next. You may add Acked-by: Florian Westphal <fw@strlen.de> if you like.
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 7 Feb 2023 17:52:05 -0500 you wrote: > We've moved some duplicate code into nf_nat_ovs in: > > "net: eliminate the duplicate code in the ct nat functions of ovs and tc" > > This patchset addresses more code duplication in the conntrack of ovs > and tc then creates nf_conntrack_ovs for them, and four functions will > be extracted and moved into it: > > [...] Here is the summary with links: - [PATCHv2,net-next,1/5] net: create nf_conntrack_ovs for ovs and tc use https://git.kernel.org/netdev/net-next/c/c0c3ab63de60 - [PATCHv2,net-next,2/5] net: extract nf_ct_skb_network_trim function to nf_conntrack_ovs https://git.kernel.org/netdev/net-next/c/67fc5d7ffbd4 - [PATCHv2,net-next,3/5] openvswitch: move key and ovs_cb update out of handle_fragments https://git.kernel.org/netdev/net-next/c/1b83bf4489cb - [PATCHv2,net-next,4/5] net: sched: move frag check and tc_skb_cb update out of handle_fragments https://git.kernel.org/netdev/net-next/c/558d95e7e11c - [PATCHv2,net-next,5/5] net: extract nf_ct_handle_fragments to nf_conntrack_ovs https://git.kernel.org/netdev/net-next/c/0785407e78d4 You are awesome, thank you!
We've moved some duplicate code into nf_nat_ovs in: "net: eliminate the duplicate code in the ct nat functions of ovs and tc" This patchset addresses more code duplication in the conntrack of ovs and tc then creates nf_conntrack_ovs for them, and four functions will be extracted and moved into it: nf_ct_handle_fragments() nf_ct_skb_network_trim() nf_ct_helper() nf_ct_add_helper() v1->v2: - In patch 1/5, fix the wrong option name 'NF_NF_CONNTRACK' used in net/openvswitch/Kconfig, found by kernel test robot. Xin Long (5): net: create nf_conntrack_ovs for ovs and tc use net: extract nf_ct_skb_network_trim function to nf_conntrack_ovs openvswitch: move key and ovs_cb update out of handle_fragments net: sched: move frag check and tc_skb_cb update out of handle_fragments net: extract nf_ct_handle_fragments to nf_conntrack_ovs include/net/netfilter/nf_conntrack.h | 4 + net/netfilter/Kconfig | 3 + net/netfilter/Makefile | 1 + net/netfilter/nf_conntrack_helper.c | 98 --------------- net/netfilter/nf_conntrack_ovs.c | 178 +++++++++++++++++++++++++++ net/openvswitch/Kconfig | 1 + net/openvswitch/conntrack.c | 80 ++---------- net/sched/Kconfig | 1 + net/sched/act_ct.c | 76 ++---------- 9 files changed, 207 insertions(+), 235 deletions(-) create mode 100644 net/netfilter/nf_conntrack_ovs.c