* [PATCH] examples/l2fwd-crypto: fix port id type
@ 2017-10-18 9:50 Zhiyong Yang
2017-10-18 13:10 ` De Lara Guarch, Pablo
2017-10-19 2:56 ` [PATCH v2] " Zhiyong Yang
0 siblings, 2 replies; 6+ messages in thread
From: Zhiyong Yang @ 2017-10-18 9:50 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Zhiyong Yang
Fix port id issue and remove unnecessary cast.
Fixes: f8244c6399d9 ("ethdev: increase port id range")
Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
---
examples/l2fwd-crypto/main.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 7dfcba421..3408938aa 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -647,7 +647,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned int portid,
if (options->mac_updating)
l2fwd_mac_updating(m, dst_port);
- l2fwd_send_packet(m, (uint8_t) dst_port);
+ l2fwd_send_packet(m, dst_port);
}
/** Generate random key */
@@ -719,7 +719,8 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
unsigned lcore_id = rte_lcore_id();
uint64_t prev_tsc = 0, diff_tsc, cur_tsc, timer_tsc = 0;
- unsigned i, j, portid, nb_rx, len;
+ unsigned int i, j, nb_rx, len;
+ uint16_t portid;
struct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];
const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
US_PER_S * BURST_TX_DRAIN_US;
@@ -884,7 +885,7 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
continue;
l2fwd_send_burst(&lcore_queue_conf[lcore_id],
qconf->pkt_buf[portid].len,
- (uint8_t) portid);
+ portid);
qconf->pkt_buf[portid].len = 0;
}
@@ -918,7 +919,7 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
cparams = &port_cparams[i];
- nb_rx = rte_eth_rx_burst((uint8_t) portid, 0,
+ nb_rx = rte_eth_rx_burst(portid, 0,
pkts_burst, MAX_PKT_BURST);
port_statistics[portid].rx += nb_rx;
@@ -2342,7 +2343,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
static int
initialize_ports(struct l2fwd_crypto_options *options)
{
- uint8_t last_portid, portid;
+ uint16_t last_portid, portid;
unsigned enabled_portcount = 0;
unsigned nb_ports = rte_eth_dev_count();
@@ -2363,12 +2364,12 @@ initialize_ports(struct l2fwd_crypto_options *options)
continue;
/* init port */
- printf("Initializing port %u... ", (unsigned) portid);
+ printf("Initializing port %u... ", portid);
fflush(stdout);
retval = rte_eth_dev_configure(portid, 1, 1, &port_conf);
if (retval < 0) {
printf("Cannot configure device: err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2376,7 +2377,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
&nb_txd);
if (retval < 0) {
printf("Cannot adjust number of descriptors: err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2387,7 +2388,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
NULL, l2fwd_pktmbuf_pool);
if (retval < 0) {
printf("rte_eth_rx_queue_setup:err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2398,7 +2399,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
NULL);
if (retval < 0) {
printf("rte_eth_tx_queue_setup:err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2407,7 +2408,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
retval = rte_eth_dev_start(portid);
if (retval < 0) {
printf("rte_eth_dev_start:err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2416,7 +2417,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
rte_eth_macaddr_get(portid, &l2fwd_ports_eth_addr[portid]);
printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
- (unsigned) portid,
+ portid,
l2fwd_ports_eth_addr[portid].addr_bytes[0],
l2fwd_ports_eth_addr[portid].addr_bytes[1],
l2fwd_ports_eth_addr[portid].addr_bytes[2],
@@ -2493,7 +2494,8 @@ main(int argc, char **argv)
struct lcore_queue_conf *qconf;
struct l2fwd_crypto_options options;
- uint8_t nb_ports, nb_cryptodevs, portid, cdev_id;
+ uint8_t nb_cryptodevs, cdev_id;
+ uint16_t nb_ports, portid;
unsigned lcore_id, rx_lcore_id;
int ret, enabled_cdevcount, enabled_portcount;
uint8_t enabled_cdevs[RTE_CRYPTO_MAX_DEVS] = {0};
@@ -2570,7 +2572,7 @@ main(int argc, char **argv)
qconf->rx_port_list[qconf->nb_rx_ports] = portid;
qconf->nb_rx_ports++;
- printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned)portid);
+ printf("Lcore %u: RX port %u\n", rx_lcore_id, portid);
}
/* Enable Crypto devices */
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] examples/l2fwd-crypto: fix port id type
2017-10-18 9:50 [PATCH] examples/l2fwd-crypto: fix port id type Zhiyong Yang
@ 2017-10-18 13:10 ` De Lara Guarch, Pablo
2017-10-19 0:55 ` Yang, Zhiyong
2017-10-19 2:56 ` [PATCH v2] " Zhiyong Yang
1 sibling, 1 reply; 6+ messages in thread
From: De Lara Guarch, Pablo @ 2017-10-18 13:10 UTC (permalink / raw)
To: Yang, Zhiyong, dev; +Cc: Yigit, Ferruh, Yang, Zhiyong
Hi Zhiyong,
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhiyong Yang
> Sent: Wednesday, October 18, 2017 10:50 AM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Yang, Zhiyong
> <zhiyong.yang@intel.com>
> Subject: [dpdk-dev] [PATCH] examples/l2fwd-crypto: fix port id type
>
> Fix port id issue and remove unnecessary cast.
>
> Fixes: f8244c6399d9 ("ethdev: increase port id range")
> Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
Actually, I think we can extend this patch to declare all variables
related to port ids to uint16_t.
I have seen the following: "l2fwd_dst_ports", "portid", "dest_portid", "dst_port".
Rest of the patch looks good to me, so you can keep the ack if you are doing a v2.
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] examples/l2fwd-crypto: fix port id type
2017-10-18 13:10 ` De Lara Guarch, Pablo
@ 2017-10-19 0:55 ` Yang, Zhiyong
0 siblings, 0 replies; 6+ messages in thread
From: Yang, Zhiyong @ 2017-10-19 0:55 UTC (permalink / raw)
To: De Lara Guarch, Pablo, dev; +Cc: Yigit, Ferruh
Hi Pablo,
> -----Original Message-----
> From: De Lara Guarch, Pablo
> Sent: Wednesday, October 18, 2017 9:10 PM
> To: Yang, Zhiyong <zhiyong.yang@intel.com>; dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Yang, Zhiyong
> <zhiyong.yang@intel.com>
> Subject: RE: [dpdk-dev] [PATCH] examples/l2fwd-crypto: fix port id type
>
> Hi Zhiyong,
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhiyong Yang
> > Sent: Wednesday, October 18, 2017 10:50 AM
> > To: dev@dpdk.org
> > Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Yang, Zhiyong
> > <zhiyong.yang@intel.com>
> > Subject: [dpdk-dev] [PATCH] examples/l2fwd-crypto: fix port id type
> >
> > Fix port id issue and remove unnecessary cast.
> >
> > Fixes: f8244c6399d9 ("ethdev: increase port id range")
> > Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
>
> Actually, I think we can extend this patch to declare all variables related to port
> ids to uint16_t.
> I have seen the following: "l2fwd_dst_ports", "portid", "dest_portid", "dst_port".
>
> Rest of the patch looks good to me, so you can keep the ack if you are doing a
> v2.
>
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
>
Thanks for your review and acked by. I can do as you comment in V2.
zhiyong
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] examples/l2fwd-crypto: fix port id type
2017-10-18 9:50 [PATCH] examples/l2fwd-crypto: fix port id type Zhiyong Yang
2017-10-18 13:10 ` De Lara Guarch, Pablo
@ 2017-10-19 2:56 ` Zhiyong Yang
2017-10-19 3:06 ` Yang, Zhiyong
2017-10-19 19:10 ` De Lara Guarch, Pablo
1 sibling, 2 replies; 6+ messages in thread
From: Zhiyong Yang @ 2017-10-19 2:56 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, pablo.de.lara.guarch, Zhiyong Yang
Fix port id issues and keep variables related to port ids in
consistent data type definition "uint16_t".
Remove unnecessary cast in the meanwhile.
Fixes: f8244c6399d9 ("ethdev: increase port id range")
Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
examples/l2fwd-crypto/main.c | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 7dfcba421..fa995e7dd 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -114,7 +114,7 @@ static uint64_t l2fwd_enabled_port_mask;
static uint64_t l2fwd_enabled_crypto_mask;
/* list of enabled ports */
-static uint32_t l2fwd_dst_ports[RTE_MAX_ETHPORTS];
+static uint16_t l2fwd_dst_ports[RTE_MAX_ETHPORTS];
struct pkt_buffer {
@@ -226,7 +226,7 @@ struct l2fwd_crypto_params {
/** lcore configuration */
struct lcore_queue_conf {
unsigned nb_rx_ports;
- unsigned rx_port_list[MAX_RX_QUEUE_PER_LCORE];
+ uint16_t rx_port_list[MAX_RX_QUEUE_PER_LCORE];
unsigned nb_crypto_devs;
unsigned cryptodev_list[MAX_RX_QUEUE_PER_LCORE];
@@ -292,7 +292,7 @@ print_stats(void)
uint64_t total_packets_dropped, total_packets_tx, total_packets_rx;
uint64_t total_packets_enqueued, total_packets_dequeued,
total_packets_errors;
- unsigned portid;
+ uint16_t portid;
uint64_t cdevid;
total_packets_dropped = 0;
@@ -621,7 +621,7 @@ l2fwd_send_packet(struct rte_mbuf *m, uint16_t port)
}
static void
-l2fwd_mac_updating(struct rte_mbuf *m, unsigned int dest_portid)
+l2fwd_mac_updating(struct rte_mbuf *m, uint16_t dest_portid)
{
struct ether_hdr *eth;
void *tmp;
@@ -637,17 +637,17 @@ l2fwd_mac_updating(struct rte_mbuf *m, unsigned int dest_portid)
}
static void
-l2fwd_simple_forward(struct rte_mbuf *m, unsigned int portid,
+l2fwd_simple_forward(struct rte_mbuf *m, uint16_t portid,
struct l2fwd_crypto_options *options)
{
- unsigned int dst_port;
+ uint16_t dst_port;
dst_port = l2fwd_dst_ports[portid];
if (options->mac_updating)
l2fwd_mac_updating(m, dst_port);
- l2fwd_send_packet(m, (uint8_t) dst_port);
+ l2fwd_send_packet(m, dst_port);
}
/** Generate random key */
@@ -719,7 +719,8 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
unsigned lcore_id = rte_lcore_id();
uint64_t prev_tsc = 0, diff_tsc, cur_tsc, timer_tsc = 0;
- unsigned i, j, portid, nb_rx, len;
+ unsigned int i, j, nb_rx, len;
+ uint16_t portid;
struct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];
const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
US_PER_S * BURST_TX_DRAIN_US;
@@ -884,7 +885,7 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
continue;
l2fwd_send_burst(&lcore_queue_conf[lcore_id],
qconf->pkt_buf[portid].len,
- (uint8_t) portid);
+ portid);
qconf->pkt_buf[portid].len = 0;
}
@@ -918,7 +919,7 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
cparams = &port_cparams[i];
- nb_rx = rte_eth_rx_burst((uint8_t) portid, 0,
+ nb_rx = rte_eth_rx_burst(portid, 0,
pkts_burst, MAX_PKT_BURST);
port_statistics[portid].rx += nb_rx;
@@ -2342,7 +2343,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
static int
initialize_ports(struct l2fwd_crypto_options *options)
{
- uint8_t last_portid, portid;
+ uint16_t last_portid, portid;
unsigned enabled_portcount = 0;
unsigned nb_ports = rte_eth_dev_count();
@@ -2363,12 +2364,12 @@ initialize_ports(struct l2fwd_crypto_options *options)
continue;
/* init port */
- printf("Initializing port %u... ", (unsigned) portid);
+ printf("Initializing port %u... ", portid);
fflush(stdout);
retval = rte_eth_dev_configure(portid, 1, 1, &port_conf);
if (retval < 0) {
printf("Cannot configure device: err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2376,7 +2377,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
&nb_txd);
if (retval < 0) {
printf("Cannot adjust number of descriptors: err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2387,7 +2388,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
NULL, l2fwd_pktmbuf_pool);
if (retval < 0) {
printf("rte_eth_rx_queue_setup:err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2398,7 +2399,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
NULL);
if (retval < 0) {
printf("rte_eth_tx_queue_setup:err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2407,7 +2408,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
retval = rte_eth_dev_start(portid);
if (retval < 0) {
printf("rte_eth_dev_start:err=%d, port=%u\n",
- retval, (unsigned) portid);
+ retval, portid);
return -1;
}
@@ -2416,7 +2417,7 @@ initialize_ports(struct l2fwd_crypto_options *options)
rte_eth_macaddr_get(portid, &l2fwd_ports_eth_addr[portid]);
printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
- (unsigned) portid,
+ portid,
l2fwd_ports_eth_addr[portid].addr_bytes[0],
l2fwd_ports_eth_addr[portid].addr_bytes[1],
l2fwd_ports_eth_addr[portid].addr_bytes[2],
@@ -2493,7 +2494,8 @@ main(int argc, char **argv)
struct lcore_queue_conf *qconf;
struct l2fwd_crypto_options options;
- uint8_t nb_ports, nb_cryptodevs, portid, cdev_id;
+ uint8_t nb_cryptodevs, cdev_id;
+ uint16_t nb_ports, portid;
unsigned lcore_id, rx_lcore_id;
int ret, enabled_cdevcount, enabled_portcount;
uint8_t enabled_cdevs[RTE_CRYPTO_MAX_DEVS] = {0};
@@ -2570,7 +2572,7 @@ main(int argc, char **argv)
qconf->rx_port_list[qconf->nb_rx_ports] = portid;
qconf->nb_rx_ports++;
- printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned)portid);
+ printf("Lcore %u: RX port %u\n", rx_lcore_id, portid);
}
/* Enable Crypto devices */
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] examples/l2fwd-crypto: fix port id type
2017-10-19 2:56 ` [PATCH v2] " Zhiyong Yang
@ 2017-10-19 3:06 ` Yang, Zhiyong
2017-10-19 19:10 ` De Lara Guarch, Pablo
1 sibling, 0 replies; 6+ messages in thread
From: Yang, Zhiyong @ 2017-10-19 3:06 UTC (permalink / raw)
To: dev; +Cc: Yigit, Ferruh, De Lara Guarch, Pablo
Hi,
Sorry I miss the changes in v2. Add it after SOB.
Zhiyong
> -----Original Message-----
> From: Yang, Zhiyong
> Sent: Thursday, October 19, 2017 10:57 AM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Yang, Zhiyong <zhiyong.yang@intel.com>
> Subject: [PATCH v2] examples/l2fwd-crypto: fix port id type
>
> Fix port id issues and keep variables related to port ids in consistent data type
> definition "uint16_t".
>
> Remove unnecessary cast in the meanwhile.
>
> Fixes: f8244c6399d9 ("ethdev: increase port id range")
> Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> ---
Changes in V2.
Add to fix some variables data types related to port id such as "l2fwd_dst_ports",
"dest_portid", "dst_port", " rx_port_list" , according to Pablo's comments.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] examples/l2fwd-crypto: fix port id type
2017-10-19 2:56 ` [PATCH v2] " Zhiyong Yang
2017-10-19 3:06 ` Yang, Zhiyong
@ 2017-10-19 19:10 ` De Lara Guarch, Pablo
1 sibling, 0 replies; 6+ messages in thread
From: De Lara Guarch, Pablo @ 2017-10-19 19:10 UTC (permalink / raw)
To: Yang, Zhiyong, dev; +Cc: Yigit, Ferruh, Yang, Zhiyong
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhiyong Yang
> Sent: Thursday, October 19, 2017 3:57 AM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Yang, Zhiyong
> <zhiyong.yang@intel.com>
> Subject: [dpdk-dev] [PATCH v2] examples/l2fwd-crypto: fix port id type
>
> Fix port id issues and keep variables related to port ids in consistent data
> type definition "uint16_t".
>
> Remove unnecessary cast in the meanwhile.
>
> Fixes: f8244c6399d9 ("ethdev: increase port id range")
> Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Applied to dpdk-next-crypto.
Thanks,
Pablo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-19 19:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-18 9:50 [PATCH] examples/l2fwd-crypto: fix port id type Zhiyong Yang
2017-10-18 13:10 ` De Lara Guarch, Pablo
2017-10-19 0:55 ` Yang, Zhiyong
2017-10-19 2:56 ` [PATCH v2] " Zhiyong Yang
2017-10-19 3:06 ` Yang, Zhiyong
2017-10-19 19:10 ` De Lara Guarch, Pablo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.