net: openvswitch: Fix matching zone id for invalid conns arriving from tc
authorPaul Blakey <paulb@nvidia.com>
Tue, 14 Dec 2021 17:24:35 +0000 (19:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:04:02 +0000 (11:04 +0100)
commite7b33ff6439ac071ade78b49d3a9dd6519ddb78d
tree2288983f16607e27daae01abadc84bb250f61398
parenta006c84824634fd13f442cd57c1217cc2b1aedbd
net: openvswitch: Fix matching zone id for invalid conns arriving from tc

[ Upstream commit 635d448a1cce4b4ebee52b351052c70434fa90ea ]

Zone id is not restored if we passed ct and ct rejected the connection,
as there is no ct info on the skb.

Save the zone from tc skb cb to tc skb extension and pass it on to
ovs, use that info to restore the zone id for invalid connections.

Fixes: d29334c15d33 ("net/sched: act_api: fix miss set post_ct for ovs after do conntrack in act_ct")
Signed-off-by: Paul Blakey <paulb@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/linux/skbuff.h
net/openvswitch/flow.c
net/sched/cls_api.c