Merge remote-tracking branch 'upstream/main'

.github/workflows/build.yml

@@ -107,7 +107,7 @@ jobs:
     - name: Install packages
       run: sudo apt install -y ccache libarchive-dev libbsd-dev libbpf-dev
         libfdt-dev libibverbs-dev libipsec-mb-dev libisal-dev libjansson-dev
-        libnuma-dev libpcap-dev libssl-dev ninja-build pkg-config python3-pip
+        libnuma-dev libpcap-dev libssl-dev libvirt-dev ninja-build pkg-config python3-pip
         python3-pyelftools python3-setuptools python3-wheel zlib1g-dev
     - name: Install libabigail build dependencies if no cache is available
       if: env.ABI_CHECKS == 'true' && steps.libabigail-cache.outputs.cache-hit != 'true'
@@ -196,8 +196,8 @@ jobs:
       if: steps.image_cache.outputs.cache-hit != 'true'
       run: docker exec -i dpdk dnf install -y ccache intel-ipsec-mb-devel
         isa-l-devel jansson-devel libarchive-devel libatomic libbsd-devel
-        libbpf-devel libfdt-devel libpcap-devel libxdp-devel ninja-build
-        numactl-devel openssl-devel python3-pip python3-pyelftools
+        libbpf-devel libfdt-devel libpcap-devel libvirt-devel libxdp-devel
+        ninja-build numactl-devel openssl-devel python3-pip python3-pyelftools
         python3-setuptools python3-wheel rdma-core-devel zlib-devel
     - name: Save image in cache
       if: steps.image_cache.outputs.cache-hit != 'true'
@@ -271,8 +271,8 @@ jobs:
     - name: Install packages
       run: docker exec -i dpdk dnf install -y ccache intel-ipsec-mb-devel
         isa-l-devel jansson-devel libarchive-devel libatomic libbsd-devel
-        libbpf-devel libfdt-devel libpcap-devel libxdp-devel ninja-build
-        numactl-devel openssl-devel python3-pip python3-pyelftools
+        libbpf-devel libfdt-devel libpcap-devel libvirt-devel libxdp-devel
+        ninja-build numactl-devel openssl-devel python3-pip python3-pyelftools
         python3-setuptools python3-wheel rdma-core-devel zlib-devel
         ${{ matrix.config.compiler }}
     - name: Run setup

.gitignore

@@ -1,5 +1,10 @@
 # ignore hidden files
 .*
+# except the tracked ones and derivatives
+!.ci/
+!.github/
+!.gitignore*
+!.mailmap*
 
 # ignore generated documentation tables
 doc/guides/nics/overview_table.txt

.mailmap

@@ -751,6 +751,7 @@ Július Milan <[email protected]>
 Junfeng Guo <[email protected]>
 Junjie Chen <[email protected]>
 Junjie Wan <[email protected]>
+Junlong Wang <[email protected]>
 Jun Qiu <[email protected]>
 Jun W Zhou <[email protected]>
 Junxiao Shi <[email protected]>
@@ -804,7 +805,7 @@ Kirill Rybalchenko <[email protected]>
 Kishore Padmanabha <[email protected]>
 Klaus Degner <[email protected]>
 Kommula Shiva Shankar <[email protected]>
-Konstantin Ananyev <konstantin.v.ananyev@yandex.ru> <konstantin.ananyev@huawei.com> <[email protected]>
+Konstantin Ananyev <konstantin.ananyev@huawei.com> <konstantin.v.ananyev@yandex.ru> <[email protected]>
 Krishna Murthy <[email protected]>
 Krzysztof Galazka <[email protected]>
 Krzysztof Kanas <[email protected]> <[email protected]>
@@ -846,6 +847,7 @@ Li Feng <[email protected]>
 Li Han <[email protected]>
 Lihong Ma <[email protected]>
 Lijian Zhang <[email protected]>
+Lijie Shan <[email protected]>
 Lijuan Tu <[email protected]> <[email protected]>
 Lijun Ou <[email protected]>
 Liming Sun <[email protected]> <[email protected]>
