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
ethdev: increase port id range
[dpdk.git]
/
examples
/
multi_process
/
client_server_mp
/
mp_server
/
init.c
diff --git
a/examples/multi_process/client_server_mp/mp_server/init.c
b/examples/multi_process/client_server_mp/mp_server/init.c
index
ad941a7
..
cacf4e0
100644
(file)
--- a/
examples/multi_process/client_server_mp/mp_server/init.c
+++ b/
examples/multi_process/client_server_mp/mp_server/init.c
@@
-114,7
+114,7
@@
init_mbuf_pools(void)
* - start the port and report its status to stdout
*/
static int
* - start the port and report its status to stdout
*/
static int
-init_port(uint
8
_t port_num)
+init_port(uint
16
_t port_num)
{
/* for port configuration all features are off by default */
const struct rte_eth_conf port_conf = {
{
/* for port configuration all features are off by default */
const struct rte_eth_conf port_conf = {
@@
-123,13
+123,13
@@
init_port(uint8_t port_num)
}
};
const uint16_t rx_rings = 1, tx_rings = num_clients;
}
};
const uint16_t rx_rings = 1, tx_rings = num_clients;
-
const
uint16_t rx_ring_size = RTE_MP_RX_DESC_DEFAULT;
-
const
uint16_t tx_ring_size = RTE_MP_TX_DESC_DEFAULT;
+ uint16_t rx_ring_size = RTE_MP_RX_DESC_DEFAULT;
+ uint16_t tx_ring_size = RTE_MP_TX_DESC_DEFAULT;
uint16_t q;
int retval;
uint16_t q;
int retval;
- printf("Port %u init ... ",
(unsigned)
port_num);
+ printf("Port %u init ... ", port_num);
fflush(stdout);
/* Standard DPDK port initialisation - config port, then set up
fflush(stdout);
/* Standard DPDK port initialisation - config port, then set up
@@
-138,6
+138,11
@@
init_port(uint8_t port_num)
&port_conf)) != 0)
return retval;
&port_conf)) != 0)
return retval;
+ retval = rte_eth_dev_adjust_nb_rx_tx_desc(port_num, &rx_ring_size,
+ &tx_ring_size);
+ if (retval != 0)
+ return retval;
+
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size,
rte_eth_dev_socket_id(port_num),
for (q = 0; q < rx_rings; q++) {
retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size,
rte_eth_dev_socket_id(port_num),
@@
-195,11
+200,12
@@
init_shm_rings(void)
/* Check the link status of all ports in up to 9s, and print them finally */
static void
/* Check the link status of all ports in up to 9s, and print them finally */
static void
-check_all_ports_link_status(uint
8
_t port_num, uint32_t port_mask)
+check_all_ports_link_status(uint
16
_t port_num, uint32_t port_mask)
{
#define CHECK_INTERVAL 100 /* 100ms */
#define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
{
#define CHECK_INTERVAL 100 /* 100ms */
#define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
- uint8_t portid, count, all_ports_up, print_flag = 0;
+ uint16_t portid;
+ uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
printf("\nChecking link status");
struct rte_eth_link link;
printf("\nChecking link status");
@@
-257,7
+263,7
@@
init(int argc, char *argv[])
{
int retval;
const struct rte_memzone *mz;
{
int retval;
const struct rte_memzone *mz;
- uint
8
_t i, total_ports;
+ uint
16
_t i, total_ports;
/* init EAL, parsing EAL args */
retval = rte_eal_init(argc, argv);
/* init EAL, parsing EAL args */
retval = rte_eal_init(argc, argv);