d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app/testpmd: merge ports list update functions

Browse Source 
The arrays ports_ids and fwd_ports_ids require the same kind
of update when some ports are removed or added.

The functions update_fwd_ports() and remove_unused_fwd_ports()
are merged in the new function remove_invalid_ports().
The part for adding new port is moved into setup_attached_port().

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
This commit is contained in:
Thomas Monjalon 2018-10-25 17:11:14 +02:00 committed by Ferruh Yigit
parent f8e5baa266
commit 4f1de450c9
1 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/test-pmd/testpmd.c
View File

@ -1614,31 +1614,6 @@ launch_packet_forwarding(lcore_function_t *pkt_fwd_on_lcore)
}
}
/*
* Update the forward ports list.
*/
void
update_fwd_ports(portid_t new_pid)
{
unsigned int i;
unsigned int new_nb_fwd_ports = 0;
int move = 0;
for (i = 0; i < nb_fwd_ports; ++i) {
if (port_id_is_invalid(fwd_ports_ids[i], DISABLED_WARN))
move = 1;
else if (move)
fwd_ports_ids[new_nb_fwd_ports++] = fwd_ports_ids[i];
else
new_nb_fwd_ports++;
}
if (new_pid < RTE_MAX_ETHPORTS)
fwd_ports_ids[new_nb_fwd_ports++] = new_pid;
nb_fwd_ports = new_nb_fwd_ports;
nb_cfg_ports = new_nb_fwd_ports;
}
/*
* Launch packet forwarding configuration.
*/
@ -2193,28 +2168,25 @@ stop_port(portid_t pid)
}
static void
remove_unused_fwd_ports(void)
remove_invalid_ports_in(portid_t *array, portid_t *total)
{
int i;
int last_port_idx = nb_ports - 1;
portid_t i;
portid_t new_total = 0;
for (i = 0; i <= last_port_idx; i++) { /* iterate in ports_ids */
if (rte_eth_devices[ports_ids[i]].state != RTE_ETH_DEV_UNUSED)
continue;
/* skip unused ports at the end */
while (i <= last_port_idx &&
rte_eth_devices[ports_ids[last_port_idx]].state
== RTE_ETH_DEV_UNUSED)
last_port_idx--;
if (last_port_idx < i)
break;
/* overwrite unused port with last valid port */
ports_ids[i] = ports_ids[last_port_idx];
/* decrease ports count */
last_port_idx--;
}
nb_ports = rte_eth_dev_count_avail();
update_fwd_ports(RTE_MAX_ETHPORTS);
for (i = 0; i < *total; i++)
if (!port_id_is_invalid(array[i], DISABLED_WARN)) {
array[new_total] = array[i];
new_total++;
}
*total = new_total;
}
static void
remove_invalid_ports(void)
{
remove_invalid_ports_in(ports_ids, &nb_ports);
remove_invalid_ports_in(fwd_ports_ids, &nb_fwd_ports);
nb_cfg_ports = nb_fwd_ports;
}
void
@ -2259,7 +2231,7 @@ close_port(portid_t pid)
port_flow_flush(pi);
rte_eth_dev_close(pi);
remove_unused_fwd_ports();
remove_invalid_ports();
if (rte_atomic16_cmpset(&(port->port_status),
RTE_PORT_HANDLING, RTE_PORT_CLOSED) == 0)
@ -2344,13 +2316,11 @@ setup_attached_port(portid_t pi)
reconfig(pi, socket_id);
rte_eth_promiscuous_enable(pi);
ports_ids[nb_ports] = pi;
nb_ports = rte_eth_dev_count_avail();
ports_ids[nb_ports++] = pi;
fwd_ports_ids[nb_fwd_ports++] = pi;
nb_cfg_ports = nb_fwd_ports;
ports[pi].port_status = RTE_PORT_STOPPED;
update_fwd_ports(pi);
printf("Port %d is attached. Now total ports is %d\n", pi, nb_ports);
printf("Done\n");
}
@ -2396,7 +2366,7 @@ detach_port_device(portid_t port_id)
}
}
remove_unused_fwd_ports();
remove_invalid_ports();
printf("Device of port %u is detached\n", port_id);
printf("Now total ports is %d\n", nb_ports);