X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=fcdc29bfdc44f1a811d70a5fa81329a4092fa1cb;hp=6553fca77ec9d13cbca42249e821f4e6b41f3011;hb=5100aa9;hpb=0a554c773bc287721d1100db4725c373b7640c67

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 6553fca77ec..fcdc29bfdc4 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -888,7 +888,20 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf)
       ;
     /* vmxnet3 */
     else if (d->vendor_id == 0x15ad && d->device_id == 0x07b0)
-      ;
+      {
+	/*
+	 * For vmxnet3 PCI, unless it is explicitly specified in the whitelist,
+	 * the default is to put it in the blacklist.
+	 */
+	if (devconf == 0)
+	  {
+	    pool_get (conf->dev_confs, devconf);
+	    hash_set (conf->device_config_index_by_pci_addr, addr->as_u32,
+		      devconf - conf->dev_confs);
+	    devconf->pci_addr.as_u32 = addr->as_u32;
+	    devconf->is_blacklisted = 1;
+	  }
+      }
     /* all Intel network devices */
     else if (d->vendor_id == 0x8086 && d->device_class == PCI_CLASS_NETWORK_ETHERNET)
       ;
@@ -1284,15 +1297,18 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
 	  /* *INDENT-ON* */
 	}
 
+      uword default_hugepage_sz = clib_mem_get_default_hugepage_size ();
       /* *INDENT-OFF* */
       clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
         {
 	  clib_error_t *e;
-
+	  uword n_pages;
 	  vec_validate(mem_by_socket, c);
+	  n_pages = round_pow2 ((uword) mem_by_socket[c]<<20,
+				default_hugepage_sz);
+	  n_pages /= default_hugepage_sz;
 
-	  e = clib_sysfs_prealloc_hugepages(c, 0, mem_by_socket[c] / 2);
-	  if (e)
+	  if ((e = clib_sysfs_prealloc_hugepages(c, 0, n_pages)))
 	    clib_error_report (e);
       }));
       /* *INDENT-ON* */
@@ -1568,54 +1584,10 @@ dpdk_update_link_state (dpdk_device_t * xd, f64 now)
 	  break;
 	}
     }
-  if (hw_flags_chg || (xd->link.link_speed != prev_link.link_speed))
-    {
-      hw_flags_chg = 1;
-      switch (xd->link.link_speed)
-	{
-	case ETH_SPEED_NUM_10M:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10M;
-	  break;
-	case ETH_SPEED_NUM_100M:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100M;
-	  break;
-	case ETH_SPEED_NUM_1G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_1G;
-	  break;
-	case ETH_SPEED_NUM_2_5G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_2_5G;
-	  break;
-	case ETH_SPEED_NUM_5G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_5G;
-	  break;
-	case ETH_SPEED_NUM_10G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10G;
-	  break;
-	case ETH_SPEED_NUM_20G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_20G;
-	  break;
-	case ETH_SPEED_NUM_25G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_25G;
-	  break;
-	case ETH_SPEED_NUM_40G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_40G;
-	  break;
-	case ETH_SPEED_NUM_50G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_50G;
-	  break;
-	case ETH_SPEED_NUM_56G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_56G;
-	  break;
-	case ETH_SPEED_NUM_100G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100G;
-	  break;
-	case 0:
-	  break;
-	default:
-	  dpdk_log_warn ("unknown link speed %d", xd->link.link_speed);
-	  break;
-	}
-    }
+  if (xd->link.link_speed != prev_link.link_speed)
+    vnet_hw_interface_set_link_speed (vnm, xd->hw_if_index,
+				      xd->link.link_speed * 1000);
+
   if (hw_flags_chg)
     {
       if (LINK_STATE_ELOGS)