app/testpmd: fix use of indirect action after port close
PATCH 1/1 app/testpmd: fix use of indirect action after port close
When a port was closed, indirect actions could remain
with their handles no longer valid.
If a newly attached device was assigned the same ID as the closed port, those indirect actions became accessible again.
Any attempt to use them resulted in an undefined behavior. Automatically flush indirect actions when a port is closed.
--- app/test-pmd/config.c | 31 +++++++++++++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 1 + 3 files changed, 33 insertions(+)
app/test-pmd/config.c +31 -0
@@ -1844,6 +1844,37 @@ port_action_handle_destroy(portid_t port_id,return ret; } +int +port_action_handle_flush (portid_t port_id) +{ +struct rte_port *port; +struct port_indirect_action **tmp; +int ret =0 ; + +if (port_id_is_invalid (port_id,ENABLED_WARN ) || + port_id == (portid_t )RTE_PORT_ALL ) +return -EINVAL ; + port = &ports[port_id]; + tmp = &port->actions_list; +while (*tmp !=NULL ) { +struct rte_flow_error error; +struct port_indirect_action *pia = *tmp; + +/* Poisoning to make sure PMDs update it in case of error. */ +memset (&error,0x44 ,sizeof (error)); +if (pia->handle !=NULL && +rte_flow_action_handle_destroy + (port_id, pia->handle, &error) !=0 ) { +printf ("Indirect action #%u not destroyed\n" , pia->id); + ret =port_flow_complain (&error); + tmp = &pia->next; + }else { + *tmp = pia->next; +free (pia); + } + } +return ret; +}/** Get indirect action by port + id */ struct rte_flow_action_handle *
app/test-pmd/testpmd.c +1 -0
@@ -3139,6 +3139,7 @@ close_port(portid_t pid)if (is_proc_primary ()) {port_flow_flush (pi);port_flex_item_flush (pi); +port_action_handle_flush (pi);rte_eth_dev_close (pi); }
app/test-pmd/testpmd.h +1 -0
@@ -907,6 +907,7 @@ int port_action_handle_create(portid_t port_id, uint32_t id, const struct rte_flow_action *action);int port_action_handle_destroy (portid_t port_id,uint32_t n,const uint32_t *action); +int port_action_handle_flush (portid_t port_id);struct rte_flow_action_handle *port_action_handle_get_by_id (portid_t port_id,uint32_t id); int port_action_handle_update(portid_t port_id, uint32_t id,
Signature · 1 line
2.25.1
Hi Dmitry,
Quoted 7 lines · Dmitry Kozlyuk
When a port was closed, indirect actions could remain
with their handles no longer valid.
If a newly attached device was assigned the same ID as the closed port, those indirect actions became accessible again.
Any attempt to use them resulted in an undefined behavior. Automatically flush indirect actions when a port is closed.
Quoted 6 lines
Fixes 4b61b8774be9 ("ethdev: introduce indirect flow action")Signed-off-by Dmitry Kozlyuk <[email protected]>Acked-by Matan Azrad <[email protected]>---
From: guides/prog_guide/rte_flow.rst
/"If ``RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP`` is advertised,// //this means that the PMD can keep at least some indirect actions// //across device stop and start.
/Please check, if we are inline with the guidelines given in the section. /
/
Quoted 71 lines
app/test-pmd/config.c | 31 +++++++++++++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 1 + 3 files changed, 33 insertions(+)app/test-pmd/config.c +31
-0@@ -1844,6 +1844,37 @@ port_action_handle_destroy(portid_t port_id,return ret; } +int +port_action_handle_flush (portid_t port_id) +{ +struct rte_port *port; +struct port_indirect_action **tmp; +int ret =0 ; + +if (port_id_is_invalid (port_id,ENABLED_WARN ) || + port_id == (portid_t )RTE_PORT_ALL ) +return -EINVAL ; + port = &ports[port_id]; + tmp = &port->actions_list; +while (*tmp !=NULL ) { +struct rte_flow_error error; +struct port_indirect_action *pia = *tmp; + +/* Poisoning to make sure PMDs update it in case of error. */ +memset (&error,0x44 ,sizeof (error)); +if (pia->handle !=NULL && +rte_flow_action_handle_destroy + (port_id, pia->handle, &error) !=0 ) { +printf ("Indirect action #%u not destroyed\n" , pia->id); + ret =port_flow_complain (&error); + tmp = &pia->next; + }else { + *tmp = pia->next; +free (pia); + } + } +return ret; +}/** Get indirect action by port + id */ struct rte_flow_action_handle *app/test-pmd/testpmd.c +1
-0@@ -3139,6 +3139,7 @@ close_port(portid_t pid)if (is_proc_primary ()) {port_flow_flush (pi);port_flex_item_flush (pi); +port_action_handle_flush (pi);rte_eth_dev_close (pi); }app/test-pmd/testpmd.h +1
-0@@ -907,6 +907,7 @@ int port_action_handle_create(portid_t port_id, uint32_t id, const struct rte_flow_action *action);int port_action_handle_destroy (portid_t port_id,uint32_t n,const uint32_t *action); +int port_action_handle_flush (portid_t port_id);struct rte_flow_action_handle *port_action_handle_get_by_id (portid_t port_id,uint32_t id); int port_action_handle_update(portid_t port_id, uint32_t id,
Hi Aman,
Quoted 17 lines
From: Singh, Aman Deep <[email protected]>
Sent: Wednesday, March 30, 2022 5:24 PM [...]Quoted 7 lines · Dmitry Kozlyuk
When a port was closed, indirect actions could remain
with their handles no longer valid.
If a newly attached device was assigned the same ID as the closed port, those indirect actions became accessible again.
Any attempt to use them resulted in an undefined behavior. Automatically flush indirect actions when a port is closed.Quoted 6 lines
Fixes 4b61b8774be9 ("ethdev: introduce indirect flow action")Signed-off-by Dmitry Kozlyuk <[email protected]>Acked-by Matan Azrad <[email protected]>---
Quoted 6 lines
From:
guides/prog_guide/rte_flow.rst
/"If ``RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP`` is advertised,// //this means that the PMD can keep at least some indirect actions// //across device stop and start./Please check, if we are inline with the guidelines given in the section.
This patch is related to port closing, not port stopping. Flow API resources are owned by the port,
so they cannot be valid when the port is closed and its ethdev removed. TestPMD was keeping indirect action handles contrary to this.
As for RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP,
there is already "flow indirect_action destroy"
to erase indirect actions before stopping the port if this is desired. I had another patch in mind to add "flow indirect_action flush" for convenience, but it is independent of this fix.
Hi Aman,
Quoted 34 lines
From: Dmitry Kozlyuk <[email protected]>
Sent: Thursday, March 31, 2022 1:57 AM
[...]Quoted 7 lines
From: Singh, Aman Deep <[email protected]>
Sent: Wednesday, March 30, 2022 5:24 PM [...]Quoted 3 lines · Dmitry Kozlyuk
When a port was closed, indirect actions could remain with their handles no longer valid.
If a newly attached device was assigned the same ID as the closedport,
Quoted 10 lines
Quoted 10 lines
those indirect actions became accessible again. Any attempt to use them resulted in an undefined behavior. Automatically flush indirect actions when a port is closed.
Fixes 4b61b8774be9 ("ethdev: introduce indirect flow action")Signed-off-by Dmitry Kozlyuk <[email protected]>Acked-by Matan Azrad <[email protected]>---
Quoted 6 lines
From:
guides/prog_guide/rte_flow.rst
/"If ``RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP`` is advertised,// //this means that the PMD can keep at least some indirect actions// //across device stop and start./Please check, if we are inline with the guidelines given in the
section.
This patch is related to port closing, not port stopping. Flow API resources are owned by the port,
so they cannot be valid when the port is closed and its ethdev removed. TestPMD was keeping indirect action handles contrary to this.
Quoted 5 lines
As for
RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP,
there is already "flowindirect_actiondestroy"
to erase indirect actions before stopping the port if this is desired. I had another patch in mind to add "flowindirect_actionflush" for convenience, but it is independent of this fix.
Did my response clear up your concern?
In short: this patch is aligned with the defined flow resource behavior.
Singh, Aman Deep
Acked-byQuoted 35 lines · Dmitry Kozlyuk
Hi Aman,
Quoted 33 lines
From: Dmitry Kozlyuk <[email protected]>
Sent: Thursday, March 31, 2022 1:57 AM
[...]Quoted 7 lines
From: Singh, Aman Deep <[email protected]>
Sent: Wednesday, March 30, 2022 5:24 PM [...]Quoted 3 lines · Dmitry Kozlyuk
When a port was closed, indirect actions could remain with their handles no longer valid.
If a newly attached device was assigned the same ID as the closedport,
Quoted 10 lines
Quoted 10 lines
those indirect actions became accessible again. Any attempt to use them resulted in an undefined behavior. Automatically flush indirect actions when a port is closed.
Fixes 4b61b8774be9 ("ethdev: introduce indirect flow action")Signed-off-by Dmitry Kozlyuk <[email protected]>Acked-by Matan Azrad <[email protected]>---
Quoted 6 lines
From:
guides/prog_guide/rte_flow.rst
/"If ``RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP`` is advertised,// //this means that the PMD can keep at least some indirect actions// //across device stop and start./Please check, if we are inline with the guidelines given in the
section.
This patch is related to port closing, not port stopping. Flow API resources are owned by the port,
so they cannot be valid when the port is closed and its ethdev removed. TestPMD was keeping indirect action handles contrary to this.
Agreed, at port close these should be flushed. LGTM
Quoted 8 lines
Quoted 6 lines
As for
RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP,
there is already "flowindirect_actiondestroy"
to erase indirect actions before stopping the port if this is desired. I had another patch in mind to add "flowindirect_actionflush" for convenience, but it is independent of this fix.Did my response clear up your concern?
In short: this patch is aligned with the defined flow resource behavior.
Thomas Monjalon
Applied12/04/2022 07:41, Singh, Aman Deep:
Quoted 30 lines · Dmitry Kozlyuk
Quoted 29 lines
Quoted 29 lines
From: Dmitry Kozlyuk <[email protected]>
Sent: Thursday, March 31, 2022 1:57 AM
[...]Quoted 7 lines
From: Singh, Aman Deep <[email protected]>
Sent: Wednesday, March 30, 2022 5:24 PM [...]Quoted 3 lines · Dmitry Kozlyuk
When a port was closed, indirect actions could remain with their handles no longer valid.
If a newly attached device was assigned the same ID as the closedport,
Quoted 10 lines
Quoted 10 lines
those indirect actions became accessible again. Any attempt to use them resulted in an undefined behavior. Automatically flush indirect actions when a port is closed.
Fixes 4b61b8774be9 ("ethdev: introduce indirect flow action")Signed-off-by Dmitry Kozlyuk <[email protected]>Acked-by Matan Azrad <[email protected]>---
Quoted 6 lines
From:
guides/prog_guide/rte_flow.rst
/"If ``RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP`` is advertised,// //this means that the PMD can keep at least some indirect actions// //across device stop and start./Please check, if we are inline with the guidelines given in the
section.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
This patch is related to port closing, not port stopping. Flow API resources are owned by the port,
so they cannot be valid when the port is closed and its ethdev removed. TestPMD was keeping indirect action handles contrary to this.Agreed, at port close these should be flushed. LGTM
Acked-by Aman Singh <[email protected]>
Applied in next-net, thanks.