app/testpmd: request device removal interrupt

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2ab5091..a05a363 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -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>
@@ -270,6 +271,16 @@ uint8_t no_flush_rx = 0; /* flush by default */
  */
 uint8_t no_link_check = 0; /* check by default */
 
+/*
+ * Enable link status change notification
+ */
+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.
  */
@@ -351,6 +362,9 @@ struct rte_stats_bitrates *bitrate_data;
 /* Forward function declarations */
 static void map_port_queue_stats_mapping_registers(uint8_t pi, struct rte_port *port);
 static void check_all_ports_link_status(uint32_t port_mask);
+static void eth_event_callback(uint8_t port_id,
+                              enum rte_eth_event_type type,
+                              void *param);
 
 /*
  * Check if all the ports are started.
@@ -1347,6 +1361,7 @@ start_port(portid_t pid)
        queueid_t qi;
        struct rte_port *port;
        struct ether_addr mac_addr;
+       enum rte_eth_event_type event_type;
 
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return 0;
@@ -1458,6 +1473,21 @@ start_port(portid_t pid)
                                return -1;
                        }
                }
+
+               for (event_type = RTE_ETH_EVENT_UNKNOWN;
+                    event_type < RTE_ETH_EVENT_MAX;
+                    event_type++) {
+                       diag = rte_eth_dev_callback_register(pi,
+                                                       event_type,
+                                                       eth_event_callback,
+                                                       NULL);
+                       if (diag) {
+                               printf("Failed to setup even callback for event %d\n",
+                                       event_type);
+                               return -1;
+                       }
+               }
+
                /* start port */
                if (rte_eth_dev_start(pi) < 0) {
                        printf("Fail to start port %d\n", pi);
@@ -1727,6 +1757,70 @@ check_all_ports_link_status(uint32_t port_mask)
                if (all_ports_up == 1 || count == (MAX_CHECK_TIME - 1)) {
                        print_flag = 1;
                }
+
+               if (lsc_interrupt)
+                       break;
+       }
+}
+
+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)
+{
+       static const char * const event_desc[] = {
+               [RTE_ETH_EVENT_UNKNOWN] = "Unknown",
+               [RTE_ETH_EVENT_INTR_LSC] = "LSC",
+               [RTE_ETH_EVENT_QUEUE_STATE] = "Queue state",
+               [RTE_ETH_EVENT_INTR_RESET] = "Interrupt reset",
+               [RTE_ETH_EVENT_VF_MBOX] = "VF Mbox",
+               [RTE_ETH_EVENT_MACSEC] = "MACsec",
+               [RTE_ETH_EVENT_INTR_RMV] = "device removal",
+               [RTE_ETH_EVENT_MAX] = NULL,
+       };
+
+       RTE_SET_USED(param);
+
+       if (type >= RTE_ETH_EVENT_MAX) {
+               fprintf(stderr, "\nPort %" PRIu8 ": %s called upon invalid event %d\n",
+                       port_id, __func__, type);
+               fflush(stderr);
+       } else {
+               printf("\nPort %" PRIu8 ": %s event\n", port_id,
+                       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;
        }
 }
 
@@ -1882,6 +1976,15 @@ init_port_config(void)
 #ifdef RTE_NIC_BYPASS
                rte_eth_dev_bypass_init(pid);
 #endif
+
+               if (lsc_interrupt &&
+                   (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;
        }
 }