Skip to content

Commit 9399a57

Browse files
author
root
committed
DPDK: Upgrad to 23.11.5.
1 parent b648edf commit 9399a57

File tree

297 files changed

+4309
-4001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+4309
-4001
lines changed

‎dpdk/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23.11.3
1+
23.11.5

‎dpdk/app/test-bbdev/test_vectors/fft_9.data‎

Lines changed: 0 additions & 870 deletions
This file was deleted.

‎dpdk/app/test-bbdev/test_vectors/fft_byp_28.data‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@ input0 =
3030
0xF7B50127, 0x0C83E9D9, 0x046B181F, 0x08B612A4, 0x024E0B91, 0x01000207, 0xFC97F83A, 0xF8B40DD4
3131

3232
output0 =
33-
0xFFF0FE8A, 0x01B3FE2F, 0x020EFFF3, 0x000C005A, 0x0040012B, 0xFF70015F, 0xFF40FD66, 0x0120FCAD,
34-
0x01DAFE8E, 0xFF05FFC8, 0x00EE0080, 0x00350269, 0x0094FCA0, 0x0398FD13, 0x03240016, 0xFF7AFEFE,
35-
0x006401AB, 0xFDB70295, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
36-
0xFB2C034A, 0xFC8F0175, 0xFE6402D8, 0x00810097, 0x015C007D, 0x01760158, 0xFAB702B3, 0xFBC0008C,
37-
0xFDE80195, 0x0050FFB2, 0x012BFFF2, 0x00EB00CD, 0xFAB30041, 0xFCDDFFFF, 0xFD200228, 0xFFD70030,
38-
0x004A0030, 0x004A00A4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
39-
0x0157004F, 0x01B2FFA3, 0x025EFFFE, 0xFE5D048C, 0xFAC301F3, 0xFD5BFE59, 0xFFE10181, 0x0151FF78,
40-
0x035B00E8, 0xFE3C030C, 0xFB1CFFA5, 0xFE84FC85, 0xFDB80124, 0x0063FF8B, 0x01FC0236, 0xFEEE01EE,
41-
0xFD31FF7F, 0xFFA1FDC2, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
42-
0x034202FC, 0xFFFF0471, 0xFE8B012F, 0x002B0237, 0x00A10164, 0x017301DA, 0x029803A6, 0xFE8A03A1,
43-
0xFE8EFF93, 0xFECC031E, 0xFF180338, 0xFEFE0385, 0x0199041C, 0xFE1B02C8, 0xFF6EFF4A, 0xFEAE0180,
44-
0xFE6A0189, 0xFE610144, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
45-
0x0143FD7B, 0x03030124, 0xFF5B02E4, 0x00A6FFE1, 0x001901AD, 0xFE4D0120, 0x0109FD68, 0x01A90075,
46-
0xFE9C0115, 0x01AB0028, 0xFF9D0119, 0xFEACFF0B, 0x01C2FCFD, 0x0211000C, 0xFF02005C, 0x00D600A9,
47-
0xFFAD0038, 0x001EFF0E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
48-
0x0180FE7E, 0x0186FED1, 0x0133FED6, 0xFE52FFE6, 0xFFCB00C9, 0xFEE70242, 0x00ACFE85, 0x019DFF6D,
49-
0x00B5005F, 0xFF0501FC, 0xFE9100E4, 0xFFA90070, 0x00D0FDE8, 0x017DFEDA, 0x008AFF87, 0xFDF101B9,
50-
0xFE30001D, 0xFFCD005C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
51-
0x032A0018, 0x0472FEFA, 0x05900042, 0x0034FE3D, 0x00AEFF8E, 0xFF5D0008, 0x031F0119, 0x055100BB,
52-
0x05AE02EC, 0x0036FE6A, 0x00100002, 0xFE78FFDC, 0x03D40175, 0x04410261, 0x035502CE, 0x00A0FE4E,
53-
0x001EFFCF, 0xFE9DFF4C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
54-
0xFF8AFE0D, 0x01F3FFD6, 0x002A023F, 0x005FFF16, 0x020C003C, 0x00E601EA, 0x003DFE48, 0x025A00FD,
55-
0xFFA5031A, 0x004C0068, 0x011500DC, 0x00A101A5, 0x0087FD60, 0x01BC01B5, 0xFD6602EA, 0x006A01B3,
56-
0x00090192, 0x002A0131, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
33+
0xFFF0FE8A, 0x01B3FE2F, 0x020EFFF3, 0xFC0901D2, 0x027501DE, 0xFF660279, 0x00ADFA89, 0xFE72FF52,
34+
0x0450FD29, 0xFB34FF92, 0x032C0136, 0xFE780346, 0x01BFFAC9, 0x00DDFF9A, 0x068FFF1F, 0xFB6DFF18,
35+
0x02D9034F, 0xFCFF0289, 0x0101FEA7, 0xFD2D016A, 0x02E40068, 0x00000000, 0x00000000, 0x00000000,
36+
0xFB2C034A, 0xFC8F0175, 0xFE6402D8, 0x0054FD1C, 0xFFA403AA, 0x02E1000F, 0xFBBE06CD, 0xFB8FFDEA,
37+
0xFF910362, 0x0031FCA4, 0x00BA02DD, 0x0138FE72, 0xFBC80412, 0xFC67FD73, 0xFEDA0415, 0x00D3FD1C,
38+
0xFDCA02DA, 0x0260FF7E, 0x0055046F, 0x0033FCD9, 0x0115029F, 0x00000000, 0x00000000, 0x00000000,
39+
0x0157004F, 0x01B2FFA3, 0x025EFFFE, 0xFF090623, 0xFAA8024A, 0xFF63FD71, 0xFD3DFEE3, 0x025000C5,
40+
0x010A0140, 0xFEFA0575, 0xFA6BFF7D, 0x0177FCA0, 0xFC05FF1E, 0x01D500C8, 0xFFC20139, 0xFE1A0397,
41+
0xFD29003C, 0x020FFDE0, 0xFE3FFCB4, 0x00740264, 0xFEA4FEEA, 0x00000000, 0x00000000, 0x00000000,
42+
0x034202FC, 0xFFFF0471, 0xFE8B012F, 0xFF440324, 0x0224032D, 0x02A6FF74, 0x04D00629, 0xFC86FEE6,
43+
0xFE59041B, 0xFD140405, 0x00830542, 0x008401C8, 0x034707AB, 0xFCCEFCE1, 0xFE6304CE, 0xFD2A022A,
44+
0xFF88041C, 0x0080FF16, 0x005502F2, 0x0006FB55, 0xFE420451, 0x00000000, 0x00000000, 0x00000000,
45+
0x0143FD7B, 0x03030124, 0xFF5B02E4, 0x0064FE8F, 0xFDE7013A, 0xFEBA0406, 0x01DFFF4B, 0x023F00C1,
46+
0x0035FF5C, 0x01D9FF2E, 0xFD26FFAA, 0xFEB902C3, 0x020FFF39, 0x02F600F7, 0x0144FE3F, 0x00DEFE9B,
47+
0xFE25FE61, 0xFDC20265, 0xFFA00261, 0x00D00119, 0x02A9FE77, 0x00000000, 0x00000000, 0x00000000,
48+
0x0180FE7E, 0x0186FED1, 0x0133FED6, 0xFF9B01B2, 0xFD94FF7A, 0x019B0480, 0xFD99FFDF, 0x02210198,
49+
0x03B600C2, 0xFFE6037E, 0xFC71FF70, 0x01D90323, 0xFDA0FE73, 0x00DE01A8, 0x04810088, 0xFE5A033B,
50+
0xFBEDFDBF, 0x01340495, 0xFC67FFF8, 0xFE9A0247, 0x03A402B8, 0x00000000, 0x00000000, 0x00000000,
51+
0x032A0018, 0x0472FEFA, 0x05900042, 0xFEF6FE6B, 0x0155FDD4, 0xFD290258, 0x02FE0438, 0x077BFE5F,
52+
0x0447033F, 0xFEC5FC97, 0xFF6EFFE3, 0xFD27020C, 0x03810467, 0x05140185, 0x0498032B, 0x0001FE27,
53+
0x014EFE85, 0xFBFD0004, 0xFE8E0309, 0x018BFE07, 0xFF8601E0, 0x00000000, 0x00000000, 0x00000000,
54+
0xFF8AFE0D, 0x01F3FFD6, 0x002A023F, 0x0341029B, 0x01F2FC54, 0x009D030A, 0xFE5FFE5B, 0x039B01AC,
55+
0xFF260308, 0x023404C9, 0x01D3FCFC, 0x006402DF, 0x0043FC95, 0x02E90289, 0xFC41012D, 0x020E070B,
56+
0x01D0FD78, 0xFFA001E1, 0xFEA900C2, 0x022801E2, 0x007CFD4D, 0x00000000, 0x00000000, 0x00000000
5757