@@ -869,6 +871,8 @@ Louis Peens <[email protected]> <[email protected]>
 Luca Boccassi <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Luca Vizzarro <[email protected]>
 Luc Pelletier <[email protected]>
+Luka Jankovic <[email protected]>
+Lukas Sismis <[email protected]>
 Lukasz Bartosik <[email protected]>
 Lukasz Cieplicki <[email protected]>
 Lukasz Czapnik <[email protected]>
@@ -1523,6 +1527,7 @@ Timmons C. Player <[email protected]>
 Timothy McDaniel <[email protected]>
 Timothy Miskell <[email protected]>
 Timothy Redaelli <[email protected]>
+Tim Martin <[email protected]>
 Tim Shearer <[email protected]>
 Ting-Kai Ku <[email protected]>
 Ting Xu <[email protected]>

MAINTAINERS

@@ -37,6 +37,7 @@ M: Ajit Khaparde <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-brcm
 
 Next-net-intel Tree
+M: Bruce Richardson <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 
 Next-net-mrvl Tree
@@ -112,6 +113,12 @@ F: license/
 F: .editorconfig
 F: .mailmap
 
+Linux kernel uAPI headers
+M: Maxime Coquelin <[email protected]>
+F: devtools/linux-uapi.sh
+F: doc/guides/contributing/linux_uapi.rst
+F: kernel/linux/uapi/
+
 Build System
 M: Bruce Richardson <[email protected]>
 F: Makefile
@@ -186,6 +193,7 @@ F: app/test/test_threads.c
 F: app/test/test_version.c
 
 Logging
+M: Stephen Hemminger <[email protected]>
 F: lib/log/
 F: doc/guides/prog_guide/log_lib.rst
 F: app/test/test_logs.c
@@ -220,6 +228,13 @@ F: app/test/test_malloc_perf.c
 F: app/test/test_memory.c
 F: app/test/test_memzone.c
 
+Lcore Variables
+M: Mattias Rönnblom <[email protected]>
+F: lib/eal/include/rte_lcore_var.h
+F: lib/eal/common/eal_common_lcore_var.c
+F: app/test/test_lcore_var*
+F: doc/guides/prog_guide/lcore_var.rst
+
 Interrupt Subsystem
 M: Harman Kalra <[email protected]>
 F: lib/eal/include/rte_epoll.h
@@ -770,13 +785,17 @@ F: doc/guides/nics/features/e1000.ini
 F: doc/guides/nics/features/igb*.ini
 
 Intel ixgbe
+M: Anatoly Burakov <[email protected]>
+M: Vladimir Medvedkin <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/ixgbe/
 F: doc/guides/nics/ixgbe.rst
 F: doc/guides/nics/intel_vf.rst
 F: doc/guides/nics/features/ixgbe*.ini
 
 Intel i40e
+M: Ian Stokes <[email protected]>
+M: Bruce Richardson <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/i40e/
 F: doc/guides/nics/i40e.rst
@@ -790,27 +809,32 @@ F: doc/guides/nics/fm10k.rst
 F: doc/guides/nics/features/fm10k*.ini
 
 Intel iavf
-M: Jingjing Wu <[email protected]>
+M: Vladimir Medvedkin <[email protected]>
+M: Ian Stokes <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/iavf/
 F: drivers/common/iavf/
 F: doc/guides/nics/features/iavf*.ini
 
 Intel ice
+M: Bruce Richardson <[email protected]>
+M: Anatoly Burakov <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/ice/
 F: doc/guides/nics/ice.rst
 F: doc/guides/nics/features/ice.ini
 
 Intel idpf
 M: Jingjing Wu <[email protected]>
+M: Praveen Shetty <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/idpf/
 F: drivers/common/idpf/
 F: doc/guides/nics/idpf.rst
 F: doc/guides/nics/features/idpf.ini
 
 Intel cpfl - EXPERIMENTAL
+M: Praveen Shetty <[email protected]>
 T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/cpfl/
 F: doc/guides/nics/cpfl.rst
