net/sched: act_ct: Offload connections with commit action
Subsystems (3)
PATCH 1/1 net/sched: act_ct: Offload connections with commit action
Currently established connections are not offloaded if the filter has a "ct commit" action. This behavior will not offload connections of the following scenario:
$ tc_filter add dev $DEV ingress protocol ip prio 1 flower \ ct_state -trk \ action ct commit action goto chain 1
$ tc_filter add dev $DEV ingress protocol ip chain 1 prio 1 flower \ action mirred egress redirect dev $DEV2
$ tc_filter add dev $DEV2 ingress protocol ip prio 1 flower \ action ct commit action goto chain 1
$ tc_filter add dev $DEV2 ingress protocol ip prio 1 chain 1 flower \ ct_state +trk+est \ action mirred egress redirect dev $DEV
Offload established connections, regardless of the commit flag.
Fixes 46475bb20f4b ("net/sched: act_ct: Software offload of established flows")
Reviewed-by Oz Shlomo <[email protected]>
Reviewed-by Jiri Pirko <[email protected]>
Signed-off-by Paul Blakey <[email protected]>
--- net/sched/act_ct.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/sched/act_ct.c +4 -3
@@ -984,7 +984,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,*/ cached =tcf_ct_skb_nfct_cached (net, skb, p->zone, force);if (!cached) { -if (!commit &&tcf_ct_flow_table_lookup (p, skb, family)) { +if (tcf_ct_flow_table_lookup (p, skb, family)) { skip_add = true; goto do_nat; }
@@ -1022,10 +1022,11 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,* even if the connection is already confirmed. */ nf_conntrack_confirm (skb); - }else if (!skip_add) { -tcf_ct_flow_table_process_conn (p->ct_ft, ct, ctinfo); } +if (!skip_add) +tcf_ct_flow_table_process_conn (p->ct_ft, ct, ctinfo); + out_push:skb_push_rcsum (skb, nh_ofs);
Signature · 1 line
2.30.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Wed, 26 May 2021 14:44:09 +0300 you wrote:
Currently established connections are not offloaded if the filter has a "ct commit" action. This behavior will not offload connections of the following scenario:
$ tc_filter add dev $DEV ingress protocol ip prio 1 flower \ ct_state -trk \ action ct commit action goto chain 1[...]
Here is the summary with links:
- [net] net/sched: act_ct: Offload connections with commit action
https://git.kernel.org/netdev/net/c/0cc254e5aa37
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html