19.04.2 Release Notes

Change-Id: I1ee3909e042e56fd4caf3732762e9a9276aa6db1
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

.gitreview

@@ -2,3 +2,4 @@
 host=gerrit.fd.io
 port=29418
 project=vpp
+defaultbranch=stable/1904

MAINTAINERS

@@ -105,6 +105,11 @@ M:	Florin Coras <fcoras@cisco.com>
 F:	src/vnet/lisp-cp/
 F:	src/vnet/lisp-gpe/
 
+VNET GSO
+I: gso
+M: Andrew Yourtchenko <ayourtch@gmail.com>
+F: src/vnet/interface_output.c
+
 Plugin - MAP
 M:	Ole Troan <ot@cisco.com>
 F:	src/plugins/map

build/external/packages/ipsec-mb.mk

@@ -25,7 +25,8 @@ define  ipsec-mb_config_cmds
 endef
 
 define  ipsec-mb_build_cmds
-	@true
+	echo "BUILDING"
+	make -C $(ipsec-mb_src_dir) DEBUG=y NASM=$(ipsec-mb_install_dir)/bin/nasm 
 endef
 
 define  ipsec-mb_install_cmds

docs/etc/requirements.txt

@@ -20,4 +20,4 @@ Sphinx==1.8.2
 sphinx-rtd-theme==0.4.2
 sphinxcontrib-websupport==1.1.0
 typing==3.6.6
-urllib3==1.24.1
+urllib3==1.24.2

doxygen/dev_doc.md

@@ -12,3 +12,6 @@ Programming notes for developers.
 - @subpage acl_lookup_context
 - @subpage libmemif_doc
 - @subpage syslog_doc
+- @subpage ipfix_doc
+- @subpage stats_doc
+- @subpage if_stats_client_doc

doxygen/test_framework_doc.md