@@ -1042,6 +1066,13 @@ F: drivers/net/avp/
 F: doc/guides/nics/avp.rst
 F: doc/guides/nics/features/avp.ini
 
+ZTE zxdh - EXPERIMENTAL
+M: Junlong Wang <[email protected]>
+M: Lijie Shan <[email protected]>
+F: drivers/net/zxdh/
+F: doc/guides/nics/zxdh.rst
+F: doc/guides/nics/features/zxdh.ini
+
 PCAP PMD
 F: drivers/net/pcap/
 F: doc/guides/nics/pcap_ring.rst
@@ -1393,7 +1424,7 @@ M: Pavan Nikhilesh <[email protected]>
 F: drivers/event/octeontx/timvf_*
 
 Intel DLB2
-M: Abdullah Sevincer <abdullah.sevincer@intel.com>
+M: Pravin Pathak <pravin.pathak@intel.com>
 F: drivers/event/dlb2/
 F: doc/guides/eventdevs/dlb2.rst
 
@@ -1503,6 +1534,12 @@ T: git://dpdk.org/next/dpdk-next-net-mrvl
 F: doc/guides/rawdevs/cnxk_gpio.rst
 F: drivers/raw/cnxk_gpio/
 
+Marvell CNXK RVU LF
+M: Akhil Goyal <[email protected]>
+T: git://dpdk.org/next/dpdk-next-net-mrvl
+F: drivers/raw/cnxk_rvu_lf/
+F: doc/guides/rawdevs/cnxk_rvu_lf.rst
+
 NTB
 M: Jingjing Wu <[email protected]>
 F: drivers/raw/ntb/
@@ -1744,6 +1781,7 @@ M: David Hunt <[email protected]>
 M: Sivaprasad Tummala <[email protected]>
 F: lib/power/
 F: doc/guides/prog_guide/power_man.rst
+F: drivers/power/
 F: app/test/test_power*
 F: examples/l3fwd-power/
 F: doc/guides/sample_app_ug/l3_forward_power_man.rst

VERSION

@@ -1 +1 @@
-24.11.0-rc1
+24.11.0-rc2

app/dumpcap/main.c

@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include <rte_alarm.h>
+#include <rte_bitops.h>
 #include <rte_bpf.h>
 #include <rte_config.h>
 #include <rte_debug.h>
@@ -95,7 +96,6 @@ struct interface {
 	struct rte_bpf_prm *bpf_prm;
 	char name[RTE_ETH_NAME_MAX_LEN];
 
-	struct rte_rxtx_callback *rx_cb[RTE_MAX_QUEUES_PER_PORT];
 	const char *ifname;
 	const char *ifdescr;
 };
@@ -677,7 +677,7 @@ static struct rte_ring *create_ring(void)
 
 	/* Find next power of 2 >= size. */
 	size = ring_size;
