Skip to contentSkip to conversation

app/testpmd: cleanup port resources after implicit close

PATCH In review Dmitry Kozlyuk 2 participants 2 messages Jun 15, 2022 – Jun 23, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 app/testpmd: cleanup port resources after implicit close

When a port was closed implicitly closed by the PMD, for example, if it was a representor port and its master port was detached, flow 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. Flow flex items had no such issue on close, but had it on detach.

Introduce flush_port_owned_resources() function
for consistent cleanup and call it when a port is closed or detached. Make it flush flow rules and multicast addresses too because they logically belong to the port being removed.

Fixes 55509e3a49fb ("app/testpmd: support shared flow action")
Fixes 59f3a8acbcdb ("app/testpmd: add flex item commands")
---
 app/test-pmd/testpmd.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
app/test-pmd/testpmd.c +12 -6
index 04c39adc21..fe125e40e8 100644
@@ -3202,6 +3202,15 @@ remove_invalid_ports(void)
 	nb_cfg_ports = nb_fwd_ports;
 }
 
+static void
+flush_port_owned_resources(portid_t pi)
+{
+	mcast_addr_pool_destroy(pi);
+	port_flow_flush(pi);
+	port_flex_item_flush(pi);
+	port_action_handle_flush(pi);
+}
+
 void
 close_port(portid_t pid)
 {
@@ -3238,10 +3247,7 @@ close_port(portid_t pid)
 		}
 
 		if (is_proc_primary()) {
-			mcast_addr_pool_destroy(pi);
-			port_flow_flush(pi);
-			port_flex_item_flush(pi);
-			port_action_handle_flush(pi);
+			flush_port_owned_resources(pi);
 			rte_eth_dev_close(pi);
 		}
 
@@ -3386,7 +3392,7 @@ detach_device(struct rte_device *dev)
 					sibling);
 				return;
 			}
-			port_flow_flush(sibling);
+			flush_port_owned_resources(sibling);
 		}
 	}
 
@@ -3453,7 +3459,7 @@ detach_devargs(char *identifier)
 				rte_devargs_reset(&da);
 				return;
 			}
-			port_flow_flush(port_id);
+			flush_port_owned_resources(port_id);
 		}
 	}
 
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Dmitry Kozlyuk

When a port was closed implicitly closed by the PMD, for example, if it was a representor port and its master port was detached, flow 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. Flow flex items had no such issue on close, but had it on detach.

Introduce flush_port_owned_resources() function
for consistent cleanup and call it when a port is closed or detached. Make it flush flow rules and multicast addresses too because they logically belong to the port being removed.

Quoted 6 lines
Fixes 55509e3a49fb ("app/testpmd: support shared flow action")
Fixes 59f3a8acbcdb ("app/testpmd: add flex item commands")

Resolved merge conflict on apply to dpdk-next-net/main, applied, thanks.