[dpdk-dev,v3,1/2] net/bnxt: switch to the new offload API
Checks
Commit Message
Update bnxt PMD to new ethdev offloads API.
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
--
v1->v2: return an error if requested offload flags do not
match supported offload capabilities.
v2->v3: modify the code based on review comments.
---
drivers/net/bnxt/bnxt_ethdev.c | 58 +++++++++++++++++++++++++++++-------------
1 file changed, 41 insertions(+), 17 deletions(-)
Comments
On 4/2/2018 11:25 PM, Ajit Khaparde wrote:
> Update bnxt PMD to new ethdev offloads API.
>
> Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
> --
> v1->v2: return an error if requested offload flags do not
> match supported offload capabilities.
> v2->v3: modify the code based on review comments.
<...>
> @@ -516,6 +526,20 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
> static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
> {
> struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
> + uint64_t tx_offloads = eth_dev->data->dev_conf.txmode.offloads;
> + uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
> +
> + if (tx_offloads != (tx_offloads & BNXT_DEV_TX_OFFLOAD_SUPPORT)) {
> + PMD_DRV_LOG(ERR, "Tx offloads requested 0x%lx supported 0x%x\n",
> + tx_offloads, BNXT_DEV_TX_OFFLOAD_SUPPORT);
> + return -ENOTSUP;
> + }
> +
> + if (rx_offloads != (rx_offloads & BNXT_DEV_RX_OFFLOAD_SUPPORT)) {
> + PMD_DRV_LOG(ERR, "Rx offloads requested 0x%lx supported 0x%x\n",
> + rx_offloads, BNXT_DEV_RX_OFFLOAD_SUPPORT);
> + return -ENOTSUP;
> + }
This is causing i686 build error [1].
[1]
In file included from .../dpdk/drivers/net/bnxt/bnxt_ethdev.c:43:0:
.../dpdk/drivers/net/bnxt/bnxt_ethdev.c: In function ‘bnxt_dev_configure_op’:
.../dpdk/drivers/net/bnxt/bnxt.h:341:50: error: format ‘%lx’ expects argument of
type ‘long unsigned int’, but argument 5 has type ‘uint64_t {aka long long
unsigned int}’ [-Werror=format=]
rte_log(RTE_LOG_ ## level, bnxt_logtype_driver, "%s(): " fmt, \
^
.../dpdk/drivers/net/bnxt/bnxt.h:345:2: note: in expansion of macro
‘PMD_DRV_LOG_RAW’
PMD_DRV_LOG_RAW(level, fmt, ## args)
^~~~~~~~~~~~~~~
.../dpdk/drivers/net/bnxt/bnxt_ethdev.c:528:3: note: in expansion of macro
‘PMD_DRV_LOG’
PMD_DRV_LOG(ERR, "Tx offloads requested 0x%lx supported 0x%x\n",
^~~~~~~~~~~
.../dpdk/drivers/net/bnxt/bnxt_ethdev.c:528:47: note: format string is defined here
PMD_DRV_LOG(ERR, "Tx offloads requested 0x%lx supported 0x%x\n",
~~^
%llx
In file included from .../dpdk/drivers/net/bnxt/bnxt_ethdev.c:43:0:
.../dpdk/drivers/net/bnxt/bnxt.h:341:50: error: format ‘%lx’ expects argument of
type ‘long unsigned int’, but argument 5 has type ‘uint64_t {aka long long
unsigned int}’ [-Werror=format=]
rte_log(RTE_LOG_ ## level, bnxt_logtype_driver, "%s(): " fmt, \
^
.../dpdk/drivers/net/bnxt/bnxt.h:345:2: note: in expansion of macro
‘PMD_DRV_LOG_RAW’
PMD_DRV_LOG_RAW(level, fmt, ## args)
^~~~~~~~~~~~~~~
.../dpdk/drivers/net/bnxt/bnxt_ethdev.c:534:3: note: in expansion of macro
‘PMD_DRV_LOG’
PMD_DRV_LOG(ERR, "Rx offloads requested 0x%lx supported 0x%x\n",
^~~~~~~~~~~
.../dpdk/drivers/net/bnxt/bnxt_ethdev.c:534:47: note: format string is defined here
PMD_DRV_LOG(ERR, "Rx offloads requested 0x%lx supported 0x%x\n",
~~^
%llx
cc1: all warnings being treated as errors
@@ -152,6 +152,27 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
ETH_RSS_NONFRAG_IPV6_TCP | \
ETH_RSS_NONFRAG_IPV6_UDP)
+#define BNXT_DEV_TX_OFFLOAD_SUPPORT (DEV_TX_OFFLOAD_VLAN_INSERT | \
+ DEV_TX_OFFLOAD_IPV4_CKSUM | \
+ DEV_TX_OFFLOAD_TCP_CKSUM | \
+ DEV_TX_OFFLOAD_UDP_CKSUM | \
+ DEV_TX_OFFLOAD_TCP_TSO | \
+ DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | \
+ DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \
+ DEV_TX_OFFLOAD_GRE_TNL_TSO | \
+ DEV_TX_OFFLOAD_IPIP_TNL_TSO | \
+ DEV_TX_OFFLOAD_GENEVE_TNL_TSO | \
+ DEV_TX_OFFLOAD_MULTI_SEGS)
+
+#define BNXT_DEV_RX_OFFLOAD_SUPPORT (DEV_RX_OFFLOAD_VLAN_FILTER | \
+ DEV_RX_OFFLOAD_VLAN_STRIP | \
+ DEV_RX_OFFLOAD_IPV4_CKSUM | \
+ DEV_RX_OFFLOAD_UDP_CKSUM | \
+ DEV_RX_OFFLOAD_TCP_CKSUM | \
+ DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
+ DEV_RX_OFFLOAD_JUMBO_FRAME | \
+ DEV_RX_OFFLOAD_CRC_STRIP)
+
static int bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask);
static void bnxt_print_link_info(struct rte_eth_dev *eth_dev);
@@ -436,21 +457,12 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
dev_info->min_rx_bufsize = 1;
dev_info->max_rx_pktlen = BNXT_MAX_MTU + ETHER_HDR_LEN + ETHER_CRC_LEN
+ VLAN_TAG_SIZE;
- dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP |
- DEV_RX_OFFLOAD_IPV4_CKSUM |
- DEV_RX_OFFLOAD_UDP_CKSUM |
- DEV_RX_OFFLOAD_TCP_CKSUM |
- DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
- dev_info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT |
- DEV_TX_OFFLOAD_IPV4_CKSUM |
- DEV_TX_OFFLOAD_TCP_CKSUM |
- DEV_TX_OFFLOAD_UDP_CKSUM |
- DEV_TX_OFFLOAD_TCP_TSO |
- DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
- DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
- DEV_TX_OFFLOAD_GRE_TNL_TSO |
- DEV_TX_OFFLOAD_IPIP_TNL_TSO |
- DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
+
+ dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;
+ if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
+ dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TIMESTAMP;
+ dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT;
+ dev_info->flow_type_rss_offloads = BNXT_ETH_RSS_SUPPORT;
/* *INDENT-OFF* */
dev_info->default_rxconf = (struct rte_eth_rxconf) {
@@ -471,8 +483,6 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
},
.tx_free_thresh = 32,
.tx_rs_thresh = 32,
- .txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS |
- ETH_TXQ_FLAGS_NOOFFLOADS,
};
eth_dev->data->dev_conf.intr_conf.lsc = 1;
@@ -516,6 +526,20 @@ static void bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)
{
struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+ uint64_t tx_offloads = eth_dev->data->dev_conf.txmode.offloads;
+ uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
+
+ if (tx_offloads != (tx_offloads & BNXT_DEV_TX_OFFLOAD_SUPPORT)) {
+ PMD_DRV_LOG(ERR, "Tx offloads requested 0x%lx supported 0x%x\n",
+ tx_offloads, BNXT_DEV_TX_OFFLOAD_SUPPORT);
+ return -ENOTSUP;
+ }
+
+ if (rx_offloads != (rx_offloads & BNXT_DEV_RX_OFFLOAD_SUPPORT)) {
+ PMD_DRV_LOG(ERR, "Rx offloads requested 0x%lx supported 0x%x\n",
+ rx_offloads, BNXT_DEV_RX_OFFLOAD_SUPPORT);
+ return -ENOTSUP;
+ }
bp->rx_queues = (void *)eth_dev->data->rx_queues;
bp->tx_queues = (void *)eth_dev->data->tx_queues;