-	log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
+	log2 = sizeof(size) * 8 - rte_clz64(size - 1);
 	size = 1u << log2;
 
 	if (size != ring_size) {
@@ -800,9 +800,10 @@ static dumpcap_out_t create_output(void)
 		free(os);
 
 		TAILQ_FOREACH(intf, &interfaces, next) {
-			rte_pcapng_add_interface(ret.pcapng, intf->port,
-						 intf->ifname, intf->ifdescr,
-						 intf->opts.filter);
+			if (rte_pcapng_add_interface(ret.pcapng, intf->port, intf->ifname,
+						     intf->ifdescr, intf->opts.filter) < 0)
+				rte_exit(EXIT_FAILURE, "rte_pcapng_add_interface %u failed\n",
+					intf->port);
 		}
 	} else {
 		pcap_t *pcap;

app/graph/ethdev.c

@@ -208,10 +208,22 @@ ethdev_show(const char *name)
 	if (rc < 0)
 		return rc;
 
-	rte_eth_dev_info_get(port_id, &info);
-	rte_eth_stats_get(port_id, &stats);
-	rte_eth_macaddr_get(port_id, &addr);
-	rte_eth_link_get(port_id, &link);
+	rc = rte_eth_dev_info_get(port_id, &info);
+	if (rc < 0)
+		return rc;
+
+	rc = rte_eth_link_get(port_id, &link);
+	if (rc < 0)
+		return rc;
+
+	rc = rte_eth_stats_get(port_id, &stats);
+	if (rc < 0)
+		return rc;
+
+	rc = rte_eth_macaddr_get(port_id, &addr);
+	if (rc < 0)
+		return rc;
+
 	rte_eth_dev_get_mtu(port_id, &mtu);
 
 	length = strlen(conn->msg_out);

app/test-bbdev/test_bbdev_perf.c

@@ -111,6 +111,8 @@ static uint32_t ldpc_cap_flags;
 /* FFT window width predefined on device and on vector. */
 static int fft_window_width_dev;
 
+bool dump_ops = true;
+
 /* Represents tested active devices */
 static struct active_device {
 	const char *driver_name;
@@ -3109,6 +3111,20 @@ run_test_case_on_device(test_case_function *test_case_func, uint8_t dev_id,
 	/* Run test case function */
 	t_ret = test_case_func(ad, op_params);
 
+	if (dump_ops) {
+		/* Dump queue information in local file. */
+		static FILE *fd;
+		fd = fopen("./dump_bbdev_queue_ops.txt", "w");
+		if (fd == NULL) {
+			printf("Open dump file error.\n");
+			return -1;
+		}
+		rte_bbdev_queue_ops_dump(ad->dev_id, ad->queue_ids[i], fd);
+		fclose(fd);
+		/* Run it once only. */
+		dump_ops = false;
+	}
+
 	/* Free active device resources and return */
 	free_buffers(ad, op_params);
 	return t_ret;
@@ -3519,6 +3535,10 @@ throughput_intr_lcore_ldpc_dec(void *arg)
 			rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
 	}
 
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_intr_disable(tp->dev_id, queue_id),
+			"Failed to disable interrupts for dev: %u, queue_id: %u",
+			tp->dev_id, queue_id);
+
 	return TEST_SUCCESS;
 }
 
@@ -3613,6 +3633,10 @@ throughput_intr_lcore_dec(void *arg)
 			rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
 	}
 
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_intr_disable(tp->dev_id, queue_id),
+			"Failed to disable interrupts for dev: %u, queue_id: %u",
+			tp->dev_id, queue_id);
+
 	return TEST_SUCCESS;
 }
 
@@ -3702,6 +3726,10 @@ throughput_intr_lcore_enc(void *arg)
 			rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
 	}
 
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_intr_disable(tp->dev_id, queue_id),
+			"Failed to disable interrupts for dev: %u, queue_id: %u",
+			tp->dev_id, queue_id);
+
 	return TEST_SUCCESS;
 }
 
@@ -3794,6 +3822,10 @@ throughput_intr_lcore_ldpc_enc(void *arg)
 			rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
 	}
 
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_intr_disable(tp->dev_id, queue_id),
+			"Failed to disable interrupts for dev: %u, queue_id: %u",
+			tp->dev_id, queue_id);
+
 	return TEST_SUCCESS;
 }
 
@@ -3885,6 +3917,10 @@ throughput_intr_lcore_fft(void *arg)
 			rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
 	}
 
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_intr_disable(tp->dev_id, queue_id),
+			"Failed to disable interrupts for dev: %u, queue_id: %u",
+			tp->dev_id, queue_id);
+
 	return TEST_SUCCESS;
 }
 
@@ -3970,6 +4006,10 @@ throughput_intr_lcore_mldts(void *arg)
 			rte_atomic_store_explicit(&tp->nb_dequeued, 0, rte_memory_order_relaxed);
 	}
 
+	TEST_ASSERT_SUCCESS(rte_bbdev_queue_intr_disable(tp->dev_id, queue_id),
+			"Failed to disable interrupts for dev: %u, queue_id: %u",
+			tp->dev_id, queue_id);
+
 	return TEST_SUCCESS;
 }