5858

5959
in_sequence_size =

‎dpdk/app/test-crypto-perf/cperf_ops.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,9 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
535535
uint16_t i;
536536
/* AAD is placed after the IV */
537537
uint16_t aad_offset = iv_offset +
538-
RTE_ALIGN_CEIL(test_vector->aead_iv.length, 16);
538+
((options->aead_algo == RTE_CRYPTO_AEAD_AES_CCM) ?
539+
RTE_ALIGN_CEIL(test_vector->aead_iv.length, 16) :
540+
test_vector->aead_iv.length);
539541

540542
for (i = 0; i < nb_ops; i++) {
541543
struct rte_crypto_sym_op *sym_op = ops[i]->sym;

‎dpdk/app/test-eventdev/test_perf_common.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,9 +1547,9 @@ perf_worker_cleanup(struct rte_mempool *const pool, uint8_t dev_id,
15471547
for (i = nb_enq; i < nb_deq; i++)
15481548
rte_mempool_put(pool, events[i].event_ptr);
15491549

1550-
for (i = 0; i < nb_deq; i++)
1550+
for (i = nb_enq; i < nb_deq; i++)
15511551
events[i].op = RTE_EVENT_OP_RELEASE;
1552-
rte_event_enqueue_burst(dev_id, port_id, events, nb_deq);
1552+
rte_event_enqueue_burst(dev_id, port_id, events + nb_enq, nb_deq - nb_enq);
15531553
}
15541554
rte_event_port_quiesce(dev_id, port_id, perf_event_port_flush, pool);
15551555
}

