net/sched: act_ct: Always fill offloading tuple iifidx

Referenced commit doesn't always set iifidx when offloading the flow to
hardware. Fix the following cases:

- nf_conn_act_ct_ext_fill() is called before extension is created with
nf_conn_act_ct_ext_add() in tcf_ct_act(). This can cause rule offload with
unspecified iifidx when connection is offloaded after only single
original-direction packet has been processed by tc data path. Always fill
the new nf_conn_act_ct_ext instance after creating it in
nf_conn_act_ct_ext_add().

- Offloading of unidirectional UDP NEW connections is now supported, but ct
flow iifidx field is not updated when connection is promoted to
bidirectional which can result reply-direction iifidx to be zero when
refreshing the connection. Fill in the extension and update flow iifidx
before calling flow_offload_refresh().

Fixes: 9795ded7f9 ("net/sched: act_ct: Fill offloading tuple iifidx")
Reviewed-by: Paul Blakey <paulb@nvidia.com>
Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Fixes: 6a9bad0069 ("net/sched: act_ct: offload UDP NEW connections")
Link: https://lore.kernel.org/r/20231103151410.764271-1-vladbu@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

This commit is contained in:

Vlad Buslov

2023-11-03 16:14:10 +01:00

committed by

Jakub Kicinski

parent caf3100810

commit 9bc64bd0cd

3 changed files with 34 additions and 17 deletions

									
										net/openvswitch/conntrack.c
									
		+1
		-1
	
												View File
												
				@@ -985,7 +985,7 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,

						if (err)

							return err;

						nf_conn_act_ct_ext_add(ct);

						nf_conn_act_ct_ext_add(skb, ct, ctinfo);

					} else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&

						   labels_nonzero(&info->labels.mask)) {

						err = ovs_ct_set_labels(ct, key, &info->labels.value,