Merge remote-tracking branch 'upstream/main'

.mailmap

@@ -98,6 +98,7 @@ Anatolii Gerasymenko <[email protected]>
 Anatoly Burakov <[email protected]>
 Anbarasan Murugesan <[email protected]>
 Anders Roxell <[email protected]>
+Andre Muezerie <[email protected]> <[email protected]>
 Andrea Arcangeli <[email protected]>
 Andrea Grandi <[email protected]>
 Andre Richter <[email protected]>
@@ -262,6 +263,7 @@ Chris Wright <[email protected]>
 Chuanshe Zhang <[email protected]>
 Chuanyu Xue <[email protected]>
 Chuhong Yao <[email protected]>
+Chunhao Lin <[email protected]>
 Chunsong Feng <[email protected]>
 Churchill Khangar <[email protected]>
 Cian Ferriter <[email protected]>
@@ -561,6 +563,7 @@ Hongjun Ni <[email protected]>
 Hongzhi Guo <[email protected]>
 Honnappa Nagarahalli <[email protected]>
 Horia Geanta Neag <[email protected]>
+Howard Wang <[email protected]>
 H. Peter Anvin <[email protected]>
 Hrvoje Habjanic <[email protected]>
 Huaibin Wang <[email protected]>
@@ -1179,6 +1182,7 @@ Peng Yu <[email protected]>
 Peng Zhang <[email protected]> <[email protected]>
 Pengzhen Liu <[email protected]>
 Peter Mccarthy <[email protected]>
+Peter Morrow <[email protected]>
 Peter Nilsson <[email protected]>
 Peter Spreadborough <[email protected]>
 Petr Houska <[email protected]>
@@ -1285,6 +1289,7 @@ Robin Jarry <[email protected]> <[email protected]>
 Robin Zhang <[email protected]>
 Rob Miller <[email protected]>
 Rob Scheepens <[email protected]>
+Rogelio Domínguez Hernández <[email protected]>
 Roger Melton <[email protected]>
 Rohit Raj <[email protected]>
 Roland Qi <[email protected]>
@@ -1326,6 +1331,7 @@ Sampath Peechu <[email protected]>
 Samuel Gauthier <[email protected]>
 Sandilya Bhagi <[email protected]>
 Sangjin Han <[email protected]>
+Sangtani Parag Satishbhai <[email protected]>
 Sankar Chokkalingam <[email protected]>
 Santoshkumar Karanappa Rastapur <[email protected]>
 Santosh Shukla <[email protected]> <[email protected]>
@@ -1517,6 +1523,7 @@ Thomas Long <[email protected]>
 Thomas Monjalon <[email protected]> <[email protected]>
 Thomas Petazzoni <[email protected]>
 Thomas Speier <[email protected]>
+Thomas Wilks <[email protected]>
 Tiago Lam <[email protected]>
 Tianfei Zhang <[email protected]>
 Tianhao Chai <[email protected]>
@@ -1534,6 +1541,7 @@ Ting Xu <[email protected]>
 Tingting Liao <[email protected]>
 Tiwei Bie <[email protected]> <[email protected]>
 Todd Fujinaka <[email protected]>
+Tomáš Ďurovec <[email protected]>
 Tomasz Cel <[email protected]>
 Tomasz Duszynski <[email protected]> <[email protected]>
 Tomasz Jonak <[email protected]>
@@ -1570,6 +1578,7 @@ Vanshika Shukla <[email protected]>
 Varun Lakkur Ambaji Rao <[email protected]>
 Varun Sethi <[email protected]>
 Vasily Philipov <[email protected]>
+Vasuthevan Maheswaran <[email protected]>
 Veerasenareddy Burru <[email protected]>
 Venkata Suresh Kumar P <[email protected]>
 Venkat Duvvuru <[email protected]>
@@ -1684,6 +1693,7 @@ Xieming Katty <[email protected]>
 Xinfeng Zhao <[email protected]>
 Xingguang He <[email protected]>
 Xingyou Chen <[email protected]>
+Xing Wang <[email protected]>
 Xinying Yu <[email protected]>
 Xin Long <[email protected]>
 Xi Zhang <[email protected]>
@@ -1746,6 +1756,7 @@ Yongseok Koh <[email protected]>
 Yong Wang <[email protected]> <[email protected]>
 Yongxin Liu <[email protected]>
 Yong Xu <[email protected]>
+Yong Zhang <[email protected]>
 Yoni Gilad <[email protected]>
 Youri Querry <[email protected]>
 Yuanhan Liu <[email protected]> <[email protected]>

MAINTAINERS

@@ -1003,6 +1003,14 @@ F: drivers/net/qede/
 F: doc/guides/nics/qede.rst
 F: doc/guides/nics/features/qede*.ini
 
+Realtek r8169
+M: Howard Wang <[email protected]>
+M: Chunhao Lin <[email protected]>
+M: Xing Wang <[email protected]>
+F: drivers/net/r8169/
+F: doc/guides/nics/r8169.rst
+F: doc/guides/nics/features/r8169.ini
+
 Solarflare sfc_efx
 M: Andrew Rybchenko <[email protected]>
 F: drivers/common/sfc_efx/
