[PATCH v3 1/2] app/testpmd: fix flow update

[Dariusz Sosnowski]

> -----Original Message-----
> From: Danylo Vodopianov <dvo-plv at napatech.com>
> Sent: Monday, November 18, 2024 19:03
> To: NBU-Contact-Thomas Monjalon (EXTERNAL) <thomas at monjalon.net>;
> aman.deep.singh at intel.com; yuying.zhang at intel.com; Ori Kam
> <orika at nvidia.com>; mko-plv at napatech.com; ckm at napatech.com; Dariusz
> Sosnowski <dsosnowski at nvidia.com>; sil-plv at napatech.com
> Cc: Gregory Etelson <getelson at nvidia.com>; Alexander Kozyrev
> <akozyrev at nvidia.com>; dev at dpdk.org; stable at dpdk.org;
> ferruh.yigit at amd.com
> Subject: [PATCH v3 1/2] app/testpmd: fix flow update
> 
> External email: Use caution opening links or attachments
> 
> 
> If actions provided to “flow update…“ command contained an age action, then
> testpmd did not update the age action context accordingly.
> 
> Thus "flow aged <port_id> destroy" command can not execute successfully.
> 
> Fix was done with next steps
> 1. Generate new port flow entry to add/replace action(s).
> 2. Set age context if age action is present.
> 3. Replace flow in the flow list.
> 
> Fixes: 2d9c7e56e52c ("app/testpmd: support updating flow rule actions")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Danylo Vodopianov <dvo-plv at napatech.com>
> ---
>  app/test-pmd/config.c | 21 ++++++++++++++++++++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> 88770b4dfc..c831166431 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -3882,7 +3882,8 @@ port_flow_update(portid_t port_id, uint32_t rule_id,
>                  const struct rte_flow_action *actions, bool is_user_id)  {
>         struct rte_port *port;
> -       struct port_flow **flow_list;
> +       struct port_flow **flow_list, *uf;
> +       struct rte_flow_action_age *age = age_action_get(actions);
> 
>         if (port_id_is_invalid(port_id, ENABLED_WARN) ||
>             port_id == (portid_t)RTE_PORT_ALL) @@ -3897,6 +3898,16 @@
> port_flow_update(portid_t port_id, uint32_t rule_id,
>                         flow_list = &flow->next;
>                         continue;
>                 }
> +
> +               /* Update flow action(s) with new action(s) */
> +               uf = port_flow_new(flow->rule.attr_ro, flow->rule.pattern_ro, actions,
> &error);
> +               if (!uf)
> +                       return port_flow_complain(&error);
> +               if (age) {
> +                       flow->age_type = ACTION_AGE_CONTEXT_TYPE_FLOW;
> +                       age->context = &flow->age_type;
> +               }
> +
>                 /*
>                  * Poisoning to make sure PMDs update it in case
>                  * of error.
> @@ -3913,6 +3924,14 @@ port_flow_update(portid_t port_id, uint32_t
> rule_id,
>                         printf("Flow rule #%"PRIu64
>                                " updated with new actions\n",
>                                flow->id);
> +
> +               uf->next = flow->next;
> +               uf->id = flow->id;
> +               uf->user_id = flow->user_id;
> +               uf->flow = flow->flow;
> +               *flow_list = uf;
> +
> +               free(flow);
>                 return 0;
>         }
>         printf("Failed to find flow %"PRIu32"\n", rule_id);
> --
> 2.43.5
> 
> Disclaimer: This email and any files transmitted with it may contain confidential
> information intended for the addressee(s) only. The information is not to be
> surrendered or copied to unauthorized persons. If you have received this
> communication in error, please notify the sender immediately and delete this e-
> mail from your system.

Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>

Best regards,
Dariusz Sosnowski