mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: 46475bb20f ("net/sched: act_ct: Software offload of established flows")
Reviewed-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Paul Blakey <paulb@nvidia.com>
Link: https://lore.kernel.org/r/1622029449-27060-1-git-send-email-paulb@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
			
			
This commit is contained in:
		
							parent
							
								
									b28d8f0c25
								
							
						
					
					
						commit
						0cc254e5aa
					
				
					 1 changed files with 4 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -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);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue