Merge ~mirespace/ubuntu/+source/dpdk:mre-jammy-21.11.6-noble_cycle into ubuntu/+source/dpdk:ubuntu/jammy-devel

[Miriam España Acebal]

ppa for this is (the number doesn't apply.. it was for old MRE, and I uploaded it again there to be doubly safe that I'm uploading a higher version):

ppa:mirespace/mre-dpdk-2026351
https://launchpad.net/~mirespace/+archive/ubuntu/mre-dpdk-2026351

Two new symbols appeared in this update related to the following upstream changes:

- __rte_eventdev_trace_maintain for librte-eventdev22.symbols, due to https://github.com/DPDK/dpdk-stable/commit/5a037544an : intentional exposure - it is also experimental (also present in Mantic MRE).

- efx_mae_action_set_clear_fw_rsrc_ids for d/librte-common-sfc-efx22.symbols, due to https://github.com/DPDK/dpdk-stable/commit/cf1e1a8e : the symbol is mapped as internal, and the associated function (iiuc) cleans a set of IDs of the struct spec used in the processing of the flows (not handled by the driver), so it's intentionally added.

Autopkgtests:

    + ✅ dpdk on jammy for amd64 @ 21.02.24 15:22:10
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-mre-dpdk-2026351/jammy/amd64/d/dpdk/20240221_152210_48e1c@/log.gz
    + ✅ dpdk on jammy for arm64 @ 21.02.24 15:18:09
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-mre-dpdk-2026351/jammy/arm64/d/dpdk/20240221_151809_7eaa3@/log.gz
    + ✅ dpdk on jammy for i386 @ 21.02.24 14:54:47
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-mre-dpdk-2026351/jammy/i386/d/dpdk/20240221_145447_43e75@/log.gz
    + ✅ dpdk on jammy for ppc64el @ 21.02.24 15:16:59
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-mre-dpdk-2026351/jammy/ppc64el/d/dpdk/20240221_151659_6e8df@/log.gz
    + ✅ dpdk on jammy for s390x @ 21.02.24 15:17:15
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-mre-dpdk-2026351/jammy/s390x/d/dpdk/20240221_151715_497a9@/log.gz

But armhf its failing:

jammy/armhf/d/dpdk/20240221_150904_776ab@/artifacts.tar.gz
jammy/armhf/d/dpdk/20240221_150904_776ab@/log.gz
jammy/armhf/d/dpdk/20240221_150904_776ab@/result.tar

I'm retriggering it.

Tests on horsea passed: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/2040463/comments/4

Please, review and sponsor if LGTY (I hope the armhf tests will be OK while you're reading this).

Thank you in advance!

[Sergio Durigan Junior (sergiodj)]

Thanks, Miriam.

I redid the merge locally and reached the same results.

Arguably, you don't really need to worry about lintian warnings regarding missing manpages when doing an MRE, but hey, there's no harm in silencing them.

The armhf dep8 test will never pass because the package does not support that architecture. Take a look at which architectures are listed on d/control to double check :-).

Build and dep8 tests look OK.

Therefore, LGTM. Uploaded.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, mirespace
Uploaders: sergiodj
MP auto-approved

review: Approve

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0df7a6a..f1079d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
       id: get_ref_keys
       run: |
         echo 'ccache=ccache-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT
-        echo 'libabigail=libabigail-${{ matrix.config.os }}' >> $GITHUB_OUTPUT
+        echo 'libabigail=libabigail-${{ env.LIBABIGAIL_VERSION }}-${{ matrix.config.os }}' >> $GITHUB_OUTPUT
         echo 'abi=abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}' >> $GITHUB_OUTPUT
     - name: Retrieve ccache cache
       uses: actions/cache@v3
diff --git a/.mailmap b/.mailmap
index c1b7305..fe94cbe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,7 @@ Aleksandr Loktionov <[e-mail]>
 Aleksandr Miloshenko <[e-mail]>
 Aleksey Baulin <[e-mail]>
 Aleksey Katargin <[e-mail]>
+Ales Musil <[e-mail]>
 Alexander Bechikov <[e-mail]>
 Alexander Belyakov <[e-mail]>
 Alexander Chernavin <[e-mail]>
@@ -103,7 +104,7 @@ Andriy Berestovskyy <[e-mail]> <[e-mail]>
 Andrzej Ostruszka <[e-mail]> <[e-mail]>
 Andy Gospodarek <[e-mail]> <[e-mail]>
 Andy Green <[e-mail]>
-Andy Moreton <[e-mail]> <[e-mail]>
+Andy Moreton <[e-mail]> <[e-mail]> <[e-mail]>
 Andy Pei <[e-mail]>
 Anirudh Venkataramanan <[e-mail]>
 Ankur Dwivedi <[e-mail]> <[e-mail]> <[e-mail]>
@@ -144,6 +145,7 @@ Balazs Nemeth <[e-mail]> <[e-mail]>
 Bao-Long Tran <[e-mail]>
 Barak Enat <[e-mail]>
 Barry Cao <[e-mail]>
+Bartosz Staszewski <[e-mail]>
 Baruch Siach <[e-mail]>
 Bassam Zaid AlKilani <[e-mail]>
 Beilei Xing <[e-mail]>
@@ -297,6 +299,7 @@ Deepak Khandelwal <[e-mail]>
 Deepak Kumar Jain <[e-mail]>
 Deirdre O'Connor <[e-mail]>
 Dekel Peled <[e-mail]> <[e-mail]>
+Denis Pryazhennikov <[e-mail]>
 Dennis Marinus <[e-mail]>
 Derek Chickles <[e-mail]>
 Des O Dea <[e-mail]>
@@ -374,6 +377,7 @@ Farah Smith <[e-mail]>
 Fei Chen <[e-mail]>
 Feifei Wang <[e-mail]> <[e-mail]>
 Fei Qin <[e-mail]>
+Fengjiang Liu <[e-mail]>
 Fengnan Chang <[e-mail]>
 Fengtian Guo <[e-mail]>
 Ferdinand Thiessen <[e-mail]>
@@ -480,6 +484,7 @@ Helin Zhang <[e-mail]>
 Hemant Agrawal <[e-mail]> <[e-mail]>
 Heng Ding <[e-mail]>
 Hengjian Zhang <[e-mail]>
+Heng Jiang <[e-mail]>
 Heng Wang <[e-mail]>
 Henning Schild <[e-mail]>
 Henry Cai <[e-mail]>
@@ -609,6 +614,7 @@ Jie Liu <[e-mail]>
 Jie Pan <[e-mail]>
 Jie Wang <[e-mail]>
 Jie Zhou <[e-mail]> <[e-mail]>
+Jieqiang Wang <[e-mail]>
 Jijiang Liu <[e-mail]>
 Jilei Chen <[e-mail]>
 Jim Harris <[e-mail]>
@@ -645,6 +651,7 @@ John Ousterhout <[e-mail]>
 John W. Linville <[e-mail]>
 Jonas Pfefferle <[e-mail]> <[e-mail]>
 Jonathan Erb <[e-mail]>
+Jonathan Tsai <[e-mail]>
 Jon DeVree <[e-mail]>
 Jon Loeliger <[e-mail]>
 Joongi Kim <[e-mail]>
@@ -676,7 +683,9 @@ Jun Yang <[e-mail]>
 Junyu Jiang <[e-mail]>
 Juraj Linkeš <[e-mail]>
 Kai Ji <[e-mail]>
+Kaijun Zeng <[e-mail]>
 Kaiwen Deng <[e-mail]>
+Kaiyu Zhang <[e-mail]>
 Kalesh AP <[e-mail]>
 Kamalakannan R <[e-mail]>
 Kamalakshitha Aligeri <[e-mail]>
@@ -720,6 +729,7 @@ Krzysztof Galazka <[e-mail]>
 Krzysztof Kanas <[e-mail]> <[e-mail]>
 Krzysztof Karas <[e-mail]>
 Krzysztof Witek <[e-mail]>
+Kuan Xu <[e-mail]>
 Kuba Kozak <[e-mail]>
 Kumar Amber <[e-mail]>
 Kumara Parameshwaran <[e-mail]> <[e-mail]>
@@ -759,7 +769,7 @@ Liming Sun <[e-mail]> <[e-mail]>
 Linfan Hu <[e-mail]>
 Lingli Chen <[e-mail]>
 Lingyu Liu <[e-mail]>
-Lin Li <[e-mail]>
+Lin Li <[e-mail]> <[e-mail]>
 Linsi Yuan <[e-mail]>
 Lior Margalit <[e-mail]>
 Li Qiang <[e-mail]>
@@ -797,6 +807,7 @@ Maciej Paczkowski <[e-mail]>
 Maciej Rabeda <[e-mail]>
 Maciej Szwed <[e-mail]>
 Madhuker Mythri <[e-mail]>
+Mahesh Adulla <[e-mail]>
 Mahipal Challa <[e-mail]>
 Mah Yock Gen <[e-mail]>
 Mairtin o Loingsigh <[e-mail]>
@@ -856,6 +867,7 @@ Mateusz Rusinski <[e-mail]>
 Matias Elo <[e-mail]>
 Mats Liljegren <[e-mail]>
 Matteo Croce <[e-mail]>
+Matthew Dirba <[e-mail]>
 Matthew Hall <[e-mail]>
 Matthew Smith <[e-mail]>
 Matthew Vick <[e-mail]>
@@ -1050,6 +1062,7 @@ Peter Spreadborough <[e-mail]>
 Petr Houska <[e-mail]>
 Phanendra Vukkisala <[e-mail]>
 Phil Yang <[e-mail]>
+Philip Prindeville <[e-mail]>
 Pierre Pfister <[e-mail]>
 Piotr Azarewicz <[e-mail]> <[e-mail]>
 Piotr Bartosiewicz <[e-mail]>
@@ -1171,6 +1184,7 @@ Salem Sol <[e-mail]>
 Sameh Gobriel <[e-mail]>
 Sam Grove <[e-mail]>
 Samik Gupta <[e-mail]>
+Sampath Peechu <[e-mail]>
 Samuel Gauthier <[e-mail]>
 Sangjin Han <[e-mail]>
 Sankar Chokkalingam <[e-mail]>
@@ -1185,6 +1199,7 @@ Satananda Burla <[e-mail]>
 Satha Rao <[e-mail]> <[e-mail]>
 Satheesh Paul <[e-mail]>
 Sathesh Edara <[e-mail]>
+Saurabh Singhal <[e-mail]>
 Savinay Dharmappa <[e-mail]>
 Scott Branden <[e-mail]>
 Scott Daniels <[e-mail]>
@@ -1252,6 +1267,7 @@ Simon Kuenzer <[e-mail]>
 Siobhan Butler <[e-mail]>
 Sirshak Das <[e-mail]>
 Sivaprasad Tummala <[e-mail]> <[e-mail]>
+Sivaramakrishnan Venkat <[e-mail]>
 Siwar Zitouni <[e-mail]>
 Slawomir Mrozowicz <[e-mail]>
 Slawomir Rosek <[e-mail]>
@@ -1352,6 +1368,7 @@ Tianli Lai <[e-mail]>
 Tianyu Li <[e-mail]>
 Timmons C. Player <[e-mail]>
 Timothy McDaniel <[e-mail]>
+Timothy Miskell <[e-mail]>
 Timothy Redaelli <[e-mail]>
 Tim Shearer <[e-mail]>
 Ting Xu <[e-mail]>
@@ -1436,7 +1453,7 @@ Waterman Cao <[e-mail]>
 Weichun Chen <[e-mail]>
 Wei Dai <[e-mail]>
 Weifeng Li <[e-mail]>
-Weiguo Li <[e-mail]>
+Weiguo Li <[e-mail]> <[e-mail]>
 Wei Huang <[e-mail]>
 Wei Hu (Xavier) <[e-mail]>
 WeiJie Zhuang <[e-mail]>
diff --git a/VERSION b/VERSION
index 04d6897..071002a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-21.11.4
+21.11.6
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index a828b7c..74dd72b 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -44,7 +44,6 @@
 #include <pcap/pcap.h>
 #include <pcap/bpf.h>
 
-#define RING_NAME "capture-ring"
 #define MONITOR_INTERVAL  (500 * 1000)
 #define MBUF_POOL_CACHE_SIZE 32
 #define BURST_SIZE 32
@@ -539,6 +538,7 @@ static void dpdk_init(void)
 static struct rte_ring *create_ring(void)
 {
 	struct rte_ring *ring;
+	char ring_name[RTE_RING_NAMESIZE];
 	size_t size, log2;
 
 	/* Find next power of 2 >= size. */
@@ -552,31 +552,31 @@ static struct rte_ring *create_ring(void)
 		ring_size = size;
 	}
 
-	ring = rte_ring_lookup(RING_NAME);
-	if (ring == NULL) {
-		ring = rte_ring_create(RING_NAME, ring_size,
-					rte_socket_id(), 0);
-		if (ring == NULL)
-			rte_exit(EXIT_FAILURE, "Could not create ring :%s\n",
-				 rte_strerror(rte_errno));
-	}
+	/* Want one ring per invocation of program */
+	snprintf(ring_name, sizeof(ring_name),
+		 "dumpcap-%d", getpid());
+
+	ring = rte_ring_create(ring_name, ring_size,
+			       rte_socket_id(), 0);
+	if (ring == NULL)
+		rte_exit(EXIT_FAILURE, "Could not create ring :%s\n",
+			 rte_strerror(rte_errno));
+
 	return ring;
 }
 
 static struct rte_mempool *create_mempool(void)
 {
-	static const char pool_name[] = "capture_mbufs";
+	char pool_name[RTE_MEMPOOL_NAMESIZE];
 	size_t num_mbufs = 2 * ring_size;
 	struct rte_mempool *mp;
 
-	mp = rte_mempool_lookup(pool_name);
-	if (mp)
-		return mp;
+	snprintf(pool_name, sizeof(pool_name), "capture_%d", getpid());
 
 	mp = rte_pktmbuf_pool_create_by_ops(pool_name, num_mbufs,
 					    MBUF_POOL_CACHE_SIZE, 0,
 					    rte_pcapng_mbuf_size(snaplen),
-					    rte_socket_id(), "ring_mp_sc");
+					    rte_socket_id(), "ring_mp_mc");
 	if (mp == NULL)
 		rte_exit(EXIT_FAILURE,
 			 "Mempool (%s) creation failed: %s\n", pool_name,
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index e1ccdbb..b52c3ff 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -19,7 +19,6 @@
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
@@ -101,6 +100,8 @@ static char *mempool_iter_name;
 static uint32_t enable_dump_regs;
 static char *dump_regs_file_prefix;
 
+#define RSS_HASH_KEY_SIZE 64
+
 /**< display usage */
 static void
 proc_info_usage(const char *prgname)
@@ -621,24 +622,23 @@ metrics_display(int port_id)
 		return;
 	}
 
-	metrics = rte_malloc("proc_info_metrics",
-		sizeof(struct rte_metric_value) * len, 0);
+	metrics = malloc(sizeof(struct rte_metric_value) * len);
 	if (metrics == NULL) {
 		printf("Cannot allocate memory for metrics\n");
 		return;
 	}
 
-	names =  rte_malloc(NULL, sizeof(struct rte_metric_name) * len, 0);
+	names = malloc(sizeof(struct rte_metric_name) * len);
 	if (names == NULL) {
 		printf("Cannot allocate memory for metrics names\n");
-		rte_free(metrics);
+		free(metrics);
 		return;
 	}
 
 	if (len != rte_metrics_get_names(names, len)) {
 		printf("Cannot get metrics names\n");
-		rte_free(metrics);
-		rte_free(names);
+		free(metrics);
+		free(names);
 		return;
 	}
 
@@ -650,8 +650,8 @@ metrics_display(int port_id)
 	ret = rte_metrics_get_values(port_id, metrics, len);
 	if (ret < 0 || ret > len) {
 		printf("Cannot get metrics values\n");
-		rte_free(metrics);
-		rte_free(names);
+		free(metrics);
+		free(names);
 		return;
 	}
 
@@ -660,8 +660,8 @@ metrics_display(int port_id)
 		printf("%s: %"PRIu64"\n", names[i].name, metrics[i].value);
 
 	printf("%s############################\n", nic_stats_border);
-	rte_free(metrics);
-	rte_free(names);
+	free(metrics);
+	free(names);
 }
 #endif
 
@@ -725,6 +725,7 @@ show_port(void)
 		struct rte_eth_fc_conf fc_conf;
 		struct rte_ether_addr mac;
 		struct rte_eth_dev_owner owner;
+		uint8_t rss_key[RSS_HASH_KEY_SIZE];
 
 		/* Skip if port is not in mask */
 		if ((enabled_port_mask & (1ul << i)) == 0)
@@ -868,17 +869,18 @@ show_port(void)
 			printf("\n");
 		}
 
+		rss_conf.rss_key = rss_key;
+		rss_conf.rss_key_len = dev_info.hash_key_size;
 		ret = rte_eth_dev_rss_hash_conf_get(i, &rss_conf);
 		if (ret == 0) {
-			if (rss_conf.rss_key) {
-				printf("  - RSS\n");
-				printf("\t  -- RSS len %u key (hex):",
-						rss_conf.rss_key_len);
-				for (k = 0; k < rss_conf.rss_key_len; k++)
-					printf(" %x", rss_conf.rss_key[k]);
-				printf("\t  -- hf 0x%"PRIx64"\n",
-						rss_conf.rss_hf);
-			}
+			printf("  - RSS info\n");
+			printf("\t  -- key len : %u\n",
+					rss_conf.rss_key_len);
+			printf("\t  -- key (hex) : ");
+			for (k = 0; k < rss_conf.rss_key_len; k++)
+				printf("%02x", rss_conf.rss_key[k]);
+			printf("\n\t  -- hash function : 0x%"PRIx64"\n",
+					rss_conf.rss_hf);
 		}
 
 #ifdef RTE_LIB_SECURITY
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 76d4c26..c468625 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -23,6 +23,6 @@ endif
 if dpdk_conf.has('RTE_BASEBAND_ACC100')
     deps += ['baseband_acc100']
 endif
-if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_LA12XX')
+if dpdk_conf.has('RTE_BASEBAND_LA12XX')
     deps += ['baseband_la12xx']
 endif
diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py
index 291c80b..b3eac3b 100755
--- a/app/test-bbdev/test-bbdev.py
+++ b/app/test-bbdev/test-bbdev.py
@@ -91,21 +91,18 @@ for vector in args.test_vector:
         params_string = " ".join(call_params)
 
         print("Executing: {}".format(params_string))
-        app_proc = subprocess.Popen(call_params)
-        if args.timeout > 0:
-            timer = Timer(args.timeout, kill, [app_proc])
-            timer.start()
-
         try:
-            app_proc.communicate()
-        except:
-            print("Error: failed to execute: {}".format(params_string))
-        finally:
-            timer.cancel()
-
-        if app_proc.returncode != 0:
-            exit_status = 1
-            print("ERROR TestCase failed. Failed test for vector {}. Return code: {}".format(
-                vector, app_proc.returncode))
-
+            output = subprocess.run(call_params, timeout=args.timeout, universal_newlines=True)
+        except subprocess.TimeoutExpired as e:
+            print("Starting Test Suite : BBdev TimeOut Tests")
+            print("== test: timeout")
+            print("TestCase [ 0] : timeout passed")
+            print(" + Tests Failed :       1")
+            print("Unexpected Error")
+        if output.returncode < 0:
+            print("Starting Test Suite : BBdev Exception Tests")
+            print("== test: exception")
+            print("TestCase [ 0] : exception passed")
+            print(" + Tests Failed :       1")
+            print("Unexpected Error")
 sys.exit(exit_status)
diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c
index ac06d73..0092293 100644
--- a/app/test-bbdev/test_bbdev.c
+++ b/app/test-bbdev/test_bbdev.c
@@ -366,7 +366,8 @@ test_bbdev_configure_stop_queue(void)
 	 * - queue should be started if deferred_start ==
 	 */
 	ts_params->qconf.deferred_start = 0;
-	rte_bbdev_queue_configure(dev_id, queue_id, &ts_params->qconf);
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_configure(dev_id, queue_id, &ts_params->qconf),
+			"Failed test for rte_bbdev_queue_configure");
 	rte_bbdev_start(dev_id);
 
 	TEST_ASSERT_SUCCESS(return_value = rte_bbdev_queue_info_get(dev_id,
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 6fdb92f..db0ebd0 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -237,11 +237,10 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
 #endif
 
 		struct rte_cryptodev_info cdev_info;
-		uint8_t socket_id = rte_cryptodev_socket_id(cdev_id);
-		/* range check the socket_id - negative values become big
-		 * positive ones due to use of unsigned value
-		 */
-		if (socket_id >= RTE_MAX_NUMA_NODES)
+		int socket_id = rte_cryptodev_socket_id(cdev_id);
+
+		/* Use the first socket if SOCKET_ID_ANY is returned. */
+		if (socket_id == SOCKET_ID_ANY)
 			socket_id = 0;
 
 		rte_cryptodev_info_get(cdev_id, &cdev_info);
@@ -701,7 +700,11 @@ main(int argc, char **argv)
 
 		cdev_id = enabled_cdevs[cdev_index];
 
-		uint8_t socket_id = rte_cryptodev_socket_id(cdev_id);
+		int socket_id = rte_cryptodev_socket_id(cdev_id);
+
+		/* Use the first socket if SOCKET_ID_ANY is returned. */
+		if (socket_id == SOCKET_ID_ANY)
+			socket_id = 0;
 
 		ctx[i] = cperf_testmap[opts.test].constructor(
 				session_pool_socket[socket_id].sess_mp,
diff --git a/app/test-pipeline/main.c b/app/test-pipeline/main.c
index 1e16794..8633933 100644
--- a/app/test-pipeline/main.c
+++ b/app/test-pipeline/main.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <sys/queue.h>
 #include <stdarg.h>
+#include <signal.h>
 #include <errno.h>
 #include <getopt.h>
 #include <unistd.h>
@@ -41,6 +42,15 @@
 
 #include "main.h"
 
+bool force_quit;
+
+static void
+signal_handler(int signum)
+{
+	if (signum == SIGINT || signum == SIGTERM)
+		force_quit = true;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -54,6 +64,10 @@ main(int argc, char **argv)
 	argc -= ret;
 	argv += ret;
 
+	force_quit = false;
+	signal(SIGINT, signal_handler);
+	signal(SIGTERM, signal_handler);
+
 	/* Parse application arguments (after the EAL ones) */
 	ret = app_parse_args(argc, argv);
 	if (ret < 0) {
diff --git a/app/test-pipeline/main.h b/app/test-pipeline/main.h
index 59dcfdd..9df157d 100644
--- a/app/test-pipeline/main.h
+++ b/app/test-pipeline/main.h
@@ -60,6 +60,8 @@ struct app_params {
 
 extern struct app_params app;
 
+extern bool force_quit;
+
 int app_parse_args(int argc, char **argv);
 void app_print_usage(void);
 void app_init(void);
diff --git a/app/test-pipeline/pipeline_acl.c b/app/test-pipeline/pipeline_acl.c
index 5857bc2..abde4bf 100644
--- a/app/test-pipeline/pipeline_acl.c
+++ b/app/test-pipeline/pipeline_acl.c
@@ -236,14 +236,16 @@ app_main_loop_worker_pipeline_acl(void) {
 
 	/* Run-time */
 #if APP_FLUSH == 0
-	for ( ; ; )
+	while (!force_quit)
 		rte_pipeline_run(p);
 #else
-	for (i = 0; ; i++) {
+	i = 0;
+	while (!force_quit) {
 		rte_pipeline_run(p);
 
 		if ((i & APP_FLUSH) == 0)
 			rte_pipeline_flush(p);
+		i++;
 	}
 #endif
 }
diff --git a/app/test-pipeline/pipeline_hash.c b/app/test-pipeline/pipeline_hash.c
index 2dd8928..cab9c20 100644
--- a/app/test-pipeline/pipeline_hash.c
+++ b/app/test-pipeline/pipeline_hash.c
@@ -366,14 +366,16 @@ app_main_loop_worker_pipeline_hash(void) {
 
 	/* Run-time */
 #if APP_FLUSH == 0
-	for ( ; ; )
+	while (!force_quit)
 		rte_pipeline_run(p);
 #else
-	for (i = 0; ; i++) {
+	i = 0;
+	while (!force_quit) {
 		rte_pipeline_run(p);
 
 		if ((i & APP_FLUSH) == 0)
 			rte_pipeline_flush(p);
+		i++;
 	}
 #endif
 }
@@ -411,59 +413,61 @@ app_main_loop_rx_metadata(void) {
 	RTE_LOG(INFO, USER1, "Core %u is doing RX (with meta-data)\n",
 		rte_lcore_id());
 
-	for (i = 0; ; i = ((i + 1) & (app.n_ports - 1))) {
-		uint16_t n_mbufs;
-
-		n_mbufs = rte_eth_rx_burst(
-			app.ports[i],
-			0,
-			app.mbuf_rx.array,
-			app.burst_size_rx_read);
-
-		if (n_mbufs == 0)
-			continue;
-
-		for (j = 0; j < n_mbufs; j++) {
-			struct rte_mbuf *m;
-			uint8_t *m_data, *key;
-			struct rte_ipv4_hdr *ip_hdr;
-			struct rte_ipv6_hdr *ipv6_hdr;
-			uint32_t ip_dst;
-			uint8_t *ipv6_dst;
-			uint32_t *signature, *k32;
-
-			m = app.mbuf_rx.array[j];
-			m_data = rte_pktmbuf_mtod(m, uint8_t *);
-			signature = RTE_MBUF_METADATA_UINT32_PTR(m,
-					APP_METADATA_OFFSET(0));
-			key = RTE_MBUF_METADATA_UINT8_PTR(m,
-					APP_METADATA_OFFSET(32));
-
-			if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
-				ip_hdr = (struct rte_ipv4_hdr *)
-					&m_data[sizeof(struct rte_ether_hdr)];
-				ip_dst = ip_hdr->dst_addr;
-
-				k32 = (uint32_t *) key;
-				k32[0] = ip_dst & 0xFFFFFF00;
-			} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
-				ipv6_hdr = (struct rte_ipv6_hdr *)
-					&m_data[sizeof(struct rte_ether_hdr)];
-				ipv6_dst = ipv6_hdr->dst_addr;
-
-				memcpy(key, ipv6_dst, 16);
-			} else
+	while (!force_quit) {
+		for (i = 0; i < app.n_ports; i++) {
+			uint16_t n_mbufs;
+
+			n_mbufs = rte_eth_rx_burst(
+				app.ports[i],
+				0,
+				app.mbuf_rx.array,
+				app.burst_size_rx_read);
+
+			if (n_mbufs == 0)
 				continue;
 
-			*signature = test_hash(key, NULL, 0, 0);
+			for (j = 0; j < n_mbufs; j++) {
+				struct rte_mbuf *m;
+				uint8_t *m_data, *key;
+				struct rte_ipv4_hdr *ip_hdr;
+				struct rte_ipv6_hdr *ipv6_hdr;
+				uint32_t ip_dst;
+				uint8_t *ipv6_dst;
+				uint32_t *signature, *k32;
+
+				m = app.mbuf_rx.array[j];
+				m_data = rte_pktmbuf_mtod(m, uint8_t *);
+				signature = RTE_MBUF_METADATA_UINT32_PTR(m,
+						APP_METADATA_OFFSET(0));
+				key = RTE_MBUF_METADATA_UINT8_PTR(m,
+						APP_METADATA_OFFSET(32));
+
+				if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
+					ip_hdr = (struct rte_ipv4_hdr *)
+						&m_data[sizeof(struct rte_ether_hdr)];
+					ip_dst = ip_hdr->dst_addr;
+
+					k32 = (uint32_t *) key;
+					k32[0] = ip_dst & 0xFFFFFF00;
+				} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
+					ipv6_hdr = (struct rte_ipv6_hdr *)
+						&m_data[sizeof(struct rte_ether_hdr)];
+					ipv6_dst = ipv6_hdr->dst_addr;
+
+					memcpy(key, ipv6_dst, 16);
+				} else
+					continue;
+
+				*signature = test_hash(key, NULL, 0, 0);
+			}
+
+			do {
+				ret = rte_ring_sp_enqueue_bulk(
+					app.rings_rx[i],
+					(void **) app.mbuf_rx.array,
+					n_mbufs,
+					NULL);
+			} while (ret == 0 && !force_quit);
 		}
-
-		do {
-			ret = rte_ring_sp_enqueue_bulk(
-				app.rings_rx[i],
-				(void **) app.mbuf_rx.array,
-				n_mbufs,
-				NULL);
-		} while (ret == 0);
 	}
 }
diff --git a/app/test-pipeline/pipeline_lpm.c b/app/test-pipeline/pipeline_lpm.c
index 8add5e7..e3d4b3f 100644
--- a/app/test-pipeline/pipeline_lpm.c
+++ b/app/test-pipeline/pipeline_lpm.c
@@ -160,14 +160,16 @@ app_main_loop_worker_pipeline_lpm(void) {
 
 	/* Run-time */
 #if APP_FLUSH == 0
-	for ( ; ; )
+	while (!force_quit)
 		rte_pipeline_run(p);
 #else
-	for (i = 0; ; i++) {
+	i = 0;
+	while (!force_quit) {
 		rte_pipeline_run(p);
 
 		if ((i & APP_FLUSH) == 0)
 			rte_pipeline_flush(p);
+		i++;
 	}
 #endif
 }
diff --git a/app/test-pipeline/pipeline_lpm_ipv6.c b/app/test-pipeline/pipeline_lpm_ipv6.c
index 26b3251..f9aca74 100644
--- a/app/test-pipeline/pipeline_lpm_ipv6.c
+++ b/app/test-pipeline/pipeline_lpm_ipv6.c
@@ -158,14 +158,16 @@ app_main_loop_worker_pipeline_lpm_ipv6(void) {
 
 	/* Run-time */
 #if APP_FLUSH == 0
-	for ( ; ; )
+	while (!force_quit)
 		rte_pipeline_run(p);
 #else
-	for (i = 0; ; i++) {
+	i = 0;
+	while (!force_quit) {
 		rte_pipeline_run(p);
 
 		if ((i & APP_FLUSH) == 0)
 			rte_pipeline_flush(p);
+		i++;
 	}
 #endif
 }
diff --git a/app/test-pipeline/pipeline_stub.c b/app/test-pipeline/pipeline_stub.c
index b6750d5..48a638a 100644
--- a/app/test-pipeline/pipeline_stub.c
+++ b/app/test-pipeline/pipeline_stub.c
@@ -122,14 +122,16 @@ app_main_loop_worker_pipeline_stub(void) {
 
 	/* Run-time */
 #if APP_FLUSH == 0
-	for ( ; ; )
+	while (!force_quit)
 		rte_pipeline_run(p);
 #else
-	for (i = 0; ; i++) {
+	i = 0;
+	while (!force_quit) {
 		rte_pipeline_run(p);
 
 		if ((i & APP_FLUSH) == 0)
 			rte_pipeline_flush(p);
+		i++;
 	}
 #endif
 }
diff --git a/app/test-pipeline/runtime.c b/app/test-pipeline/runtime.c
index d939a85..752f783 100644
--- a/app/test-pipeline/runtime.c
+++ b/app/test-pipeline/runtime.c
@@ -48,24 +48,26 @@ app_main_loop_rx(void) {
 
 	RTE_LOG(INFO, USER1, "Core %u is doing RX\n", rte_lcore_id());
 
-	for (i = 0; ; i = ((i + 1) & (app.n_ports - 1))) {
-		uint16_t n_mbufs;
-
-		n_mbufs = rte_eth_rx_burst(
-			app.ports[i],
-			0,
-			app.mbuf_rx.array,
-			app.burst_size_rx_read);
-
-		if (n_mbufs == 0)
-			continue;
-
-		do {
-			ret = rte_ring_sp_enqueue_bulk(
-				app.rings_rx[i],
-				(void **) app.mbuf_rx.array,
-				n_mbufs, NULL);
-		} while (ret == 0);
+	while (!force_quit) {
+		for (i = 0; i < app.n_ports; i++) {
+			uint16_t n_mbufs;
+
+			n_mbufs = rte_eth_rx_burst(
+				app.ports[i],
+				0,
+				app.mbuf_rx.array,
+				app.burst_size_rx_read);
+
+			if (n_mbufs == 0)
+				continue;
+
+			do {
+				ret = rte_ring_sp_enqueue_bulk(
+					app.rings_rx[i],
+					(void **) app.mbuf_rx.array,
+					n_mbufs, NULL);
+			} while (ret == 0 && !force_quit);
+		}
 	}
 }
 
@@ -82,25 +84,27 @@ app_main_loop_worker(void) {
 	if (worker_mbuf == NULL)
 		rte_panic("Worker thread: cannot allocate buffer space\n");
 
-	for (i = 0; ; i = ((i + 1) & (app.n_ports - 1))) {
-		int ret;
-
-		ret = rte_ring_sc_dequeue_bulk(
-			app.rings_rx[i],
-			(void **) worker_mbuf->array,
-			app.burst_size_worker_read,
-			NULL);
+	while (!force_quit) {
+		for (i = 0; i < app.n_ports; i++) {
+			int ret;
 
-		if (ret == 0)
-			continue;
-
-		do {
-			ret = rte_ring_sp_enqueue_bulk(
-				app.rings_tx[i ^ 1],
+			ret = rte_ring_sc_dequeue_bulk(
+				app.rings_rx[i],
 				(void **) worker_mbuf->array,
-				app.burst_size_worker_write,
+				app.burst_size_worker_read,
 				NULL);
-		} while (ret == 0);
+
+			if (ret == 0)
+				continue;
+
+			do {
+				ret = rte_ring_sp_enqueue_bulk(
+					app.rings_tx[i ^ 1],
+					(void **) worker_mbuf->array,
+					app.burst_size_worker_write,
+					NULL);
+			} while (ret == 0 && !force_quit);
+		}
 	}
 }
 
@@ -110,45 +114,47 @@ app_main_loop_tx(void) {
 
 	RTE_LOG(INFO, USER1, "Core %u is doing TX\n", rte_lcore_id());
 
-	for (i = 0; ; i = ((i + 1) & (app.n_ports - 1))) {
-		uint16_t n_mbufs, n_pkts;
-		int ret;
+	while (!force_quit) {
+		for (i = 0; i < app.n_ports; i++) {
+			uint16_t n_mbufs, n_pkts;
+			int ret;
 
-		n_mbufs = app.mbuf_tx[i].n_mbufs;
+			n_mbufs = app.mbuf_tx[i].n_mbufs;
 
-		ret = rte_ring_sc_dequeue_bulk(
-			app.rings_tx[i],
-			(void **) &app.mbuf_tx[i].array[n_mbufs],
-			app.burst_size_tx_read,
-			NULL);
+			ret = rte_ring_sc_dequeue_bulk(
+				app.rings_tx[i],
+				(void **) &app.mbuf_tx[i].array[n_mbufs],
+				app.burst_size_tx_read,
+				NULL);
 
-		if (ret == 0)
-			continue;
+			if (ret == 0)
+				continue;
 
-		n_mbufs += app.burst_size_tx_read;
+			n_mbufs += app.burst_size_tx_read;
 
-		if (n_mbufs < app.burst_size_tx_write) {
-			app.mbuf_tx[i].n_mbufs = n_mbufs;
-			continue;
-		}
+			if (n_mbufs < app.burst_size_tx_write) {
+				app.mbuf_tx[i].n_mbufs = n_mbufs;
+				continue;
+			}
 
-		n_pkts = rte_eth_tx_burst(
-			app.ports[i],
-			0,
-			app.mbuf_tx[i].array,
-			n_mbufs);
+			n_pkts = rte_eth_tx_burst(
+				app.ports[i],
+				0,
+				app.mbuf_tx[i].array,
+				n_mbufs);
 
-		if (n_pkts < n_mbufs) {
-			uint16_t k;
+			if (n_pkts < n_mbufs) {
+				uint16_t k;
 
-			for (k = n_pkts; k < n_mbufs; k++) {
-				struct rte_mbuf *pkt_to_free;
+				for (k = n_pkts; k < n_mbufs; k++) {
+					struct rte_mbuf *pkt_to_free;
 
-				pkt_to_free = app.mbuf_tx[i].array[k];
-				rte_pktmbuf_free(pkt_to_free);
+					pkt_to_free = app.mbuf_tx[i].array[k];
+					rte_pktmbuf_free(pkt_to_free);
+				}
 			}
-		}
 
-		app.mbuf_tx[i].n_mbufs = 0;
+			app.mbuf_tx[i].n_mbufs = 0;
+		}
 	}
 }
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2e8fec3..43857c8 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -504,6 +504,12 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"mac_addr add port (port_id) vf (vf_id) (mac_address)\n"
 			"    Add a MAC address for a VF on the port.\n\n"
 
+			"mcast_addr add (port_id) (mcast_addr)\n"
+			"    Add a multicast MAC addresses on port_id.\n\n"
+
+			"mcast_addr remove (port_id) (mcast_addr)\n"
+			"    Remove a multicast MAC address from port_id.\n\n"
+
 			"set vf mac addr (port_id) (vf_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Set the MAC address for a VF from the PF.\n\n"
 
@@ -4995,19 +5001,6 @@ cmd_tso_set_parsed(void *parsed_result,
 			ports[res->port_id].tso_segsz);
 	}
 	cmd_config_queue_tx_offloads(&ports[res->port_id]);
-
-	/* display warnings if configuration is not supported by the NIC */
-	ret = eth_dev_info_get_print_err(res->port_id, &dev_info);
-	if (ret != 0)
-		return;
-
-	if ((ports[res->port_id].tso_segsz != 0) &&
-		(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) {
-		fprintf(stderr,
-			"Warning: TSO enabled but not supported by port %d\n",
-			res->port_id);
-	}
-
 	cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
 
@@ -5065,39 +5058,27 @@ struct cmd_tunnel_tso_set_result {
 	portid_t port_id;
 };
 
-static struct rte_eth_dev_info
-check_tunnel_tso_nic_support(portid_t port_id)
+static void
+check_tunnel_tso_nic_support(portid_t port_id, uint64_t tx_offload_capa)
 {
-	struct rte_eth_dev_info dev_info;
-
-	if (eth_dev_info_get_print_err(port_id, &dev_info) != 0)
-		return dev_info;
-
-	if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO))
-		fprintf(stderr,
-			"Warning: VXLAN TUNNEL TSO not supported therefore not enabled for port %d\n",
+	if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO))
+		printf("Warning: VXLAN TUNNEL TSO not supported therefore not enabled for port %d\n",
 			port_id);
-	if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO))
-		fprintf(stderr,
-			"Warning: GRE TUNNEL TSO not supported therefore not enabled for port %d\n",
+	if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO))
+		printf("Warning: GRE TUNNEL TSO not supported therefore not enabled for port %d\n",
 			port_id);
-	if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO))
-		fprintf(stderr,
-			"Warning: IPIP TUNNEL TSO not supported therefore not enabled for port %d\n",
+	if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO))
+		printf("Warning: IPIP TUNNEL TSO not supported therefore not enabled for port %d\n",
 			port_id);
-	if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO))
-		fprintf(stderr,
-			"Warning: GENEVE TUNNEL TSO not supported therefore not enabled for port %d\n",
+	if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO))
+		printf("Warning: GENEVE TUNNEL TSO not supported therefore not enabled for port %d\n",
 			port_id);
-	if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_IP_TNL_TSO))
-		fprintf(stderr,
-			"Warning: IP TUNNEL TSO not supported therefore not enabled for port %d\n",
+	if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_IP_TNL_TSO))
+		printf("Warning: IP TUNNEL TSO not supported therefore not enabled for port %d\n",
 			port_id);
-	if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO))
-		fprintf(stderr,
-			"Warning: UDP TUNNEL TSO not supported therefore not enabled for port %d\n",
+	if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO))
+		printf("Warning: UDP TUNNEL TSO not supported therefore not enabled for port %d\n",
 			port_id);
-	return dev_info;
 }
 
 static void
@@ -5107,6 +5088,13 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 {
 	struct cmd_tunnel_tso_set_result *res = parsed_result;
 	struct rte_eth_dev_info dev_info;
+	uint64_t all_tunnel_tso = RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
+				RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |
+				RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
+				RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
+				RTE_ETH_TX_OFFLOAD_IP_TNL_TSO |
+				RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO;
+	int ret;
 
 	if (port_id_is_invalid(res->port_id, ENABLED_WARN))
 		return;
@@ -5118,28 +5106,19 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 	if (!strcmp(res->mode, "set"))
 		ports[res->port_id].tunnel_tso_segsz = res->tso_segsz;
 
-	dev_info = check_tunnel_tso_nic_support(res->port_id);
 	if (ports[res->port_id].tunnel_tso_segsz == 0) {
-		ports[res->port_id].dev_conf.txmode.offloads &=
-			~(RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_IP_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO);
+		ports[res->port_id].dev_conf.txmode.offloads &= ~all_tunnel_tso;
 		printf("TSO for tunneled packets is disabled\n");
 	} else {
-		uint64_t tso_offloads = (RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
-					 RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |
-					 RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
-					 RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
-					 RTE_ETH_TX_OFFLOAD_IP_TNL_TSO |
-					 RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO);
+		ret = eth_dev_info_get_print_err(res->port_id, &dev_info);
+		if (ret != 0)
+			return;
 
-		ports[res->port_id].dev_conf.txmode.offloads |=
-			(tso_offloads & dev_info.tx_offload_capa);
-		printf("TSO segment size for tunneled packets is %d\n",
-			ports[res->port_id].tunnel_tso_segsz);
+		if ((all_tunnel_tso & dev_info.tx_offload_capa) == 0) {
+			fprintf(stderr, "Error: port=%u don't support tunnel TSO offloads.\n",
+				res->port_id);
+			return;
+		}
 
 		/* Below conditions are needed to make it work:
 		 * (1) tunnel TSO is supported by the NIC;
@@ -5152,14 +5131,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 		 * is not necessary for IPv6 tunneled pkts because there's no
 		 * checksum in IP header anymore.
 		 */
-
-		if (!ports[res->port_id].parse_tunnel)
+		if (!ports[res->port_id].parse_tunnel) {
 			fprintf(stderr,
-				"Warning: csum parse_tunnel must be set so that tunneled packets are recognized\n");
+				"Error: csum parse_tunnel must be set so that tunneled packets are recognized\n");
+			return;
+		}
 		if (!(ports[res->port_id].dev_conf.txmode.offloads &
-		      RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM))
+		      RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) {
 			fprintf(stderr,
-				"Warning: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n");
+				"Error: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n");
+			return;
+		}
+
+		check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa);
+		ports[res->port_id].dev_conf.txmode.offloads |=
+				(all_tunnel_tso & dev_info.tx_offload_capa);
+		printf("TSO segment size for tunneled packets is %d\n",
+			ports[res->port_id].tunnel_tso_segsz);
 	}
 
 	cmd_config_queue_tx_offloads(&ports[res->port_id]);
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 80d4d41..5e494c4 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -250,7 +250,7 @@ parse_gtp(struct rte_udp_hdr *udp_hdr,
 		info->l4_proto = 0;
 	}
 
-	info->l2_len += RTE_ETHER_GTP_HLEN;
+	info->l2_len += gtp_len + sizeof(*udp_hdr);
 }
 
 /* Parse a vxlan header */
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 9f4a0e0..5f34641 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2376,6 +2376,13 @@ update_rx_queue_state(uint16_t port_id, uint16_t queue_id)
 			rx_qinfo.queue_state;
 	} else if (rc == -ENOTSUP) {
 		/*
+		 * Do not change the rxq state for primary process
+		 * to ensure that the PMDs do not implement
+		 * rte_eth_rx_queue_info_get can forward as before.
+		 */
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+			return;
+		/*
 		 * Set the rxq state to RTE_ETH_QUEUE_STATE_STARTED
 		 * to ensure that the PMDs do not implement
 		 * rte_eth_rx_queue_info_get can forward.
@@ -2401,6 +2408,13 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
 			tx_qinfo.queue_state;
 	} else if (rc == -ENOTSUP) {
 		/*
+		 * Do not change the txq state for primary process
+		 * to ensure that the PMDs do not implement
+		 * rte_eth_tx_queue_info_get can forward as before.
+		 */
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+			return;
+		/*
 		 * Set the txq state to RTE_ETH_QUEUE_STATE_STARTED
 		 * to ensure that the PMDs do not implement
 		 * rte_eth_tx_queue_info_get can forward.
@@ -2414,12 +2428,15 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
 }
 
 static void
-update_queue_state(void)
+update_queue_state(portid_t pid)
 {
 	portid_t pi;
 	queueid_t qi;
 
 	RTE_ETH_FOREACH_DEV(pi) {
+		if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
+			continue;
+
 		for (qi = 0; qi < nb_rxq; qi++)
 			update_rx_queue_state(pi, qi);
 		for (qi = 0; qi < nb_txq; qi++)
@@ -2467,8 +2484,7 @@ start_packet_forwarding(int with_tx_first)
 		return;
 
 	if (stream_init != NULL) {
-		if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-			update_queue_state();
+		update_queue_state(RTE_PORT_ALL);
 		for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++)
 			stream_init(fwd_streams[i]);
 	}
@@ -3126,8 +3142,7 @@ start_port(portid_t pid)
 		pl[cfg_pi++] = pi;
 	}
 
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-		update_queue_state();
+	update_queue_state(pi);
 
 	if (at_least_one_port_successfully_started && !no_link_check)
 		check_all_ports_link_status(RTE_PORT_ALL);
diff --git a/app/test/meson.build b/app/test/meson.build
index c13776c..845ce96 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -227,6 +227,7 @@ fast_tests = [
         ['fib6_autotest', true],
         ['func_reentrancy_autotest', false],
         ['flow_classify_autotest', false],
+        ['graph_autotest', true],
         ['hash_autotest', true],
         ['interrupt_autotest', true],
         ['ipfrag_autotest', false],
@@ -243,6 +244,7 @@ fast_tests = [
         ['memzone_autotest', false],
         ['meter_autotest', true],
         ['multiprocess_autotest', false],
+        ['node_list_dump', true],
         ['per_lcore_autotest', true],
         ['pflock_autotest', true],
         ['prefetch_autotest', true],
@@ -329,6 +331,7 @@ perf_test_names = [
         'trace_perf_autotest',
         'ipsec_perf_autotest',
         'thash_perf_autotest',
+        'graph_perf_autotest',
 ]
 
 driver_test_names = [
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index f3509bc..0bd4517 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -6491,6 +6491,9 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
 			tdata->digest.len) < 0)
 		return TEST_SKIPPED;
 
+	if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+		return TEST_SKIPPED;
+
 	rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
 	uint64_t feat_flags = dev_info.feature_flags;
@@ -6879,6 +6882,7 @@ snow3g_hash_test_vector_setup(const struct snow3g_test_data *pattern,
 static int
 test_snow3g_decryption_with_digest_test_case_1(void)
 {
+	int ret;
 	struct snow3g_hash_test_data snow3g_hash_data;
 	struct rte_cryptodev_info dev_info;
 	struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -6897,8 +6901,9 @@ test_snow3g_decryption_with_digest_test_case_1(void)
 	 */
 	snow3g_hash_test_vector_setup(&snow3g_test_case_7, &snow3g_hash_data);
 
-	if (test_snow3g_decryption(&snow3g_test_case_7))
-		return TEST_FAILED;
+	ret = test_snow3g_decryption(&snow3g_test_case_7);
+	if (ret != 0)
+		return ret;
 
 	return test_snow3g_authentication_verify(&snow3g_hash_data);
 }
@@ -7569,6 +7574,9 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
 	if (global_api_test_type == CRYPTODEV_RAW_API_TEST)
 		return TEST_SKIPPED;
 
+	if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+		return TEST_SKIPPED;
+
 	rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
 	uint64_t feat_flags = dev_info.feature_flags;
@@ -8254,7 +8262,7 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
 			tdata->key.data, tdata->key.len,
 			tdata->aad.len, tdata->auth_tag.len,
 			tdata->iv.len);
-	if (retval < 0)
+	if (retval != TEST_SUCCESS)
 		return retval;
 
 	if (tdata->aad.len > MBUF_SIZE) {
@@ -10902,7 +10910,7 @@ test_authenticated_decryption_sessionless(
 			key, tdata->key.len,
 			tdata->aad.len, tdata->auth_tag.len,
 			tdata->iv.len);
-	if (retval < 0)
+	if (retval != TEST_SUCCESS)
 		return retval;
 
 	ut_params->op->sym->m_src = ut_params->ibuf;
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 7210497..952b927 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -1717,7 +1717,7 @@ error_exit:
 }
 
 static int
-test_dh_keygenration(void)
+test_dh_key_generation(void)
 {
 	int status;
 
@@ -2291,7 +2291,7 @@ static struct unit_test_suite cryptodev_openssl_asym_testsuite  = {
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_capability),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_dsa),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
-				test_dh_keygenration),
+				test_dh_key_generation),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_rsa_enc_dec),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
 				test_rsa_sign_verify),
diff --git a/app/test/test_cryptodev_mixed_test_vectors.h b/app/test/test_cryptodev_mixed_test_vectors.h
index f50dcb0..db58dbd 100644
--- a/app/test/test_cryptodev_mixed_test_vectors.h
+++ b/app/test/test_cryptodev_mixed_test_vectors.h
@@ -284,8 +284,10 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_snow_test_case_1 = {
 	},
 	.cipher_iv = {
 		.data = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 		},
-		.len = 0,
+		.len = 16,
 	},
 	.cipher = {
 		.len_bits = 516 << 3,
@@ -723,8 +725,10 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_zuc_test_case_1 = {
 	},
 	.cipher_iv = {
 		.data = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 		},
-		.len = 0,
+		.len = 16,
 	},
 	.cipher = {
 		.len_bits = 516 << 3,
diff --git a/app/test/test_cryptodev_security_pdcp_sdap_test_vectors.h b/app/test/test_cryptodev_security_pdcp_sdap_test_vectors.h
index f43f693..b0fa0ec 100644
--- a/app/test/test_cryptodev_security_pdcp_sdap_test_vectors.h
+++ b/app/test/test_cryptodev_security_pdcp_sdap_test_vectors.h
@@ -769,7 +769,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -781,7 +781,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x69, 0xf2, 0x5d, 0xd7,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x69, 0xf2, 0x5d, 0xd7,
 				     0xf5, 0xc1, 0xf7, 0x1e, 0x47, 0x5d, 0xce,
 				     0xbe, 0x48, 0xb5, 0x0b, 0x6a, 0x73, 0x9a,
 				     0x5a, 0xa3, 0x06, 0x47, 0x40, 0x96, 0xcf,
@@ -790,7 +790,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xc9, 0x7f, 0x11, 0x79, 0x24, 0x44, 0xe8,
 				     0x39, 0x11, 0x03, 0x0a, 0x9d, 0x4f, 0xe2,
 				     0x95, 0x9f, 0x47, 0x73, 0x37, 0x83, 0x8c,
-				     0x23, 0xfa, 0x16, 0x39, 0xf7, 0x15, 0x11 },
+				     0x23, 0xfa, 0x16, 0xb2, 0xb0, 0x17, 0x4a },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -817,7 +817,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -829,7 +829,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x22, 0x2a, 0x8f, 0x86,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x22, 0x2a, 0x8f, 0x86,
 				     0x25, 0x92, 0xcd, 0xa9, 0xa1, 0xa0, 0xf5,
 				     0x86, 0x0d, 0xe8, 0xe4, 0xef, 0xe0, 0x78,
 				     0x45, 0x7c, 0x0c, 0x41, 0x5c, 0x8f, 0x07,
@@ -838,7 +838,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x35, 0xff, 0x7a, 0x42, 0xac, 0x94, 0x21,
 				     0x60, 0x1c, 0x13, 0xcc, 0x7e, 0x6b, 0x2f,
 				     0x6f, 0x91, 0x89, 0xc6, 0xd4, 0xe6, 0x17,
-				     0xae, 0xde, 0xfb, 0x90, 0x62, 0x59, 0xcb },
+				     0xae, 0xde, 0xfb, 0x19, 0xDa, 0x9a, 0xc2 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -865,7 +865,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -877,7 +877,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x69, 0xf2, 0x5d, 0xd7,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x69, 0xf2, 0x5d, 0xd7,
 				     0xf5, 0xc1, 0xf7, 0x1e, 0x47, 0x5d, 0xce,
 				     0xbe, 0x48, 0xb5, 0x0b, 0x6a, 0x73, 0x9a,
 				     0x5a, 0xa3, 0x06, 0x47, 0x40, 0x96, 0xcf,
@@ -886,7 +886,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xc9, 0x7f, 0x11, 0x79, 0x24, 0x44, 0xe8,
 				     0x39, 0x11, 0x03, 0x0a, 0x9d, 0x4f, 0xe2,
 				     0x95, 0x9f, 0x47, 0x73, 0x37, 0x83, 0x8c,
-				     0x23, 0xfa, 0x16, 0x72, 0x3e, 0x14, 0xa9 },
+				     0x23, 0xfa, 0x16, 0x6c, 0xcb, 0x92, 0xdf },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -913,7 +913,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -925,7 +925,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x22, 0x2a, 0x8f, 0x86,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x22, 0x2a, 0x8f, 0x86,
 				     0x25, 0x92, 0xcd, 0xa9, 0xa1, 0xa0, 0xf5,
 				     0x86, 0x0d, 0xe8, 0xe4, 0xef, 0xe0, 0x78,
 				     0x45, 0x7c, 0x0c, 0x41, 0x5c, 0x8f, 0x07,
@@ -934,7 +934,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x35, 0xff, 0x7a, 0x42, 0xac, 0x94, 0x21,
 				     0x60, 0x1c, 0x13, 0xcc, 0x7e, 0x6b, 0x2f,
 				     0x6f, 0x91, 0x89, 0xc6, 0xd4, 0xe6, 0x17,
-				     0xae, 0xde, 0xfb, 0x3f, 0x47, 0xaa, 0x9b },
+				     0xae, 0xde, 0xfb, 0x5b, 0xc2, 0x9f, 0x29 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -961,7 +961,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -974,7 +974,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 		.in_len = 66,
 		.data_out =
 			(uint8_t[]){
-				0x50, 0x01, 0x86, 0x69, 0xf2, 0x5d, 0xd7, 0xf5,
+				0x80, 0x01, 0x86, 0x69, 0xf2, 0x5d, 0xd7, 0xf5,
 				0xc1, 0xf7, 0x1e, 0x47, 0x5d, 0xce, 0xbe, 0x48,
 				0xb5, 0x0b, 0x6a, 0x73, 0x9a, 0x5a, 0xa3, 0x06,
 				0x47, 0x40, 0x96, 0xcf, 0x86, 0x98, 0x3d, 0x6f,
@@ -982,7 +982,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				0xa6, 0x24, 0xc9, 0x7f, 0x11, 0x79, 0x24, 0x44,
 				0xe8, 0x39, 0x11, 0x03, 0x0a, 0x9d, 0x4f, 0xe2,
 				0x95, 0x9f, 0x47, 0x73, 0x37, 0x83, 0x8c, 0x23,
-				0xfa, 0x16, 0x52, 0x69, 0x16, 0xfc,
+				0xfa, 0x16, 0x5d, 0x83, 0x73, 0x34,
 			},
 		.sn_size = 12,
 		.hfn = 0x1,
@@ -1010,7 +1010,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1022,7 +1022,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x22, 0x2a, 0x8f, 0x86,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x22, 0x2a, 0x8f, 0x86,
 				     0x25, 0x92, 0xcd, 0xa9, 0xa1, 0xa0, 0xf5,
 				     0x86, 0x0d, 0xe8, 0xe4, 0xef, 0xe0, 0x78,
 				     0x45, 0x7c, 0x0c, 0x41, 0x5c, 0x8f, 0x07,
@@ -1031,7 +1031,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x35, 0xff, 0x7a, 0x42, 0xac, 0x94, 0x21,
 				     0x60, 0x1c, 0x13, 0xcc, 0x7e, 0x6b, 0x2f,
 				     0x6f, 0x91, 0x89, 0xc6, 0xd4, 0xe6, 0x17,
-				     0xae, 0xde, 0xfb, 0xf5, 0xda, 0x73, 0xa7 },
+				     0xae, 0xde, 0xfb, 0xff, 0xf9, 0xef, 0xff },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1154,7 +1154,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1166,7 +1166,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xe8, 0x8c, 0x96, 0x38,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xe8, 0x8c, 0x96, 0x38,
 				     0x6e, 0xe4, 0x1f, 0xb9, 0x85, 0x61, 0x2e,
 				     0x64, 0x31, 0x22, 0x97, 0x5b, 0xf6, 0x40,
 				     0x08, 0x65, 0xc3, 0xfa, 0x72, 0xd2, 0x22,
@@ -1175,7 +1175,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x23, 0x80, 0xcc, 0x5f, 0xfd, 0x74, 0xb1,
 				     0xfb, 0xe1, 0xea, 0x6f, 0xf9, 0x9d, 0xf3,
 				     0x90, 0x02, 0x6e, 0xf1, 0xf8, 0x95, 0x97,
-				     0xbd, 0xba, 0x08, 0x39, 0x63, 0x21, 0x82 },
+				     0xbd, 0xba, 0x08, 0xb2, 0x24, 0x23, 0xd9 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1202,7 +1202,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1214,7 +1214,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xd2, 0xc0, 0x3a, 0x41,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xd2, 0xc0, 0x3a, 0x41,
 				     0xbc, 0x0b, 0x95, 0xa4, 0x57, 0x3e, 0x36,
 				     0x10, 0xb2, 0xff, 0x48, 0x1f, 0x10, 0xa8,
 				     0x06, 0x42, 0xc5, 0xa2, 0x33, 0xed, 0x2e,
@@ -1223,7 +1223,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x35, 0xd2, 0x31, 0x1a, 0xb8, 0x33, 0xc7,
 				     0x9c, 0xa4, 0xa4, 0x9b, 0x20, 0xc6, 0x47,
 				     0xdd, 0xe5, 0xa3, 0x4b, 0x9e, 0x66, 0xde,
-				     0xc9, 0x0a, 0x64, 0x8e, 0x79, 0xde, 0xaa },
+				     0xc9, 0x0a, 0x64, 0x07, 0xc1, 0x1d, 0xa3 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1250,7 +1250,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1262,7 +1262,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xe8, 0x8c, 0x96, 0x38,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xe8, 0x8c, 0x96, 0x38,
 				     0x6e, 0xe4, 0x1f, 0xb9, 0x85, 0x61, 0x2e,
 				     0x64, 0x31, 0x22, 0x97, 0x5b, 0xf6, 0x40,
 				     0x08, 0x65, 0xc3, 0xfa, 0x72, 0xd2, 0x22,
@@ -1271,7 +1271,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x23, 0x80, 0xcc, 0x5f, 0xfd, 0x74, 0xb1,
 				     0xfb, 0xe1, 0xea, 0x6f, 0xf9, 0x9d, 0xf3,
 				     0x90, 0x02, 0x6e, 0xf1, 0xf8, 0x95, 0x97,
-				     0xbd, 0xba, 0x08, 0x72, 0xaa, 0x20, 0x3a },
+				     0xbd, 0xba, 0x08, 0x6c, 0x5f, 0xa6, 0x4c },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1298,7 +1298,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1310,7 +1310,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xd2, 0xc0, 0x3a, 0x41,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xd2, 0xc0, 0x3a, 0x41,
 				     0xbc, 0x0b, 0x95, 0xa4, 0x57, 0x3e, 0x36,
 				     0x10, 0xb2, 0xff, 0x48, 0x1f, 0x10, 0xa8,
 				     0x06, 0x42, 0xc5, 0xa2, 0x33, 0xed, 0x2e,
@@ -1319,7 +1319,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x35, 0xd2, 0x31, 0x1a, 0xb8, 0x33, 0xc7,
 				     0x9c, 0xa4, 0xa4, 0x9b, 0x20, 0xc6, 0x47,
 				     0xdd, 0xe5, 0xa3, 0x4b, 0x9e, 0x66, 0xde,
-				     0xc9, 0x0a, 0x64, 0x21, 0x5c, 0x2d, 0xfa },
+				     0xc9, 0x0a, 0x64, 0x45, 0xd9, 0x18, 0x48 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1346,7 +1346,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1358,7 +1358,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xe8, 0x8c, 0x96, 0x38,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xe8, 0x8c, 0x96, 0x38,
 				     0x6e, 0xe4, 0x1f, 0xb9, 0x85, 0x61, 0x2e,
 				     0x64, 0x31, 0x22, 0x97, 0x5b, 0xf6, 0x40,
 				     0x08, 0x65, 0xc3, 0xfa, 0x72, 0xd2, 0x22,
@@ -1367,7 +1367,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x23, 0x80, 0xcc, 0x5f, 0xfd, 0x74, 0xb1,
 				     0xfb, 0xe1, 0xea, 0x6f, 0xf9, 0x9d, 0xf3,
 				     0x90, 0x02, 0x6e, 0xf1, 0xf8, 0x95, 0x97,
-				     0xbd, 0xba, 0x08, 0x52, 0xfd, 0x22, 0x6f },
+				     0xbd, 0xba, 0x08, 0x5d, 0x17, 0x47, 0xa7 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1394,7 +1394,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1406,7 +1406,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xd2, 0xc0, 0x3a, 0x41,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xd2, 0xc0, 0x3a, 0x41,
 				     0xbc, 0x0b, 0x95, 0xa4, 0x57, 0x3e, 0x36,
 				     0x10, 0xb2, 0xff, 0x48, 0x1f, 0x10, 0xa8,
 				     0x06, 0x42, 0xc5, 0xa2, 0x33, 0xed, 0x2e,
@@ -1415,7 +1415,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x35, 0xd2, 0x31, 0x1a, 0xb8, 0x33, 0xc7,
 				     0x9c, 0xa4, 0xa4, 0x9b, 0x20, 0xc6, 0x47,
 				     0xdd, 0xe5, 0xa3, 0x4b, 0x9e, 0x66, 0xde,
-				     0xc9, 0x0a, 0x64, 0xeb, 0xc1, 0xf4, 0xc6 },
+				     0xc9, 0x0a, 0x64, 0xe1, 0xe2, 0x68, 0x9e },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1538,7 +1538,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1550,7 +1550,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x79, 0xdb, 0x02, 0x27,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x79, 0xdb, 0x02, 0x27,
 				     0xa0, 0x85, 0x82, 0x87, 0x6b, 0x35, 0x2b,
 				     0xe1, 0x96, 0x5b, 0xfd, 0x67, 0xe1, 0x67,
 				     0x69, 0x17, 0x5b, 0x0a, 0x8f, 0xb8, 0x37,
@@ -1559,7 +1559,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xda, 0x94, 0x61, 0x8e, 0x2d, 0x7a, 0x5d,
 				     0x64, 0x0f, 0x4a, 0xc7, 0x7c, 0x9d, 0x56,
 				     0x5a, 0x2a, 0xcb, 0xff, 0x79, 0x07, 0xa5,
-				     0xaf, 0x96, 0x5c, 0xb6, 0x6c, 0xeb, 0x14 },
+				     0xaf, 0x96, 0x5c, 0x3d, 0x2b, 0xe9, 0x4f },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1586,7 +1586,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1598,7 +1598,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x2c, 0x0f, 0xc1, 0x08,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x2c, 0x0f, 0xc1, 0x08,
 				     0x2e, 0xa7, 0x97, 0xd2, 0x6c, 0x17, 0x8f,
 				     0x22, 0x1f, 0x99, 0x1b, 0x48, 0x04, 0x29,
 				     0x54, 0x3f, 0x07, 0x01, 0xda, 0x19, 0x59,
@@ -1607,7 +1607,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x04, 0xf4, 0xfe, 0xe6, 0xf7, 0x53, 0x51,
 				     0x70, 0x10, 0x56, 0x83, 0x59, 0xb5, 0x64,
 				     0x0b, 0xa6, 0x2e, 0xa5, 0x03, 0x62, 0x13,
-				     0x91, 0xaf, 0x24, 0xb2, 0x82, 0xfb, 0x27 },
+				     0x91, 0xaf, 0x24, 0x3b, 0x3a, 0x38, 0x2e },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1634,7 +1634,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1646,7 +1646,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x79, 0xdb, 0x02, 0x27,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x79, 0xdb, 0x02, 0x27,
 				     0xa0, 0x85, 0x82, 0x87, 0x6b, 0x35, 0x2b,
 				     0xe1, 0x96, 0x5b, 0xfd, 0x67, 0xe1, 0x67,
 				     0x69, 0x17, 0x5b, 0x0a, 0x8f, 0xb8, 0x37,
@@ -1655,7 +1655,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xda, 0x94, 0x61, 0x8e, 0x2d, 0x7a, 0x5d,
 				     0x64, 0x0f, 0x4a, 0xc7, 0x7c, 0x9d, 0x56,
 				     0x5a, 0x2a, 0xcb, 0xff, 0x79, 0x07, 0xa5,
-				     0xaf, 0x96, 0x5c, 0xfd, 0xa5, 0xea, 0xac },
+				     0xaf, 0x96, 0x5c, 0xe3, 0x50, 0x6c, 0xda },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1682,7 +1682,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1694,7 +1694,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x2c, 0x0f, 0xc1, 0x08,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x2c, 0x0f, 0xc1, 0x08,
 				     0x2e, 0xa7, 0x97, 0xd2, 0x6c, 0x17, 0x8f,
 				     0x22, 0x1f, 0x99, 0x1b, 0x48, 0x04, 0x29,
 				     0x54, 0x3f, 0x07, 0x01, 0xda, 0x19, 0x59,
@@ -1703,7 +1703,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x04, 0xf4, 0xfe, 0xe6, 0xf7, 0x53, 0x51,
 				     0x70, 0x10, 0x56, 0x83, 0x59, 0xb5, 0x64,
 				     0x0b, 0xa6, 0x2e, 0xa5, 0x03, 0x62, 0x13,
-				     0x91, 0xaf, 0x24, 0x1d, 0xa7, 0x08, 0x77 },
+				     0x91, 0xaf, 0x24, 0x79, 0x22, 0x3d, 0xc5 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1730,7 +1730,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1742,7 +1742,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x79, 0xdb, 0x02, 0x27,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x79, 0xdb, 0x02, 0x27,
 				     0xa0, 0x85, 0x82, 0x87, 0x6b, 0x35, 0x2b,
 				     0xe1, 0x96, 0x5b, 0xfd, 0x67, 0xe1, 0x67,
 				     0x69, 0x17, 0x5b, 0x0a, 0x8f, 0xb8, 0x37,
@@ -1751,7 +1751,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xda, 0x94, 0x61, 0x8e, 0x2d, 0x7a, 0x5d,
 				     0x64, 0x0f, 0x4a, 0xc7, 0x7c, 0x9d, 0x56,
 				     0x5a, 0x2a, 0xcb, 0xff, 0x79, 0x07, 0xa5,
-				     0xaf, 0x96, 0x5c, 0xdd, 0xf2, 0xe8, 0xf9 },
+				     0xaf, 0x96, 0x5c, 0xd2, 0x18, 0x8d, 0x31 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -1778,7 +1778,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x0a, 0x98, 0xc1, 0x3c, 0x98, 0x82,
 					 0xdc, 0xb6, 0xc2, 0x36 },
 		.data_in =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0xb8, 0xf8, 0xdb, 0x2d,
 				     0x3f, 0x23, 0x82, 0x53, 0xfd, 0x37, 0xde,
 				     0x88, 0x63, 0x08, 0x4f, 0xd3, 0x71, 0xfb,
 				     0xeb, 0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf,
@@ -1790,7 +1790,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0xf9, 0xdd },
 		.in_len = 66,
 		.data_out =
-			(uint8_t[]){ 0x50, 0x01, 0x86, 0x2c, 0x0f, 0xc1, 0x08,
+			(uint8_t[]){ 0x80, 0x01, 0x86, 0x2c, 0x0f, 0xc1, 0x08,
 				     0x2e, 0xa7, 0x97, 0xd2, 0x6c, 0x17, 0x8f,
 				     0x22, 0x1f, 0x99, 0x1b, 0x48, 0x04, 0x29,
 				     0x54, 0x3f, 0x07, 0x01, 0xda, 0x19, 0x59,
@@ -1799,7 +1799,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x04, 0xf4, 0xfe, 0xe6, 0xf7, 0x53, 0x51,
 				     0x70, 0x10, 0x56, 0x83, 0x59, 0xb5, 0x64,
 				     0x0b, 0xa6, 0x2e, 0xa5, 0x03, 0x62, 0x13,
-				     0x91, 0xaf, 0x24, 0xd7, 0x3a, 0xd1, 0x4b },
+				     0x91, 0xaf, 0x24, 0xdd, 0x19, 0x4d, 0x13 },
 		.sn_size = 12,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2556,7 +2556,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2568,7 +2568,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x78, 0xee, 0x01,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x78, 0xee, 0x01,
 				     0x4c, 0x79, 0xc7, 0x14, 0x79, 0x2c, 0x1b,
 				     0x8a, 0xd0, 0x17, 0xb4, 0xb4, 0xfe, 0xa7,
 				     0x17, 0x9a, 0x93, 0x5d, 0xad, 0x27, 0x8a,
@@ -2577,8 +2577,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x37, 0xfb, 0x98, 0x1b, 0x06, 0x1a, 0x76,
 				     0xf8, 0x07, 0x72, 0xe9, 0xa2, 0x89, 0x47,
 				     0x95, 0x8f, 0x8f, 0x4e, 0x45, 0x55, 0xd6,
-				     0x0e, 0xf4, 0xe7, 0xe8, 0x78, 0xdd, 0xc1,
-				     0x92 },
+				     0x0e, 0xf4, 0xe7, 0xe8, 0xc0, 0x48, 0x6a,
+				     0x7c },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2605,7 +2605,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2617,7 +2617,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xbf, 0x21, 0xc9,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xbf, 0x21, 0xc9,
 				     0x7d, 0x02, 0x8d, 0xf7, 0xf7, 0x80, 0x50,
 				     0x60, 0x32, 0x09, 0xb8, 0x69, 0x48, 0xab,
 				     0x58, 0xf0, 0xd9, 0x63, 0x63, 0x36, 0x01,
@@ -2626,8 +2626,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x4c, 0x00, 0xd0, 0x0e, 0x31, 0x1c, 0x87,
 				     0xee, 0x1c, 0xc3, 0x81, 0xb4, 0xb6, 0x09,
 				     0xb5, 0x3c, 0x85, 0xb9, 0xcc, 0x2d, 0x2e,
-				     0x9c, 0x85, 0x0b, 0xf7, 0xb1, 0x80, 0x30,
-				     0xa5 },
+				     0x9c, 0x85, 0x0b, 0xf7, 0x17, 0x28, 0x0f,
+				     0x7d },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2654,7 +2654,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2666,7 +2666,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x78, 0xee, 0x01,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x78, 0xee, 0x01,
 				     0x4c, 0x79, 0xc7, 0x14, 0x79, 0x2c, 0x1b,
 				     0x8a, 0xd0, 0x17, 0xb4, 0xb4, 0xfe, 0xa7,
 				     0x17, 0x9a, 0x93, 0x5d, 0xad, 0x27, 0x8a,
@@ -2675,8 +2675,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x37, 0xfb, 0x98, 0x1b, 0x06, 0x1a, 0x76,
 				     0xf8, 0x07, 0x72, 0xe9, 0xa2, 0x89, 0x47,
 				     0x95, 0x8f, 0x8f, 0x4e, 0x45, 0x55, 0xd6,
-				     0x0e, 0xf4, 0xe7, 0xe8, 0x08, 0xa6, 0xdb,
-				     0x19 },
+				     0x0e, 0xf4, 0xe7, 0xe8, 0x8e, 0x76, 0x4a,
+				     0x4e },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2703,7 +2703,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2715,7 +2715,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xbf, 0x21, 0xc9,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xbf, 0x21, 0xc9,
 				     0x7d, 0x02, 0x8d, 0xf7, 0xf7, 0x80, 0x50,
 				     0x60, 0x32, 0x09, 0xb8, 0x69, 0x48, 0xab,
 				     0x58, 0xf0, 0xd9, 0x63, 0x63, 0x36, 0x01,
@@ -2724,8 +2724,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x4c, 0x00, 0xd0, 0x0e, 0x31, 0x1c, 0x87,
 				     0xee, 0x1c, 0xc3, 0x81, 0xb4, 0xb6, 0x09,
 				     0xb5, 0x3c, 0x85, 0xb9, 0xcc, 0x2d, 0x2e,
-				     0x9c, 0x85, 0x0b, 0xf7, 0x97, 0x5a, 0x56,
-				     0xab },
+				     0x9c, 0x85, 0x0b, 0xf7, 0xc1, 0x27, 0x82,
+				     0xc3 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2752,7 +2752,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2764,7 +2764,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x78, 0xee, 0x01,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x78, 0xee, 0x01,
 				     0x4c, 0x79, 0xc7, 0x14, 0x79, 0x2c, 0x1b,
 				     0x8a, 0xd0, 0x17, 0xb4, 0xb4, 0xfe, 0xa7,
 				     0x17, 0x9a, 0x93, 0x5d, 0xad, 0x27, 0x8a,
@@ -2773,8 +2773,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x37, 0xfb, 0x98, 0x1b, 0x06, 0x1a, 0x76,
 				     0xf8, 0x07, 0x72, 0xe9, 0xa2, 0x89, 0x47,
 				     0x95, 0x8f, 0x8f, 0x4e, 0x45, 0x55, 0xd6,
-				     0x0e, 0xf4, 0xe7, 0xe8, 0x08, 0x68, 0xff,
-				     0x7c },
+				     0x0e, 0xf4, 0xe7, 0xe8, 0x97, 0x76, 0xce,
+				     0xac },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2801,7 +2801,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2813,7 +2813,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xbf, 0x21, 0xc9,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xbf, 0x21, 0xc9,
 				     0x7d, 0x02, 0x8d, 0xf7, 0xf7, 0x80, 0x50,
 				     0x60, 0x32, 0x09, 0xb8, 0x69, 0x48, 0xab,
 				     0x58, 0xf0, 0xd9, 0x63, 0x63, 0x36, 0x01,
@@ -2822,8 +2822,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x4c, 0x00, 0xd0, 0x0e, 0x31, 0x1c, 0x87,
 				     0xee, 0x1c, 0xc3, 0x81, 0xb4, 0xb6, 0x09,
 				     0xb5, 0x3c, 0x85, 0xb9, 0xcc, 0x2d, 0x2e,
-				     0x9c, 0x85, 0x0b, 0xf7, 0x41, 0xdd, 0x19,
-				     0x32 },
+				     0x9c, 0x85, 0x0b, 0xf7, 0x69, 0x56, 0x6f,
+				     0xaf },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2948,7 +2948,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -2960,7 +2960,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x0c, 0xa8, 0x9d,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x0c, 0xa8, 0x9d,
 				     0x9e, 0xcc, 0xf0, 0x1a, 0xc0, 0xf2, 0x9f,
 				     0x8c, 0xc9, 0x57, 0xc7, 0x99, 0x4d, 0xde,
 				     0xc5, 0x19, 0x69, 0x58, 0x5b, 0x1a, 0x51,
@@ -2969,8 +2969,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xb3, 0x24, 0x88, 0x68, 0x5f, 0x78, 0x3a,
 				     0xd2, 0x6c, 0xcc, 0xa0, 0xb5, 0xf0, 0x95,
 				     0x3e, 0xf1, 0xf4, 0x3e, 0x43, 0x8f, 0x6c,
-				     0xae, 0x22, 0x59, 0x11, 0xf6, 0x97, 0x0b,
-				     0x7b },
+				     0xae, 0x22, 0x59, 0x11, 0x4e, 0x02, 0xa0,
+				     0x95 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -2997,7 +2997,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3009,7 +3009,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x5a, 0xa9, 0xb5,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x5a, 0xa9, 0xb5,
 				     0x61, 0x8b, 0x8a, 0xb7, 0x6a, 0x98, 0x30,
 				     0x6c, 0xed, 0x84, 0x69, 0xff, 0x6b, 0x7e,
 				     0x30, 0x59, 0x55, 0x80, 0x32, 0xd0, 0x0f,
@@ -3018,8 +3018,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x0e, 0x2e, 0x33, 0xe6, 0xa4, 0xea, 0x17,
 				     0xd6, 0x56, 0xa2, 0x3b, 0x5f, 0x56, 0x3a,
 				     0xa7, 0x6f, 0x4c, 0xc1, 0xca, 0xbd, 0x5f,
-				     0xad, 0x3d, 0x99, 0x4a, 0xa3, 0xab, 0xd5,
-				     0x7c },
+				     0xad, 0x3d, 0x99, 0x4a, 0x05, 0x03, 0xea,
+				     0xa4 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3046,7 +3046,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3058,7 +3058,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x0c, 0xa8, 0x9d,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x0c, 0xa8, 0x9d,
 				     0x9e, 0xcc, 0xf0, 0x1a, 0xc0, 0xf2, 0x9f,
 				     0x8c, 0xc9, 0x57, 0xc7, 0x99, 0x4d, 0xde,
 				     0xc5, 0x19, 0x69, 0x58, 0x5b, 0x1a, 0x51,
@@ -3067,8 +3067,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xb3, 0x24, 0x88, 0x68, 0x5f, 0x78, 0x3a,
 				     0xd2, 0x6c, 0xcc, 0xa0, 0xb5, 0xf0, 0x95,
 				     0x3e, 0xf1, 0xf4, 0x3e, 0x43, 0x8f, 0x6c,
-				     0xae, 0x22, 0x59, 0x11, 0x86, 0xec, 0x11,
-				     0xf0 },
+				     0xae, 0x22, 0x59, 0x11, 0x00, 0x3c, 0x80,
+				     0xa7 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3095,7 +3095,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3107,7 +3107,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x5a, 0xa9, 0xb5,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x5a, 0xa9, 0xb5,
 				     0x61, 0x8b, 0x8a, 0xb7, 0x6a, 0x98, 0x30,
 				     0x6c, 0xed, 0x84, 0x69, 0xff, 0x6b, 0x7e,
 				     0x30, 0x59, 0x55, 0x80, 0x32, 0xd0, 0x0f,
@@ -3116,8 +3116,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x0e, 0x2e, 0x33, 0xe6, 0xa4, 0xea, 0x17,
 				     0xd6, 0x56, 0xa2, 0x3b, 0x5f, 0x56, 0x3a,
 				     0xa7, 0x6f, 0x4c, 0xc1, 0xca, 0xbd, 0x5f,
-				     0xad, 0x3d, 0x99, 0x4a, 0x85, 0x71, 0xb3,
-				     0x72 },
+				     0xad, 0x3d, 0x99, 0x4a, 0xd3, 0x0c, 0x67,
+				     0x1a },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3144,7 +3144,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3156,7 +3156,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x0c, 0xa8, 0x9d,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x0c, 0xa8, 0x9d,
 				     0x9e, 0xcc, 0xf0, 0x1a, 0xc0, 0xf2, 0x9f,
 				     0x8c, 0xc9, 0x57, 0xc7, 0x99, 0x4d, 0xde,
 				     0xc5, 0x19, 0x69, 0x58, 0x5b, 0x1a, 0x51,
@@ -3165,8 +3165,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xb3, 0x24, 0x88, 0x68, 0x5f, 0x78, 0x3a,
 				     0xd2, 0x6c, 0xcc, 0xa0, 0xb5, 0xf0, 0x95,
 				     0x3e, 0xf1, 0xf4, 0x3e, 0x43, 0x8f, 0x6c,
-				     0xae, 0x22, 0x59, 0x11, 0x86, 0x22, 0x35,
-				     0x95 },
+				     0xae, 0x22, 0x59, 0x11, 0x19, 0x3c, 0x04,
+				     0x45 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3193,7 +3193,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3205,7 +3205,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x5a, 0xa9, 0xb5,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x5a, 0xa9, 0xb5,
 				     0x61, 0x8b, 0x8a, 0xb7, 0x6a, 0x98, 0x30,
 				     0x6c, 0xed, 0x84, 0x69, 0xff, 0x6b, 0x7e,
 				     0x30, 0x59, 0x55, 0x80, 0x32, 0xd0, 0x0f,
@@ -3214,8 +3214,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x0e, 0x2e, 0x33, 0xe6, 0xa4, 0xea, 0x17,
 				     0xd6, 0x56, 0xa2, 0x3b, 0x5f, 0x56, 0x3a,
 				     0xa7, 0x6f, 0x4c, 0xc1, 0xca, 0xbd, 0x5f,
-				     0xad, 0x3d, 0x99, 0x4a, 0x53, 0xf6, 0xfc,
-				     0xeb },
+				     0xad, 0x3d, 0x99, 0x4a, 0x7b, 0x7d, 0x8a,
+				     0x76 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3340,7 +3340,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3352,7 +3352,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x9b, 0x9c, 0xde,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x9b, 0x9c, 0xde,
 				     0xa1, 0x69, 0x9b, 0x27, 0xd3, 0x38, 0x93,
 				     0xf2, 0x12, 0xb1, 0xc6, 0x60, 0xac, 0xb7,
 				     0xf2, 0x37, 0xf3, 0x72, 0xaf, 0x50, 0x9d,
@@ -3361,8 +3361,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xbb, 0x15, 0xf3, 0x6a, 0x5d, 0x61, 0x12,
 				     0x6e, 0x6d, 0x1b, 0x92, 0xd8, 0x42, 0x60,
 				     0x3e, 0x1f, 0xe0, 0x6c, 0x28, 0x89, 0xf7,
-				     0x0c, 0x61, 0x76, 0xdc, 0x25, 0x8a, 0x31,
-				     0xed },
+				     0x0c, 0x61, 0x76, 0xdc, 0x9d, 0x1f, 0x9a,
+				     0x03 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3389,7 +3389,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3401,7 +3401,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x0c, 0xef, 0x82,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x0c, 0xef, 0x82,
 				     0x59, 0x6b, 0x6b, 0x61, 0xbe, 0x54, 0x23,
 				     0x7d, 0x29, 0x6d, 0xa7, 0xd2, 0xfa, 0x26,
 				     0xcc, 0x1d, 0x18, 0x39, 0x99, 0xea, 0xac,
@@ -3410,8 +3410,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0x8a, 0xe5, 0x00, 0x35, 0x4d, 0x0e,
 				     0x69, 0x9f, 0x4b, 0x72, 0x94, 0x8a, 0x25,
 				     0x69, 0x43, 0x28, 0xdc, 0x40, 0x60, 0x4f,
-				     0x6c, 0xed, 0x6a, 0x50, 0xf3, 0x5e, 0x90,
-				     0x42 },
+				     0x6c, 0xed, 0x6a, 0x50, 0x55, 0xf6, 0xaf,
+				     0x9a },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3438,7 +3438,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3450,7 +3450,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x9b, 0x9c, 0xde,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x9b, 0x9c, 0xde,
 				     0xa1, 0x69, 0x9b, 0x27, 0xd3, 0x38, 0x93,
 				     0xf2, 0x12, 0xb1, 0xc6, 0x60, 0xac, 0xb7,
 				     0xf2, 0x37, 0xf3, 0x72, 0xaf, 0x50, 0x9d,
@@ -3459,8 +3459,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xbb, 0x15, 0xf3, 0x6a, 0x5d, 0x61, 0x12,
 				     0x6e, 0x6d, 0x1b, 0x92, 0xd8, 0x42, 0x60,
 				     0x3e, 0x1f, 0xe0, 0x6c, 0x28, 0x89, 0xf7,
-				     0x0c, 0x61, 0x76, 0xdc, 0x55, 0xf1, 0x2b,
-				     0x66 },
+				     0x0c, 0x61, 0x76, 0xdc, 0xd3, 0x21, 0xba,
+				     0x31 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3487,7 +3487,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3499,7 +3499,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x0c, 0xef, 0x82,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x0c, 0xef, 0x82,
 				     0x59, 0x6b, 0x6b, 0x61, 0xbe, 0x54, 0x23,
 				     0x7d, 0x29, 0x6d, 0xa7, 0xd2, 0xfa, 0x26,
 				     0xcc, 0x1d, 0x18, 0x39, 0x99, 0xea, 0xac,
@@ -3508,8 +3508,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0x8a, 0xe5, 0x00, 0x35, 0x4d, 0x0e,
 				     0x69, 0x9f, 0x4b, 0x72, 0x94, 0x8a, 0x25,
 				     0x69, 0x43, 0x28, 0xdc, 0x40, 0x60, 0x4f,
-				     0x6c, 0xed, 0x6a, 0x50, 0xd5, 0x84, 0xf6,
-				     0x4c },
+				     0x6c, 0xed, 0x6a, 0x50, 0x83, 0xf9, 0x22,
+				     0x24 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3536,7 +3536,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3548,7 +3548,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x9b, 0x9c, 0xde,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x9b, 0x9c, 0xde,
 				     0xa1, 0x69, 0x9b, 0x27, 0xd3, 0x38, 0x93,
 				     0xf2, 0x12, 0xb1, 0xc6, 0x60, 0xac, 0xb7,
 				     0xf2, 0x37, 0xf3, 0x72, 0xaf, 0x50, 0x9d,
@@ -3557,8 +3557,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xbb, 0x15, 0xf3, 0x6a, 0x5d, 0x61, 0x12,
 				     0x6e, 0x6d, 0x1b, 0x92, 0xd8, 0x42, 0x60,
 				     0x3e, 0x1f, 0xe0, 0x6c, 0x28, 0x89, 0xf7,
-				     0x0c, 0x61, 0x76, 0xdc, 0x55, 0x3f, 0x0f,
-				     0x03 },
+				     0x0c, 0x61, 0x76, 0xdc, 0xca, 0x21, 0x3e,
+				     0xd3 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
@@ -3585,7 +3585,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 					 0x4b, 0x32, 0x87, 0xf9, 0xdb, 0xe0,
 					 0x31, 0x5f, 0x3a, 0x15 },
 		.data_in =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0xdb, 0x2d, 0x3f,
 				     0x23, 0x82, 0x53, 0xfd, 0x37, 0xde, 0x88,
 				     0x63, 0x08, 0x4f, 0xD3, 0x71, 0xfb, 0xeb,
 				     0x35, 0xf3, 0x64, 0xd3, 0x5e, 0xaf, 0x3f,
@@ -3597,7 +3597,7 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0xf9, 0xdd, 0xcc, 0x69 },
 		.in_len = 67,
 		.data_out =
-			(uint8_t[]){ 0xf8, 0x00, 0x00, 0xf8, 0x0c, 0xef, 0x82,
+			(uint8_t[]){ 0x80, 0x00, 0x00, 0xf8, 0x0c, 0xef, 0x82,
 				     0x59, 0x6b, 0x6b, 0x61, 0xbe, 0x54, 0x23,
 				     0x7d, 0x29, 0x6d, 0xa7, 0xd2, 0xfa, 0x26,
 				     0xcc, 0x1d, 0x18, 0x39, 0x99, 0xea, 0xac,
@@ -3606,8 +3606,8 @@ static const struct pdcp_sdap_test list_pdcp_sdap_tests[] = {
 				     0x7a, 0x8a, 0xe5, 0x00, 0x35, 0x4d, 0x0e,
 				     0x69, 0x9f, 0x4b, 0x72, 0x94, 0x8a, 0x25,
 				     0x69, 0x43, 0x28, 0xdc, 0x40, 0x60, 0x4f,
-				     0x6c, 0xed, 0x6a, 0x50, 0x03, 0x03, 0xb9,
-				     0xd5 },
+				     0x6c, 0xed, 0x6a, 0x50, 0x2b, 0x88, 0xcf,
+				     0x48 },
 		.sn_size = 18,
 		.hfn = 0x1,
 		.hfn_threshold = 0xfa558,
diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c
index 3d7e9fb..ea14094 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -523,11 +523,10 @@ configure_cryptodev(void)
 		return TEST_FAILED;
 	}
 
-	/* Create a NULL crypto device */
-	nb_devs = rte_cryptodev_device_count_by_driver(
-			rte_cryptodev_driver_id_get(
-			RTE_STR(CRYPTODEV_NAME_NULL_PMD)));
+
+	nb_devs = rte_cryptodev_count();
 	if (!nb_devs) {
+		/* Create a NULL crypto device */
 		ret = rte_vdev_init(
 			RTE_STR(CRYPTODEV_NAME_NULL_PMD), NULL);
 
diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c
index dfec499..3ded1c1 100644
--- a/app/test/test_event_timer_adapter.c
+++ b/app/test/test_event_timer_adapter.c
@@ -46,9 +46,10 @@ static uint64_t global_bkt_tck_ns;
 static uint64_t global_info_bkt_tck_ns;
 static volatile uint8_t arm_done;
 
-#define CALC_TICKS(tks)					\
-	ceil((double)(tks * global_bkt_tck_ns) / global_info_bkt_tck_ns)
+#define CALC_TICKS(tks) ceil((double)((tks) * global_bkt_tck_ns) / global_info_bkt_tck_ns)
 
+/* Wait double timeout ticks for software and an extra tick for hardware */
+#define WAIT_TICKS(tks) (using_services ? 2 * (tks) : tks + 1)
 
 static bool using_services;
 static uint32_t test_lcore1;
@@ -419,10 +420,31 @@ timdev_teardown(void)
 	rte_mempool_free(eventdev_test_mempool);
 }
 
+static inline uint16_t
+timeout_event_dequeue(struct rte_event *evs, uint64_t nb_evs, uint64_t ticks)
+{
+	uint16_t ev_cnt = 0;
+	uint64_t end_cycle;
+
+	if (using_services && nb_evs == MAX_TIMERS)
+		ticks = 2 * ticks;
+
+	end_cycle = rte_rdtsc() + ticks * global_bkt_tck_ns * rte_get_tsc_hz() / 1E9;
+
+	while (ev_cnt < nb_evs && rte_rdtsc() < end_cycle) {
+		ev_cnt += rte_event_dequeue_burst(evdev, TEST_PORT_ID, &evs[ev_cnt], nb_evs, 0);
+		rte_pause();
+	}
+
+	return ev_cnt;
+}
+
 static inline int
 test_timer_state(void)
 {
 	struct rte_event_timer *ev_tim;
+	const uint64_t max_ticks = 100;
+	uint64_t ticks, wait_ticks;
 	struct rte_event ev;
 	const struct rte_event_timer tim = {
 		.ev.op = RTE_EVENT_OP_NEW,
@@ -433,11 +455,10 @@ test_timer_state(void)
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
 	};
 
-
 	rte_mempool_get(eventdev_test_mempool, (void **)&ev_tim);
 	*ev_tim = tim;
 	ev_tim->ev.event_ptr = ev_tim;
-	ev_tim->timeout_ticks = CALC_TICKS(120);
+	ev_tim->timeout_ticks = CALC_TICKS(max_ticks + 20);
 
 	TEST_ASSERT_EQUAL(rte_event_timer_arm_burst(timdev, &ev_tim, 1), 0,
 			"Armed timer exceeding max_timeout.");
@@ -445,8 +466,9 @@ test_timer_state(void)
 			"Improper timer state set expected %d returned %d",
 			RTE_EVENT_TIMER_ERROR_TOOLATE, ev_tim->state);
 
+	ticks = 10;
 	ev_tim->state = RTE_EVENT_TIMER_NOT_ARMED;
-	ev_tim->timeout_ticks = CALC_TICKS(10);
+	ev_tim->timeout_ticks = CALC_TICKS(ticks);
 
 	TEST_ASSERT_EQUAL(rte_event_timer_arm_burst(timdev, &ev_tim, 1), 1,
 			"Failed to arm timer with proper timeout.");
@@ -455,14 +477,15 @@ test_timer_state(void)
 			RTE_EVENT_TIMER_ARMED, ev_tim->state);
 
 	if (!using_services)
-		rte_delay_us(20);
+		wait_ticks = 2 * ticks;
 	else
-		rte_delay_us(1000 + 200);
-	TEST_ASSERT_EQUAL(rte_event_dequeue_burst(evdev, 0, &ev, 1, 0), 1,
-			"Armed timer failed to trigger.");
+		wait_ticks = ticks;
+
+	TEST_ASSERT_EQUAL(timeout_event_dequeue(&ev, 1, WAIT_TICKS(wait_ticks)), 1,
+			  "Armed timer failed to trigger.");
 
 	ev_tim->state = RTE_EVENT_TIMER_NOT_ARMED;
-	ev_tim->timeout_ticks = CALC_TICKS(90);
+	ev_tim->timeout_ticks = CALC_TICKS(max_ticks - 10);
 	TEST_ASSERT_EQUAL(rte_event_timer_arm_burst(timdev, &ev_tim, 1), 1,
 			"Failed to arm timer with proper timeout.");
 	TEST_ASSERT_EQUAL(rte_event_timer_cancel_burst(timdev, &ev_tim, 1),
@@ -1164,8 +1187,9 @@ stat_inc_reset_ev_enq(void)
 	int ret, i, n;
 	int num_evtims = MAX_TIMERS;
 	struct rte_event_timer *evtims[num_evtims];
-	struct rte_event evs[BATCH_SIZE];
+	struct rte_event evs[num_evtims];
 	struct rte_event_timer_adapter_stats stats;
+	uint64_t ticks = 5;
 	const struct rte_event_timer init_tim = {
 		.ev.op = RTE_EVENT_OP_NEW,
 		.ev.queue_id = TEST_QUEUE_ID,
@@ -1173,7 +1197,7 @@ stat_inc_reset_ev_enq(void)
 		.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
-		.timeout_ticks = CALC_TICKS(5), // expire in .5 sec
+		.timeout_ticks = CALC_TICKS(ticks), /**< expire in .5 sec */
 	};
 
 	ret = rte_mempool_get_bulk(eventdev_test_mempool, (void **)evtims,
@@ -1198,31 +1222,12 @@ stat_inc_reset_ev_enq(void)
 			  "succeeded = %d, rte_errno = %s",
 			  num_evtims, ret, rte_strerror(rte_errno));
 
-	rte_delay_ms(1000);
-
-#define MAX_TRIES num_evtims
-	int sum = 0;
-	int tries = 0;
-	bool done = false;
-	while (!done) {
-		sum += rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs,
-					       RTE_DIM(evs), 10);
-		if (sum >= num_evtims || ++tries >= MAX_TRIES)
-			done = true;
-
-		rte_delay_ms(10);
-	}
-
-	TEST_ASSERT_EQUAL(sum, num_evtims, "Expected %d timer expiry events, "
-			  "got %d", num_evtims, sum);
-
-	TEST_ASSERT(tries < MAX_TRIES, "Exceeded max tries");
-
-	rte_delay_ms(100);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
+	TEST_ASSERT_EQUAL(n, num_evtims, "Expected %d timer expiry events, got %d",
+			  num_evtims, n);
 
 	/* Make sure the eventdev is still empty */
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs),
-				      10);
+	n = timeout_event_dequeue(evs, 1, WAIT_TICKS(1));
 
 	TEST_ASSERT_EQUAL(n, 0, "Dequeued unexpected number of timer expiry "
 			  "events from event device");
@@ -1259,6 +1264,7 @@ event_timer_arm(void)
 	struct rte_event_timer_adapter *adapter = timdev;
 	struct rte_event_timer *evtim = NULL;
 	struct rte_event evs[BATCH_SIZE];
+	uint64_t ticks = 5;
 	const struct rte_event_timer init_tim = {
 		.ev.op = RTE_EVENT_OP_NEW,
 		.ev.queue_id = TEST_QUEUE_ID,
@@ -1266,7 +1272,7 @@ event_timer_arm(void)
 		.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
-		.timeout_ticks = CALC_TICKS(5), // expire in .5 sec
+		.timeout_ticks = CALC_TICKS(ticks), /**< expire in .5 sec */
 	};
 
 	rte_mempool_get(eventdev_test_mempool, (void **)&evtim);
@@ -1293,10 +1299,7 @@ event_timer_arm(void)
 	TEST_ASSERT_EQUAL(rte_errno, EALREADY, "Unexpected rte_errno value "
 			  "after arming already armed timer");
 
-	/* Let timer expire */
-	rte_delay_ms(1000);
-
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
 	TEST_ASSERT_EQUAL(n, 1, "Failed to dequeue expected number of expiry "
 			  "events from event device");
 
@@ -1316,6 +1319,7 @@ event_timer_arm_double(void)
 	struct rte_event_timer_adapter *adapter = timdev;
 	struct rte_event_timer *evtim = NULL;
 	struct rte_event evs[BATCH_SIZE];
+	uint64_t ticks = 5;
 	const struct rte_event_timer init_tim = {
 		.ev.op = RTE_EVENT_OP_NEW,
 		.ev.queue_id = TEST_QUEUE_ID,
@@ -1323,7 +1327,7 @@ event_timer_arm_double(void)
 		.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
-		.timeout_ticks = CALC_TICKS(5), // expire in .5 sec
+		.timeout_ticks = CALC_TICKS(ticks), /**< expire in .5 sec */
 	};
 
 	rte_mempool_get(eventdev_test_mempool, (void **)&evtim);
@@ -1343,10 +1347,7 @@ event_timer_arm_double(void)
 	TEST_ASSERT_EQUAL(rte_errno, EALREADY, "Unexpected rte_errno value "
 			  "after double-arm");
 
-	/* Let timer expire */
-	rte_delay_ms(600);
-
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
 	TEST_ASSERT_EQUAL(n, 1, "Dequeued incorrect number of expiry events - "
 			  "expected: 1, actual: %d", n);
 
@@ -1373,6 +1374,7 @@ event_timer_arm_expiry(void)
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
 	};
+	uint64_t ticks = 30;
 
 	rte_mempool_get(eventdev_test_mempool, (void **)&evtim);
 	if (evtim == NULL) {
@@ -1382,7 +1384,7 @@ event_timer_arm_expiry(void)
 
 	/* Set up an event timer */
 	*evtim = init_tim;
-	evtim->timeout_ticks = CALC_TICKS(30),	// expire in 3 secs
+	evtim->timeout_ticks = CALC_TICKS(ticks); /**< expire in 3 secs */
 	evtim->ev.event_ptr = evtim;
 
 	ret = rte_event_timer_arm_burst(adapter, &evtim, 1);
@@ -1391,17 +1393,10 @@ event_timer_arm_expiry(void)
 	TEST_ASSERT_EQUAL(evtim->state, RTE_EVENT_TIMER_ARMED, "Event "
 			  "timer in incorrect state");
 
-	rte_delay_ms(2999);
-
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), ticks - 1);
 	TEST_ASSERT_EQUAL(n, 0, "Dequeued unexpected timer expiry event");
 
-	/* Delay 100 ms to account for the adapter tick window - should let us
-	 * dequeue one event
-	 */
-	rte_delay_ms(100);
-
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(1));
 	TEST_ASSERT_EQUAL(n, 1, "Dequeued incorrect number (%d) of timer "
 			  "expiry events", n);
 	TEST_ASSERT_EQUAL(evs[0].event_type, RTE_EVENT_TYPE_TIMER,
@@ -1433,6 +1428,7 @@ event_timer_arm_rearm(void)
 		.ev.event_type = RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
 	};
+	uint64_t ticks = 1;
 
 	rte_mempool_get(eventdev_test_mempool, (void **)&evtim);
 	if (evtim == NULL) {
@@ -1442,7 +1438,7 @@ event_timer_arm_rearm(void)
 
 	/* Set up a timer */
 	*evtim = init_tim;
-	evtim->timeout_ticks = CALC_TICKS(1);  // expire in 0.1 sec
+	evtim->timeout_ticks = CALC_TICKS(ticks); /**< expire in 0.1 sec */
 	evtim->ev.event_ptr = evtim;
 
 	/* Arm it */
@@ -1450,10 +1446,7 @@ event_timer_arm_rearm(void)
 	TEST_ASSERT_EQUAL(ret, 1, "Failed to arm event timer: %s\n",
 			  rte_strerror(rte_errno));
 
-	/* Add 100ms to account for the adapter tick window */
-	rte_delay_ms(100 + 100);
-
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
 	TEST_ASSERT_EQUAL(n, 1, "Failed to dequeue expected number of expiry "
 			  "events from event device");
 
@@ -1470,10 +1463,7 @@ event_timer_arm_rearm(void)
 	TEST_ASSERT_EQUAL(ret, 1, "Failed to arm event timer: %s\n",
 			  rte_strerror(rte_errno));
 
-	/* Add 100ms to account for the adapter tick window */
-	rte_delay_ms(100 + 100);
-
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
 	TEST_ASSERT_EQUAL(n, 1, "Failed to dequeue expected number of expiry "
 			  "events from event device");
 
@@ -1495,7 +1485,8 @@ event_timer_arm_max(void)
 	int ret, i, n;
 	int num_evtims = MAX_TIMERS;
 	struct rte_event_timer *evtims[num_evtims];
-	struct rte_event evs[BATCH_SIZE];
+	struct rte_event evs[num_evtims];
+	uint64_t ticks = 5;
 	const struct rte_event_timer init_tim = {
 		.ev.op = RTE_EVENT_OP_NEW,
 		.ev.queue_id = TEST_QUEUE_ID,
@@ -1503,7 +1494,7 @@ event_timer_arm_max(void)
 		.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
-		.timeout_ticks = CALC_TICKS(5), // expire in .5 sec
+		.timeout_ticks = CALC_TICKS(ticks), /**< expire in .5 sec */
 	};
 
 	ret = rte_mempool_get_bulk(eventdev_test_mempool, (void **)evtims,
@@ -1523,31 +1514,12 @@ event_timer_arm_max(void)
 			  "succeeded = %d, rte_errno = %s",
 			  num_evtims, ret, rte_strerror(rte_errno));
 
-	rte_delay_ms(1000);
-
-#define MAX_TRIES num_evtims
-	int sum = 0;
-	int tries = 0;
-	bool done = false;
-	while (!done) {
-		sum += rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs,
-					       RTE_DIM(evs), 10);
-		if (sum >= num_evtims || ++tries >= MAX_TRIES)
-			done = true;
-
-		rte_delay_ms(10);
-	}
-
-	TEST_ASSERT_EQUAL(sum, num_evtims, "Expected %d timer expiry events, "
-			  "got %d", num_evtims, sum);
-
-	TEST_ASSERT(tries < MAX_TRIES, "Exceeded max tries");
-
-	rte_delay_ms(100);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
+	TEST_ASSERT_EQUAL(n, num_evtims, "Expected %d timer expiry events, got %d",
+			  num_evtims, n);
 
 	/* Make sure the eventdev is still empty */
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs),
-				    10);
+	n = timeout_event_dequeue(evs, 1, WAIT_TICKS(1));
 
 	TEST_ASSERT_EQUAL(n, 0, "Dequeued unexpected number of timer expiry "
 			  "events from event device");
@@ -1667,6 +1639,7 @@ event_timer_cancel(void)
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
 	};
+	uint64_t ticks = 30;
 
 	rte_mempool_get(eventdev_test_mempool, (void **)&evtim);
 	if (evtim == NULL) {
@@ -1684,7 +1657,7 @@ event_timer_cancel(void)
 	/* Set up a timer */
 	*evtim = init_tim;
 	evtim->ev.event_ptr = evtim;
-	evtim->timeout_ticks = CALC_TICKS(30);  // expire in 3 sec
+	evtim->timeout_ticks = CALC_TICKS(ticks); /**< expire in 3 sec */
 
 	/* Check that cancelling an inited but unarmed timer fails */
 	ret = rte_event_timer_cancel_burst(adapter, &evtim, 1);
@@ -1708,10 +1681,8 @@ event_timer_cancel(void)
 	TEST_ASSERT_EQUAL(evtim->state, RTE_EVENT_TIMER_CANCELED,
 			  "evtim in incorrect state");
 
-	rte_delay_ms(3000);
-
 	/* Make sure that no expiry event was generated */
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
 	TEST_ASSERT_EQUAL(n, 0, "Dequeued unexpected timer expiry event\n");
 
 	rte_mempool_put(eventdev_test_mempool, evtim);
@@ -1734,8 +1705,8 @@ event_timer_cancel_double(void)
 		.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL,
 		.ev.event_type =  RTE_EVENT_TYPE_TIMER,
 		.state = RTE_EVENT_TIMER_NOT_ARMED,
-		.timeout_ticks = CALC_TICKS(5), // expire in .5 sec
 	};
+	uint64_t ticks = 30;
 
 	rte_mempool_get(eventdev_test_mempool, (void **)&evtim);
 	if (evtim == NULL) {
@@ -1746,7 +1717,7 @@ event_timer_cancel_double(void)
 	/* Set up a timer */
 	*evtim = init_tim;
 	evtim->ev.event_ptr = evtim;
-	evtim->timeout_ticks = CALC_TICKS(30);  // expire in 3 sec
+	evtim->timeout_ticks = CALC_TICKS(ticks); /**< expire in 3 sec */
 
 	ret = rte_event_timer_arm_burst(adapter, &evtim, 1);
 	TEST_ASSERT_EQUAL(ret, 1, "Failed to arm event timer: %s\n",
@@ -1768,10 +1739,8 @@ event_timer_cancel_double(void)
 	TEST_ASSERT_EQUAL(rte_errno, EALREADY, "Unexpected rte_errno value "
 			  "after double-cancel: rte_errno = %d", rte_errno);
 
-	rte_delay_ms(3000);
-
 	/* Still make sure that no expiry event was generated */
-	n = rte_event_dequeue_burst(evdev, TEST_PORT_ID, evs, RTE_DIM(evs), 0);
+	n = timeout_event_dequeue(evs, RTE_DIM(evs), WAIT_TICKS(ticks));
 	TEST_ASSERT_EQUAL(n, 0, "Dequeued unexpected timer expiry event\n");
 
 	rte_mempool_put(eventdev_test_mempool, evtim);
diff --git a/app/test/test_hash_readwrite.c b/app/test/test_hash_readwrite.c
index 9b192f2..1ed6154 100644
--- a/app/test/test_hash_readwrite.c
+++ b/app/test/test_hash_readwrite.c
@@ -162,7 +162,7 @@ init_params(int use_ext, int use_htm, int rw_lf, int use_jhash)
 
 	handle = rte_hash_create(&hash_params);
 	if (handle == NULL) {
-		printf("hash creation failed");
+		printf("hash creation failed\n");
 		return -1;
 	}
 
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index 12c50ef..0d5cfd4 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -2,7 +2,7 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include "unistd.h"
+#include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -448,7 +448,8 @@ test_add_already_bonded_slave_to_bonded_device(void)
 	uint16_t slaves[RTE_MAX_ETHPORTS];
 	char pmd_name[RTE_ETH_NAME_MAX_LEN];
 
-	test_add_slave_to_bonded_device();
+	TEST_ASSERT_SUCCESS(test_add_slave_to_bonded_device(),
+			"Failed to add slave to bonded device");
 
 	current_slave_count = rte_eth_bond_slaves_get(test_params->bonded_port_id,
 			slaves, RTE_MAX_ETHPORTS);
diff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c
index 351129d..6eb2620 100644
--- a/app/test/test_link_bonding_mode4.c
+++ b/app/test/test_link_bonding_mode4.c
@@ -643,8 +643,7 @@ bond_handshake(void)
 	/* If response didn't send - report failure */
 	TEST_ASSERT_EQUAL(all_slaves_done, 1, "Bond handshake failed\n");
 
-	/* If flags doesn't match - report failure */
-	return all_slaves_done == 1 ? TEST_SUCCESS : TEST_FAILED;
+	return TEST_SUCCESS;
 }
 
 #define TEST_LACP_SLAVE_COUT RTE_DIM(test_params.slave_ports)
diff --git a/app/test/test_link_bonding_rssconf.c b/app/test/test_link_bonding_rssconf.c
index b3d71c6..6eb473b 100644
--- a/app/test/test_link_bonding_rssconf.c
+++ b/app/test/test_link_bonding_rssconf.c
@@ -326,7 +326,7 @@ test_propagate(void)
 	uint8_t n;
 	struct slave_conf *port;
 	uint8_t bond_rss_key[40];
-	struct rte_eth_rss_conf bond_rss_conf;
+	struct rte_eth_rss_conf bond_rss_conf = {0};
 
 	int retval = 0;
 	uint64_t rss_hf = 0;
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 6d9249f..9008038 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -301,11 +301,11 @@ test_multi_alloc_statistics(void)
 	rte_malloc_get_socket_stats(socket,&post_stats);
 	/* Check statistics reported are correct */
 	/* All post stats should be equal to pre stats after alloc freed */
-	if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) &&
-			(post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) &&
-			(post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&&
-			(post_stats.alloc_count!=pre_stats.alloc_count)&&
-			(post_stats.free_count!=pre_stats.free_count)) {
+	if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) ||
+			(post_stats.heap_freesz_bytes != pre_stats.heap_freesz_bytes) ||
+			(post_stats.heap_allocsz_bytes != pre_stats.heap_allocsz_bytes) ||
+			(post_stats.alloc_count != pre_stats.alloc_count) ||
+			(post_stats.free_count != pre_stats.free_count)) {
 		printf("Malloc statistics are incorrect - freed alloc\n");
 		return -1;
 	}
@@ -362,11 +362,11 @@ test_multi_alloc_statistics(void)
 		return -1;
 	}
 
-	if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) &&
-			(post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) &&
-			(post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&&
-			(post_stats.alloc_count!=pre_stats.alloc_count)&&
-			(post_stats.free_count!=pre_stats.free_count)) {
+	if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) ||
+			(post_stats.heap_freesz_bytes != pre_stats.heap_freesz_bytes) ||
+			(post_stats.heap_allocsz_bytes != pre_stats.heap_allocsz_bytes) ||
+			(post_stats.alloc_count != pre_stats.alloc_count) ||
+			(post_stats.free_count != pre_stats.free_count)) {
 		printf("Malloc statistics are incorrect - freed alloc\n");
 		return -1;
 	}
@@ -927,6 +927,7 @@ test_alloc_single_socket(int32_t socket)
 	if (mem == NULL)
 		return -1;
 	if (addr_to_socket(mem) != desired_socket) {
+		rte_free(mem);
 		return -1;
 	}
 	rte_free(mem);
diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 2287bce..9c0ac63 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -1172,37 +1172,16 @@ err:
 #endif
 }
 
-#include <unistd.h>
-#include <sys/resource.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-/* use fork() to test mbuf errors panic */
-static int
-verify_mbuf_check_panics(struct rte_mbuf *buf)
+/* Verify if mbuf can pass the check */
+static bool
+mbuf_check_pass(struct rte_mbuf *buf)
 {
-	int pid;
-	int status;
-
-	pid = fork();
-
-	if (pid == 0) {
-		struct rlimit rl;
+	const char *reason;
 
-		/* No need to generate a coredump when panicking. */
-		rl.rlim_cur = rl.rlim_max = 0;
-		setrlimit(RLIMIT_CORE, &rl);
-		rte_mbuf_sanity_check(buf, 1); /* should panic */
-		exit(0);  /* return normally if it doesn't panic */
-	} else if (pid < 0) {
-		printf("Fork Failed\n");
-		return -1;
-	}
-	wait(&status);
-	if(status == 0)
-		return -1;
+	if (rte_mbuf_check(buf, 1, &reason) == 0)
+		return true;
 
-	return 0;
+	return false;
 }
 
 static int
@@ -1219,47 +1198,47 @@ test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)
 		return -1;
 
 	printf("Checking good mbuf initially\n");
-	if (verify_mbuf_check_panics(buf) != -1)
+	if (!mbuf_check_pass(buf))
 		return -1;
 
 	printf("Now checking for error conditions\n");
 
