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

app/testpmd: request device removal interrupt

Browse Source 
Enable device removal event for PMD supporting it.
Add the --no-rmv-interrupt parameter to explicitly disable it.

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Signed-off-by: Elad Persiko <eladpe@mellanox.com>
This commit is contained in:
Gaetan Rivet 2017-04-18 14:17:42 +02:00 committed by Thomas Monjalon
parent 8ea656f8c3
commit 284c908cc5
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/test-pmd/parameters.c
View File

@ -201,6 +201,7 @@ usage(char* progname)
printf(" --disable-link-check: disable check on link status when "
"starting/stopping ports.\n");
printf(" --no-lsc-interrupt: disable link status change interrupt.\n");
printf(" --no-rmv-interrupt: disable device removal interrupt.");
}
#ifdef RTE_LIBRTE_CMDLINE
@ -570,6 +571,7 @@ launch_args_parse(int argc, char** argv)
{ "txpkts", 1, 0, 0 },
{ "disable-link-check", 0, 0, 0 },
{ "no-lsc-interrupt", 0, 0, 0 },
{ "no-rmv-interrupt", 0, 0, 0 },
{ 0, 0, 0, 0 },
};
@ -1002,6 +1004,8 @@ launch_args_parse(int argc, char** argv)
no_link_check = 1;
if (!strcmp(lgopts[opt_idx].name, "no-lsc-interrupt"))
lsc_interrupt = 0;
if (!strcmp(lgopts[opt_idx].name, "no-rmv-interrupt"))
rmv_interrupt = 0;
break;
case 'h':

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

@ -59,6 +59,7 @@
#include <rte_memzone.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_alarm.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
#include <rte_atomic.h>
@ -275,6 +276,11 @@ uint8_t no_link_check = 0; /* check by default */
*/
uint8_t lsc_interrupt = 1; /* enabled by default */
/*
* Enable device removal notification.
*/
uint8_t rmv_interrupt = 1; /* enabled by default */
/*
* NIC bypass mode configuration options.
*/
@ -1757,6 +1763,29 @@ check_all_ports_link_status(uint32_t port_mask)
}
}
static void
rmv_event_callback(void *arg)
{
struct rte_eth_dev *dev;
struct rte_devargs *da;
char name[32] = "";
uint8_t port_id = (intptr_t)arg;
RTE_ETH_VALID_PORTID_OR_RET(port_id);
dev = &rte_eth_devices[port_id];
da = dev->device->devargs;
stop_port(port_id);
close_port(port_id);
if (da->type == RTE_DEVTYPE_VIRTUAL)
snprintf(name, sizeof(name), "%s", da->virt.drv_name);
else if (da->type == RTE_DEVTYPE_WHITELISTED_PCI)
rte_eal_pci_device_name(&da->pci.addr, name, sizeof(name));
printf("removing device %s\n", name);
rte_eal_dev_detach(name);
dev->state = RTE_ETH_DEV_UNUSED;
}
/* This function is used by the interrupt thread */
static void
eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param)
@ -1783,6 +1812,16 @@ eth_event_callback(uint8_t port_id, enum rte_eth_event_type type, void *param)
event_desc[type]);
fflush(stdout);
}
switch (type) {
case RTE_ETH_EVENT_INTR_RMV:
if (rte_eal_alarm_set(100000,
rmv_event_callback, (void *)(intptr_t)port_id))
fprintf(stderr, "Could not set up deferred device removal\n");
break;
default:
break;
}
}
static int
@ -1942,6 +1981,10 @@ init_port_config(void)
(rte_eth_devices[pid].data->dev_flags &
RTE_ETH_DEV_INTR_LSC))
port->dev_conf.intr_conf.lsc = 1;
if (rmv_interrupt &&
(rte_eth_devices[pid].data->dev_flags &
RTE_ETH_DEV_INTR_RMV))
port->dev_conf.intr_conf.rmv = 1;
}
}

1
app/test-pmd/testpmd.h
View File

@ -306,6 +306,7 @@ extern uint8_t mp_anon; /**< set by "--mp-anon" parameter */
extern uint8_t no_link_check; /**<set by "--disable-link-check" parameter */
extern volatile int test_done; /* stop packet forwarding when set to 1. */
extern uint8_t lsc_interrupt; /**< disabled by "--no-lsc-interrupt" parameter */
extern uint8_t rmv_interrupt; /**< disabled by "--no-rmv-interrupt" parameter */
#ifdef RTE_NIC_BYPASS
extern uint32_t bypass_timeout; /**< Store the NIC bypass watchdog timeout */