Skip to content

net: move more duplicate code of ovs and tc conntrack into nf_conntrack_ovs

Xin Long netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 11 repliesApplied 5/5
  2. v15 patches 1 replySuperseded

Changes in v2 from the cover letter

- In patch 1/5, fix the wrong option name 'NF_NF_CONNTRACK' used in net/openvswitch/Kconfig, found by kernel test robot.

Patches in v2 All 5 applied

#Subject and filesSizeRepliesApplied
1/5net: create nf_conntrack_ovs for ovs and tc usenet/netfilter/Kconfig net/netfilter/Makefile net/netfilter/nf_conntrack_helper.c +3 more+110 -982 repliesApplied
2/5net: extract nf_ct_skb_network_trim function to nf_conntrack_ovsinclude/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_ovs.c net/openvswitch/conntrack.c +1 more+33 -582 repliesApplied
3/5openvswitch: move key and ovs_cb update out of handle_fragmentsnet/openvswitch/conntrack.c+25 -122 repliesApplied
4/5net: sched: move frag check and tc_skb_cb update out of handle_fragmentsnet/sched/act_ct.c+39 -321 replyApplied
5/5net: extract nf_ct_handle_fragments to nf_conntrack_ovsinclude/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_ovs.c net/openvswitch/conntrack.c +1 more+53 -882 repliesApplied

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchSimon HormanAaron ConoleFlorian Westphal
SeriesA-b
1/5R-b R-b
2/5R-b R-b
3/5R-b R-b
4/5R-b
5/5R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCHv2 net-next 0/5] net: move more duplicate code of ovs and tc conntrack into nf_conntrack_ovs

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
Signature · 1 line
2.31.1