@@ -1552,6 +1560,11 @@ M: Gagandeep Singh <[email protected]>
 F: drivers/raw/dpaa2_cmdif/
 F: doc/guides/rawdevs/dpaa2_cmdif.rst
 
+ZTE GDTC
+M: Yong Zhang <[email protected]>
+F: drivers/raw/gdtc/
+F: doc/guides/rawdevs/gdtc.rst
+
 
 Packet processing
 -----------------
@@ -1863,14 +1876,13 @@ F: app/test/commands.c
 F: app/test/packet_burst_generator.c
 F: app/test/packet_burst_generator.h
 F: app/test/process.h
-F: app/test/resource.*
 F: app/test/test.c
 F: app/test/test.h
 F: app/test/test_pmd_perf.c
-F: app/test/test_resource.c
 F: app/test/virtual_pmd.c
 F: app/test/virtual_pmd.h
 F: buildtools/has-hugepages.py
+F: buildtools/gen-header.py
 F: buildtools/get-test-suites.py
 
 Sample packet helper functions for unit test

VERSION

@@ -1 +1 @@
-24.11.0-rc2
+24.11.0-rc3

app/graph/graph.c

@@ -103,9 +103,9 @@ parser_usecases_read(char *usecases)
 {
 	bool valid = false;
 	uint32_t i, j = 0;
-	char *token;
+	char *token, *saveptr = NULL;
 
-	token = strtok(usecases, ",");
+	token = strtok_r(usecases, ",", &saveptr);
 	while (token != NULL) {
 		for (i = 0; i < RTE_DIM(supported_usecases); i++) {
 			if (strcmp(supported_usecases[i], token) == 0) {
@@ -116,7 +116,7 @@ parser_usecases_read(char *usecases)
 				break;
 			}
 		}
-		token = strtok(NULL, ",");
+		token = strtok_r(NULL, ",", &saveptr);
 	}
 
 	return valid;

app/graph/utils.c

@@ -95,12 +95,12 @@ parser_ip4_read(uint32_t *value, char *p)
 {
 	uint8_t shift = 24;
 	uint32_t ip = 0;
-	char *token;
+	char *token, *saveptr = NULL;
 
-	token = strtok(p, ".");
+	token = strtok_r(p, ".", &saveptr);
 	while (token != NULL) {
 		ip |= (((uint32_t)strtoul(token, NULL, 10)) << shift);
-		token = strtok(NULL, ".");
+		token = strtok_r(NULL, ".", &saveptr);
 		shift -= 8;
 	}
 
@@ -113,13 +113,13 @@ int
 parser_ip6_read(uint8_t *value, char *p)
 {
 	uint64_t val = 0;
-	char *token;
+	char *token, *saveptr = NULL;
 
-	token = strtok(p, ":");
+	token = strtok_r(p, ":", &saveptr);
 	while (token != NULL) {
 		hex_string_to_uint64(&val, token);
 		*value = val;
-		token = strtok(NULL, ":");
+		token = strtok_r(NULL, ":", &saveptr);
 		value++;
 		val = 0;
 	}
@@ -132,13 +132,13 @@ parser_mac_read(uint64_t *value, char *p)
 {
 	uint64_t mac = 0, val = 0;
 	uint8_t shift = 40;
-	char *token;
+	char *token, *saveptr = NULL;
 
-	token = strtok(p, ":");
+	token = strtok_r(p, ":", &saveptr);
 	while (token != NULL) {
 		hex_string_to_uint64(&val, token);
 		mac |= val << shift;
-		token = strtok(NULL, ":");
+		token = strtok_r(NULL, ":", &saveptr);
 		shift -= 8;
 		val = 0;
 	}

app/meson.build

@@ -55,6 +55,7 @@ foreach app:apps
     build = true
     reason = '<unknown reason>' # set if build == false to explain
     sources = []
+    resources = []
     includes = []
     cflags = default_cflags
     ldflags = default_ldflags
@@ -115,7 +116,7 @@ foreach app:apps
     endif
 
     exec = executable('dpdk-' + name,
-            sources,
+            [ sources, resources ],
             c_args: cflags,
             link_args: ldflags,
             link_whole: link_libs,

app/proc-info/main.c

@@ -2171,11 +2171,11 @@ main(int argc, char **argv)
 
 	if (mem_info) {
 		meminfo_display();
-		return 0;
+		goto cleanup;
 	}
 
 	if (eventdev_xstats() > 0)
-		return 0;
+		goto cleanup;
 
 	nb_ports = rte_eth_dev_count_avail();
 	if (nb_ports == 0)
@@ -2256,6 +2256,7 @@ main(int argc, char **argv)
 	RTE_ETH_FOREACH_DEV(i)
 		rte_eth_dev_close(i);
 
+cleanup:
 	ret = rte_eal_cleanup();
 	if (ret)
 		printf("Error from rte_eal_cleanup(), %d\n", ret);