Skip to content

Commit 6590dfd

Browse files
Update files for version 3.0.0058
1 parent 6dc892d commit 6590dfd

File tree

412 files changed

+28359
-2312
lines changed

Some content is hidden

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

412 files changed

+28359
-2312
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.10.0087
1+
3.0.0058

applications/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.10.0087
1+
3.0.0058

applications/app_shield_agent/app_shield_agent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
8080
return EXIT_FAILURE;
8181

8282
/* Parse cmdline/json arguments */
83-
result = doca_argp_init("doca_app_shield_agent", &apsh_conf);
83+
result = doca_argp_init(NULL, &apsh_conf);
8484
if (result != DOCA_SUCCESS) {
8585
DOCA_LOG_ERR("Failed to init ARGP resources: %s", doca_error_get_descr(result));
8686
return EXIT_FAILURE;

applications/common/dpdk_utils.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ static doca_error_t port_init(struct rte_mempool *mbuf_pool, uint8_t port, struc
313313
}
314314

315315
port_conf.rxmode.mq_mode = rss_support ? RTE_ETH_MQ_RX_RSS : RTE_ETH_MQ_RX_NONE;
316+
port_conf.txmode.offloads = app_config->port_config.tx_offloads;
316317

317318
/* Configure the Ethernet device */
318319
ret = rte_eth_dev_configure(port, rx_rings + nb_hairpin_queues, tx_rings + nb_hairpin_queues, &port_conf);

applications/common/dpdk_utils.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ struct doca_buf;
5252

5353
/* Port configuration */
5454
struct application_port_config {
55-
int nb_ports; /* Set on init to 0 for don't care, required ports otherwise */
56-
uint16_t nb_queues; /* Set on init to 0 for don't care, required minimum cores otherwise */
57-
int nb_hairpin_q; /* Set on init to 0 to disable, hairpin queues otherwise */
58-
uint16_t mbuf_size; /* Set on init to 0 for don't care, packet mbuf size (including headroom) otherwise */
55+
int nb_ports; /* Set on init to 0 for don't care, required ports otherwise */
56+
uint16_t nb_queues; /* Set on init to 0 for don't care, required minimum cores otherwise */
57+
int nb_hairpin_q; /* Set on init to 0 to disable, hairpin queues otherwise */
58+
uint16_t mbuf_size; /* Set on init to 0 for don't care, packet mbuf size (including headroom) otherwise */
59+
uint64_t tx_offloads; /* Set on init to 0 for don't care, port tx offload flags otherwise */
5960
uint16_t enable_mbuf_metadata : 1; /* Set on init to 0 to disable, otherwise it will add meta to each mbuf */
6061
uint16_t self_hairpin : 1; /* Set on init to 1 enable both self and peer hairpin */
6162
uint16_t rss_support : 1; /* Set on init to 0 for no RSS support, RSS support otherwise */

applications/common/flow_parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ static doca_error_t parse_match_field(char *field_name, char *value, void *struc
869869
match->flags = (uint32_t)strtol(value, NULL, HEXADECIMAL_BASE);
870870

871871
else if (strcmp(field_name, "port_meta") == 0)
872-
match->parser_meta.port_meta = (uint32_t)strtol(value, NULL, 0);
872+
match->parser_meta.port_id = (uint32_t)strtol(value, NULL, 0);
873873

874874
else if (strcmp(field_name, "outer.eth.src_mac") == 0) {
875875
result = parse_mac_address(value, match->outer.eth.src_mac);

applications/common/pack.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ uint32_t unpack_uint32(uint8_t **buffer)
122122
uint32_t value = 0;
123123
uint8_t *read_head = *buffer;
124124

125-
value |= SET_BYTE(*read_head++, 3);
126-
value |= SET_BYTE(*read_head++, 2);
127-
value |= SET_BYTE(*read_head++, 1);
128-
value |= SET_BYTE(*read_head++, 0);
125+
value |= SET_BYTE((uint32_t)(*read_head++), 3);
126+
value |= SET_BYTE((uint32_t)(*read_head++), 2);
127+
value |= SET_BYTE((uint32_t)(*read_head++), 1);
128+
value |= SET_BYTE((uint32_t)(*read_head++), 0);
129129
*buffer = read_head;
130130

131131
return value;

0 commit comments

Comments
 (0)