‎dpdk/app/test-eventdev/test_pipeline_common.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,10 +707,10 @@ pipeline_worker_cleanup(uint8_t dev, uint8_t port, struct rte_event ev[],
707707
rte_pktmbuf_free(ev[i].mbuf);
708708
}
709709

710-
for (i = 0; i < deq; i++)
710+
for (i = enq; i < deq; i++)
711711
ev[i].op = RTE_EVENT_OP_RELEASE;
712712

713-
rte_event_enqueue_burst(dev, port, ev, deq);
713+
rte_event_enqueue_burst(dev, port, ev + enq, deq - enq);
714714
}
715715

716716
rte_event_port_quiesce(dev, port, pipeline_event_port_flush, NULL);

‎dpdk/app/test-pmd/cmdline.c‎

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3120,16 +3120,19 @@ cmd_config_dcb_parsed(void *parsed_result,
31203120
uint8_t pfc_en;
31213121
int ret;
31223122

3123+
if (port_id_is_invalid(port_id, ENABLED_WARN))
3124+
return;
3125+
31233126
port = &ports[port_id];
31243127
/** Check if the port is not started **/
31253128
if (port->port_status != RTE_PORT_STOPPED) {
31263129
fprintf(stderr, "Please stop port %d first\n", port_id);
31273130
return;
31283131
}
31293132

3130-
if ((res->num_tcs != RTE_ETH_4_TCS) && (res->num_tcs != RTE_ETH_8_TCS)) {
3133+
if (res->num_tcs <= 1 || res->num_tcs > RTE_ETH_8_TCS) {
31313134
fprintf(stderr,
3132-
"The invalid number of traffic class, only 4 or 8 allowed.\n");
3135+
"The invalid number of traffic class, only 2~8 allowed.\n");
31333136
return;
31343137
}
31353138

@@ -6322,6 +6325,9 @@ cmd_priority_flow_ctrl_set_parsed(void *parsed_result,
63226325
int rx_fc_enable, tx_fc_enable;
63236326
int ret;
63246327

6328+
if (port_id_is_invalid(res->port_id, ENABLED_WARN))
6329+
return;
6330+
63256331
/*
63266332
* Rx on/off, flow control is enabled/disabled on RX side. This can indicate
63276333
* the RTE_ETH_FC_TX_PAUSE, Transmit pause frame at the Rx side.
@@ -11049,20 +11055,21 @@ cmd_rx_offload_get_configuration_parsed(
1104911055
struct cmd_rx_offload_get_configuration_result *res = parsed_result;
1105011056
struct rte_eth_dev_info dev_info;
1105111057
portid_t port_id = res->port_id;
11052-
struct rte_port *port = &ports[port_id];
11058+
struct rte_port *port;
1105311059
struct rte_eth_conf dev_conf;
1105411060
uint64_t port_offloads;
1105511061
uint64_t queue_offloads;
1105611062
uint16_t nb_rx_queues;
1105711063
int q;
1105811064
int ret;
1105911065

11060-
printf("Rx Offloading Configuration of port %d :\n", port_id);
11061-
1106211066
ret = eth_dev_conf_get_print_err(port_id, &dev_conf);
1106311067
if (ret != 0)
1106411068
return;
1106511069

11070+
port = &ports[port_id];
11071+
printf("Rx Offloading Configuration of port %d :\n", port_id);
11072+
1106611073
port_offloads = dev_conf.rxmode.offloads;
1106711074
printf(" Port :");
1106811075
print_rx_offloads(port_offloads);
@@ -11163,23 +11170,24 @@ static void
1116311170
config_port_rx_offload(portid_t port_id, char *name, bool on)
1116411171
{
1116511172
struct rte_eth_dev_info dev_info;
11166-
struct rte_port *port = &ports[port_id];
11173+
struct rte_port *port;
1116711174
uint16_t nb_rx_queues;
1116811175
uint64_t offload;
1116911176
int q;
1117011177
int ret;
1117111178

11179+
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11180+
if (ret != 0)
11181+
return;
11182+
11183+
port = &ports[port_id];
1117211184
if (port->port_status != RTE_PORT_STOPPED) {
1117311185
fprintf(stderr,
1117411186
"Error: Can't config offload when Port %d is not stopped\n",
1117511187
port_id);
1117611188
return;
1117711189
}
1117811190

11179-
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11180-
if (ret != 0)
11181-
return;
11182-
1118311191
if (!strcmp(name, "all")) {
1118411192
offload = dev_info.rx_offload_capa;
1118511193
} else {
@@ -11365,21 +11373,22 @@ cmd_config_per_queue_rx_offload_parsed(void *parsed_result,
1136511373
struct rte_eth_dev_info dev_info;
1136611374
portid_t port_id = res->port_id;
1136711375
uint16_t queue_id = res->queue_id;
11368-
struct rte_port *port = &ports[port_id];
11376+
struct rte_port *port;
1136911377
uint64_t offload;
1137011378
int ret;
1137111379

11380+
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11381+
if (ret != 0)
11382+
return;
11383+
11384+
port = &ports[port_id];
1137211385
if (port->port_status != RTE_PORT_STOPPED) {
1137311386
fprintf(stderr,
1137411387
"Error: Can't config offload when Port %d is not stopped\n",
1137511388
port_id);
1137611389
return;
1137711390
}
1137811391

11379-
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11380-
if (ret != 0)
11381-
return;
11382-
1138311392
if (queue_id >= dev_info.nb_rx_queues) {
1138411393
fprintf(stderr,
1138511394
"Error: input queue_id should be 0 ... %d\n",
@@ -11567,20 +11576,20 @@ cmd_tx_offload_get_configuration_parsed(
1156711576
struct cmd_tx_offload_get_configuration_result *res = parsed_result;
1156811577
struct rte_eth_dev_info dev_info;
1156911578
portid_t port_id = res->port_id;
11570-
struct rte_port *port = &ports[port_id];
11579+
struct rte_port *port;
1157111580
struct rte_eth_conf dev_conf;
1157211581
uint64_t port_offloads;
1157311582
uint64_t queue_offloads;
1157411583
uint16_t nb_tx_queues;
1157511584
int q;
1157611585
int ret;
1157711586

11578-
printf("Tx Offloading Configuration of port %d :\n", port_id);
11579-
1158011587
ret = eth_dev_conf_get_print_err(port_id, &dev_conf);
1158111588
if (ret != 0)
1158211589
return;
1158311590

11591+
printf("Tx Offloading Configuration of port %d :\n", port_id);
11592+
port = &ports[port_id];
1158411593
port_offloads = dev_conf.txmode.offloads;
1158511594
printf(" Port :");
1158611595
print_tx_offloads(port_offloads);
@@ -11685,23 +11694,24 @@ static void
1168511694
config_port_tx_offload(portid_t port_id, char *name, bool on)
1168611695
{
1168711696
struct rte_eth_dev_info dev_info;
11688-
struct rte_port *port = &ports[port_id];
11697+
struct rte_port *port;
1168911698
uint16_t nb_tx_queues;
1169011699
uint64_t offload;
1169111700
int q;
1169211701
int ret;
1169311702

11703+
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11704+
if (ret != 0)
11705+
return;
11706+
11707+
port = &ports[port_id];
1169411708
if (port->port_status != RTE_PORT_STOPPED) {
1169511709
fprintf(stderr,
1169611710
"Error: Can't config offload when Port %d is not stopped\n",
1169711711
port_id);
1169811712
return;
1169911713
}
1170011714

11701-
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11702-
if (ret != 0)
11703-
return;
11704-
1170511715
if (!strcmp(name, "all")) {
1170611716
offload = dev_info.tx_offload_capa;
1170711717
} else {
@@ -11891,21 +11901,22 @@ cmd_config_per_queue_tx_offload_parsed(void *parsed_result,
1189111901
struct rte_eth_dev_info dev_info;
1189211902
portid_t port_id = res->port_id;
1189311903
uint16_t queue_id = res->queue_id;
11894-
struct rte_port *port = &ports[port_id];
11904+
struct rte_port *port;
1189511905
uint64_t offload;
1189611906
int ret;
1189711907

11908+
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11909+
if (ret != 0)
11910+
return;
11911+
11912+
port = &ports[port_id];
1189811913
if (port->port_status != RTE_PORT_STOPPED) {
1189911914
fprintf(stderr,
1190011915
"Error: Can't config offload when Port %d is not stopped\n",
1190111916
port_id);
1190211917
return;
1190311918
}
1190411919

11905-
ret = eth_dev_info_get_print_err(port_id, &dev_info);
11906-
if (ret != 0)
11907-
return;
11908-
1190911920
if (queue_id >= dev_info.nb_tx_queues) {
1191011921
fprintf(stderr,
1191111922
"Error: input queue_id should be 0 ... %d\n",

‎dpdk/app/test-pmd/config.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4546,11 +4546,12 @@ port_rss_hash_key_update(portid_t port_id, char rss_type[], uint8_t *hash_key,
45464546

45474547
rss_conf.rss_key = NULL;
45484548
rss_conf.rss_key_len = 0;
4549-
rss_conf.rss_hf = str_to_rsstypes(rss_type);
4549+
rss_conf.rss_hf = 0;
45504550
diag = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf);
45514551
if (diag == 0) {
45524552
rss_conf.rss_key = hash_key;
45534553
rss_conf.rss_key_len = hash_key_len;
4554+
rss_conf.rss_hf = str_to_rsstypes(rss_type);
45544555
diag = rte_eth_dev_rss_hash_update(port_id, &rss_conf);
45554556
}
45564557
if (diag == 0)
@@ -6909,8 +6910,8 @@ port_dcb_info_display(portid_t port_id)
69096910
printf("\n TC : ");
69106911
for (i = 0; i < dcb_info.nb_tcs; i++)
69116912
printf("\t%4d", i);
6912-
printf("\n Priority : ");
6913-
for (i = 0; i < dcb_info.nb_tcs; i++)
6913+
printf("\n Prio2TC : ");
6914+
for (i = 0; i < RTE_ETH_DCB_NUM_USER_PRIORITIES; i++)
69146915
printf("\t%4d", dcb_info.prio_tc[i]);
69156916
printf("\n BW percent :");
69166917
for (i = 0; i < dcb_info.nb_tcs; i++)

0 commit comments

Comments
 (0)