On 05/09/2022 16:08, Eelco Chaudron wrote:
> tc was not setting the OVS_CT_ATTR_FORCE_COMMIT flag when a forced
> commit was requested. This patch will fix this.
>
> Signed-off-by: Eelco Chaudron <[email protected]>
> ---
> lib/netdev-offload-tc.c | 13 +++++++++++--
> tests/system-offloads-testsuite.at | 1 -
> 2 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c
> index f6f90a741..31f2bf205 100644
> --- a/lib/netdev-offload-tc.c
> +++ b/lib/netdev-offload-tc.c
> @@ -804,7 +804,11 @@ parse_tc_flower_to_actions__(struct tc_flower *flower,
> struct ofpbuf *buf,
> ct_offset = nl_msg_start_nested(buf, OVS_ACTION_ATTR_CT);
>
> if (action->ct.commit) {
> - nl_msg_put_flag(buf, OVS_CT_ATTR_COMMIT);
> + if (action->ct.force) {
> + nl_msg_put_flag(buf, OVS_CT_ATTR_FORCE_COMMIT);
> + } else {
> + nl_msg_put_flag(buf, OVS_CT_ATTR_COMMIT);
> + }
> }
>
> if (action->ct.zone) {
> @@ -1288,7 +1292,12 @@ parse_put_flow_ct_action(struct tc_flower *flower,
> NL_ATTR_FOR_EACH_UNSAFE (ct_attr, ct_left, ct, ct_len) {
> switch (nl_attr_type(ct_attr)) {
> case OVS_CT_ATTR_COMMIT: {
> - action->ct.commit = true;
> + action->ct.commit = true;
> + }
> + break;
> + case OVS_CT_ATTR_FORCE_COMMIT: {
> + action->ct.commit = true;
> + action->ct.force = true;
> }
> break;
> case OVS_CT_ATTR_ZONE: {
> diff --git a/tests/system-offloads-testsuite.at
> b/tests/system-offloads-testsuite.at
> index ba36393de..428ad1bd5 100644
> --- a/tests/system-offloads-testsuite.at
> +++ b/tests/system-offloads-testsuite.at
> @@ -55,7 +55,6 @@ m4_define([OVS_TEST_SKIP_LIST],
> [ovs_test_skip_list="
> datapath - truncate and output to gre tunnel by simulated packets
> datapath - truncate and output to gre tunnel
> -conntrack - force commit
> conntrack - preserve registers
> conntrack - zones
> conntrack - zones from field
>
> _______________________________________________
> dev mailing list
> [email protected]
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Acked-by: Roi Dayan <[email protected]>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
