[dpdk-dev] [PATCH 2/2] net/failsafe: convert to new Rx offloads API

[Moti Haimovsky]

Ethdev Rx offloads API has changed since:
commit ce17eddefc20 ("ethdev: introduce Rx queue offloads API")
This commit adds support for the new Rx offloads API.

Signed-off-by: Moti Haimovsky <mo...@mellanox.com>
---
 drivers/net/failsafe/failsafe_ops.c | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/net/failsafe/failsafe_ops.c 
b/drivers/net/failsafe/failsafe_ops.c
index 1fd845f..6532a62 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -77,6 +77,13 @@
                DEV_RX_OFFLOAD_UDP_CKSUM |
                DEV_RX_OFFLOAD_TCP_CKSUM |
                DEV_RX_OFFLOAD_TCP_LRO,
+       .rx_queue_offload_capa =
+               DEV_RX_OFFLOAD_VLAN_STRIP |
+               DEV_RX_OFFLOAD_QINQ_STRIP |
+               DEV_RX_OFFLOAD_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_UDP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_CKSUM |
+               DEV_RX_OFFLOAD_TCP_LRO,
        .tx_offload_capa = 0x0,
        .tx_queue_offload_capa = 0x0,
        .flow_type_rss_offloads = 0x0,
@@ -254,6 +261,22 @@
        fs_dev_free_queues(dev);
 }
 
+static bool
+fs_rxq_are_offloads_valid(struct rte_eth_dev *dev, uint64_t offloads)
+{
+       uint64_t port_offloads = dev->data->dev_conf.rxmode.offloads;
+       uint64_t queue_supp_offloads = PRIV(dev)->infos.rx_queue_offload_capa;
+       uint64_t port_supp_offloads = PRIV(dev)->infos.rx_offload_capa;
+
+       if ((offloads & (queue_supp_offloads | port_supp_offloads)) !=
+            offloads)
+               return false;
+       /* Verify we have no conflict with port offloads */
+       if ((port_offloads ^ offloads) & port_supp_offloads)
+               return false;
+       return true;
+}
+
 static void
 fs_rx_queue_release(void *queue)
 {
@@ -291,6 +314,17 @@
                fs_rx_queue_release(rxq);
                dev->data->rx_queues[rx_queue_id] = NULL;
        }
+       /* Verify application offloads are valid for our port and queue. */
+       if (!fs_rxq_are_offloads_valid(dev, rx_conf->offloads)) {
+               rte_errno = ENOTSUP;
+               ERROR("%p: Rx queue offloads 0x%lx don't match port "
+                     "offloads 0x%lx or supported offloads 0x%lx",
+                     (void *)dev, rx_conf->offloads,
+                     dev->data->dev_conf.rxmode.offloads,
+                     PRIV(dev)->infos.rx_offload_capa |
+                     PRIV(dev)->infos.rx_queue_offload_capa);
+               return -rte_errno;
+       }
        rxq = rte_zmalloc(NULL,
                          sizeof(*rxq) +
                          sizeof(rte_atomic64_t) * PRIV(dev)->subs_tail,
@@ -590,12 +624,16 @@
                           sizeof(default_infos));
        } else {
                uint32_t rx_offload_capa;
+               uint32_t rxq_offload_capa;
 
                rx_offload_capa = default_infos.rx_offload_capa;
+               rxq_offload_capa = default_infos.rx_queue_offload_capa;
                FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
                        rte_eth_dev_info_get(PORT_ID(sdev),
                                        &PRIV(dev)->infos);
                        rx_offload_capa &= PRIV(dev)->infos.rx_offload_capa;
+                       rxq_offload_capa &=
+                                       PRIV(dev)->infos.rx_queue_offload_capa;
                }
                sdev = TX_SUBDEV(dev);
                rte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);
-- 
1.8.3.1