X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fcli.c;h=40ec32325e403687e13281535c2dee7f690626da;hb=f91080c01104a5999fe6c08e699b3426fea62dad;hp=25308588469d92724b5e1b4d40ce1f0ae57278e4;hpb=a059a000f81a7251ffed2821f69dd96cfd94c8c7;p=vpp.git

diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c
index 25308588469..40ec32325e4 100644
--- a/src/plugins/dpdk/device/cli.c
+++ b/src/plugins/dpdk/device/cli.c
@@ -46,6 +46,7 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd,
   dpdk_main_t *dm = &dpdk_main;
   vnet_hw_interface_t *hw;
   struct rte_eth_dev_info dev_info;
+  struct rte_pci_device *pci_dev;
   uword *p = 0;
   clib_error_t *error = NULL;
 
@@ -66,14 +67,21 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd,
   *xd = vec_elt_at_index (dm->devices, hw->dev_instance);
 
   rte_eth_dev_info_get ((*xd)->port_id, &dev_info);
-  if (dev_info.pci_dev)
+
+#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
+  pci_dev = dev_info.pci_dev;
+#else
+  pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+#endif
+
+  if (pci_dev)
     {				/* bonded interface has no pci info */
       vlib_pci_addr_t pci_addr;
 
-      pci_addr.domain = dev_info.pci_dev->addr.domain;
-      pci_addr.bus = dev_info.pci_dev->addr.bus;
-      pci_addr.slot = dev_info.pci_dev->addr.devid;
-      pci_addr.function = dev_info.pci_dev->addr.function;
+      pci_addr.domain = pci_dev->addr.domain;
+      pci_addr.bus = pci_dev->addr.bus;
+      pci_addr.slot = pci_dev->addr.devid;
+      pci_addr.function = pci_dev->addr.function;
 
       p =
 	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
@@ -139,7 +147,7 @@ pcap_trace_command_internal (vlib_main_t * vm,
 		    clib_error_report (error);
 		  else
 		    vlib_cli_output (vm, "saved to %s...",
-				     dm->pcap[rx_tx].pcap_filename);
+				     dm->pcap[rx_tx].pcap_main.file_name);
 		}
 
 	      dm->pcap[rx_tx].pcap_enable = 0;
@@ -203,23 +211,25 @@ pcap_trace_command_internal (vlib_main_t * vm,
 	    {
 	      vlib_cli_output
 		(vm, "max is %d for any interface to file %s",
-		 dm->pcap_pkts_to_capture ?
-		 dm->pcap[rx_tx].pcap_pkts_to_capture
+		 dm->pcap[rx_tx].pcap_main.n_packets_to_capture ?
+		 dm->pcap[rx_tx].pcap_main.n_packets_to_capture
 		 : PCAP_DEF_PKT_TO_CAPTURE,
-		 dm->pcap_filename ?
-		 dm->pcap[rx_tx].pcap_filename : (u8 *) "/tmp/vpe.pcap");
+		 dm->pcap[rx_tx].pcap_main.file_name ?
+		 (u8 *) dm->pcap[rx_tx].pcap_main.file_name :
+		 (u8 *) "/tmp/vpe.pcap");
 	    }
 	  else
 	    {
 	      vlib_cli_output (vm, "max is %d for interface %U to file %s",
-			       dm->pcap[rx_tx].pcap_pkts_to_capture
-			       ? dm->pcap_pkts_to_capture
-			       : PCAP_DEF_PKT_TO_CAPTURE,
+			       dm->pcap[rx_tx].pcap_main.n_packets_to_capture
+			       ? dm->pcap[rx_tx].
+			       pcap_main.n_packets_to_capture :
+			       PCAP_DEF_PKT_TO_CAPTURE,
 			       format_vnet_sw_if_index_name, dm->vnet_main,
 			       dm->pcap_sw_if_index,
-			       dm->pcap[rx_tx].pcap_filename
-			       ? dm->pcap[rx_tx].pcap_filename : (u8 *)
-			       "/tmp/vpe.pcap");
+			       dm->pcap[rx_tx].
+			       pcap_main.file_name ? (u8 *) dm->pcap[rx_tx].
+			       pcap_main.file_name : (u8 *) "/tmp/vpe.pcap");
 	    }
 
 	  if (dm->pcap[rx_tx].pcap_enable == 0)
