[dpdk-dev,v2,03/39] examples/l2fwd-jobstats: convert to new ethdev offloads API

Message ID 7ddb1ea46013dad991a4330a5c22a90c2c54064a.1513081087.git.shahafs@mellanox.com (mailing list archive)
State Superseded, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Shahaf Shuler Dec. 12, 2017, 12:26 p.m. UTC
  Ethdev offloads API has changed since:

commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API")
commit cba7f53b717d ("ethdev: introduce Tx queue offloads API")

This commit support the new API.

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
 examples/l2fwd-jobstats/main.c | 38 +++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)
  

Comments

De Lara Guarch, Pablo Dec. 19, 2017, 12:33 p.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Shahaf Shuler
> Sent: Tuesday, December 12, 2017 12:26 PM
> To: dev@dpdk.org; Ananyev, Konstantin <konstantin.ananyev@intel.com>;
> Nicolau, Radu <radu.nicolau@intel.com>; arybchenko@solarflare.com
> Subject: [dpdk-dev] [PATCH v2 03/39] examples/l2fwd-jobstats: convert to
> new ethdev offloads API
> 
> Ethdev offloads API has changed since:
> 
> commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API") commit
> cba7f53b717d ("ethdev: introduce Tx queue offloads API")
> 
> This commit support the new API.
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>

Hi Shahaf,

There is a compilation error when building for 32-bit targets:

examples/l2fwd-jobstats/main.c:883:11: error: format '%lx' expects argument
of type 'long unsigned int', but argument 3 has type 'uint64_t {aka long long unsigned int}'
[-Werror=format=]
    printf("Some Rx offloads are not supported "
           ^
examples/l2fwd-jobstats/main.c:883:11: error: format '%lx' expects argument
of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'
[-Werror=format=]
examples/l2fwd-jobstats/main.c:890:11: error: format '%lx' expects argument
of type 'long unsigned int', but argument 3 has type 'uint64_t {aka long long unsigned int}'
[-Werror=format=]
    printf("Some Tx offloads are not supported "
           ^
examples/l2fwd-jobstats/main.c:890:11: error: format '%lx' expects argument
of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'
[-Werror=format=]

This happens on all the apps (I acked the first two apps, since I missed this issue when I was reviewing them).

Thanks,
Pablo
  
Shahaf Shuler Dec. 21, 2017, 1:47 p.m. UTC | #2
Tuesday, December 19, 2017 2:33 PM, De Lara Guarch, Pablo:
> 
> There is a compilation error when building for 32-bit targets:
> 
> examples/l2fwd-jobstats/main.c:883:11: error: format '%lx' expects
> argument of type 'long unsigned int', but argument 3 has type 'uint64_t {aka
> long long unsigned int}'
> [-Werror=format=]
>     printf("Some Rx offloads are not supported "
>            ^
> examples/l2fwd-jobstats/main.c:883:11: error: format '%lx' expects
> argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka
> long long unsigned int}'
> [-Werror=format=]
> examples/l2fwd-jobstats/main.c:890:11: error: format '%lx' expects
> argument of type 'long unsigned int', but argument 3 has type 'uint64_t {aka
> long long unsigned int}'
> [-Werror=format=]
>     printf("Some Tx offloads are not supported "
>            ^
> examples/l2fwd-jobstats/main.c:890:11: error: format '%lx' expects
> argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka
> long long unsigned int}'
> [-Werror=format=]
> 
> This happens on all the apps (I acked the first two apps, since I missed this
> issue when I was reviewing them).

Thanks, will take care. 
In fact am thinking of removing those prints, they don't seems necessary. The PMD can print error/warn log in case of bad offloads configuration. 

> 
> Thanks,
> Pablo
  

Patch

diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index 485370d..eb035ef 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -116,17 +116,15 @@  struct lcore_queue_conf {
 
 struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
 
-static const struct rte_eth_conf port_conf = {
+static struct rte_eth_conf port_conf = {
 	.rxmode = {
 		.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 */
-		.hw_strip_crc   = 1, /**< CRC stripped by hardware */
+		.ignore_offload_bitfield = 1,
+		.offloads = DEV_RX_OFFLOAD_CRC_STRIP,
 	},
 	.txmode = {
 		.mq_mode = ETH_MQ_TX_NONE,
+		.offloads = DEV_TX_OFFLOAD_MBUF_FAST_FREE,
 	},
 };
 
@@ -866,6 +864,10 @@  struct l2fwd_port_statistics {
 
 	/* Initialise each port */
 	for (portid = 0; portid < nb_ports; portid++) {
+		struct rte_eth_dev_info dev_info;
+		struct rte_eth_rxconf rxq_conf;
+		struct rte_eth_txconf txq_conf;
+
 		/* skip ports that are not enabled */
 		if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
 			printf("Skipping disabled port %u\n", portid);
@@ -875,6 +877,21 @@  struct l2fwd_port_statistics {
 		/* init port */
 		printf("Initializing port %u... ", portid);
 		fflush(stdout);
+		rte_eth_dev_info_get(portid, &dev_info);
+		if ((dev_info.rx_offload_capa & port_conf.rxmode.offloads) !=
+		    port_conf.rxmode.offloads) {
+			printf("Some Rx offloads are not supported "
+			       "by port %d: requested 0x%lx supported 0x%lx\n",
+			       portid, port_conf.rxmode.offloads,
+			       dev_info.rx_offload_capa);
+		}
+		if ((dev_info.tx_offload_capa & port_conf.txmode.offloads) !=
+		    port_conf.txmode.offloads) {
+			printf("Some Tx offloads are not supported "
+			       "by port %d: requested 0x%lx supported 0x%lx\n",
+			       portid, port_conf.txmode.offloads,
+			       dev_info.tx_offload_capa);
+		}
 		ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
 		if (ret < 0)
 			rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
@@ -891,19 +908,24 @@  struct l2fwd_port_statistics {
 
 		/* init one RX queue */
 		fflush(stdout);
+		rxq_conf = dev_info.default_rxconf;
+		rxq_conf.offloads = port_conf.rxmode.offloads;
 		ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
 					     rte_eth_dev_socket_id(portid),
-					     NULL,
+					     &rxq_conf,
 					     l2fwd_pktmbuf_pool);
 		if (ret < 0)
 			rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
 				  ret, portid);
 
 		/* init one TX queue on each port */
+		txq_conf = dev_info.default_txconf;
+		txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
+		txq_conf.offloads = port_conf.txmode.offloads;
 		fflush(stdout);
 		ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
 				rte_eth_dev_socket_id(portid),
-				NULL);
+				&txq_conf);
 		if (ret < 0)
 			rte_exit(EXIT_FAILURE,
 			"rte_eth_tx_queue_setup:err=%d, port=%u\n",