@@ -4,6 +4,7 @@ Test Framework Documentation    {#test_framework_doc}
 PyDoc generated documentation for the "make test" framework is available for
 the following releases:
 
+- [Test framework documentation for VPP 19.04](https://docs.fd.io/vpp/19.04/vpp_make_test/html)
 - [Test framework documentation for VPP 19.01](https://docs.fd.io/vpp/19.01/vpp_make_test/html)
 - [Test framework documentation for VPP 18.10](https://docs.fd.io/vpp/18.10/vpp_make_test/html)
 - [Test framework documentation for VPP 18.07](https://docs.fd.io/vpp/18.07/vpp_make_test/html)

doxygen/user_doc.md

@@ -7,6 +7,7 @@ Several modules provide operational, dataplane-user focused documentation.
 - @subpage avf_plugin_doc
 - @subpage bfd_doc
 - @subpage dpdk_crypto_ipsec_doc
+- @subpage dhcp6_pd_doc
 - @subpage flowprobe_plugin_doc
 - @subpage ioam_plugin_doc
 - @subpage ipsec_gre_doc
@@ -16,10 +17,13 @@ Several modules provide operational, dataplane-user focused documentation.
 - @subpage lldp_doc
 - @subpage map_doc
 - @subpage marvel_plugin_doc
+- @subpage mtu_doc
 - @subpage nat64_doc
+- @subpage nat_ha_doc
 - @subpage qos_doc
 - @subpage selinux_doc
 - @subpage span_doc
 - @subpage srmpls_doc
 - @subpage srv6_doc
 - @subpage vcl_ldpreload_doc
+- @subpage vmxnet3_doc

extras/rpm/vpp-suse.spec

@@ -223,7 +223,7 @@ chmod -x %{buildroot}%{python_sitelib}/vpp_papi/*.txt
 #
 # devel
 #
-for dir in $(find %{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+for dir in %{_vpp_install_dir}/{vom,vpp}/include/
 do
 	for subdir in $(cd ${dir} && find . -type d -print)
 	do

extras/rpm/vpp.spec

@@ -46,7 +46,7 @@ Summary: Vector Packet Processing
 License: ASL 2.0
 Version: %{_version}
 Release: %{_release}
-Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python
+Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, epel-release, net-tools, pciutils, python, python36
 BuildRequires: systemd, chrpath
 BuildRequires: check, check-devel
 %if 0%{?fedora}
@@ -57,10 +57,14 @@ BuildRequires: mbedtls-devel
 BuildRequires: cmake
 %else
 %if 0%{rhel} == 7
+BuildRequires: epel-release
 BuildRequires: devtoolset-7-toolchain
 BuildREquires: openssl-devel
-BuildRequires: python-devel, python-virtualenv, python-ply
+BuildRequires: python-devel, python-virtualenv
+BuildRequires: mbedtls-devel
+BuildRequires: python36-devel python36-pip python36-ply
 BuildRequires: cmake3
+BuildRequires: boost-filesystem
 %endif
 %endif
 BuildRequires: libffi-devel
@@ -83,7 +87,7 @@ vpp_json_test - vector packet engine JSON test tool
 %package lib
 Summary: VPP libraries
 Group: System Environment/Libraries
-Requires: vpp-selinux-policy = %{_version}-%{_release}
+Requires: vpp-selinux-policy = %{_version}-%{_release} boost-filesystem
 
 %description lib
 This package contains the VPP shared libraries, including:
@@ -111,7 +115,7 @@ vppinfra
 %package plugins
 Summary: Vector Packet Processing--runtime plugins
 Group: System Environment/Libraries
-Requires: vpp = %{_version}-%{_release} numactl-libs
+Requires: vpp = %{_version}-%{_release} numactl-libs mbedtls
 %description plugins
 This package contains VPP plugins
 
@@ -231,7 +235,7 @@ install -m 0644 $MODULES \
 #
 # devel
 #
-for dir in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/include/ -maxdepth 0 -type d -print | grep -v dpdk)
+for dir in %{_mu_build_dir}/%{_vpp_install_dir}/{vom,vpp}/include/
 do
 	for subdir in $(cd ${dir} && find . -type d -print)
 	do

extras/scripts/list_api_changes.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 import os, fnmatch, subprocess
 
-starttag = 'v19.01-rc0'
-endtag = 'v19.01'
+starttag = 'v19.04-rc0'
+endtag = 'HEAD'
 emit_md = True
 apifiles = []
 

extras/vpp_if_stats/README.md

@@ -1,4 +1,4 @@
-# VPP interface stats client
+# VPP interface stats client {#if_stats_client_doc}
 
 This is a source code and a binary of a 'thin client' to collect, 
 aggregate and expose VPP interface stats through VPP stats socket API. 

src/plugins/abf/abf_api.c

@@ -312,7 +312,7 @@ VLIB_INIT_FUNCTION (abf_api_init);
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
-    .description = "ACL based Forwarding",
+    .description = "Access Control List (ACL) Based Forwarding",
 };
 /* *INDENT-ON* */
 

src/plugins/acl/acl.c

@@ -92,7 +92,7 @@ _(ACL_PLUGIN_GET_CONN_TABLE_MAX_ENTRIES,acl_plugin_get_conn_table_max_entries)
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
-    .description = "Access Control Lists",
+    .description = "Access Control Lists (ACL)",
 };
 /* *INDENT-ON* */
 

src/plugins/acl/sess_mgmt_node.c

@@ -727,6 +727,7 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 		}
 	      else
 		{
+		  clib_bitmap_free (pw0->pending_clear_sw_if_index_bitmap);
 		  if (clear_all)
 		    {
 		      /* if we need to clear all, then just clear the interfaces that we are servicing */

src/plugins/avf/README.md

@@ -75,6 +75,13 @@ setup 0000:3b:00.0 00:11:22:33:44:00
 setup 0000:3b:00.1 00:11:22:33:44:01
 ```
 
+### Promisc mode
+In cases when interface is used in the L2 mode or promisc mode is needed for some other reason,
+trust needs to be set to "on" using the linux "ip link" utility.
+```
+ip link set dev <PF inteface name> vf <VF id> trust on
+```
+
 ### Interface Creation
 Interfaces can be dynamically created by using following CLI:
 ```

src/plugins/avf/avf.h

@@ -22,6 +22,9 @@
 
 #include <vlib/log.h>
 
+#define AVF_AQ_ENQ_SUSPEND_TIME		50e-6
+#define AVF_AQ_ENQ_MAX_WAIT_TIME	50e-3
+
 #define AVF_RXD_STATUS(x)		(1ULL << x)
 #define AVF_RXD_STATUS_DD		AVF_RXD_STATUS(0)
 #define AVF_RXD_STATUS_EOP		AVF_RXD_STATUS(1)
@@ -161,6 +164,7 @@ typedef struct
 
   /* stats */
   virtchnl_eth_stats_t eth_stats;
+  virtchnl_eth_stats_t last_cleared_eth_stats;
 
   /* error */
   clib_error_t *error;

src/plugins/avf/avf_api.c

@@ -94,7 +94,9 @@ vl_api_avf_delete_t_handler (vl_api_avf_delete_t * mp)
   vnet_hw_interface_t *hw;
   int rv = 0;
 
-  hw = vnet_get_sup_hw_interface (vnm, htonl (mp->sw_if_index));
+  hw =
+    vnet_get_sup_hw_interface_api_visible_or_null (vnm,
+						   htonl (mp->sw_if_index));
   if (hw == NULL || avf_device_class.index != hw->dev_class_index)
     {
       rv = VNET_API_ERROR_INVALID_INTERFACE;

src/plugins/avf/cli.c

@@ -109,7 +109,7 @@ avf_delete_command_fn (vlib_main_t * vm, unformat_input_t * input,
     return clib_error_return (0,
 			      "please specify interface name or sw_if_index");
 
-  hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index);
   if (hw == NULL || avf_device_class.index != hw->dev_class_index)
     return clib_error_return (0, "not an AVF interface");
 
@@ -168,7 +168,7 @@ avf_test_command_fn (vlib_main_t * vm, unformat_input_t * input,
     return clib_error_return (0,
 			      "please specify interface name or sw_if_index");
 
-  hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
+  hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index);
   if (hw == NULL || avf_device_class.index != hw->dev_class_index)
     return clib_error_return (0, "not a AVF interface");
 

src/plugins/avf/device.c

@@ -101,10 +101,9 @@ clib_error_t *
 avf_aq_desc_enq (vlib_main_t * vm, avf_device_t * ad, avf_aq_desc_t * dt,
 		 void *data, int len)
 {
-  avf_main_t *am = &avf_main;
   clib_error_t *err = 0;
   avf_aq_desc_t *d, dc;
-  int n_retry = 5;
+  f64 t0, wait_time, suspend_time = AVF_AQ_ENQ_SUSPEND_TIME;
 
   d = &ad->atq[ad->atq_next_slot];
   clib_memcpy_fast (d, dt, sizeof (avf_aq_desc_t));
@@ -126,22 +125,24 @@ avf_aq_desc_enq (vlib_main_t * vm, avf_device_t * ad, avf_aq_desc_t * dt,
     clib_memcpy_fast (&dc, d, sizeof (avf_aq_desc_t));
 
   CLIB_MEMORY_BARRIER ();
-  vlib_log_debug (am->log_class, "%U", format_hexdump, data, len);
   ad->atq_next_slot = (ad->atq_next_slot + 1) % AVF_MBOX_LEN;
   avf_reg_write (ad, AVF_ATQT, ad->atq_next_slot);
   avf_reg_flush (ad);
 
+  t0 = vlib_time_now (vm);
 retry:
-  vlib_process_suspend (vm, 10e-6);
+  vlib_process_suspend (vm, suspend_time);
+  wait_time = vlib_time_now (vm) - t0;
 
   if (((d->flags & AVF_AQ_F_DD) == 0) || ((d->flags & AVF_AQ_F_CMP) == 0))
     {
-      if (--n_retry == 0)
+      if (wait_time > AVF_AQ_ENQ_MAX_WAIT_TIME)
 	{
 	  err = clib_error_return (0, "adminq enqueue timeout [opcode 0x%x]",
 				   d->opcode);
 	  goto done;
 	}
+      suspend_time *= 2;
       goto retry;
     }
 
@@ -561,7 +562,7 @@ avf_config_promisc_mode (vlib_main_t * vm, avf_device_t * ad)
   virtchnl_promisc_info_t pi = { 0 };
 
   pi.vsi_id = ad->vsi_id;
-  pi.flags = 1;
+  pi.flags = FLAG_VF_UNICAST_PROMISC | FLAG_VF_MULTICAST_PROMISC;
   return avf_send_to_pf (vm, ad, VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE, &pi,
 			 sizeof (virtchnl_promisc_info_t), 0, 0);
 }
@@ -1415,10 +1416,20 @@ static char *avf_tx_func_error_strings[] = {
 #undef _
 };
 
+static void
+avf_clear_hw_interface_counters (u32 instance)
+{
+  avf_main_t *am = &avf_main;
+  avf_device_t *ad = vec_elt_at_index (am->devices, instance);
+  clib_memcpy_fast (&ad->last_cleared_eth_stats,
+		    &ad->eth_stats, sizeof (ad->eth_stats));
+}
+
 /* *INDENT-OFF* */
 VNET_DEVICE_CLASS (avf_device_class,) =
 {
   .name = "Adaptive Virtual Function (AVF) interface",
+  .clear_counters = avf_clear_hw_interface_counters,
   .format_device = format_avf_device,
   .format_device_name = format_avf_device_name,
   .admin_up_down_function = avf_interface_admin_up_down,

src/plugins/avf/format.c

@@ -107,9 +107,10 @@ format_avf_device (u8 * s, va_list * args)
     s = format (s, "\n%Uerror %U", format_white_space, indent,
 		format_clib_error, ad->error);
 
-#define _(c) if (ad->eth_stats.c) \
+#define _(c) if (ad->eth_stats.c - ad->last_cleared_eth_stats.c) \
   a = format (a, "\n%U%-20U %u", format_white_space, indent + 2, \
-	      format_c_identifier, #c, ad->eth_stats.c);
+	      format_c_identifier, #c,                           \
+              ad->eth_stats.c - ad->last_cleared_eth_stats.c);
   foreach_virtchnl_eth_stats;
 #undef _
   if (a)

src/plugins/avf/plugin.c

@@ -22,7 +22,7 @@
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
   .version = VPP_BUILD_VER,
-  .description = "Intel Adaptive Virtual Function (AVF) Device Plugin",
+  .description = "Intel Adaptive Virtual Function (AVF) Device Driver",
 };
 /* *INDENT-ON* */
 

src/plugins/avf/virtchnl.h

@@ -21,6 +21,16 @@
 #define VIRTCHNL_VERSION_MAJOR 1
 #define VIRTCHNL_VERSION_MINOR 1
 
+#define foreach_avf_promisc_flags \
+  _(0, UNICAST_PROMISC, "unicast") \
+  _(1, MULTICAST_PROMISC, "multicast")
+
+enum
+{
+#define _(a, b, c) FLAG_VF_ ##b = (1 << a),
+  foreach_avf_promisc_flags
+#undef _
+};
 
 #define AVFINT_DYN_CTLN(x)  (0x00003800 + (0x4 * x))
 #define AVFINT_ICR0         0x00004800

src/plugins/cdp/cdp.c

@@ -189,6 +189,7 @@ VLIB_INIT_FUNCTION (cdp_init);
 VLIB_PLUGIN_REGISTER () =
 {
   .version = VPP_BUILD_VER,
+  .description = "Cisco Discovery Protocol (CDP)",
 };
 /* *INDENT-ON* */
 

src/plugins/crypto_ia32/main.c

@@ -57,7 +57,7 @@ VLIB_INIT_FUNCTION (crypto_ia32_init);
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
   .version = VPP_BUILD_VER,
-  .description = "Intel AESNI Software Crypto Backend Plugin",
+  .description = "Intel IA32 Software Crypto Engine",
 };
 /* *INDENT-ON* */
 

src/plugins/crypto_ipsecmb/CMakeLists.txt

@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+  return()
+endif()
+
 find_path(IPSECMB_INCLUDE_DIR NAMES intel-ipsec-mb.h HINTS ${IPSECMB_INCLUDE_DIR_HINT})
 find_library(IPSECMB_LIB NAMES libIPSec_MB.a HINTS ${IPSECMB_LIB_DIR_HINT})
 
@@ -33,3 +37,5 @@ if(IPSECMB_INCLUDE_DIR AND IPSECMB_LIB)
 else()
 	message(STATUS "Intel IPSecMB not found")
 endif()
+
+target_compile_options(crypto_ipsecmb_plugin PRIVATE "-march=silvermont")

src/plugins/crypto_openssl/main.c

@@ -112,15 +112,20 @@ openssl_ops_enc_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
   for (i = 0; i < n_ops; i++)
     {
       vnet_crypto_op_t *op = ops[i];
+      u32 nonce[3];
       int len;
 
       if (op->flags & VNET_CRYPTO_OP_FLAG_INIT_IV)
-	RAND_bytes (op->iv, op->iv_len);
+	RAND_bytes (op->iv, 8);
+
+      nonce[0] = op->salt;
+      clib_memcpy_fast (nonce + 1, op->iv, 8);
 
       EVP_EncryptInit_ex (ctx, cipher, 0, 0, 0);
-      EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_SET_IVLEN, op->iv_len, NULL);
-      EVP_EncryptInit_ex (ctx, 0, 0, op->key, op->iv);
-      EVP_EncryptUpdate (ctx, NULL, &len, op->aad, op->aad_len);
+      EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_SET_IVLEN, 12, NULL);
+      EVP_EncryptInit_ex (ctx, 0, 0, op->key, (u8 *) nonce);
+      if (op->aad_len)
+	EVP_EncryptUpdate (ctx, NULL, &len, op->aad, op->aad_len);
       EVP_EncryptUpdate (ctx, op->dst, &len, op->src, op->len);
       EVP_EncryptFinal_ex (ctx, op->dst + len, &len);
       EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_GET_TAG, op->tag_len, op->tag);
@@ -136,7 +141,7 @@ openssl_ops_dec_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
   openssl_per_thread_data_t *ptd = vec_elt_at_index (per_thread_data,
 						     vm->thread_index);
   EVP_CIPHER_CTX *ctx = ptd->evp_cipher_ctx;
-  u32 i;
+  u32 i, n_fail = 0;
   for (i = 0; i < n_ops; i++)
     {
       vnet_crypto_op_t *op = ops[i];
@@ -145,16 +150,20 @@ openssl_ops_dec_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,
       EVP_DecryptInit_ex (ctx, cipher, 0, 0, 0);
       EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_SET_IVLEN, op->iv_len, 0);
       EVP_DecryptInit_ex (ctx, 0, 0, op->key, op->iv);
-      EVP_DecryptUpdate (ctx, 0, &len, op->aad, op->aad_len);
+      if (op->aad_len)
+	EVP_DecryptUpdate (ctx, 0, &len, op->aad, op->aad_len);
       EVP_DecryptUpdate (ctx, op->dst, &len, op->src, op->len);
       EVP_CIPHER_CTX_ctrl (ctx, EVP_CTRL_GCM_SET_TAG, op->tag_len, op->tag);
 
       if (EVP_DecryptFinal_ex (ctx, op->dst + len, &len) > 0)
 	op->status = VNET_CRYPTO_OP_STATUS_COMPLETED;
       else
-	op->status = VNET_CRYPTO_OP_STATUS_FAIL_DECRYPT;
+	{
+	  n_fail++;
+	  op->status = VNET_CRYPTO_OP_STATUS_FAIL_DECRYPT;
+	}
     }
-  return n_ops;
+  return n_ops - n_fail;
 }
 
 static_always_inline u32
@@ -276,7 +285,7 @@ VLIB_INIT_FUNCTION (crypto_openssl_init);
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
   .version = VPP_BUILD_VER,
-  .description = "OpenSSL Crypto Engine Plugin",
+  .description = "OpenSSL Crypto Engine",
 };
 /* *INDENT-ON* */
 

src/plugins/ct6/ct6.c

@@ -304,7 +304,7 @@ VNET_FEATURE_INIT (ct6in2out, static) =
 VLIB_PLUGIN_REGISTER () =
 {
   .version = VPP_BUILD_VER,
-  .description = "ipv6 connection tracker",
+  .description = "IPv6 Connection Tracker",
 };
 /* *INDENT-ON* */
 

src/plugins/dpdk/ipsec/cli.c

@@ -27,10 +27,10 @@ format_crypto_resource (u8 * s, va_list * args)
 
   crypto_resource_t *res = vec_elt_at_index (dcm->resource, res_idx);
 
-  s =
-    format (s, "%U thr_id %3d qp %2u inflight %u\n",
-	    format_white_space, indent, (i16) res->thread_idx,
-	    res->qp_id, res->inflights);
+
+  s = format (s, "%U thr_id %3d qp %2u enc_inflight %u, dec_inflights %u\n",
+	      format_white_space, indent, (i16) res->thread_idx,
+	      res->qp_id, res->inflights[0], res->inflights[1]);
 
   return s;
 }