@@ -254,34 +264,28 @@ pcap_trace_command_internal (vlib_main_t * vm,
       /* Since no error, save configured values. */
       if (chroot_filename)
 	{
-	  if (dm->pcap[rx_tx].pcap_filename)
-	    vec_free (dm->pcap[rx_tx].pcap_filename);
+	  if (dm->pcap[rx_tx].pcap_main.file_name)
+	    vec_free (dm->pcap[rx_tx].pcap_main.file_name);
 	  vec_add1 (chroot_filename, 0);
-	  dm->pcap[rx_tx].pcap_filename = chroot_filename;
+	  dm->pcap[rx_tx].pcap_main.file_name = (char *) chroot_filename;
 	}
 
       if (max)
-	dm->pcap[rx_tx].pcap_pkts_to_capture = max;
-
+	dm->pcap[rx_tx].pcap_main.n_packets_to_capture = max;
 
       if (enabled)
 	{
-	  if (dm->pcap[rx_tx].pcap_filename == 0)
-	    dm->pcap[rx_tx].pcap_filename = format (0, "/tmp/vpe.pcap%c", 0);
-
-	  memset (&dm->pcap[rx_tx].pcap_main, 0,
-		  sizeof (dm->pcap[rx_tx].pcap_main));
-	  dm->pcap[rx_tx].pcap_main.file_name =
-	    (char *) dm->pcap[rx_tx].pcap_filename;
-	  dm->pcap[rx_tx].pcap_main.n_packets_to_capture
-	    = PCAP_DEF_PKT_TO_CAPTURE;
-	  if (dm->pcap[rx_tx].pcap_pkts_to_capture)
-	    dm->pcap[rx_tx].pcap_main.n_packets_to_capture
-	      = dm->pcap[rx_tx].pcap_pkts_to_capture;
+	  if (dm->pcap[rx_tx].pcap_main.file_name == 0)
+	    dm->pcap[rx_tx].pcap_main.file_name
+	      = (char *) format (0, "/tmp/vpe.pcap%c", 0);
 
+	  dm->pcap[rx_tx].pcap_main.n_packets_captured = 0;
 	  dm->pcap[rx_tx].pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
+	  if (dm->pcap[rx_tx].pcap_main.lock == 0)
+	    clib_spinlock_init (&(dm->pcap[rx_tx].pcap_main.lock));
 	  dm->pcap[rx_tx].pcap_enable = 1;
-	  vlib_cli_output (vm, "pcap tx capture on...");
+	  vlib_cli_output (vm, "pcap %s capture on...",
+			   rx_tx == VLIB_RX ? "rx" : "tx");
 	}
     }
   else if (chroot_filename)
@@ -1218,6 +1222,7 @@ set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input,
 
   /* Device specific data */
   struct rte_eth_dev_info dev_info;
+  struct rte_pci_device *pci_dev;
   dpdk_device_config_t *devconf = 0;
   vnet_hw_interface_t *hw;
   dpdk_device_t *xd;
@@ -1284,14 +1289,21 @@ set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input,
   xd = vec_elt_at_index (dm->devices, hw->dev_instance);
 
   rte_eth_dev_info_get (xd->port_id, &dev_info);
-  if (dev_info.pci_dev)
+
+#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
+  pci_dev = dev_info.pci_dev;
+#else
+  pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+#endif
+
+  if (pci_dev)
     {				/* bonded interface has no pci info */
       vlib_pci_addr_t pci_addr;
 
-      pci_addr.domain = dev_info.pci_dev->addr.domain;
-      pci_addr.bus = dev_info.pci_dev->addr.bus;
-      pci_addr.slot = dev_info.pci_dev->addr.devid;
-      pci_addr.function = dev_info.pci_dev->addr.function;
+      pci_addr.domain = pci_dev->addr.domain;
+      pci_addr.bus = pci_dev->addr.bus;
+      pci_addr.slot = pci_dev->addr.devid;
+      pci_addr.function = pci_dev->addr.function;
 
       p =
 	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
@@ -1443,6 +1455,7 @@ show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input,
   u32 hw_if_index = (u32) ~ 0;
   u32 profile_id, subport_id, i;
   struct rte_eth_dev_info dev_info;
+  struct rte_pci_device *pci_dev;
   dpdk_device_config_t *devconf = 0;
   vlib_thread_registration_t *tr;
   uword *p = 0;
@@ -1475,14 +1488,21 @@ show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input,
   xd = vec_elt_at_index (dm->devices, hw->dev_instance);
 
   rte_eth_dev_info_get (xd->port_id, &dev_info);
-  if (dev_info.pci_dev)
+
+#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
+  pci_dev = dev_info.pci_dev;
+#else
+  pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+#endif
+
+  if (pci_dev)
     {				/* bonded interface has no pci info */
       vlib_pci_addr_t pci_addr;
 
-      pci_addr.domain = dev_info.pci_dev->addr.domain;
-      pci_addr.bus = dev_info.pci_dev->addr.bus;
-      pci_addr.slot = dev_info.pci_dev->addr.devid;
-      pci_addr.function = dev_info.pci_dev->addr.function;
+      pci_addr.domain = pci_dev->addr.domain;
+      pci_addr.bus = pci_dev->addr.bus;
+      pci_addr.slot = pci_dev->addr.devid;
+      pci_addr.function = pci_dev->addr.function;
 
       p =
 	hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);