net: move more duplicate code of ovs and tc conntrack into nf_conntrack_ovs
Subsystems (5)
v2 cover 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
PATCH v2 1/5 net: create nf_conntrack_ovs for ovs and tc use
Similar to nf_nat_ovs created by Commit ebddb1404900 ("net: move the nat function to nf_nat_ovs for ovs and tc"), this patch is to create nf_conntrack_ovs to get these functions shared by OVS and TC only.
There are nf_ct_helper() and nf_ct_add_helper() from nf_conntrak_helper in this patch, and will be more in the following patches.
--- net/netfilter/Kconfig | 3 + net/netfilter/Makefile | 1 + net/netfilter/nf_conntrack_helper.c | 98 -------------------------- net/netfilter/nf_conntrack_ovs.c | 104 ++++++++++++++++++++++++++++ net/openvswitch/Kconfig | 1 + net/sched/Kconfig | 1 + 6 files changed, 110 insertions(+), 98 deletions(-) create mode 100644 net/netfilter/nf_conntrack_ovs.c
net/netfilter/Kconfig +3 -0
@@ -189,6 +189,9 @@ config NF_CONNTRACK_LABELS to connection tracking entries. It can be used with xtables connlabel match and the nftables ct expression. +config NF_CONNTRACK_OVS + bool + config NF_CT_PROTO_DCCP bool 'DCCP protocol connection tracking support' depends on NETFILTER_ADVANCED
net/netfilter/Makefile +1 -0
@@ -11,6 +11,7 @@ nf_conntrack-$(CONFIG_NF_CONNTRACK_TIMEOUT) += nf_conntrack_timeout.o nf_conntrack-$(CONFIG_NF_CONNTRACK_TIMESTAMP) += nf_conntrack_timestamp.o nf_conntrack-$(CONFIG_NF_CONNTRACK_EVENTS) += nf_conntrack_ecache.o nf_conntrack-$(CONFIG_NF_CONNTRACK_LABELS) += nf_conntrack_labels.o +nf_conntrack-$(CONFIG_NF_CONNTRACK_OVS) += nf_conntrack_ovs.o nf_conntrack-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o nf_conntrack-$(CONFIG_NF_CT_PROTO_SCTP) += nf_conntrack_proto_sctp.o nf_conntrack-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o
net/netfilter/nf_conntrack_helper.c +0 -98
104 lines not on this page · raw message
net/netfilter/nf_conntrack_ovs.c new file +104 -0
104 lines not on this page · raw message
net/openvswitch/Kconfig +1 -0
@@ -15,6 +15,7 @@ config OPENVSWITCH select NET_MPLS_GSO select DST_CACHE select NET_NSH + select NF_CONNTRACK_OVS if NF_CONNTRACK select NF_NAT_OVS if NF_NAT help Open vSwitch is a multilayer Ethernet switch targeted at virtualized
net/sched/Kconfig +1 -0
@@ -984,6 +984,7 @@ config NET_ACT_TUNNEL_KEY config NET_ACT_CT tristate "connection tracking tc action" depends on NET_CLS_ACT && NF_CONNTRACK && (!NF_NAT || NF_NAT) && NF_FLOW_TABLE + select NF_CONNTRACK_OVS select NF_NAT_OVS if NF_NAT help Say Y here to allow sending the packets to conntrack module.
Signature · 1 line
2.31.1
Re: [PATCHv2 net-next 1/5] net: create nf_conntrack_ovs for ovs and tc use
Quoted 8 lines · Xin Long
Similar to
nf_nat_ovscreated by Commitebddb1404900("net: move the nat function tonf_nat_ovsfor ovs and tc"), this patch is to createnf_conntrack_ovsto get these functions shared by OVS and TC only.There are
nf_ct_helper()andnf_ct_add_helper()fromnf_conntrak_helperin this patch, and will be more in the following patches.Signed-off-by Xin Long <[email protected]>
Re: [PATCHv2 net-next 1/5] net: create nf_conntrack_ovs for ovs and tc use
In reply to Xin LongQuoted 9 lines · Xin Long
Similar to
nf_nat_ovscreated by Commitebddb1404900("net: move the nat function tonf_nat_ovsfor ovs and tc"), this patch is to createnf_conntrack_ovsto get these functions shared by OVS and TC only.There are
nf_ct_helper()andnf_ct_add_helper()fromnf_conntrak_helperin this patch, and will be more in the following patches.Signed-off-by Xin Long <[email protected]>---
PATCH v2 2/5 net: extract nf_ct_skb_network_trim function to nf_conntrack_ovs
In reply to Xin LongThere are almost the same code in ovs_skb_network_trim() and tcf_ct_skb_network_trim(), this patch extracts them into a function nf_ct_skb_network_trim() and moves the function to nf_conntrack_ovs.
--- include/net/netfilter/nf_conntrack.h | 2 ++ net/netfilter/nf_conntrack_ovs.c | 26 ++++++++++++++++++++ net/openvswitch/conntrack.c | 36 ++++------------------------ net/sched/act_ct.c | 27 +-------------------- 4 files changed, 33 insertions(+), 58 deletions(-)
include/net/netfilter/nf_conntrack.h +2 -0
@@ -362,6 +362,8 @@ static inline struct nf_conntrack_net *nf_ct_pernet(const struct net *net)return net_generic (net, nf_conntrack_net_id); } +int nf_ct_skb_network_trim (struct sk_buff *skb,int family); +#define NF_CT_STAT_INC (net, count) __this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_INC_ATOMIC (net, count) this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_ADD_ATOMIC (net, count, v) this_cpu_add((net)->ct.stat->count, (v))
net/netfilter/nf_conntrack_ovs.c +26 -0
@@ -102,3 +102,29 @@ int nf_ct_add_helper(struct nf_conn *ct, const char *name, u8 family,return ret; }EXPORT_SYMBOL_GPL (nf_ct_add_helper); + +/* Trim the skb to the length specified by the IP/IPv6 header, +* removing any trailing lower-layer padding. This prepares the skb +* for higher-layer processing that assumes skb->len excludes padding +* (such as nf_ip_checksum). The caller needs to pull the skb to the +* network header, and ensure ip_hdr/ipv6_hdr points to valid data. +*/ +int nf_ct_skb_network_trim (struct sk_buff *skb,int family) +{ +unsigned int len; + +switch (family) { +case NFPROTO_IPV4 : + len =skb_ip_totlen (skb); +break ; +case NFPROTO_IPV6 : + len =sizeof (struct ipv6hdr ) + +ntohs (ipv6_hdr (skb)->payload_len); +break ; +default : + len = skb->len; + } + +return pskb_trim_rcsum (skb, len); +} +EXPORT_SYMBOL_GPL (nf_ct_skb_network_trim);
net/openvswitch/conntrack.c +4 -32
@@ -1090,36 +1090,6 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,return 0 ; } -/* Trim the skb to the length specified by the IP/IPv6 header, -* removing any trailing lower-layer padding. This prepares the skb -* for higher-layer processing that assumes skb->len excludes padding -* (such as nf_ip_checksum). The caller needs to pull the skb to the -* network header, and ensure ip_hdr/ipv6_hdr points to valid data. -*/ -static int ovs_skb_network_trim (struct sk_buff *skb) -{ -unsigned int len; -int err; - -switch (skb->protocol) { -case htons (ETH_P_IP ): - len =skb_ip_totlen (skb); -break ; -case htons (ETH_P_IPV6 ): - len =sizeof (struct ipv6hdr ) - +ntohs (ipv6_hdr (skb)->payload_len); -break ; -default : - len = skb->len; - } - - err =pskb_trim_rcsum (skb, len); -if (err) -kfree_skb (skb); - -return err; -} -/* Returns 0 on success, -EINPROGRESS if 'skb' is stolen, or other nonzero * value if 'skb' is freed. */
@@ -1134,9 +1104,11 @@ int ovs_ct_execute(struct net *net, struct sk_buff *skb, nh_ofs =skb_network_offset (skb);skb_pull_rcsum (skb, nh_ofs); - err =ovs_skb_network_trim (skb); -if (err) + err =nf_ct_skb_network_trim (skb, info->family); +if (err) { +kfree_skb (skb);return err; + }if (key->ip.frag !=OVS_FRAG_TYPE_NONE ) { err =handle_fragments (net, key, info->zone.id, skb);
net/sched/act_ct.c +1 -26
@@ -726,31 +726,6 @@ static bool tcf_ct_skb_nfct_cached(struct net *net, struct sk_buff *skb,return false; } -/* Trim the skb to the length specified by the IP/IPv6 header, -* removing any trailing lower-layer padding. This prepares the skb -* for higher-layer processing that assumes skb->len excludes padding -* (such as nf_ip_checksum). The caller needs to pull the skb to the -* network header, and ensure ip_hdr/ipv6_hdr points to valid data. -*/ -static int tcf_ct_skb_network_trim (struct sk_buff *skb,int family) -{ -unsigned int len; - -switch (family) { -case NFPROTO_IPV4 : - len =skb_ip_totlen (skb); -break ; -case NFPROTO_IPV6 : - len =sizeof (struct ipv6hdr ) - +ntohs (ipv6_hdr (skb)->payload_len); -break ; -default : - len = skb->len; - } - -return pskb_trim_rcsum (skb, len); -} -static u8 tcf_ct_skb_nf_family (struct sk_buff *skb) {u8 family =NFPROTO_UNSPEC ;
@@ -1011,7 +986,7 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,if (err) goto drop; - err =tcf_ct_skb_network_trim (skb, family); + err =nf_ct_skb_network_trim (skb, family);if (err) goto drop;
Signature · 1 line
2.31.1
Re: [PATCHv2 net-next 2/5] net: extract nf_ct_skb_network_trim function to nf_conntrack_ovs
Quoted 5 lines · Xin Long
There are almost the same code in
ovs_skb_network_trim()andtcf_ct_skb_network_trim(), this patch extracts them into a functionnf_ct_skb_network_trim()and moves the function tonf_conntrack_ovs.Signed-off-by Xin Long <[email protected]>
Re: [PATCHv2 net-next 2/5] net: extract nf_ct_skb_network_trim function to nf_conntrack_ovs
In reply to Xin LongQuoted 6 lines · Xin Long
There are almost the same code in
ovs_skb_network_trim()andtcf_ct_skb_network_trim(), this patch extracts them into a functionnf_ct_skb_network_trim()and moves the function tonf_conntrack_ovs.Signed-off-by Xin Long <[email protected]>---
PATCH v2 3/5 openvswitch: move key and ovs_cb update out of handle_fragments
In reply to Xin LongThis patch has no functional changes and just moves key and ovs_cb update out of handle_fragments, and skb_clear_hash() and skb->ignore_df change into handle_fragments(), to make it easier to move the duplicate code from handle_fragments() into nf_conntrack_ovs later.
Note that it changes to pass info->family to handle_fragments() instead of key for the packet type check, as info->family is set according to key->eth.type in ovs_ct_copy_action() when creating the action.
--- net/openvswitch/conntrack.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-)
net/openvswitch/conntrack.c +25 -12
@@ -437,13 +437,12 @@ static int ovs_ct_set_labels(struct nf_conn *ct, struct sw_flow_key *key,/* Returns 0 on success, -EINPROGRESS if 'skb' is stolen, or other nonzero * value if 'skb' is freed. */ -static int handle_fragments (struct net *net,struct sw_flow_key *key, -u16 zone,struct sk_buff *skb) +static int handle_fragments (struct net *net,struct sk_buff *skb, +u16 zone,u8 family,u8 *proto,u16 *mru) { -struct ovs_skb_cb ovs_cb = *OVS_CB (skb);int err; -if (key->eth.type ==htons (ETH_P_IP )) { +if (family ==NFPROTO_IPV4 ) {enum ip_defrag_users user =IP_DEFRAG_CONNTRACK_IN + zone;memset (IPCB (skb),0 ,sizeof (struct inet_skb_parm ));
@@ -451,9 +450,9 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key,if (err)return err; - ovs_cb.mru =IPCB (skb)->frag_max_size; + *mru =IPCB (skb)->frag_max_size;#if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 ) - } else if (key->eth.type == htons(ETH_P_IPV6)) { + } else if (family == NFPROTO_IPV6) {enum ip6_defrag_users user =IP6_DEFRAG_CONNTRACK_IN + zone;memset (IP6CB (skb),0 ,sizeof (struct inet6_skb_parm ));
@@ -464,22 +463,35 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key,return err; } - key->ip.proto =ipv6_hdr (skb)->nexthdr; - ovs_cb.mru =IP6CB (skb)->frag_max_size; + *proto =ipv6_hdr (skb)->nexthdr; + *mru =IP6CB (skb)->frag_max_size;#endif }else {kfree_skb (skb);return -EPFNOSUPPORT ; } +skb_clear_hash (skb); + skb->ignore_df =1 ; + +return 0 ; +} + +static int ovs_ct_handle_fragments (struct net *net,struct sw_flow_key *key, +u16 zone,int family,struct sk_buff *skb) +{ +struct ovs_skb_cb ovs_cb = *OVS_CB (skb); +int err; + + err =handle_fragments (net, skb, zone, family, &key->ip.proto, &ovs_cb.mru); +if (err) +return err; +/* The key extracted from the fragment that completed this datagram * likely didn't have an L4 header, so regenerate it. */ ovs_flow_key_update_l3l4 (skb, key); - key->ip.frag =OVS_FRAG_TYPE_NONE ; -skb_clear_hash (skb); - skb->ignore_df =1 ; *OVS_CB (skb) = ovs_cb;return 0 ;
@@ -1111,7 +1123,8 @@ int ovs_ct_execute(struct net *net, struct sk_buff *skb, }if (key->ip.frag !=OVS_FRAG_TYPE_NONE ) { - err =handle_fragments (net, key, info->zone.id, skb); + err =ovs_ct_handle_fragments (net, key, info->zone.id, + info->family, skb);if (err)return err; }
Signature · 1 line
2.31.1
Re: [PATCHv2 net-next 3/5] openvswitch: move key and ovs_cb update out of handle_fragments
Quoted 10 lines · Xin Long
This patch has no functional changes and just moves key and
ovs_cbupdate out ofhandle_fragments, andskb_clear_hash()andskb->ignore_dfchange intohandle_fragments(), to make it easier to move the duplicate code fromhandle_fragments()intonf_conntrack_ovslater.Note that it changes to pass
info->familytohandle_fragments()instead of key for the packet type check, asinfo->familyis set according tokey->eth.typeinovs_ct_copy_action()when creating the action.Signed-off-by Xin Long <[email protected]>
Re: [PATCHv2 net-next 3/5] openvswitch: move key and ovs_cb update out of handle_fragments
In reply to Xin LongQuoted 11 lines · Xin Long
This patch has no functional changes and just moves key and
ovs_cbupdate out ofhandle_fragments, andskb_clear_hash()andskb->ignore_dfchange intohandle_fragments(), to make it easier to move the duplicate code fromhandle_fragments()intonf_conntrack_ovslater.Note that it changes to pass
info->familytohandle_fragments()instead of key for the packet type check, asinfo->familyis set according tokey->eth.typeinovs_ct_copy_action()when creating the action.Signed-off-by Xin Long <[email protected]>---
PATCH v2 4/5 net: sched: move frag check and tc_skb_cb update out of handle_fragments
In reply to Xin LongThis patch has no functional changes and just moves frag check and tc_skb_cb update out of handle_fragments, to make it easier to move the duplicate code from handle_fragments() into nf_conntrack_ovs later.
--- net/sched/act_ct.c | 71 +++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 32 deletions(-)
net/sched/act_ct.c +39 -32
@@ -778,29 +778,10 @@ static int tcf_ct_ipv6_is_fragment(struct sk_buff *skb, bool *frag)return 0 ; } -static int tcf_ct_handle_fragments (struct net *net,struct sk_buff *skb, -u8 family,u16 zone,bool *defrag) +static int handle_fragments (struct net *net,struct sk_buff *skb, +u16 zone,u8 family,u16 *mru) { -enum ip_conntrack_info ctinfo; -struct nf_conn *ct; -int err =0 ; -bool frag; -u16 mru; - -/* Previously seen (loopback)? Ignore. */ - ct =nf_ct_get (skb, &ctinfo); -if ((ct && !nf_ct_is_template (ct)) || ctinfo ==IP_CT_UNTRACKED ) -return 0 ; - -if (family ==NFPROTO_IPV4 ) - err =tcf_ct_ipv4_is_fragment (skb, &frag); -else - err =tcf_ct_ipv6_is_fragment (skb, &frag); -if (err || !frag) -return err; - -skb_get (skb); - mru =tc_skb_cb (skb)->mru; +int err;if (family ==NFPROTO_IPV4 ) {enum ip_defrag_users user =IP_DEFRAG_CONNTRACK_IN + zone;
@@ -812,10 +793,8 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,if (err && err != -EINPROGRESS )return err; -if (!err) { - *defrag = true; - mru =IPCB (skb)->frag_max_size; - } +if (!err) + *mru =IPCB (skb)->frag_max_size; }else {/* NFPROTO_IPV6 */ #if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )enum ip6_defrag_users user =IP6_DEFRAG_CONNTRACK_IN + zone;
@@ -825,18 +804,14 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,if (err && err != -EINPROGRESS ) goto out_free; -if (!err) { - *defrag = true; - mru =IP6CB (skb)->frag_max_size; - } +if (!err) + *mru =IP6CB (skb)->frag_max_size;#else err = -EOPNOTSUPP ; goto out_free;#endif } -if (err != -EINPROGRESS ) -tc_skb_cb (skb)->mru = mru;skb_clear_hash (skb); skb->ignore_df =1 ;return err;
@@ -846,6 +821,38 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,return err; } +static int tcf_ct_handle_fragments (struct net *net,struct sk_buff *skb, +u8 family,u16 zone,bool *defrag) +{ +enum ip_conntrack_info ctinfo; +struct nf_conn *ct; +int err =0 ; +bool frag; +u16 mru; + +/* Previously seen (loopback)? Ignore. */ + ct =nf_ct_get (skb, &ctinfo); +if ((ct && !nf_ct_is_template (ct)) || ctinfo ==IP_CT_UNTRACKED ) +return 0 ; + +if (family ==NFPROTO_IPV4 ) + err =tcf_ct_ipv4_is_fragment (skb, &frag); +else + err =tcf_ct_ipv6_is_fragment (skb, &frag); +if (err || !frag) +return err; + +skb_get (skb); + err =handle_fragments (net, skb, zone, family, &mru); +if (err) +return err; + + *defrag = true; +tc_skb_cb (skb)->mru = mru; + +return 0 ; +} +static void tcf_ct_params_free (struct tcf_ct_params *params) {if (params->helper) {
Signature · 1 line
2.31.1
Re: [PATCHv2 net-next 4/5] net: sched: move frag check and tc_skb_cb update out of handle_fragments
Quoted 5 lines · Xin Long
This patch has no functional changes and just moves frag check and
tc_skb_cbupdate out ofhandle_fragments, to make it easier to move the duplicate code fromhandle_fragments()intonf_conntrack_ovslater.Signed-off-by Xin Long <[email protected]>
PATCH v2 5/5 net: extract nf_ct_handle_fragments to nf_conntrack_ovs
In reply to Xin LongNow handle_fragments() in OVS and TC have the similar code, and this patch removes the duplicate code by moving the function to nf_conntrack_ovs.
Note that skb_clear_hash(skb) or skb->ignore_df = 1 should be done only when defrag returns 0, as it does in other places in kernel.
--- include/net/netfilter/nf_conntrack.h | 2 ++ net/netfilter/nf_conntrack_ovs.c | 48 ++++++++++++++++++++++++++++ net/openvswitch/conntrack.c | 45 +------------------------- net/sched/act_ct.c | 46 ++------------------------ 4 files changed, 53 insertions(+), 88 deletions(-)
include/net/netfilter/nf_conntrack.h +2 -0
@@ -363,6 +363,8 @@ static inline struct nf_conntrack_net *nf_ct_pernet(const struct net *net) }int nf_ct_skb_network_trim (struct sk_buff *skb,int family); +int nf_ct_handle_fragments (struct net *net,struct sk_buff *skb, +u16 zone,u8 family,u8 *proto,u16 *mru);#define NF_CT_STAT_INC (net, count) __this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_INC_ATOMIC (net, count) this_cpu_inc((net)->ct.stat->count)
net/netfilter/nf_conntrack_ovs.c +48 -0
57 lines not on this page · raw message
net/openvswitch/conntrack.c +1 -44
57 lines not on this page · raw message
net/sched/act_ct.c +2 -44
64 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [PATCHv2 net-next 5/5] net: extract nf_ct_handle_fragments to nf_conntrack_ovs
Quoted 9 lines · Xin Long
Now
handle_fragments()in OVS and TC have the similar code, and this patch removes the duplicate code by moving the function tonf_conntrack_ovs.Note that
skb_clear_hash(skb)orskb->ignore_df= 1 should be done only when defrag returns 0, as it does in other places in kernel.Signed-off-by Xin Long <[email protected]>
Re: [PATCHv2 net-next 5/5] net: extract nf_ct_handle_fragments to nf_conntrack_ovs
In reply to Xin LongQuoted 10 lines · Xin Long
Now
handle_fragments()in OVS and TC have the similar code, and this patch removes the duplicate code by moving the function tonf_conntrack_ovs.Note that
skb_clear_hash(skb)orskb->ignore_df= 1 should be done only when defrag returns 0, as it does in other places in kernel.Signed-off-by Xin Long <[email protected]>---
Jakub Kicinski
maintainerQuoted 4 lines · On Tue, 7 Feb 2023 17:52:05 -0500 Xin Long wrote:
We've moved some duplicate code into
nf_nat_ovsin:"net: eliminate the duplicate code in the ct nat functions of ovs and tc"
Quoted 8 lines
This patchset addresses more code duplication in the conntrack of ovs and tc then creates
nf_conntrack_ovsfor 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?
Quoted 9 lines · Jakub Kicinski
Quoted 8 lines · On Tue, 7 Feb 2023 17:52:05 -0500 Xin Long wrote:
We've moved some duplicate code into
nf_nat_ovsin:"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_ovsfor them, and four functions will be extracted and moved into it:
Quoted 6 lines
Quoted 4 lines
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
if you like.
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 7 Feb 2023 17:52:05 -0500 you wrote:
We've moved some duplicate code into
nf_nat_ovsin:"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_ovsfor 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!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html