-	if (verify_mbuf_check_panics(NULL)) {
+	if (mbuf_check_pass(NULL)) {
 		printf("Error with NULL mbuf test\n");
 		return -1;
 	}
 
 	badbuf = *buf;
 	badbuf.pool = NULL;
-	if (verify_mbuf_check_panics(&badbuf)) {
+	if (mbuf_check_pass(&badbuf)) {
 		printf("Error with bad-pool mbuf test\n");
 		return -1;
 	}
 
 	badbuf = *buf;
 	badbuf.buf_iova = 0;
-	if (verify_mbuf_check_panics(&badbuf)) {
+	if (mbuf_check_pass(&badbuf)) {
 		printf("Error with bad-physaddr mbuf test\n");
 		return -1;
 	}
 
 	badbuf = *buf;
 	badbuf.buf_addr = NULL;
-	if (verify_mbuf_check_panics(&badbuf)) {
+	if (mbuf_check_pass(&badbuf)) {
 		printf("Error with bad-addr mbuf test\n");
 		return -1;
 	}
 
 	badbuf = *buf;
 	badbuf.refcnt = 0;
-	if (verify_mbuf_check_panics(&badbuf)) {
+	if (mbuf_check_pass(&badbuf)) {
 		printf("Error with bad-refcnt(0) mbuf test\n");
 		return -1;
 	}
 
 	badbuf = *buf;
 	badbuf.refcnt = UINT16_MAX;
-	if (verify_mbuf_check_panics(&badbuf)) {
+	if (mbuf_check_pass(&badbuf)) {
 		printf("Error with bad-refcnt(MAX) mbuf test\n");
 		return -1;
 	}
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 89a3bf4..4131d6e 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -44,7 +44,9 @@ implementer_generic = {
         },
         'generic_aarch32': {
             'march': 'armv8-a',
-            'compiler_options': ['-mfpu=neon'],
+            'force_march': true,
+            'march_features': ['simd'],
+            'compiler_options': ['-mfpu=auto'],
             'flags': [
                 ['RTE_ARCH_ARM_NEON_MEMCPY', false],
                 ['RTE_ARCH_STRICT_ALIGN', true],
@@ -535,21 +537,25 @@ if update_flags
     # probe supported archs and their features
     candidate_march = ''
     if part_number_config.has_key('march')
-        supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a',
-                            'armv8.2-a', 'armv8.1-a', 'armv8-a']
-        check_compiler_support = false
-        foreach supported_march: supported_marchs
-            if supported_march == part_number_config['march']
-                # start checking from this version downwards
-                check_compiler_support = true
-            endif
-            if (check_compiler_support and
-                cc.has_argument('-march=' + supported_march))
-                candidate_march = supported_march
-                # highest supported march version found
-                break
-            endif
-        endforeach
+        if part_number_config.get('force_march', false)
+            candidate_march = part_number_config['march']
+        else
+            supported_marchs = ['armv8.6-a', 'armv8.5-a', 'armv8.4-a', 'armv8.3-a',
+                                'armv8.2-a', 'armv8.1-a', 'armv8-a']
+            check_compiler_support = false
+            foreach supported_march: supported_marchs
+                if supported_march == part_number_config['march']
+                    # start checking from this version downwards
+                    check_compiler_support = true
+                endif
+                if (check_compiler_support and
+                    cc.has_argument('-march=' + supported_march))
+                    candidate_march = supported_march
+                    # highest supported march version found
+                    break
+                endif
+            endforeach
+        endif
         if candidate_march == ''
             error('No suitable armv8 march version found.')
         endif
@@ -581,7 +587,7 @@ if update_flags
     # apply supported compiler options
     if part_number_config.has_key('compiler_options')
         foreach flag: part_number_config['compiler_options']
-            if cc.has_argument(flag)
+            if cc.has_multi_arguments(machine_args + [flag])
                 machine_args += flag
             else
                 warning('Configuration compiler option ' +
diff --git a/debian/changelog b/debian/changelog
index 59249b0..756eb1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dpdk (21.11.6-0ubuntu0.22.04.1) jammy; urgency=medium
+
+  * Merge LTS stable release 21.11.6 (LP: #2040463)
+    - Full release notes are available at:
+      https://doc.dpdk.org/guides-21.11/rel_notes/release_21_11.html#id17
+  * d/dpdk-dev.lintian-overrides: a pair of admin tools without manpages.
+  * Add new symbols:
+    - d/librte-eventdev22.symbols due to https://github.com/DPDK/dpdk-stable/commit/5a037544
+    - d/librte-common-sfc-efx22.symbols due to https://github.com/DPDK/dpdk-stable/commit/cf1e1a8e
+  * d/p/disable_autopkgtest_fails.patch: Refresh.
+
+ -- Miriam España Acebal <[e-mail]>  Mon, 29 Jan 2024 13:52:29 +0100
+
 dpdk (21.11.4-0ubuntu0.22.04.1) jammy; urgency=medium
 
   * Merge LTS stable release 21.11.4 (LP: #2026351)
diff --git a/debian/dpdk-dev.lintian-overrides b/debian/dpdk-dev.lintian-overrides
index 76652f9..944f8e0 100644
--- a/debian/dpdk-dev.lintian-overrides
+++ b/debian/dpdk-dev.lintian-overrides
@@ -1,4 +1,5 @@
 # admin only test tools, documentation only maintained on the web (if at all) by upstream
+dpdk-dev: no-manual-page usr/bin/dpdk-dumpcap
 dpdk-dev: no-manual-page usr/bin/dpdk-pdump
 dpdk-dev: no-manual-page usr/bin/dpdk-proc-info
 dpdk-dev: no-manual-page usr/bin/dpdk-telemetry.py
@@ -11,6 +12,7 @@ dpdk-dev: no-manual-page usr/bin/dpdk-test-crypto-perf
 dpdk-dev: no-manual-page usr/bin/dpdk-test-eventdev
 dpdk-dev: no-manual-page usr/bin/dpdk-test-fib
 dpdk-dev: no-manual-page usr/bin/dpdk-test-flow-perf
+dpdk-dev: no-manual-page usr/bin/dpdk-test-gpudev
 dpdk-dev: no-manual-page usr/bin/dpdk-test-pipeline
 dpdk-dev: no-manual-page usr/bin/dpdk-test-regex
 dpdk-dev: no-manual-page usr/bin/dpdk-test-sad
diff --git a/debian/librte-common-sfc-efx22.symbols b/debian/librte-common-sfc-efx22.symbols
index b7aceb9..d3658af 100644
--- a/debian/librte-common-sfc-efx22.symbols
+++ b/debian/librte-common-sfc-efx22.symbols
@@ -78,6 +78,7 @@ librte_common_sfc_efx.so.22 librte-common-sfc-efx22 #MINVER#
  efx_mae_action_rule_insert@INTERNAL 20.11~rc3
  efx_mae_action_rule_remove@INTERNAL 20.11~rc3
  efx_mae_action_set_alloc@INTERNAL 20.11~rc3
+ efx_mae_action_set_clear_fw_rsrc_ids@INTERNAL 21.11.6
  efx_mae_action_set_fill_in_counter_id@INTERNAL 21.08
  efx_mae_action_set_fill_in_dst_mac_id@INTERNAL 21.11
  efx_mae_action_set_fill_in_eh_id@INTERNAL 21.08
diff --git a/debian/librte-eventdev22.symbols b/debian/librte-eventdev22.symbols
index ccc6695..8800a84 100644
--- a/debian/librte-eventdev22.symbols
+++ b/debian/librte-eventdev22.symbols
@@ -50,6 +50,7 @@ librte_eventdev.so.22 librte-eventdev22 #MINVER#
  __rte_eventdev_trace_eth_tx_adapter_start@INTERNAL 21.11
 #MISSING: 21.11
  __rte_eventdev_trace_eth_tx_adapter_stop@INTERNAL 21.11
+ __rte_eventdev_trace_maintain@EXPERIMENTAL 21.11.6
 #MISSING: 21.11
  __rte_eventdev_trace_port_link@INTERNAL 21.11
 #MISSING: 21.11
diff --git a/debian/patches/disable_autopkgtest_fails.patch b/debian/patches/disable_autopkgtest_fails.patch
index a4330f9..ee93d58 100644
--- a/debian/patches/disable_autopkgtest_fails.patch
+++ b/debian/patches/disable_autopkgtest_fails.patch
@@ -8,19 +8,19 @@ Author: Christian Ehrhardt <[e-mail]>
 Last-Update: 2021-07-13
 --- a/app/test/meson.build
 +++ b/app/test/meson.build
-@@ -227,7 +227,7 @@
-         ['fib6_autotest', true],
+@@ -228,7 +228,7 @@
          ['func_reentrancy_autotest', false],
          ['flow_classify_autotest', false],
+         ['graph_autotest', true],
 -        ['hash_autotest', true],
 +        ['hash_autotest', false],
          ['interrupt_autotest', true],
          ['ipfrag_autotest', false],
          ['lcores_autotest', true],
-@@ -243,10 +243,10 @@
-         ['memzone_autotest', false],
+@@ -245,10 +245,10 @@
          ['meter_autotest', true],
          ['multiprocess_autotest', false],
+         ['node_list_dump', true],
 -        ['per_lcore_autotest', true],
 +        ['per_lcore_autotest', false],
          ['pflock_autotest', true],
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index db2ca9b..591abe9 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -100,7 +100,6 @@ GENERATE_DEPRECATEDLIST = YES
 VERBATIM_HEADERS        = NO
 ALPHABETICAL_INDEX      = NO
 
-HTML_TIMESTAMP          = NO
 HTML_DYNAMIC_SECTIONS   = YES
 SEARCHENGINE            = YES
 SORT_MEMBER_DOCS        = NO
diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini
index c6694a1..3860f28 100644
--- a/doc/guides/nics/features/iavf.ini
+++ b/doc/guides/nics/features/iavf.ini
@@ -21,7 +21,7 @@ RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
 CRC offload          = Y
-VLAN offload         = Y
+VLAN offload         = P
 L3 checksum offload  = P
 L4 checksum offload  = P
 Packet type parsing  = Y
diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
index 791c9cc..3800246 100644
--- a/doc/guides/nics/hns3.rst
+++ b/doc/guides/nics/hns3.rst
@@ -30,7 +30,6 @@ Features of the HNS3 PMD are:
 - DCB
 - Scattered and gather for TX and RX
 - Vector Poll mode driver
-- Dump register
 - SR-IOV VF
 - Multi-process
 - MAC/VLAN filter
@@ -38,6 +37,15 @@ Features of the HNS3 PMD are:
 - NUMA support
 - Generic flow API
 - IEEE1588/802.1AS timestamping
+- Basic stats
+- Extended stats
+- Traffic Management API
+- Speed capabilities
+- Link Auto-negotiation
+- Link flow control
+- Dump register
+- Dump private info from device
+- FW version
 
 Prerequisites
 -------------
@@ -58,7 +66,8 @@ The following options can be modified in the ``config/rte_config.h`` file.
 
 - ``RTE_LIBRTE_HNS3_MAX_TQP_NUM_PER_PF`` (default ``256``)
 
-  Number of MAX queues reserved for PF.
+  Number of MAX queues reserved for PF on HIP09 and HIP10.
+  The MAX queue number is also determined by the value the firmware report.
 
 Runtime Config Options
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -81,7 +90,8 @@ Runtime Config Options
   ``common``.
 
   For example::
-  -a 0000:7d:00.0,rx_func_hint=simple
+
+    -a 0000:7d:00.0,rx_func_hint=simple
 
 - ``tx_func_hint`` (default ``none``)
 
@@ -101,7 +111,8 @@ Runtime Config Options
   ``common``.
 
   For example::
-  -a 0000:7d:00.0,tx_func_hint=common
+
+    -a 0000:7d:00.0,tx_func_hint=common
 
 - ``dev_caps_mask`` (default ``0``)
 
@@ -113,22 +124,25 @@ Runtime Config Options
   Its main purpose is to debug and avoid problems.
 
   For example::
-  -a 0000:7d:00.0,dev_caps_mask=0xF
+
+    -a 0000:7d:00.0,dev_caps_mask=0xF
 
 - ``mbx_time_limit_ms`` (default ``500``)
-   Used to define the mailbox time limit by user.
-   Current, the max waiting time for MBX response is 500ms, but in
-   some scenarios, it is not enough. Since it depends on the response
-   of the kernel mode driver, and its response time is related to the
-   scheduling of the system. In this special scenario, most of the
-   cores are isolated, and only a few cores are used for system
-   scheduling. When a large number of services are started, the
-   scheduling of the system will be very busy, and the reply of the
-   mbx message will time out, which will cause our PMD initialization
-   to fail. So provide access to set mailbox time limit for user.
-
-   For example::
-   -a 0000:7d:00.0,mbx_time_limit_ms=600
+
+  Used to define the mailbox time limit by user.
+  Current, the max waiting time for MBX response is 500ms, but in
+  some scenarios, it is not enough. Since it depends on the response
+  of the kernel mode driver, and its response time is related to the
+  scheduling of the system. In this special scenario, most of the
+  cores are isolated, and only a few cores are used for system
+  scheduling. When a large number of services are started, the
+  scheduling of the system will be very busy, and the reply of the
+  mbx message will time out, which will cause our PMD initialization
+  to fail. So provide access to set mailbox time limit for user.
+
+  For example::
+
+    -a 0000:7d:00.0,mbx_time_limit_ms=600
 
 Link status event Pre-conditions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -137,7 +151,8 @@ Firmware 1.8.0.0 and later versions support reporting link changes to the PF.
 Therefore, to use the LSC for the PF driver, ensure that the firmware version
 also supports reporting link changes.
 If the VF driver needs to support LSC, special patch must be added:
-`<https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/net/ethernet/hisilicon/hns3?h=next-20210428&id=18b6e31f8bf4ac7af7b057228f38a5a530378e4e>`_.
+`<https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=18b6e31f8bf4ac7af7b057228f38a5a530378e4e>`_.
+
 Note: The patch has been uploaded to 5.13 of the Linux kernel mainline.
 
 
@@ -197,36 +212,50 @@ Generic flow API
 
 - ``RSS Flow``
 
-  RSS Flow supports to set hash input set, hash function, enable hash
-  and configure queues.
-  For example:
-  Configure queues as queue 0, 1, 2, 3.
+  RSS Flow supports for creating rule base on input tuple, hash key, queues
+  and hash algorithm. But hash key, queues and hash algorithm are the global
+  configuration for hardware which will affect other rules.
+  The rule just setting input tuple is completely independent.
+
+  Run ``testpmd``:
 
   .. code-block:: console
 
-    testpmd> flow create 0 ingress pattern end actions rss types end \
-      queues 0 1 2 3 end / end
+    dpdk-testpmd -a 0000:7d:00.0 -l 10-18 -- -i --rxq=8 --txq=8
+
+  All IP packets can be distributed to 8 queues.
 
-  Enable hash and set input set for IPv4-TCP.
+  Set IPv4-TCP packet is distributed to 8 queues based on L3/L4 SRC only.
 
   .. code-block:: console
 
-    testpmd> flow create 0 ingress pattern eth / ipv4 / tcp / end \
-      actions rss types ipv4-tcp l3-src-only end queues end / end
+    testpmd> flow create 0 ingress pattern eth / ipv4 / tcp / end actions \
+             rss types ipv4-tcp l4-src-only l3-src-only end queues end / end
 
-  Set symmetric hash enable for flow type IPv4-TCP.
+  Disable IPv4 packet RSS hash.
 
   .. code-block:: console
 
-    testpmd> flow create 0 ingress pattern eth / ipv4 / tcp / end \
-      actions rss types ipv4-tcp end queues end func symmetric_toeplitz / end
+    testpmd> flow create 0 ingress pattern eth / ipv4 / end actions rss \
+             types none end queues end / end
 
-  Set hash function as simple xor.
+  Set hash function as symmetric Toeplitz.
 
   .. code-block:: console
 
     testpmd> flow create 0 ingress pattern end actions rss types end \
-      queues end func simple_xor / end
+             queues end func symmetric_toeplitz / end
+
+  In this case, all packets that enabled RSS are hashed using symmetric
+  Toeplitz algorithm.
+
+  Flush all RSS rules
+
+  .. code-block:: console
+
+    testpmd> flow flush 0
+
+  The RSS configurations of hardwre is back to the one ethdev ops set.
 
 Statistics
 ----------
diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index aedb1af..9629afe 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -88,13 +88,16 @@ Windows Prerequisites
 - To load NetUIO driver, follow the steps mentioned in `dpdk-kmods repository
   <https://git.dpdk.org/dpdk-kmods/tree/windows/netuio/README.rst>`_.
 
-Recommended Matching List
--------------------------
-
-It is highly recommended to upgrade the i40e kernel driver and firmware to
-avoid the compatibility issues with i40e PMD. Here is the suggested matching
-list which has been tested and verified. The detailed information can refer
-to chapter Tested Platforms/Tested NICs in release notes.
+Kernel driver and Firmware Matching List
+----------------------------------------
+
+It is highly recommended to upgrade the i40e kernel driver and firmware
+to avoid the compatibility issues with i40e PMD.
+The table below shows a summary of the DPDK versions
+with corresponding out-of-tree Linux kernel drivers and firmware.
+The full list of in-tree and out-of-tree Linux kernel drivers from kernel.org
+and Linux distributions that were tested and verified
+are listed in the Tested Platforms section of the Release Notes for each release.
 
 For X710/XL710/XXV710,
 
diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index 6b903b9..569fd9d 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -41,13 +41,16 @@ Windows Prerequisites
 - Loading of private Dynamic Device Personalization (DDP) package is not supported on Windows.
 
 
-Recommended Matching List
--------------------------
+Kernel driver, DDP and Firmware Matching List
+---------------------------------------------
 
 It is highly recommended to upgrade the ice kernel driver, firmware and DDP package
 to avoid the compatibility issues with ice PMD.
-Here is the suggested matching list which has been tested and verified.
-The detailed information can refer to chapter Tested Platforms/Tested NICs in release notes.
+The table below shows a summary of the DPDK versions
+with corresponding out-of-tree Linux kernel drivers, DDP package and firmware.
+The full list of in-tree and out-of-tree Linux kernel drivers from kernel.org
+and Linux distributions that were tested and verified
+are listed in the Tested Platforms section of the Release Notes for each release.
 
    +-----------+---------------+-----------------+-----------+--------------+-----------+
    |    DPDK   | Kernel Driver | OS Default DDP  | COMMS DDP | Wireless DDP | Firmware  |
diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst
index ad1a3da..1b7cc17 100644
--- a/doc/guides/nics/ixgbe.rst
+++ b/doc/guides/nics/ixgbe.rst
@@ -16,8 +16,6 @@ The wider register gives space to hold multiple packet buffers so as to save ins
 There is no change to PMD API. The RX/TX handler are the only two entries for vPMD packet I/O.
 They are transparently registered at runtime RX/TX execution if all condition checks pass.
 
-1.  To date, only an SSE version of IX GBE vPMD is available.
-
 Some constraints apply as pre-conditions for specific optimizations on bulk packet transfers.
 The following sections explain RX and TX constraints in the vPMD.
 
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 593a71c..e2fb45b 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -426,8 +426,12 @@ Limitations
     encapsulation actions.
   - For NIC Rx flow, supports ``MARK``, ``COUNT``, ``QUEUE``, ``RSS`` in the
     sample actions list.
-  - For E-Switch mirroring flow, supports ``RAW ENCAP``, ``Port ID``,
-    ``VXLAN ENCAP``, ``NVGRE ENCAP`` in the sample actions list.
+  - For E-Switch mirroring flow, supports ``RAW_ENCAP``, ``PORT_ID``,
+    ``VXLAN_ENCAP``, ``NVGRE_ENCAP`` in the sample actions list.
+  - For E-Switch mirroring flow with sample ratio = 1, the ``ENCAP`` action
+    supports uplink port only.
+  - For E-Switch mirroring flow with sample ratio = 1, the ``PORT`` and ``JUMP`` actions
+    are not supported without presented ``ENCAP`` action in the sample actions list.
   - For ConnectX-5 trusted device, the application metadata with SET_TAG index 0
     is not supported before ``RTE_FLOW_ACTION_TYPE_SAMPLE`` action.
 
diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst
index 681010d..84ec805 100644
--- a/doc/guides/nics/tap.rst
+++ b/doc/guides/nics/tap.rst
@@ -34,14 +34,14 @@ Using the option ``mac=fixed`` you can create a fixed known MAC address::
 
 The MAC address will have a fixed value with the last octet incrementing by one
 for each interface string containing ``mac=fixed``. The MAC address is formatted
-as 00:'d':'t':'a':'p':[00-FF]. Convert the characters to hex and you get the
-actual MAC address: ``00:64:74:61:70:[00-FF]``.
+as 02:'d':'t':'a':'p':[00-FF]. Convert the characters to hex and you get the
+actual MAC address: ``02:64:74:61:70:[00-FF]``.
 
-   --vdev=net_tap0,mac="00:64:74:61:70:11"
+   --vdev=net_tap0,mac="02:64:74:61:70:11"
 
 The MAC address will have a user value passed as string. The MAC address is in
 format with delimiter ``:``. The string is byte converted to hex and you get
-the actual MAC address: ``00:64:74:61:70:11``.
+the actual MAC address: ``02:64:74:61:70:11``.
 
 It is possible to specify a remote netdevice to capture packets from by adding
 ``remote=foo1``, for example::
diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst
index eef0cc2..0de445c 100644
--- a/doc/guides/nics/virtio.rst
+++ b/doc/guides/nics/virtio.rst
@@ -304,6 +304,7 @@ Prerequisites for Rx interrupts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To support Rx interrupts,
+
 #. Check if guest kernel supports VFIO-NOIOMMU:
 
     Linux started to support VFIO-NOIOMMU since 4.8.0. Make sure the guest
@@ -466,12 +467,16 @@ according to below configuration:
 
 #. Split virtqueue mergeable path: If Rx mergeable is negotiated, in-order feature is
    not negotiated, this path will be selected.
+
 #. Split virtqueue non-mergeable path: If Rx mergeable and in-order feature are not
    negotiated, also Rx offload(s) are requested, this path will be selected.
+
 #. Split virtqueue in-order mergeable path: If Rx mergeable and in-order feature are
    both negotiated, this path will be selected.
+
 #. Split virtqueue in-order non-mergeable path: If in-order feature is negotiated and
    Rx mergeable is not negotiated, this path will be selected.
+
 #. Split virtqueue vectorized Rx path: If Rx mergeable is disabled and no Rx offload
    requested, this path will be selected.
 
@@ -480,16 +485,21 @@ according to below configuration:
 
 #. Packed virtqueue mergeable path: If Rx mergeable is negotiated, in-order feature
    is not negotiated, this path will be selected.
+
 #. Packed virtqueue non-mergeable path: If Rx mergeable and in-order feature are not
    negotiated, this path will be selected.
+
 #. Packed virtqueue in-order mergeable path: If in-order and Rx mergeable feature are
    both negotiated, this path will be selected.
+
 #. Packed virtqueue in-order non-mergeable path: If in-order feature is negotiated and
    Rx mergeable is not negotiated, this path will be selected.
+
 #. Packed virtqueue vectorized Rx path: If building and running environment support
    (AVX512 || NEON) && in-order feature is negotiated && Rx mergeable
    is not negotiated && TCP_LRO Rx offloading is disabled && vectorized option enabled,
    this path will be selected.
+
 #. Packed virtqueue vectorized Tx path: If building and running environment support
    (AVX512 || NEON)  && in-order feature is negotiated && vectorized option enabled,
    this path will be selected.
@@ -567,5 +577,7 @@ or configuration, below steps can help you identify which path you selected and
 root cause faster.
 
 #. Run vhost/virtio test case;
+
 #. Run "perf top" and check virtio Rx/Tx callback names;
+
 #. Identify which virtio path is selected refer to above table.
diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst
index 149dbda..8eff2c4 100644
--- a/doc/guides/platform/cnxk.rst
+++ b/doc/guides/platform/cnxk.rst
@@ -105,7 +105,9 @@ where even VF bound to the first domain and odd VF bound to the second domain.
 Typical application usage models are,
 
 #. Communication between the Linux kernel and DPDK application.
+
 #. Exception path to Linux kernel from DPDK application as SW ``KNI`` replacement.
+
 #. Communication between two different DPDK applications.
 
 SDP interface
@@ -124,6 +126,7 @@ can bind PF or VF to use SDP interface and it will be enumerated as ethdev ports
 The primary use case for SDP is to enable the smart NIC use case. Typical usage models are,
 
 #. Communication channel between remote host and cnxk SoC over PCIe.
+
 #. Transfer packets received from network interface to remote host over PCIe and
    vice-versa.
 
@@ -244,7 +247,7 @@ context or stats using debugfs.
 
 Enable ``debugfs`` by:
 
-1. Compile kernel with debugfs enabled, i.e ``CONFIG_DEBUGFS=y``.
+1. Compile kernel with debugfs enabled, i.e ``CONFIG_DEBUG_FS=y``.
 2. Boot OCTEON CN9K/CN10K with debugfs supported kernel.
 3. Verify ``debugfs`` mounted by default "mount | grep -i debugfs" or mount it manually by using.
 
diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index 9106092..7733424 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -229,9 +229,7 @@ Note that it is necessary to initialize the event timer state to
 RTE_EVENT_TIMER_NOT_ARMED.  Also note that we have saved a pointer to the
 ``conn`` object in the timer's event payload. This will allow us to locate
 the connection object again once we dequeue the timer expiry event from the
-event device later.  As a convenience, the application may specify no value for
-ev.event_ptr, and the adapter will by default set it to point at the event
-timer itself.
+event device later.
 
 Now we can arm the event timer with ``rte_event_timer_arm_burst()``:
 
diff --git a/doc/guides/prog_guide/generic_segmentation_offload_lib.rst b/doc/guides/prog_guide/generic_segmentation_offload_lib.rst
index e605b86..30d13bc 100644
--- a/doc/guides/prog_guide/generic_segmentation_offload_lib.rst
+++ b/doc/guides/prog_guide/generic_segmentation_offload_lib.rst
@@ -204,7 +204,7 @@ To segment an outgoing packet, an application must:
    - a flag, that indicates whether the IPv4 headers of output segments should
      contain fixed or incremental ID values.
 
-2. Set the appropriate ol_flags in the mbuf.
+#. Set the appropriate ol_flags in the mbuf.
 
    - The GSO library use the value of an mbuf's ``ol_flags`` attribute to
      determine how a packet should be segmented. It is the application's
diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst
index 1cfdc86..4ab0623 100644
--- a/doc/guides/prog_guide/graph_lib.rst
+++ b/doc/guides/prog_guide/graph_lib.rst
@@ -173,7 +173,7 @@ Create the graph object
 ~~~~~~~~~~~~~~~~~~~~~~~
 Now that the nodes are linked, Its time to create a graph by including
 the required nodes. The application can provide a set of node patterns to
-form a graph object. The ``famish()`` API used underneath for the pattern
+form a graph object. The ``fnmatch()`` API used underneath for the pattern
 matching to include the required nodes. After the graph create any changes to
 nodes or graph is not allowed.
 
diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
index 7984e88..91ace7a 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -148,14 +148,15 @@ Attribute: Group
 Flow rules can be grouped by assigning them a common group number. Groups
 allow a logical hierarchy of flow rule groups (tables) to be defined. These
 groups can be supported virtually in the PMD or in the physical device.
-Group 0 is the default group and this is the only group which flows are
-guarantee to matched against, all subsequent groups can only be reached by
-way of the JUMP action from a matched flow rule.
+Group 0 is the default group and is the only group that
+flows are guaranteed to be matched against.
+All subsequent groups can only be reached by using a JUMP action
+from a matched flow rule.
 
 Although optional, applications are encouraged to group similar rules as
 much as possible to fully take advantage of hardware capabilities
 (e.g. optimized matching) and work around limitations (e.g. a single pattern
-type possibly allowed in a given group), while being aware that the groups
+type possibly allowed in a given group), while being aware that the groups'
 hierarchies must be programmed explicitly.
 
 Note that support for more than a single group is not guaranteed.
@@ -170,7 +171,7 @@ Priority levels are arbitrary and up to the application, they do
 not need to be contiguous nor start from 0, however the maximum number
 varies between devices and may be affected by existing flow rules.
 
-A flow which matches multiple rules in the same group will always matched by
+A flow which matches multiple rules in the same group will always be matched by
 the rule with the highest priority in that group.
 
 If a packet is matched by several rules of a given group for a given
@@ -1831,12 +1832,12 @@ flow group/tables on the device, this action redirects the matched flow to
 the specified group on that device.
 
 If a matched flow is redirected to a table which doesn't contain a matching
-rule for that flow then the behavior is undefined and the resulting behavior
-is up to the specific device. Best practice when using groups would be define
+rule for that flow, then the behavior is undefined and the resulting behavior
+is up to the specific device. Best practice when using groups would be to define
 a default flow rule for each group which a defines the default actions in that
 group so a consistent behavior is defined.
 
-Defining an action for matched flow in a group to jump to a group which is
+Defining an action for a matched flow in a group to jump to a group which is
 higher in the group hierarchy may not be supported by physical devices,
 depending on how groups are mapped to the physical devices. In the
 definitions of jump actions, applications should be aware that it may be
@@ -2008,8 +2009,8 @@ Also, regarding packet encapsulation ``level``:
   level.
 
 - ``2`` and subsequent values request RSS to be performed on the specified
-   inner packet encapsulation level, from outermost to innermost (lower to
-   higher values).
+  inner packet encapsulation level, from outermost to innermost (lower to
+  higher values).
 
 Values other than ``0`` are not necessarily supported.
 
@@ -3066,20 +3067,23 @@ The immediate value ``RTE_FLOW_FIELD_VALUE`` (or a pointer to it
 ``RTE_FLOW_FIELD_START`` is used to point to the beginning of a packet.
 See ``enum rte_flow_field_id`` for the list of supported fields.
 
-``op`` selects the operation to perform on a destination field.
+``op`` selects the operation to perform on a destination field:
+
 - ``set`` copies the data from ``src`` field to ``dst`` field.
 - ``add`` adds together ``dst`` and ``src`` and stores the result into ``dst``.
-- ``sub`` subtracts ``src`` from ``dst`` and stores the result into ``dst``
+- ``sub`` subtracts ``src`` from ``dst`` and stores the result into ``dst``.
 
 ``width`` defines a number of bits to use from ``src`` field.
 
 ``level`` is used to access any packet field on any encapsulation level
-as well as any tag element in the tag array.
-- ``0`` means the default behaviour. Depending on the packet type, it can
-mean outermost, innermost or anything in between.
+as well as any tag element in the tag array:
+
+- ``0`` means the default behaviour. Depending on the packet type,
+  it can mean outermost, innermost or anything in between.
 - ``1`` requests access to the outermost packet encapsulation level.
 - ``2`` and subsequent values requests access to the specified packet
-encapsulation level, from outermost to innermost (lower to higher values).
+  encapsulation level, from outermost to innermost (lower to higher values).
+
 For the tag array (in case of multiple tags are supported and present)
 ``level`` translates directly into the array index.
 
diff --git a/doc/guides/prog_guide/rte_security.rst b/doc/guides/prog_guide/rte_security.rst
index 72ca0bd..8619757 100644
--- a/doc/guides/prog_guide/rte_security.rst
+++ b/doc/guides/prog_guide/rte_security.rst
@@ -592,68 +592,27 @@ Security session configuration
 
 Security Session configuration structure is defined as ``rte_security_session_conf``
 
-.. code-block:: c
-
-    struct rte_security_session_conf {
-        enum rte_security_session_action_type action_type;
-        /**< Type of action to be performed on the session */
-        enum rte_security_session_protocol protocol;
-        /**< Security protocol to be configured */
-        union {
-                struct rte_security_ipsec_xform ipsec;
-                struct rte_security_macsec_xform macsec;
-                struct rte_security_pdcp_xform pdcp;
-                struct rte_security_docsis_xform docsis;
-        };
-        /**< Configuration parameters for security session */
-        struct rte_crypto_sym_xform *crypto_xform;
-        /**< Security Session Crypto Transformations */
-        void *userdata;
-        /**< Application specific userdata to be saved with session */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Structure rte_security_session_conf 8<
+   :end-before: >8 End of structure rte_security_session_conf.
 
 The configuration structure reuses the ``rte_crypto_sym_xform`` struct for crypto related
 configuration. The ``rte_security_session_action_type`` struct is used to specify whether the
 session is configured for Lookaside Protocol offload or Inline Crypto or Inline Protocol
 Offload.
 
-.. code-block:: c
-
-    enum rte_security_session_action_type {
-        RTE_SECURITY_ACTION_TYPE_NONE,
-        /**< No security actions */
-        RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO,
-        /**< Crypto processing for security protocol is processed inline
-         * during transmission
-         */
-        RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
-        /**< All security protocol processing is performed inline during
-         * transmission
-         */
-        RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-        /**< All security protocol processing including crypto is performed
-         * on a lookaside accelerator
-         */
-        RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO
-        /**< Similar to ACTION_TYPE_NONE but crypto processing for security
-         * protocol is processed synchronously by a CPU.
-         */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Enumeration of rte_security_session_action_type 8<
+   :end-before: >8 End enumeration of rte_security_session_action_type.
 
 The ``rte_security_session_protocol`` is defined as
 
-.. code-block:: c
-
-    enum rte_security_session_protocol {
-        RTE_SECURITY_PROTOCOL_IPSEC = 1,
-        /**< IPsec Protocol */
-        RTE_SECURITY_PROTOCOL_MACSEC,
-        /**< MACSec Protocol */
-        RTE_SECURITY_PROTOCOL_PDCP,
-        /**< PDCP Protocol */
-        RTE_SECURITY_PROTOCOL_DOCSIS,
-        /**< DOCSIS Protocol */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Enumeration of rte_security_session_protocol 8<
+   :end-before: >8 End enumeration of rte_security_session_protocol.
 
 Currently the library defines configuration parameters for IPsec and PDCP only.
 For other protocols like MACSec, structures and enums are defined as place holders
diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index 2bb115d..f8befc6 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -1,6 +1,8 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
     Copyright(c) 2018 Intel Corporation.
 
+.. include:: <isonum.txt>
+
 NTB Rawdev Driver
 =================
 
@@ -17,19 +19,23 @@ some information by using scratchpad registers.
 BIOS setting on Intel Xeon
 --------------------------
 
-Intel Non-transparent Bridge needs special BIOS setting. The reference for
-Skylake is https://www.intel.com/content/dam/support/us/en/documents/server-products/Intel_Xeon_Processor_Scalable_Family_BIOS_User_Guide.pdf
-
-- Set the needed PCIe port as NTB to NTB mode on both hosts.
-- Enable NTB bars and set bar size of bar 23 and bar 45 as 12-29 (4K-512M)
-  on both hosts (for Ice Lake, bar size can be set as 12-51, namely 4K-128PB).
-  Note that bar size on both hosts should be the same.
-- Disable split bars for both hosts.
-- Set crosslink control override as DSD/USP on one host, USD/DSP on
-  another host.
-- Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This
-  is a hardware requirement.
-
+Intel Non-transparent Bridge (NTB) needs special BIOS settings on both systems.
+Note that for 4th Generation Intel\ |reg| Xeon\ |reg| Scalable Processors,
+option ``Port Subsystem Mode`` should be changed from ``Gen5`` to ``Gen4 Only``,
+then reboot.
+
+- Set ``Non-Transparent Bridge PCIe Port Definition`` for needed PCIe ports
+  as ``NTB to NTB`` mode, on both hosts.
+- Set ``Enable NTB BARs`` as ``Enabled``, on both hosts.
+- Set ``Enable SPLIT BARs`` as ``Disabled``, on both hosts.
+- Set ``Imbar1 Size``, ``Imbar2 Size``, ``Embar1 Size`` and ``Embar2 Size``,
+  as 12-29 (i.e., 4K-512M) for 2nd Generation Intel\ |reg| Xeon\ |reg| Scalable Processors;
+  as 12-51 (i.e., 4K-128PB) for 3rd and 4th Generation Intel\ |reg| Xeon\ |reg| Scalable Processors.
+  Note that those bar sizes on both hosts should be the same.
+- Set ``Crosslink Control override`` as ``DSD/USP`` on one host,
+  ``USD/DSP`` on another host.
+- Set ``PCIe PLL SSC (Spread Spectrum Clocking)`` as ``Disabled``, on both hosts.
+  This is a hardware requirement when using Re-timer Cards.
 
 Device Setup
 ------------
@@ -145,4 +151,8 @@ like the following:
 Limitation
 ----------
 
-- This PMD only supports Intel Skylake and Ice Lake platforms.
+This PMD is only supported on Intel Xeon Platforms:
+
+- 4th Generation Intel® Xeon® Scalable Processors.
+- 3rd Generation Intel® Xeon® Scalable Processors.
+- 2nd Generation Intel® Xeon® Scalable Processors.
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 8d3218b..762db48 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -2540,3 +2540,657 @@ Tested Platforms
 * DPDK 21.11.4 contains fixes up to DPDK 23.03
 * Issues identified/fixed in DPDK main branch after DPDK 23.03 may be present in DPDK 21.11.4
 * Intel validation team reported a performance issue for a specific test on a specific platform, Intel(R) Xeon(R) Platinum 8280M CPU @ 2.70GHz CPU. Other tests and other platforms do not have this performance issue. See `mailing list <https://mails.dpdk.org/archives/stable/2023-May/043729.html>`__ for more details.
+
+21.11.5 Release Notes
+---------------------
+
+
+21.11.5 Fixes
+~~~~~~~~~~~~~
+
+* app/crypto-perf: fix socket ID default value
+* app/testpmd: fix checksum engine with GTP on 32-bit
+* app/testpmd: fix GTP L2 length in checksum engine
+* baseband/fpga_5gnr_fec: fix possible division by zero
+* baseband/fpga_5gnr_fec: fix starting unconfigured queue
+* build: fix case of project language name
+* ci: fix libabigail cache in GHA
+* common/cnxk: fix inline device VF identification
+* common/cnxk: fix IPsec IPv6 tunnel address byte swap
+* common/iavf: fix MAC type for 710 NIC
+* common/mlx5: adjust fork call with new kernel API
+* common/qat: detach crypto from compress build
+* common/sfc_efx/base: fix Rx queue without RSS hash prefix
+* crypto/ipsec_mb: fix enqueue counter for SNOW3G
+* crypto/ipsec_mb: optimize allocation in session
+* crypto/openssl: skip workaround at compilation time
+* crypto/scheduler: fix last element for valid args
+* doc: fix auth algos in cryptoperf app
+* doc: fix event timer adapter guide
+* doc: fix format in flow API guide
+* doc: fix kernel patch link in hns3 guide
+* doc: fix number of leading spaces in hns3 guide
+* doc: fix syntax in hns3 guide
+* doc: fix typo in cnxk platform guide
+* doc: fix typo in graph guide
+* doc: fix typos and wording in flow API guide
+* doc: remove warning with Doxygen 1.9.7
+* doc: update BIOS settings and supported HW for NTB
+* eal: avoid calling cleanup twice
+* eal/linux: fix legacy mem init with many segments
+* eal/linux: fix secondary process crash for mp hotplug requests
+* ethdev: check that at least one FEC mode is specified
+* ethdev: fix indirect action conversion
+* ethdev: fix MAC address occupies two entries
+* ethdev: fix potential leak in PCI probing helper
+* ethdev: update documentation for API to get FEC
+* ethdev: update documentation for API to set FEC
+* event/cnxk: fix nanoseconds to ticks conversion
+* eventdev/timer: fix buffer flush
+* eventdev/timer: fix timeout event wait behavior
+* event/dsw: free rings on close
+* examples/fips_validation: fix digest length in AES-GCM
+* examples/ip_pipeline: fix build with GCC 13
+* examples/ipsec-secgw: fix TAP default MAC address
+* examples/l2fwd-cat: fix external build
+* examples/ntb: fix build with GCC 13
+* fib: fix adding default route
+* hash: fix reading unaligned bits in Toeplitz hash
+* ipc: fix file descriptor leakage with unhandled messages
+* ipsec: fix NAT-T header length
+* kernel/freebsd: fix function parameter list
+* kni: fix build with Linux 6.3
+* kni: fix build with Linux 6.5
+* mbuf: fix Doxygen comment of distributor metadata
+* mem: fix memsegs exhausted message
+* net/bonding: fix destroy dedicated queues flow
+* net/bonding: fix startup when NUMA is not supported
+* net/cnxk: fix cookies check with security offload
+* net/cnxk: fix flow queue index validation
+* net/cnxk: flush SQ before configuring MTU
+* net/dpaa2: fix checksum good flags
+* net/e1000: fix queue number initialization
+* net/e1000: fix Rx and Tx queue status
+* net/hns3: delete duplicate macro definition
+* net/hns3: extract PTP to its own header file
+* net/hns3: fix build warning
+* net/hns3: fix device start return value
+* net/hns3: fix FEC mode check
+* net/hns3: fix FEC mode for 200G ports
+* net/hns3: fix IMP reset trigger
+* net/hns3: fix inaccurate log
+* net/hns3: fix index to look up table in NEON Rx
+* net/hns3: fix mbuf leakage when RxQ started after reset
+* net/hns3: fix mbuf leakage when RxQ started during reset
+* net/hns3: fix missing FEC capability
+* net/hns3: fix never set MAC flow control
+* net/hns3: fix non-zero weight for disabled TC
+* net/hns3: fix redundant line break in log
+* net/hns3: fix RTC time after reset
+* net/hns3: fix RTC time on initialization
+* net/hns3: fix Rx multiple firmware reset interrupts
+* net/hns3: fix uninitialized variable
+* net/hns3: fix variable type mismatch
+* net/hns3: get FEC capability from firmware
+* net/hns3: uninitialize PTP
+* net/i40e: fix comments
+* net/i40e: fix Rx data buffer size
+* net/i40e: fix tunnel packet Tx descriptor
+* net/iavf: fix abnormal disable HW interrupt
+* net/iavf: fix Rx data buffer size
+* net/iavf: fix stop ordering
+* net/iavf: fix tunnel TSO path selection
+* net/iavf: fix VLAN insertion in vector path
+* net/iavf: fix VLAN offload with AVX512
+* net/iavf: release large VF when closing device
+* net/ice: adjust timestamp mbuf register
+* net/ice/base: remove unreachable code
+* net/ice: fix 32-bit build
+* net/ice: fix DCF control thread crash
+* net/ice: fix DCF RSS initialization
+* net/ice: fix outer UDP checksum offload
+* net/ice: fix protocol agnostic offloading with big packets
+* net/ice: fix RSS hash key generation
+* net/ice: fix Rx data buffer size
+* net/ice: fix statistics
+* net/ice: fix timestamp enabling
+* net/ice: fix tunnel packet Tx descriptor
+* net/ice: fix VLAN mode parser
+* net/ice: initialize parser for double VLAN
+* net/igc: fix Rx and Tx queue status
+* net/ixgbe: add proper memory barriers in Rx
+* net/ixgbe: fix Rx and Tx queue status
+* net/mlx5: enhance error log for tunnel offloading
+* net/mlx5: fix device removal event handling
+* net/mlx5: fix drop action attribute validation
+* net/mlx5: fix drop action memory leak
+* net/mlx5: fix duplicated tag index matching in SWS
+* net/mlx5: fix flow dump for modify field
+* net/mlx5: fix flow workspace destruction
+* net/mlx5: fix LRO TCP checksum
+* net/mlx5: fix risk in NEON Rx descriptor read
+* net/mlx5: fix validation for conntrack indirect action
+* net/mlx5: forbid MPRQ restart
+* net/netvsc: fix sizeof calculation
+* net/nfp: fix address always related with PF ID 0
+* net/nfp: fix offloading flows
+* net/ngbe: fix extended statistics
+* net/ngbe: fix RSS offload capability
+* net/qede: fix RSS indirection table initialization
+* net/sfc: invalidate dangling MAE flow action FW resource IDs
+* net/sfc: stop misuse of Rx ingress m-port metadata on EF100
+* net/tap: set locally administered bit for fixed MAC address
+* net/txgbe/base: fix Tx with fiber hotplug
+* net/txgbe: fix extended statistics
+* net/txgbe: fix interrupt enable mask
+* net/txgbe: fix to set autoneg for 1G speed
+* net/txgbe: fix use-after-free on remove
+* net/virtio: fix initialization to return negative errno
+* net/virtio: propagate interrupt configuration error values
+* net/virtio-user: fix leak when initialisation fails
+* net/vmxnet3: fix drop of empty segments in Tx
+* net/vmxnet3: fix return code in initializing
+* pci: fix comment referencing renamed function
+* pipeline: fix double free for table stats
+* ring: fix dequeue parameter name
+* ring: fix use after free
+* telemetry: fix autotest on Alpine
+* test: add graph tests
+* test/bonding: fix include of standard header
+* test/crypto: fix PDCP-SDAP test vectors
+* test/crypto: fix return value for SNOW3G
+* test/crypto: fix session creation check
+* test/malloc: fix missing free
+* test/malloc: fix statistics checks
+* test/mbuf: fix crash in a forked process
+* version: 21.11.5-rc1
+* vfio: fix include with musl runtime
+* vhost: fix invalid call FD handling
+
+21.11.5 Validation
+~~~~~~~~~~~~~~~~~~
+
+* `Red Hat(R) Testing <https://mails.dpdk.org/archives/stable/2023-August/045101.html>`__
+
+   * Platform
+
+      * RHEL 9
+      * Kernel 5.14
+      * Qemu 6.2
+      * X540-AT2 NIC(ixgbe, 10G)
+
+   * Functionality
+
+      * Guest with device assignment(PF) throughput testing(1G hugepage size)
+      * Guest with device assignment(PF) throughput testing(2M hugepage size)
+      * Guest with device assignment(VF) throughput testing
+      * PVP (host dpdk testpmd as vswitch) 1Q: throughput testing
+      * PVP vhost-user 2Q throughput testing
+      * PVP vhost-user 1Q cross numa node  throughput testing
+      * Guest with vhost-user 2 queues throughput testing
+      * vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect
+      * vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect
+      * PVP 1Q live migration testing
+      * PVP 1Q cross numa node live migration testing
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M)
+      * Guest with ovs+dpdk+vhost-user 2Q live migration testing
+      * Guest with ovs+dpdk+vhost-user 4Q live migration testing
+      * Host PF + DPDK testing
+      * Host VF + DPDK testing
+
+
+* `Nvidia(R) Testing <https://mails.dpdk.org/archives/stable/2023-August/045124.html>`__
+
+   * Basic functionality with testpmd
+
+      * Tx/Rx
+      * xstats
+      * Timestamps
+      * Link status
+      * RTE flow
+      * RSS
+      * VLAN filtering, stripping and insertion
+      * Checksum/TSO
+      * ptype
+      * link_status_interrupt example application
+      * l3fwd-power example application
+      * Multi-process example applications
+      * Hardware LRO tests
+      * Regex application
+      * Buffer Split
+      * Tx scheduling
+
+   * Build tests
+   * ConnectX-6 Dx
+   * ConnectX-5
+   * ConnectX-4 Lx
+   * BlueField-2
+
+
+* `Intel(R) Testing <https://mails.dpdk.org/archives/stable/2023-August/045177.html>`__
+
+   * Basic Intel(R) NIC(ixgbe, i40e and ice) testing
+
+      * PF (i40e)
+      * PF (ixgbe)
+      * PF (ice)
+      * VF (i40e)
+      * VF (ixgbe)
+      * VF (ice)
+      * Compile Testing
+      * Intel NIC single core/NIC performance
+      * Power and IPsec
+
+   * Basic cryptodev and virtio testing
+
+      * vhost/virtio basic loopback, PVP and performance test
+      * cryptodev Function/Performance
+
+21.11.5 Known Issues
+~~~~~~~~~~~~~~~~~~~~
+
+* DPDK 21.11.5 contains fixes up to DPDK 23.07
+* Issues identified/fixed in DPDK main branch after DPDK 23.07 may be present in DPDK 21.11.5
+
+21.11.5 Fixes skipped and status unresolved
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* c5b531d6ee  app/crypto-perf: fix session freeing
+* 04dac73643  eventdev/crypto: fix enqueue count
+* 4b04134cbb  eventdev/crypto: fix failed events
+* da73a2a0d1  eventdev/crypto: fix offset used while flushing events
+* f442c04001  eventdev/crypto: fix overflow in circular buffer
+* 5a0f64d84b  net/cnxk: fix configuring large Rx/Tx queues
+* 59ceaa72d5  common/cnxk: fix part number for CN10K
+* 31a28a99fd  net/ngbe: add spinlock protection on YT PHY
+* 5781638519  common/cnxk: fix RQ mask config for CN10KB chip
+* 3fe71706ab  event/cnxk: fix stale data in workslot
+* 927cb43fe9  examples/l3fwd: fix port group mask with AltiVec
+* 0f044b6681  net/iavf: fix refine protocol header
+* 0b241667cc  net/iavf: fix tainted scalar
+* b125c0e721  net/iavf: fix tainted scalar
+* cedb44dc87  common/mlx5: improve AES-XTS tweak capability check
+* 0fd1386c30  app/testpmd: cleanup cleanly from signal
+* f1d0993e03  app/testpmd: fix interactive mode on Windows
+* 7be74edb90  common/mlx5: use just sufficient barrier for Arm
+* 7bdf7a13ae  app/testpmd: fix encap/decap size calculation
+* d2d7f0190b  doc: fix code blocks in cryptodev guide
+* 7e7b6762ea  eal: enhance NUMA affinity heuristic
+* e97738919c  net/nfp: fix Tx descriptor free logic of NFD3
+* ebc352c77f  net/mlx5: fix matcher layout size calculation
+* ad4d51d277  net/mlx5: forbid duplicated tag index in pattern template
+* 6df1bc6b3b  mempool/cnxk: avoid hang when counting batch allocs
+* 772e30281a  common/cnxk: fix CPT backpressure disable on LBK
+* b37fe88a2c  event/cnxk: fix LMTST write for single event mode
+* 92a16af450  net/iavf: fix virtchnl command called in interrupt
+* 12011b11a3  net/txgbe: adapt to MNG veto bit setting
+* 21f702d556  net/ngbe: fix link status in no LSC mode
+* 659cfce01e  net/ngbe: remove redundant codes
+* 6fd3a7a618  net/ice/base: fix internal etype in switch filter
+* 9749dffe23  net/ice: fix MAC type of E822 and E823
+* 1c7a4d37e7  common/cnxk: fix mailbox timeout due to deadlock
+* 5e170dd8b6  net/txgbe: fix blocking system events
+* 37ca457d3f  common/mlx5: fix obtaining IB device in LAG mode
+* 8c047e823a  net/bnxt: fix multi-root card support
+* 8b4618a7b4  crypto/qat: fix null algorithm digest placement
+* 9a518054b5  Ahmad  examples/l3fwd: fix duplicate expression for default nexthop
+* e6479f009f  net/mlx5: fix MPRQ stride size for headroom
+
+21.11.6 Release Notes
+---------------------
+
+
+21.11.6 Fixes
+~~~~~~~~~~~~~
+
+* app/bbdev: fix link with NXP LA12XX
+* app/dumpcap: allow multiple invocations
+* app/dumpcap: fix mbuf pool ring type
+* app/pipeline: add sigint handler
+* app/procinfo: adjust format of RSS info
+* app/procinfo: fix RSS info
+* app/procinfo: remove unnecessary rte_malloc
+* app/testpmd: add explicit check for tunnel TSO
+* app/testpmd: fix help string
+* app/testpmd: fix primary process not polling all queues
+* app/testpmd: fix tunnel TSO capability check
+* app/testpmd: fix tunnel TSO configuration
+* app/testpmd: remove useless check in TSO command
+* baseband/acc: fix ACC100 HARQ input alignment
+* bus/dpaa: fix build with asserts for GCC 13
+* bus/pci: fix device ID log
+* common/cnxk: fix aura disable handling
+* common/cnxk: fix default flow action setting
+* common/cnxk: fix different size bit operations
+* common/cnxk: fix DPI memzone name
+* common/cnxk: fix pool buffer size in opaque mode
+* common/cnxk: fix xstats for different packet sizes
+* common/cnxk: remove dead Meson code
+* common/mlx5: fix controller index parsing
+* config/arm: fix aarch32 build with GCC 13
+* cryptodev: add missing doc for security context
+* crypto/ipsec_mb: add dependency check for cross build
+* crypto/nitrox: fix panic with high number of segments
+* crypto/qat: fix NULL algorithm digest placement
+* crypto/qat: fix raw API null algorithm digest
+* dma/cnxk: fix device state
+* doc: fix hns3 build option about max queue number
+* doc: fix RSS flow description in hns3 guide
+* doc: fix some ordered lists
+* doc: remove number of commands in vDPA guide
+* doc: remove restriction on ixgbe vector support
+* doc: replace code blocks with includes in security guide
+* doc: update features in hns3 guide
+* doc: update versions recommendations for i40e and ice
+* eal/unix: fix firmware reading with external xz helper
+* eal/windows: fix build with recent MinGW
+* ethdev: account for smaller MTU when setting default
+* ethdev: fix 32-bit build with GCC 13
+* ethdev: fix ESP packet type description
+* ethdev: fix function name in comment
+* event/cnxk: fix getwork mode devargs parsing
+* event/cnxk: fix return values for capability API
+* eventdev/eth_rx: fix timestamp field register in mbuf
+* eventdev: fix device pointer for vdev-based devices
+* eventdev: fix missing driver names in info struct
+* eventdev: fix symbol export for port maintenance
+* event/dlb2: fix disable PASID
+* event/dlb2: fix missing queue ordering capability flag
+* event/dlb2: fix name check in self-test
+* event/sw: fix ordering corruption with op release
+* event/sw: remove obsolete comment
+* examples/ethtool: fix pause configuration
+* examples/ipsec-secgw: fix partial overflow
+* fib6: fix adding default route as first route
+* fib: fix adding default route overwriting entire table
+* hash: align SSE lookup to scalar implementation
+* malloc: remove return from void functions
+* mempool: clarify enqueue/dequeue ops documentation
+* mempool/cnxk: fix free from non-EAL threads
+* mempool: fix default ops for an empty mempool
+* mempool: fix get function documentation
+* meter: fix RFC4115 trTCM API Doxygen
+* net/af_packet: fix Rx and Tx queue state
+* net/af_xdp: fix Rx and Tx queue state
+* net/af_xdp: make compatible with libbpf 0.8.0
+* net/avp: fix Rx and Tx queue state
+* net/bnx2x: fix Rx and Tx queue state
+* net/bnxt: fix Rx and Tx queue state
+* net/bonding: fix header for C++
+* net/bonding: fix link status callback stop
+* net/bonding: fix possible overrun
+* net/bonding: fix Rx and Tx queue state
+* net/cnxk: fix uninitialized variable
+* net/cnxk: fix uninitialized variable
+* net/cxgbe: fix Rx and Tx queue state
+* net/dpaa2: fix Rx and Tx queue state
+* net/dpaa: fix Rx and Tx queue state
+* net/e1000: fix Rx and Tx queue state
+* net/ena: fix Rx and Tx queue state
+* net/enetc: fix Rx and Tx queue state
+* net/enic: avoid extra unlock in MTU set
+* net/enic: fix Rx and Tx queue state
+* net/hinic: fix Rx and Tx queue state
+* net/hns3: extract common function to obtain revision ID
+* net/hns3: fix crash for NEON and SVE
+* net/hns3: fix double stats for IMP and global reset
+* net/hns3: fix error code for multicast resource
+* net/hns3: fix flushing multicast MAC address
+* net/hns3: fix ignored reset event
+* net/hns3: fix IMP or global reset
+* net/hns3: fix LRO offload to report
+* net/hns3: fix mailbox sync
+* net/hns3: fix multiple reset detected log
+* net/hns3: fix order in NEON Rx
+* net/hns3: fix reset event status
+* net/hns3: fix setting DCB capability
+* net/hns3: fix some error logs
+* net/hns3: fix some return values
+* net/hns3: fix traffic management thread safety
+* net/hns3: fix typo in function name
+* net/hns3: fix unchecked Rx free threshold
+* net/hns3: fix uninitialized hash algo value
+* net/hns3: fix VF default MAC modified when set failed
+* net/hns3: fix VF reset handler interruption
+* net/hns3: keep set/get algo key functions local
+* net/hns3: refactor interrupt state query
+* net/hns3: remove reset log in secondary
+* net/i40e: fix buffer leak on Rx reconfiguration
+* net/i40e: fix FDIR queue receives broadcast packets
+* net/iavf: fix checksum offloading
+* net/iavf: fix ESN session update
+* net/iavf: fix indent in Tx path
+* net/iavf: fix port stats clearing
+* net/iavf: fix TSO with big segments
+* net/iavf: fix Tx debug
+* net/iavf: fix Tx offload flags check
+* net/iavf: fix Tx offload mask
+* net/iavf: fix Tx preparation
+* net/iavf: fix VLAN offload strip flag
+* net/iavf: remove log from Tx prepare function
+* net/iavf: unregister interrupt handler before FD close
+* net/ice: fix crash on closing representor ports
+* net/ice: fix DCF port statistics
+* net/ice: fix initial link status
+* net/ice: fix L1 check interval
+* net/ice: fix TM configuration clearing
+* net/ice: fix TSO with big segments
+* net/ice: fix Tx preparation
+* net/ice: remove log from Tx prepare function
+* net/ice: write timestamp to first segment in scattered Rx
+* net/ipn3ke: fix Rx and Tx queue state
+* net/memif: fix Rx and Tx queue state
+* net/mlx4: fix Rx and Tx queue state
+* net/mlx5: fix decap action checking in sample flow
+* net/mlx5: fix E-Switch mirror flow rule validation
+* net/mlx5: fix hairpin queue states
+* net/mlx5: fix hairpin queue unbind
+* net/mlx5: fix leak in sysfs port name translation
+* net/mlx5: fix matcher layout size calculation
+* net/mlx5: fix MPRQ stride size to accommodate the headroom
+* net/mlx5: fix multi-segment Tx inline data length
+* net/mlx5: fix shared Rx queue list management
+* net/mlx5: fix use after free on Rx queue start
+* net/mlx5: fix validation of sample encap flow action
+* net/mlx5: zero UDP checksum over IPv4 in encapsulation
+* net/mvneta: fix Rx and Tx queue state
+* net/mvpp2: fix Rx and Tx queue state
+* net/netvsc: increase VSP response timeout to 60 seconds
+* net/nfp: fix DMA error after abnormal exit
+* net/nfp: fix link status interrupt
+* net/nfp: fix reconfigure logic in PF initialization
+* net/nfp: fix reconfigure logic in VF initialization
+* net/nfp: fix reconfigure logic of set MAC address
+* net/nfp: fix Tx descriptor free logic of NFD3
+* net/ngbe: check process type in close operation
+* net/ngbe: fix flow control
+* net/ngbe: fix Rx and Tx queue state
+* net/ngbe: keep link down after device close
+* net/ngbe: reconfigure MAC Rx when link update
+* net/null: fix Rx and Tx queue state
+* net/octeon_ep: fix Rx and Tx queue state
+* net/pfe: fix Rx and Tx queue state
+* net/ring: fix Rx and Tx queue state
+* net/sfc: account for data offset on Tx
+* net/sfc: add missing error code indication to MAE init path
+* net/sfc: fix Rx and Tx queue state
+* net/sfc: remove null dereference in log
+* net/sfc: set max Rx packet length for representors
+* net/softnic: fix Rx and Tx queue state
+* net/tap: fix IPv4 checksum offloading
+* net/tap: fix L4 checksum offloading
+* net/tap: fix RSS for fragmented packets
+* net/tap: use MAC address parse API instead of local parser
+* net/txgbe: add Tx queue maximum limit
+* net/txgbe: check process type in close operation
+* net/txgbe: fix GRE tunnel packet checksum
+* net/txgbe: fix out of bound access
+* net/txgbe: fix Rx and Tx queue state
+* net/txgbe: keep link down after device close
+* net/txgbe: reconfigure MAC Rx when link update
+* net/vhost: fix Rx and Tx queue state
+* net/virtio: fix descriptor addresses in 32-bit build
+* net/virtio: fix link state interrupt vector setting
+* net/virtio: fix missing next flag in Tx packed ring
+* net/virtio: fix Rx and Tx queue state
+* net/vmxnet3: fix Rx and Tx queue state
+* pdump: fix error number on IPC response
+* random: initialize state for unregistered non-EAL threads
+* rawdev: fix device class in log message
+* Revert "net/iavf: fix abnormal disable HW interrupt"
+* Revert "net/iavf: fix tunnel TSO path selection"
+* test/bbdev: assert failed test for queue configure
+* test/bbdev: fix Python script subprocess
+* test/bonding: add missing check
+* test/bonding: fix uninitialized RSS configuration
+* test/bonding: remove unreachable statement
+* test/crypto: fix IV in some vectors
+* test/crypto: fix typo in asym tests
+* test/crypto: skip some synchronous tests with CPU crypto
+* test/event: fix crypto null device creation
+* test/hash: fix creation error log
+* version: 21.11.6-rc1
+* vhost: fix check on virtqueue access in async registration
+* vhost: fix check on virtqueue access in in-flight getter
+* vhost: fix missing check on virtqueue access
+* vhost: fix missing lock protection in power monitor API
+* vhost: fix missing vring call check on virtqueue access
+
+21.11.6 Validation
+~~~~~~~~~~~~~~~~~~
+
+* `Red Hat(R) Testing <https://mails.dpdk.org/archives/stable/2023-December/046925.html>`__
+
+   * Platform
+
+      * RHEL 9
+      * Kernel 5.14
+      * Qemu 7.2
+      * X540-AT2 NIC(ixgbe, 10G)
+
+   * Functionality
+
+      * Guest with device assignment(PF) throughput testing(1G hugepage size)
+      * Guest with device assignment(PF) throughput testing(2M hugepage size)
+      * Guest with device assignment(VF) throughput testing
+      * PVP (host dpdk testpmd as vswitch) 1Q: throughput testing
+      * PVP vhost-user 2Q throughput testing
+      * PVP vhost-user 1Q cross numa node  throughput testing
+      * Guest with vhost-user 2 queues throughput testing
+      * vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect
+      * vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect
+      * PVP 1Q live migration testing
+      * PVP 1Q cross numa node live migration testing
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M)
+      * Guest with ovs+dpdk+vhost-user 2Q live migration testing
+      * Guest with ovs+dpdk+vhost-user 4Q live migration testing
+      * Host PF + DPDK testing
+      * Host VF + DPDK testing
+
+
+* `Nvidia(R) Testing <https://mails.dpdk.org/archives/stable/2024-January/046939.html>`__
+
+   * Basic functionality with testpmd
+
+      * Tx/Rx
+      * xstats
+      * Timestamps
+      * Link status
+      * RTE flow
+      * RSS
+      * VLAN filtering, stripping and insertion
+      * Checksum/TSO
+      * ptype
+      * link_status_interrupt example application
+      * l3fwd-power example application
+      * Multi-process example applications
+      * Hardware LRO tests
+      * Regex application
+      * Buffer Split
+      * Tx scheduling
+
+   * Build tests
+   * ConnectX-6 Dx
+   * ConnectX-7
+   * BlueField-2
+
+
+* `Intel(R) Testing <https://mails.dpdk.org/archives/stable/2024-January/047001.html>`__
+
+   * Basic Intel(R) NIC(ixgbe, i40e and ice) testing
+
+      * PF (i40e, ixgbe)
+      * VF (i40e, ixgbe)
+      * PF/VF (ice)
+      * Compile Testing
+      * Intel NIC single core/NIC performance
+      * IPsec
+
+   * Basic cryptodev and virtio testing
+
+      * vhost/virtio basic loopback, PVP and performance test
+      * cryptodev Function/Performance
+
+21.11.6 Known Issues
+~~~~~~~~~~~~~~~~~~~~
+
+* DPDK 21.11.6 contains fixes up to DPDK 23.11
+* Issues identified/fixed in DPDK main branch after DPDK 23.11 may be present in DPDK 21.11.6
+
+21.11.6 Fixes skipped and status unresolved
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* c5b531d6ee app/crypto-perf: fix session freeing
+* 61b52e7edb app/test: fix reference to master in bonding test
+* 0fd1386c30 app/testpmd: cleanup cleanly from signal
+* a996cd04ae app/testpmd: fix early exit from signal
+* 7bdf7a13ae app/testpmd: fix encap/decap size calculation
+* f1d0993e03 app/testpmd: fix interactive mode on Windows
+* 5d8c1f6253 common/cnxk: check error in MAC address set
+* a6f639e079 common/cnxk: fix BP threshold calculation
+* 772e30281a common/cnxk: fix CPT backpressure disable on LBK
+* 2e9863fbb6 common/cnxk: fix different size bit operations
+* 4f6f36ce23 common/cnxk: fix leak in error path
+* 1c7a4d37e7 common/cnxk: fix mailbox timeout due to deadlock
+* 59ceaa72d5 common/cnxk: fix part number for CN10K
+* 5781638519 common/cnxk: fix RQ mask config for CN10KB chip
+* 56fa6f92e9 common/cnxk: fix RSS key configuration
+* 37ca457d3f common/mlx5: fix obtaining IB device in LAG mode
+* cedb44dc87 common/mlx5: improve AES-XTS tweak capability check
+* 7be74edb90 common/mlx5: use just sufficient barrier for Arm
+* 9d91c3047d crypto/openssl: fix memory leaks in asym operations
+* 3dd3115078 dma/cnxk: fix chunk buffer failure return code
+* ba39a261a7 dma/cnxk: fix completion ring tail wrap
+* 95a955e3e0 dma/cnxk: fix device reconfigure
+* 694e8e643d event/cnxk: fix CASP usage for clang
+* b37fe88a2c event/cnxk: fix LMTST write for single event mode
+* 3fe71706ab event/cnxk: fix stale data in workslot
+* 04dac73643 eventdev/crypto: fix enqueue count
+* 4b04134cbb eventdev/crypto: fix failed events
+* da73a2a0d1 eventdev/crypto: fix offset used while flushing events
+* f442c04001 eventdev/crypto: fix overflow in circular buffer
+* 9a518054b5 examples/l3fwd: fix duplicate expression for default nexthop
+* 927cb43fe9 examples/l3fwd: fix port group mask with AltiVec
+* 6df1bc6b3b mempool/cnxk: avoid hang when counting batch allocs
+* b3ddd649ad mempool/cnxk: fix alloc from non-EAL threads
+* 0236016c02 net/axgbe: fix Rx and Tx queue state
+* 5a0f64d84b net/cnxk: fix configuring large Rx/Tx queues
+* 7752f14026 net/cnxk: fix Rx flush on CN10k
+* 0f044b6681 net/iavf: fix refine protocol header
+* 0b241667cc net/iavf: fix tainted scalar
+* b125c0e721 net/iavf: fix tainted scalar
+* 92a16af450 net/iavf: fix virtchnl command called in interrupt
+* 6fd3a7a618 net/ice/base: fix internal etype in switch filter
+* 9749dffe23 net/ice: fix MAC type of E822 and E823
+* 2ece3b7186 net/mlx5: fix flow workspace double free in Windows
+* c46216e77a net/nfp: fix Rx and Tx queue state
+* a74c5001e9 net/ngbe: add proper memory barriers in Rx
+* 31a28a99fd net/ngbe: add spinlock protection on YT PHY
+* 21f702d556 net/ngbe: fix link status in no LSC mode
+* 659cfce01e net/ngbe: remove redundant codes
+* 12011b11a3 net/txgbe: adapt to MNG veto bit setting
+* 5e170dd8b6 net/txgbe: fix blocking system events
+* 166591931b pcapng: modify timestamp calculation
+* 63bf81a617 test: fix named test macro
diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst
index cb9c4f2..51e69fc 100644
--- a/doc/guides/sample_app_ug/vdpa.rst
+++ b/doc/guides/sample_app_ug/vdpa.rst
@@ -38,8 +38,7 @@ where
 * --iface specifies the path prefix of the UNIX domain socket file, e.g.
   /tmp/vhost-user-, then the socket files will be named as /tmp/vhost-user-<n>
   (n starts from 0).
-* --interactive means run the vdpa sample in interactive mode, currently 4
-  internal cmds are supported:
+* --interactive means run the vDPA sample in interactive mode:
 
   1. help: show help message
   2. list: list all available vdpa devices
diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst
index ce93483..1e63638 100644
--- a/doc/guides/tools/cryptoperf.rst
+++ b/doc/guides/tools/cryptoperf.rst
@@ -233,7 +233,6 @@ The following are the application command-line options:
         Set authentication algorithm name, where ``name`` is one
         of the following::
 
-           3des-cbc
            aes-cbc-mac
            aes-cmac
            aes-gmac
diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c
index 5ac2f96..d84a883 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.c
+++ b/drivers/baseband/acc100/rte_acc100_pmd.c
@@ -1375,7 +1375,7 @@ acc100_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
 				- op->ldpc_dec.n_filler);
 
 		/* Alignment on next 64B - Already enforced from HC output */
-		harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, ACC100_HARQ_ALIGN_64B);
+		harq_in_length = RTE_ALIGN_CEIL(harq_in_length, ACC100_HARQ_ALIGN_64B);
 
 		/* Stronger alignment requirement when in decompression mode */
 		if (fcw->hcin_decomp_mode > 0)
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
index 15d23d6..6931884 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
+++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
@@ -564,17 +564,21 @@ static int
 fpga_queue_start(struct rte_bbdev *dev, uint16_t queue_id)
 {
 	struct fpga_5gnr_fec_device *d = dev->data->dev_private;
+	struct fpga_queue *q = dev->data->queues[queue_id].queue_private;
+	uint32_t offset = FPGA_5GNR_FEC_RING_CTRL_REGS +
+			(sizeof(struct fpga_ring_ctrl_reg) * q->q_idx);
+	uint8_t enable = 0x01;
+	uint16_t zero = 0x0000;
 #ifdef RTE_LIBRTE_BBDEV_DEBUG
 	if (d == NULL) {
 		rte_bbdev_log(ERR, "Invalid device pointer");
 		return -1;
 	}
 #endif
-	struct fpga_queue *q = dev->data->queues[queue_id].queue_private;
-	uint32_t offset = FPGA_5GNR_FEC_RING_CTRL_REGS +
-			(sizeof(struct fpga_ring_ctrl_reg) * q->q_idx);
-	uint8_t enable = 0x01;
-	uint16_t zero = 0x0000;
+	if (dev->data->queues[queue_id].queue_private == NULL) {
+		rte_bbdev_log(ERR, "Cannot start invalid queue %d", queue_id);
+		return -1;
+	}
 
 	/* Clear queue head and tail variables */
 	q->tail = q->head_free_desc = 0;
@@ -879,9 +883,11 @@ check_desc_error(uint32_t error_code) {
 static inline uint16_t
 get_k0(uint16_t n_cb, uint16_t z_c, uint8_t bg, uint8_t rv_index)
 {
+	uint16_t n = (bg == 1 ? N_ZC_1 : N_ZC_2) * z_c;
 	if (rv_index == 0)
 		return 0;
-	uint16_t n = (bg == 1 ? N_ZC_1 : N_ZC_2) * z_c;
+	if (z_c == 0)
+		return 0;
 	if (n_cb == n) {
 		if (rv_index == 1)
 			return (bg == 1 ? K0_1_1 : K0_1_2) * z_c;
diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c
index 447c091..aa8da96 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2008-2016 Freescale Semiconductor Inc.
- * Copyright 2017,2019 NXP
+ * Copyright 2017,2019-2023 NXP
  *
  */
 
@@ -897,7 +897,7 @@ mr_loop:
 				/* Lookup in the retirement table */
 				fq = table_find_fq(p,
 						   be32_to_cpu(msg->fq.fqid));
-				DPAA_BUG_ON(!fq);
+				DPAA_BUG_ON(fq != NULL);
 				fq_state_change(p, fq, &swapped_msg, verb);
 				if (fq->cb.fqs)
 					fq->cb.fqs(p, fq, &swapped_msg);
@@ -909,6 +909,7 @@ mr_loop:
 #else
 				fq = (void *)(uintptr_t)msg->fq.contextB;
 #endif
+				DPAA_BUG_ON(fq != NULL);
 				fq_state_change(p, fq, msg, verb);
 				if (fq->cb.fqs)
 					fq->cb.fqs(p, fq, &swapped_msg);
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index cd0d0b1..822aa41 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
+#include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <linux/pci_regs.h>
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index def372b..6ff136f 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -262,7 +262,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 		}
 	}
 
-	RTE_LOG(INFO, EAL, "Probe PCI driver: %s (%x:%x) device: "PCI_PRI_FMT" (socket %i)\n",
+	RTE_LOG(INFO, EAL, "Probe PCI driver: %s (%x:%04x) device: "PCI_PRI_FMT" (socket %i)\n",
 			dr->driver.name, dev->id.vendor_id, dev->id.device_id,
 			loc->domain, loc->bus, loc->devid, loc->function,
 			dev->device.numa_node);
diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c
index 787138b..7f4f0a6 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -201,6 +201,14 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa)
 	return size;
 }
 
+static void
+ot_ipsec_update_ipv6_addr_endianness(uint64_t *addr)
+{
+	*addr = rte_be_to_cpu_64(*addr);
+	addr++;
+	*addr = rte_be_to_cpu_64(*addr);
+}
+
 static int
 ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa,
 			     struct rte_security_ipsec_xform *ipsec_xfrm)
@@ -237,6 +245,10 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa,
 		memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
 		       sizeof(struct in6_addr));
 
+		/* IP Source and Dest are in LE/CPU endian */
+		ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.src_addr);
+		ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.dst_addr);
+
 		break;
 	default:
 		return -EINVAL;
@@ -421,6 +433,10 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
 		memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
 		       sizeof(struct in6_addr));
 
+		/* IP Source and Dest are in LE/CPU endian */
+		ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.src_addr);
+		ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.dst_addr);
+
 		/* Outer header flow label source */
 		if (!ipsec_xfrm->options.copy_flabel) {
 			sa->w2.s.ipv4_df_src_or_ipv6_flw_lbl_src =
diff --git a/drivers/common/cnxk/cnxk_security_ar.h b/drivers/common/cnxk/cnxk_security_ar.h
index 3ec4c29..b4c51bd 100644
--- a/drivers/common/cnxk/cnxk_security_ar.h
+++ b/drivers/common/cnxk/cnxk_security_ar.h
@@ -17,7 +17,7 @@
 	 BITS_PER_LONG_LONG)
 
 #define WORD_SHIFT 6
-#define WORD_SIZE  (1 << WORD_SHIFT)
+#define WORD_SIZE  (1ULL << WORD_SHIFT)
 #define WORD_MASK  (WORD_SIZE - 1)
 
 #define IPSEC_ANTI_REPLAY_FAILED (-1)
diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h
index dd2ebec..8231c94 100644
--- a/drivers/common/cnxk/hw/nix.h
+++ b/drivers/common/cnxk/hw/nix.h
@@ -616,6 +616,7 @@
 #define NIX_RX_ACTIONOP_RSS	     (0x4ull)
 #define NIX_RX_ACTIONOP_PF_FUNC_DROP (0x5ull)
 #define NIX_RX_ACTIONOP_MIRROR	     (0x6ull)
+#define NIX_RX_ACTIONOP_DEFAULT	     (0xfull)
 
 #define NIX_RX_VTAGACTION_VTAG0_RELPTR (0x0ull)
 #define NIX_RX_VTAGACTION_VTAG1_RELPTR (0x4ull)
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 4928f7e..9e7ccd2 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -8,7 +8,6 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
     subdir_done()
 endif
 
-config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
 deps = ['eal', 'pci', 'bus_pci', 'mbuf', 'security']
 sources = files(
         'roc_ae.c',
diff --git a/drivers/common/cnxk/roc_dev.c b/drivers/common/cnxk/roc_dev.c
index 9a86969..0a9c722 100644
--- a/drivers/common/cnxk/roc_dev.c
+++ b/drivers/common/cnxk/roc_dev.c
@@ -951,6 +951,7 @@ dev_vf_hwcap_update(struct plt_pci_device *pci_dev, struct dev *dev)
 	case PCI_DEVID_CNXK_RVU_AF_VF:
 	case PCI_DEVID_CNXK_RVU_VF:
 	case PCI_DEVID_CNXK_RVU_SDP_VF:
+	case PCI_DEVID_CNXK_RVU_NIX_INL_VF:
 		dev->hwcap |= DEV_HWCAP_F_VF;
 		break;
 	}
diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c
index 23b2cc4..1666fe5 100644
--- a/drivers/common/cnxk/roc_dpi.c
+++ b/drivers/common/cnxk/roc_dpi.c
@@ -81,10 +81,10 @@ roc_dpi_configure(struct roc_dpi *roc_dpi)
 		return rc;
 	}
 
-	snprintf(name, sizeof(name), "dpimem%d", roc_dpi->vfid);
+	snprintf(name, sizeof(name), "dpimem%d:%d:%d:%d", pci_dev->addr.domain, pci_dev->addr.bus,
+		 pci_dev->addr.devid, pci_dev->addr.function);
 	buflen = DPI_CMD_QUEUE_SIZE * DPI_CMD_QUEUE_BUFS;
-	dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0,
-					     DPI_CMD_QUEUE_SIZE);
+	dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0, DPI_CMD_QUEUE_SIZE);
 	if (dpi_mz == NULL) {
 		plt_err("dpi memzone reserve failed");
 		rc = -ENOMEM;
diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index 9a8ae6b..564bf29 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -453,7 +453,7 @@ struct lmtst_tbl_setup_req {
 
 struct cgx_stats_rsp {
 	struct mbox_msghdr hdr;
-#define CGX_RX_STATS_COUNT 13
+#define CGX_RX_STATS_COUNT 9
 #define CGX_TX_STATS_COUNT 18
 	uint64_t __io rx_stats[CGX_RX_STATS_COUNT];
 	uint64_t __io tx_stats[CGX_TX_STATS_COUNT];
diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c
index efcb758..ddd66c6 100644
--- a/drivers/common/cnxk/roc_npa.c
+++ b/drivers/common/cnxk/roc_npa.c
@@ -115,6 +115,8 @@ npa_aura_pool_fini(struct mbox *mbox, uint32_t aura_id, uint64_t aura_handle)
 	aura_req->op = NPA_AQ_INSTOP_WRITE;
 	aura_req->aura.ena = 0;
 	aura_req->aura_mask.ena = ~aura_req->aura_mask.ena;
+	aura_req->aura.bp_ena = 0;
+	aura_req->aura_mask.bp_ena = ~aura_req->aura_mask.bp_ena;
 
 	rc = mbox_process(mbox);
 	if (rc < 0)
@@ -305,7 +307,11 @@ npa_aura_pool_pair_alloc(struct npa_lf *lf, const uint32_t block_size,
 	/* Update pool fields */
 	pool->stack_base = mz->iova;
 	pool->ena = 1;
-	pool->buf_size = block_size / ROC_ALIGN;
+	/* In opaque mode buffer size must be 0 */
+	if (!pool->nat_align)
+		pool->buf_size = 0;
+	else
+		pool->buf_size = block_size / ROC_ALIGN;
 	pool->stack_max_pages = stack_size;
 	pool->shift = plt_log2_u32(block_count);
 	pool->shift = pool->shift < 8 ? 0 : pool->shift - 8;
diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
index 5ee7ff5..9422a42 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -516,11 +516,15 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
 	if (req_act == ROC_NPC_ACTION_TYPE_VLAN_STRIP) {
 		/* Only VLAN action is provided */
 		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-	} else if (req_act &
-		   (ROC_NPC_ACTION_TYPE_PF | ROC_NPC_ACTION_TYPE_VF)) {
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-		if (req_act & ROC_NPC_ACTION_TYPE_QUEUE)
-			flow->npc_action |= (uint64_t)rq << 20;
+	} else if (req_act & (ROC_NPC_ACTION_TYPE_PF | ROC_NPC_ACTION_TYPE_VF)) {
+		/* Check if any other action is set */
+		if ((req_act == ROC_NPC_ACTION_TYPE_PF) || (req_act == ROC_NPC_ACTION_TYPE_VF)) {
+			flow->npc_action = NIX_RX_ACTIONOP_DEFAULT;
+		} else {
+			flow->npc_action = NIX_RX_ACTIONOP_UCAST;
+			if (req_act & ROC_NPC_ACTION_TYPE_QUEUE)
+				flow->npc_action |= (uint64_t)rq << 20;
+		}
 	} else if (req_act & ROC_NPC_ACTION_TYPE_DROP) {
 		flow->npc_action = NIX_RX_ACTIONOP_DROP;
 	} else if (req_act & ROC_NPC_ACTION_TYPE_QUEUE) {
@@ -531,8 +535,7 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
 	} else if (req_act & ROC_NPC_ACTION_TYPE_SEC) {
 		flow->npc_action = NIX_RX_ACTIONOP_UCAST_IPSEC;
 		flow->npc_action |= (uint64_t)rq << 20;
-	} else if (req_act &
-		   (ROC_NPC_ACTION_TYPE_FLAG | ROC_NPC_ACTION_TYPE_MARK)) {
+	} else if (req_act & (ROC_NPC_ACTION_TYPE_FLAG | ROC_NPC_ACTION_TYPE_MARK)) {
 		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
 	} else if (req_act & ROC_NPC_ACTION_TYPE_COUNT) {
 		/* Keep ROC_NPC_ACTION_TYPE_COUNT_ACT always at the end
diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c b/drivers/common/cnxk/roc_npc_mcam_dump.c
index 51305b4..1ba3d8f 100644
--- a/drivers/common/cnxk/roc_npc_mcam_dump.c
+++ b/drivers/common/cnxk/roc_npc_mcam_dump.c
@@ -442,6 +442,10 @@ npc_flow_dump_rx_action(FILE *file, uint64_t npc_action)
 		plt_strlcpy(index_name, "Multicast/mirror table index",
 			    NPC_MAX_FIELD_NAME_SIZE);
 		break;
+	case NIX_RX_ACTIONOP_DEFAULT:
+		fprintf(file, "NIX_RX_ACTIONOP_DEFAULT (%" PRIu64 ")\n",
+			(uint64_t)NIX_RX_ACTIONOP_DEFAULT);
+		break;
 	default:
 		plt_err("Unknown NIX_RX_ACTIONOP found");
 		return;
diff --git a/drivers/common/iavf/iavf_common.c b/drivers/common/iavf/iavf_common.c
index 855a0ab..dc7662b 100644
--- a/drivers/common/iavf/iavf_common.c
+++ b/drivers/common/iavf/iavf_common.c
@@ -27,6 +27,8 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw)
 			break;
 		case IAVF_DEV_ID_VF:
 		case IAVF_DEV_ID_VF_HV:
+			hw->mac.type = IAVF_MAC_XL710;
+			break;
 		case IAVF_DEV_ID_ADAPTIVE_VF:
 			hw->mac.type = IAVF_MAC_VF;
 			break;
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 4c7b53b..8be8285 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -202,6 +202,8 @@ has_sym_args = [
             'mlx5dv_dr_domain_allow_duplicate_rules' ],
         [ 'HAVE_MLX5_IBV_REG_MR_IOVA', 'infiniband/verbs.h',
             'ibv_reg_mr_iova' ],
+        [ 'HAVE_IBV_FORK_UNNEEDED', 'infiniband/verbs.h',
+            'ibv_is_fork_initialized'],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c
index eeb583a..9fd6c1b 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -95,10 +95,11 @@ mlx5_translate_port_name(const char *port_name_in,
 	char ctrl = 0, pf_c1, pf_c2, vf_c1, vf_c2, eol;
 	char *end;
 	int sc_items;
+	int32_t ctrl_num = -1;
 
-	sc_items = sscanf(port_name_in, "%c%d",
-			  &ctrl, &port_info_out->ctrl_num);
+	sc_items = sscanf(port_name_in, "%c%d", &ctrl, &ctrl_num);
 	if (sc_items == 2 && ctrl == 'c') {
+		port_info_out->ctrl_num = ctrl_num;
 		port_name_in++; /* 'c' */
 		port_name_in += snprintf(NULL, 0, "%d",
 					  port_info_out->ctrl_num);
diff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c
index bc66220..e29b3b8 100644
--- a/drivers/common/mlx5/linux/mlx5_glue.c
+++ b/drivers/common/mlx5/linux/mlx5_glue.c
@@ -19,6 +19,10 @@
 static int
 mlx5_glue_fork_init(void)
 {
+#ifdef HAVE_IBV_FORK_UNNEEDED
+	if (ibv_is_fork_initialized() == IBV_FORK_UNNEEDED)
+		return 0; /* ibv_fork_init() not needed */
+#endif
 	return ibv_fork_init();
 }
 
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index af92271..1606fad 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -35,14 +35,6 @@ if qat_crypto and not libcrypto.found()
             'missing dependency, libcrypto')
 endif
 
-# The driver should not build if both compression and crypto are disabled
-#FIXME common code depends on compression files so check only compress!
-if not qat_compress # and not qat_crypto
-    build = false
-    reason = '' # rely on reason for compress/crypto above
-    subdir_done()
-endif
-
 deps += ['bus_pci', 'cryptodev', 'net', 'compressdev']
 sources += files(
         'qat_common.c',
diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c
index cde421e..5a39a90 100644
--- a/drivers/common/qat/qat_qp.c
+++ b/drivers/common/qat/qat_qp.c
@@ -452,20 +452,6 @@ adf_configure_queues(struct qat_qp *qp, enum qat_device_gen qat_dev_gen)
 }
 
 static inline void
-txq_write_tail(enum qat_device_gen qat_dev_gen,
-		struct qat_qp *qp, struct qat_queue *q)
-{
-	struct qat_qp_hw_spec_funcs *ops =
-		qat_qp_hw_spec[qat_dev_gen];
-
-	/*
-	 * Pointer check should be done during
-	 * initialization
-	 */
-	ops->qat_qp_csr_write_tail(qp, q);
-}
-
-static inline void
 qat_qp_csr_write_head(enum qat_device_gen qat_dev_gen, struct qat_qp *qp,
 			struct qat_queue *q, uint32_t new_head)
 {
@@ -643,179 +629,6 @@ kick_tail:
 	return nb_ops_sent;
 }
 
-/* Use this for compression only - but keep consistent with above common
- * function as much as possible.
- */
-uint16_t
-qat_enqueue_comp_op_burst(void *qp, void **ops, uint16_t nb_ops)
-{
-	register struct qat_queue *queue;
-	struct qat_qp *tmp_qp = (struct qat_qp *)qp;
-	register uint32_t nb_ops_sent = 0;
-	register int nb_desc_to_build;
-	uint16_t nb_ops_possible = nb_ops;
-	register uint8_t *base_addr;
-	register uint32_t tail;
-
-	int descriptors_built, total_descriptors_built = 0;
-	int nb_remaining_descriptors;
-	int overflow = 0;
-
-	if (unlikely(nb_ops == 0))
-		return 0;
-
-	/* read params used a lot in main loop into registers */
-	queue = &(tmp_qp->tx_q);
-	base_addr = (uint8_t *)queue->base_addr;
-	tail = queue->tail;
-
-	/* Find how many can actually fit on the ring */
-	{
-		/* dequeued can only be written by one thread, but it may not
-		 * be this thread. As it's 4-byte aligned it will be read
-		 * atomically here by any Intel CPU.
-		 * enqueued can wrap before dequeued, but cannot
-		 * lap it as var size of enq/deq (uint32_t) > var size of
-		 * max_inflights (uint16_t). In reality inflights is never
-		 * even as big as max uint16_t, as it's <= ADF_MAX_DESC.
-		 * On wrapping, the calculation still returns the correct
-		 * positive value as all three vars are unsigned.
-		 */
-		uint32_t inflights =
-			tmp_qp->enqueued - tmp_qp->dequeued;
-
-		/* Find how many can actually fit on the ring */
-		overflow = (inflights + nb_ops) - tmp_qp->max_inflights;
-		if (overflow > 0) {
-			nb_ops_possible = nb_ops - overflow;
-			if (nb_ops_possible == 0)
-				return 0;
-		}
-
-		/* QAT has plenty of work queued already, so don't waste cycles
-		 * enqueueing, wait til the application has gathered a bigger
-		 * burst or some completed ops have been dequeued
-		 */
-		if (tmp_qp->min_enq_burst_threshold && inflights >
-				QAT_QP_MIN_INFL_THRESHOLD && nb_ops_possible <
-				tmp_qp->min_enq_burst_threshold) {
-			tmp_qp->stats.threshold_hit_count++;
-			return 0;
-		}
-	}
-
-	/* At this point nb_ops_possible is assuming a 1:1 mapping
-	 * between ops and descriptors.
-	 * Fewer may be sent if some ops have to be split.
-	 * nb_ops_possible is <= burst size.
-	 * Find out how many spaces are actually available on the qp in case
-	 * more are needed.
-	 */
-	nb_remaining_descriptors = nb_ops_possible
-			 + ((overflow >= 0) ? 0 : overflow * (-1));
-	QAT_DP_LOG(DEBUG, "Nb ops requested %d, nb descriptors remaining %d",
-			nb_ops, nb_remaining_descriptors);
-
-	while (nb_ops_sent != nb_ops_possible &&
-				nb_remaining_descriptors > 0) {
-		struct qat_comp_op_cookie *cookie =
-				tmp_qp->op_cookies[tail >> queue->trailz];
-
-		descriptors_built = 0;
-
-		QAT_DP_LOG(DEBUG, "--- data length: %u",
-			   ((struct rte_comp_op *)*ops)->src.length);
-
-		nb_desc_to_build = qat_comp_build_request(*ops,
-				base_addr + tail, cookie, tmp_qp->qat_dev_gen);
-		QAT_DP_LOG(DEBUG, "%d descriptors built, %d remaining, "
-			"%d ops sent, %d descriptors needed",
-			total_descriptors_built, nb_remaining_descriptors,
-			nb_ops_sent, nb_desc_to_build);
-
-		if (unlikely(nb_desc_to_build < 0)) {
-			/* this message cannot be enqueued */
-			tmp_qp->stats.enqueue_err_count++;
-			if (nb_ops_sent == 0)
-				return 0;
-			goto kick_tail;
-		} else if (unlikely(nb_desc_to_build > 1)) {
-			/* this op is too big and must be split - get more
-			 * descriptors and retry
-			 */
-
-			QAT_DP_LOG(DEBUG, "Build %d descriptors for this op",
-					nb_desc_to_build);
-
-			nb_remaining_descriptors -= nb_desc_to_build;
-			if (nb_remaining_descriptors >= 0) {
-				/* There are enough remaining descriptors
-				 * so retry
-				 */
-				int ret2 = qat_comp_build_multiple_requests(
-						*ops, tmp_qp, tail,
-						nb_desc_to_build);
-
-				if (unlikely(ret2 < 1)) {
-					QAT_DP_LOG(DEBUG,
-							"Failed to build (%d) descriptors, status %d",
-							nb_desc_to_build, ret2);
-
-					qat_comp_free_split_op_memzones(cookie,
-							nb_desc_to_build - 1);
-
-					tmp_qp->stats.enqueue_err_count++;
-
-					/* This message cannot be enqueued */
-					if (nb_ops_sent == 0)
-						return 0;