mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
net: sched: do not offload flows with a helper in act_ct
[ Upstream commit7cd5af0e93
] There is no hardware supporting ct helper offload. However, prior to this patch, a flower filter with a helper in the ct action can be successfully set into the HW, for example (eth1 is a bnxt NIC): # tc qdisc add dev eth1 ingress_block 22 ingress # tc filter add block 22 proto ip flower skip_sw ip_proto tcp \ dst_port 21 ct_state -trk action ct helper ipv4-tcp-ftp # tc filter show dev eth1 ingress filter block 22 protocol ip pref 49152 flower chain 0 handle 0x1 eth_type ipv4 ip_proto tcp dst_port 21 ct_state -trk skip_sw in_hw in_hw_count 1 <---- action order 1: ct zone 0 helper ipv4-tcp-ftp pipe index 2 ref 1 bind 1 used_hw_stats delayed This might cause the flower filter not to work as expected in the HW. This patch avoids this problem by simply returning -EOPNOTSUPP in tcf_ct_offload_act_setup() to not allow to offload flows with a helper in act_ct. Fixes:a21b06e731
("net: sched: add helper support in act_ct") Signed-off-by: Xin Long <lucien.xin@gmail.com> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com> Link: https://lore.kernel.org/r/f8685ec7702c4a448a1371a8b34b43217b583b9d.1699898008.git.lucien.xin@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ba8d406095
commit
b4c2de028e
2 changed files with 12 additions and 0 deletions
|
@ -57,6 +57,11 @@ static inline struct nf_flowtable *tcf_ct_ft(const struct tc_action *a)
|
||||||
return to_ct_params(a)->nf_ft;
|
return to_ct_params(a)->nf_ft;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline struct nf_conntrack_helper *tcf_ct_helper(const struct tc_action *a)
|
||||||
|
{
|
||||||
|
return to_ct_params(a)->helper;
|
||||||
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
static inline uint16_t tcf_ct_zone(const struct tc_action *a) { return 0; }
|
static inline uint16_t tcf_ct_zone(const struct tc_action *a) { return 0; }
|
||||||
static inline int tcf_ct_action(const struct tc_action *a) { return 0; }
|
static inline int tcf_ct_action(const struct tc_action *a) { return 0; }
|
||||||
|
@ -64,6 +69,10 @@ static inline struct nf_flowtable *tcf_ct_ft(const struct tc_action *a)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
static inline struct nf_conntrack_helper *tcf_ct_helper(const struct tc_action *a)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
#endif /* CONFIG_NF_CONNTRACK */
|
#endif /* CONFIG_NF_CONNTRACK */
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_NET_ACT_CT)
|
#if IS_ENABLED(CONFIG_NET_ACT_CT)
|
||||||
|
|
|
@ -1534,6 +1534,9 @@ static int tcf_ct_offload_act_setup(struct tc_action *act, void *entry_data,
|
||||||
if (bind) {
|
if (bind) {
|
||||||
struct flow_action_entry *entry = entry_data;
|
struct flow_action_entry *entry = entry_data;
|
||||||
|
|
||||||
|
if (tcf_ct_helper(act))
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
entry->id = FLOW_ACTION_CT;
|
entry->id = FLOW_ACTION_CT;
|
||||||
entry->ct.action = tcf_ct_action(act);
|
entry->ct.action = tcf_ct_action(act);
|
||||||
entry->ct.zone = tcf_ct_zone(act);
|
entry->ct.zone = tcf_ct_zone(act);
|
||||||
|
|
Loading…
Reference in a new issue