git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: set MTU in dev config for jumbo packets
[dpdk.git]
/
examples
/
vmdq
/
main.c
diff --git
a/examples/vmdq/main.c
b/examples/vmdq/main.c
index
aa2eb35
..
52596dd
100644
(file)
--- a/
examples/vmdq/main.c
+++ b/
examples/vmdq/main.c
@@
-48,8
+48,8
@@
/*
* Configurable number of RX/TX ring descriptors
*/
/*
* Configurable number of RX/TX ring descriptors
*/
-#define RTE_TEST_RX_DESC_DEFAULT 1
28
-#define RTE_TEST_TX_DESC_DEFAULT
512
+#define RTE_TEST_RX_DESC_DEFAULT 1
024
+#define RTE_TEST_TX_DESC_DEFAULT
1024
#define INVALID_PORT_ID 0xFF
#define INVALID_PORT_ID 0xFF
@@
-65,10
+65,7
@@
static const struct rte_eth_conf vmdq_conf_default = {
.rxmode = {
.mq_mode = ETH_MQ_RX_VMDQ_ONLY,
.split_hdr_size = 0,
.rxmode = {
.mq_mode = ETH_MQ_RX_VMDQ_ONLY,
.split_hdr_size = 0,
- .header_split = 0, /**< Header Split disabled */
- .hw_ip_checksum = 0, /**< IP checksum offload disabled */
- .hw_vlan_filter = 0, /**< VLAN filtering disabled */
- .jumbo_frame = 0, /**< Jumbo Frame Support disabled */
+ .ignore_offload_bitfield = 1,
},
.txmode = {
},
.txmode = {
@@
-159,6
+156,7
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
{
struct rte_eth_dev_info dev_info;
struct rte_eth_rxconf *rxconf;
{
struct rte_eth_dev_info dev_info;
struct rte_eth_rxconf *rxconf;
+ struct rte_eth_txconf *txconf;
struct rte_eth_conf port_conf;
uint16_t rxRings, txRings;
uint16_t rxRingSize = RTE_TEST_RX_DESC_DEFAULT;
struct rte_eth_conf port_conf;
uint16_t rxRings, txRings;
uint16_t rxRingSize = RTE_TEST_RX_DESC_DEFAULT;
@@
-203,7
+201,7
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
num_pf_queues, num_pools, queues_per_pool);
printf("vmdq queue base: %d pool base %d\n",
vmdq_queue_base, vmdq_pool_base);
num_pf_queues, num_pools, queues_per_pool);
printf("vmdq queue base: %d pool base %d\n",
vmdq_queue_base, vmdq_pool_base);
- if (
port >= rte_eth_dev_count(
))
+ if (
!rte_eth_dev_is_valid_port(port
))
return -1;
/*
return -1;
/*
@@
-216,6
+214,11
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
*/
rxRings = (uint16_t)dev_info.max_rx_queues;
txRings = (uint16_t)dev_info.max_tx_queues;
*/
rxRings = (uint16_t)dev_info.max_rx_queues;
txRings = (uint16_t)dev_info.max_tx_queues;
+
+ rte_eth_dev_info_get(port, &dev_info);
+ if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+ port_conf.txmode.offloads |=
+ DEV_TX_OFFLOAD_MBUF_FAST_FREE;
retval = rte_eth_dev_configure(port, rxRings, txRings, &port_conf);
if (retval != 0)
return retval;
retval = rte_eth_dev_configure(port, rxRings, txRings, &port_conf);
if (retval != 0)
return retval;
@@
-231,9
+234,11
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
return -1;
}
return -1;
}
- rte_eth_dev_info_get(port, &dev_info);
rxconf = &dev_info.default_rxconf;
rxconf->rx_drop_en = 1;
rxconf = &dev_info.default_rxconf;
rxconf->rx_drop_en = 1;
+ txconf = &dev_info.default_txconf;
+ txconf->txq_flags = ETH_TXQ_FLAGS_IGNORE;
+ txconf->offloads = port_conf.txmode.offloads;
for (q = 0; q < rxRings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rxRingSize,
rte_eth_dev_socket_id(port),
for (q = 0; q < rxRings; q++) {
retval = rte_eth_rx_queue_setup(port, q, rxRingSize,
rte_eth_dev_socket_id(port),
@@
-248,7
+253,7
@@
port_init(uint16_t port, struct rte_mempool *mbuf_pool)
for (q = 0; q < txRings; q++) {
retval = rte_eth_tx_queue_setup(port, q, txRingSize,
rte_eth_dev_socket_id(port),
for (q = 0; q < txRings; q++) {
retval = rte_eth_tx_queue_setup(port, q, txRingSize,
rte_eth_dev_socket_id(port),
-
NULL
);
+
txconf
);
if (retval < 0) {
printf("initialise tx queue %d failed\n", q);
return retval;
if (retval < 0) {
printf("initialise tx queue %d failed\n", q);
return retval;
@@
-534,9
+539,9
@@
static unsigned check_ports_num(unsigned nb_ports)
}
for (portid = 0; portid < num_ports; portid++) {
}
for (portid = 0; portid < num_ports; portid++) {
- if (
ports[portid] >= nb_ports
) {
- printf("\nSpecified port ID(%u)
exceeds max system port ID(%u)
\n",
- ports[portid]
, (nb_ports - 1)
);
+ if (
!rte_eth_dev_is_valid_port(ports[portid])
) {
+ printf("\nSpecified port ID(%u)
is not valid
\n",
+ ports[portid]);
ports[portid] = INVALID_PORT_ID;
valid_num_ports--;
}
ports[portid] = INVALID_PORT_ID;
valid_num_ports--;
}
@@
-575,7
+580,7
@@
main(int argc, char *argv[])
if (rte_lcore_count() > RTE_MAX_LCORE)
rte_exit(EXIT_FAILURE, "Not enough cores\n");
if (rte_lcore_count() > RTE_MAX_LCORE)
rte_exit(EXIT_FAILURE, "Not enough cores\n");
- nb_ports = rte_eth_dev_count();
+ nb_ports = rte_eth_dev_count
_avail
();
/*
* Update the global var NUM_PORTS and global array PORTS
/*
* Update the global var NUM_PORTS and global array PORTS
@@
-595,7
+600,7
@@
main(int argc, char *argv[])
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
/* initialize all ports */
rte_exit(EXIT_FAILURE, "Cannot create mbuf pool\n");
/* initialize all ports */
-
for (portid = 0; portid < nb_ports; portid++
) {
+
RTE_ETH_FOREACH_DEV(portid
) {
/* skip ports that are not enabled */
if ((enabled_port_mask & (1 << portid)) == 0) {
printf("\nSkipping disabled port %d\n", portid);
/* skip ports that are not enabled */
if ((enabled_port_mask & (1 << portid)) == 0) {
printf("\nSkipping disabled port %d\n", portid);