| Message ID | cover.1670518439.git.lucien.xin@gmail.com |
|---|---|
| Headers | show |
| Series | net: eliminate the duplicate code in the ct nat functions of ovs and tc | expand |
On Thu, Dec 08, 2022 at 11:56:07AM -0500, Xin Long wrote: > The changes in the patchset: > > "net: add helper support in tc act_ct for ovs offloading" > > had moved some common ct code used by both OVS and TC into netfilter. Nice dedup. Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Hello: This series was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 8 Dec 2022 11:56:07 -0500 you wrote: > The changes in the patchset: > > "net: add helper support in tc act_ct for ovs offloading" > > had moved some common ct code used by both OVS and TC into netfilter. > > There are still some big functions pretty similar defined and used in > each of OVS and TC. It is not good to maintain such big function in 2 > places. This patchset is to extract the functions for NAT processing > from OVS and TC to netfilter. > > [...] Here is the summary with links: - [PATCHv4,net-next,1/5] openvswitch: delete the unncessary skb_pull_rcsum call in ovs_ct_nat_execute https://git.kernel.org/netdev/net-next/c/bf14f4923d51 - [PATCHv4,net-next,2/5] openvswitch: return NF_ACCEPT when OVS_CT_NAT is not set in info nat https://git.kernel.org/netdev/net-next/c/779592892133 - [PATCHv4,net-next,3/5] openvswitch: return NF_DROP when fails to add nat ext in ovs_ct_nat https://git.kernel.org/netdev/net-next/c/2b85144ab36e - [PATCHv4,net-next,4/5] net: sched: update the nat flag for icmp error packets in ct_nat_execute https://git.kernel.org/netdev/net-next/c/0564c3e51bc7 - [PATCHv4,net-next,5/5] net: move the nat function to nf_nat_ovs for ovs and tc https://git.kernel.org/netdev/net-next/c/ebddb1404900 You are awesome, thank you!
The changes in the patchset: "net: add helper support in tc act_ct for ovs offloading" had moved some common ct code used by both OVS and TC into netfilter. There are still some big functions pretty similar defined and used in each of OVS and TC. It is not good to maintain such big function in 2 places. This patchset is to extract the functions for NAT processing from OVS and TC to netfilter. To make this change clear and safe, this patchset gets the common code out of OVS and TC step by step: The patch 1-4 make some minor changes in OVS and TC to make the NAT code of them completely the same, then the patch 5 moves the common code to the netfilter and exports one function called by each of OVS and TC. v1->v2: - Create nf_nat_ovs.c to include the nat functions, as Pablo suggested. v2->v3: - fix a typo in subject of patch 2/5, as Marcelo noticed. - fix in openvswitch to keep OVS ct nat and TC ct nat consistent in patch 3/5 instead of in tc, as Marcelo noticed. - use BIT(var) macro instead of (1 << var) in patch 5/5, as Marcelo suggested. - use ifdef in netfilter/Makefile to build nf_nat_ovs only when OVS or TC ct action is enabled in patch 5/5, as Marcelo suggested. v3->v4: - add NF_NAT_OVS in netfilter/Kconfig and add select NF_NAT_OVS in OVS and TC Kconfig instead of using ifdef in netfilter/Makefile, as Pablo suggested. Xin Long (5): openvswitch: delete the unncessary skb_pull_rcsum call in ovs_ct_nat_execute openvswitch: return NF_ACCEPT when OVS_CT_NAT is not set in info nat openvswitch: return NF_DROP when fails to add nat ext in ovs_ct_nat net: sched: update the nat flag for icmp error packets in ct_nat_execute net: move the nat function to nf_nat_ovs for ovs and tc include/net/netfilter/nf_nat.h | 4 + net/netfilter/Kconfig | 3 + net/netfilter/Makefile | 1 + net/netfilter/nf_nat_ovs.c | 135 ++++++++++++++++++++++++++++++ net/openvswitch/Kconfig | 1 + net/openvswitch/conntrack.c | 146 +++------------------------------ net/sched/Kconfig | 1 + net/sched/act_ct.c | 136 +++--------------------------- 8 files changed, 169 insertions(+), 258 deletions(-) create mode 100644 net/netfilter/nf_nat_ovs.c