Merge branch 'master' into dp_query

danos · Apr 14, 2021 · ecec986 · ecec986
2 parents bfa095d + fd5c65a
commit ecec986
Show file tree

Hide file tree

Showing 24 changed files with 860 additions and 141 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,42 @@
+vyatta-dataplane (3.12.44) unstable; urgency=medium
+
+  [ Ian Wilson ]
+  * npf: Allow unit-tests to reset session ID to 0
+  * ut: Test connsync packing and restoration of SNAT session
+  * ut: Verify the SNAT session json ssync3 test
+  * npf: Fix SNAT session restoration from connsync buffer
+
+  [ Mark Gillott ]
+  * capture: ensure final cleanup occurs after interface cleanup
+    (Fixes: VRVDR-54831)
+
+  [ Srinivas Narayan ]
+  * Move crypto & UDP teardown to a later point
+
+  [ Charles (Chas) Williams ]
+  * fal: add FAL_RET_PLUGIN_CONSUMED framer type (Bugfix: VRVDR-53937)
+  * pktmbuf: add public API to set vrf (Bugfix: VRVDR-54447)
+
+ -- Srinivas Narayan <[email protected]>  Mon, 12 Apr 2021 13:11:48 +0100
+
+vyatta-dataplane (3.12.43) unstable; urgency=medium
+
+  [ Nicholas Brown ]
+  * properly export env var in Jenkinsfile
+
+  [ aroberts ]
+  * Add Aidan Gallagher to the reviewers for qos files
+
+  [ Paul Aitken ]
+  * DPI: ensure nDPI is init'd on all cores
+
+  [ Alan Dewar ]
+  * GPC: add initial counter support
+  * GPC: retrieve a policer's red packet count
+  * GPC: add support for resettable counters
+
+ -- Srinivas Narayan <[email protected]>  Wed, 07 Apr 2021 15:28:36 +0100
+
 vyatta-dataplane (3.12.42) unstable; urgency=medium
 
   [ Ian Wilson ]

diff --git a/debian/control b/debian/control
@@ -102,6 +102,7 @@ Provides: fal-acl,
           fal-qos-dscp-egressmap,
           fal-route-vrf-obj,
           fal-neigh-rtr-intf-obj,
+          fal-ret-plugin-consumed,
 Description: Vyatta optimized dataplane
  Vyatta dataplane is the set of tools to provide performance optimized routing
  and forwarding. It supports IPv4, IPv6, firewalling, bridging and more.
@@ -118,6 +119,7 @@ Depends: check,
          libvyatta-jsonw1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Provides: dp-pktmbuf-set-vrf,
 Description: Vyatta dataplane pipeline node build support
  Set of headers required for dataplane compilation
 
@@ -204,6 +206,7 @@ Provides: fal-dev-acl,
           fal-dev-invalid-vrf-id,
           fal-dev-route-vrf-obj,
           fal-dev-neigh-rtr-intf-obj,
+          fal-dev-ret-plugin-consumed,
 Description: Forwarding Abstraction Library plugin development files
  An API for dataplane FAL plugins
 

diff --git a/include/fal_plugin.h b/include/fal_plugin.h
@@ -3177,7 +3177,8 @@ union fal_pkt_feature_info {
 enum fal_feat_framer_ret_value {
 	FAL_RET_ETHER_INPUT,
 	FAL_RET_PORTMONITOR_HW_INPUT,
-	FAL_RET_CAPTURE_HW_INPUT
+	FAL_RET_CAPTURE_HW_INPUT,
+	FAL_RET_PLUGIN_CONSUMED,
 };
 
 /*

diff --git a/include/pktmbuf.h b/include/pktmbuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, AT&T Intellectual Property.  All rights reserved.
+ * Copyright (c) 2020-2021, AT&T Intellectual Property.  All rights reserved.
  *
  * SPDX-License-Identifier: LGPL-2.1-only
  */
@@ -30,6 +30,15 @@ struct rte_mbuf *dp_pktmbuf_alloc_from_default(vrfid_t vrf_id);
 vrfid_t
 dp_pktmbuf_get_vrf(const struct rte_mbuf *m);
 
+/*
+ * Set the vrf associated with the packet.
+ *
+ * @param[in] m The buffer to set the vrf on.
+ * @param[in] vrf_id The vrf to set.
+ */
+void
+dp_pktmbuf_set_vrf(struct rte_mbuf *m, vrfid_t vrf_id);
+
 /*
  * Mark a packet as having been locally generated. Locally generated
  * packets may get put in a higher priority qos queue if configured.

diff --git a/src/capture.c b/src/capture.c
@@ -1167,6 +1167,7 @@ static int capture_main_send(fal_func_t func, void *arg)
 
 void capture_destroy(void)
 {
+	RTE_LOG(INFO, DATAPLANE, "Capture shutting down\n");
 	dp_unregister_event_socket(zsock_resolve(capture_sock_main));
 	zsock_destroy(&capture_sock_main);
 

diff --git a/src/commands.c b/src/commands.c
@@ -1744,7 +1744,7 @@ static const cmd_t cmd_table[] = {
 	{ 0,	"debug",	cmd_debug,	"Debug logging level" },
 	{ 0,	"ecmp",		cmd_ecmp,	"Show/set ecmp options" },
 	{ 0,	"fal",		cmd_fal,	"FAL debugging commands" },
-	{ 0,    "gpc",          cmd_gpc_op,     "GPC OP mode information" },
+	{ 1,    "gpc",          cmd_gpc_op,     "GPC OP mode information" },
 	{ 0,	"gre",		cmd_gre,	"Show gre information" },
 	{ 0,	"help",		cmd_help,	"This help" },
 	{ 0,	"hotplug",	cmd_hotplug,	"Hotplug event" },