net/failsafe: support Rx offload capabilities
authorGaetan Rivet <gaetan.rivet@6wind.com>
Tue, 18 Jul 2017 12:48:18 +0000 (14:48 +0200)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 19 Jul 2017 13:25:42 +0000 (16:25 +0300)
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Acked-by: Olga Shern <olgas@mellanox.com>
drivers/net/failsafe/failsafe_ops.c

index 223f26a..ac3257e 100644 (file)
@@ -63,19 +63,146 @@ static struct rte_eth_dev_info default_infos = {
                .nb_seg_max = UINT16_MAX,
                .nb_mtu_seg_max = UINT16_MAX,
        },
-       /* Set of understood capabilities */
-       .rx_offload_capa = 0x0,
+       /*
+        * Set of capabilities that can be verified upon
+        * configuring a sub-device.
+        */
+       .rx_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,
        .flow_type_rss_offloads = 0x0,
 };
 
+/**
+ * Check whether a specific offloading capability
+ * is supported by a sub_device.
+ *
+ * @return
+ *   0: all requested capabilities are supported by the sub_device
+ *   positive value: This flag at least is not supported by the sub_device
+ */
+static int
+fs_port_offload_validate(struct rte_eth_dev *dev,
+                        struct sub_device *sdev)
+{
+       struct rte_eth_dev_info infos = {0};
+       struct rte_eth_conf *cf;
+       uint32_t cap;
+
+       cf = &dev->data->dev_conf;
+       SUBOPS(sdev, dev_infos_get)(ETH(sdev), &infos);
+       /* RX capabilities */
+       cap = infos.rx_offload_capa;
+       if (cf->rxmode.hw_vlan_strip &&
+           ((cap & DEV_RX_OFFLOAD_VLAN_STRIP) == 0)) {
+               WARN("VLAN stripping offload requested but not supported by sub_device %d",
+                     SUB_ID(sdev));
+               return DEV_RX_OFFLOAD_VLAN_STRIP;
+       }
+       if (cf->rxmode.hw_ip_checksum &&
+           ((cap & (DEV_RX_OFFLOAD_IPV4_CKSUM |
+                    DEV_RX_OFFLOAD_UDP_CKSUM |
+                    DEV_RX_OFFLOAD_TCP_CKSUM)) !=
+            (DEV_RX_OFFLOAD_IPV4_CKSUM |
+             DEV_RX_OFFLOAD_UDP_CKSUM |
+             DEV_RX_OFFLOAD_TCP_CKSUM))) {
+               WARN("IP checksum offload requested but not supported by sub_device %d",
+                     SUB_ID(sdev));
+               return DEV_RX_OFFLOAD_IPV4_CKSUM |
+                      DEV_RX_OFFLOAD_UDP_CKSUM |
+                      DEV_RX_OFFLOAD_TCP_CKSUM;
+       }
+       if (cf->rxmode.enable_lro &&
+           ((cap & DEV_RX_OFFLOAD_TCP_LRO) == 0)) {
+               WARN("TCP LRO offload requested but not supported by sub_device %d",
+                     SUB_ID(sdev));
+               return DEV_RX_OFFLOAD_TCP_LRO;
+       }
+       if (cf->rxmode.hw_vlan_extend &&
+           ((cap & DEV_RX_OFFLOAD_QINQ_STRIP) == 0)) {
+               WARN("Stacked VLAN stripping offload requested but not supported by sub_device %d",
+                     SUB_ID(sdev));
+               return DEV_RX_OFFLOAD_QINQ_STRIP;
+       }
+       /* TX capabilities */
+       /* Nothing to do, no tx capa supported */
+       return 0;
+}
+
+/*
+ * Disable the dev_conf flag related to an offload capability flag
+ * within an ethdev configuration.
+ */
+static int
+fs_port_disable_offload(struct rte_eth_conf *cf,
+                       uint32_t ol_cap)
+{
+       switch (ol_cap) {
+       case DEV_RX_OFFLOAD_VLAN_STRIP:
+               INFO("Disabling VLAN stripping offload");
+               cf->rxmode.hw_vlan_strip = 0;
+               break;
+       case DEV_RX_OFFLOAD_IPV4_CKSUM:
+       case DEV_RX_OFFLOAD_UDP_CKSUM:
+       case DEV_RX_OFFLOAD_TCP_CKSUM:
+       case (DEV_RX_OFFLOAD_IPV4_CKSUM |
+             DEV_RX_OFFLOAD_UDP_CKSUM |
+             DEV_RX_OFFLOAD_TCP_CKSUM):
+               INFO("Disabling IP checksum offload");
+               cf->rxmode.hw_ip_checksum = 0;
+               break;
+       case DEV_RX_OFFLOAD_TCP_LRO:
+               INFO("Disabling TCP LRO offload");
+               cf->rxmode.enable_lro = 0;
+               break;
+       case DEV_RX_OFFLOAD_QINQ_STRIP:
+               INFO("Disabling stacked VLAN stripping offload");
+               cf->rxmode.hw_vlan_extend = 0;
+               break;
+       default:
+               DEBUG("Unable to disable offload capability: %" PRIx32,
+                     ol_cap);
+               return -1;
+       }
+       return 0;
+}
+
 static int
 fs_dev_configure(struct rte_eth_dev *dev)
 {
        struct sub_device *sdev;
        uint8_t i;
+       int capa_flag;
        int ret;
 
+       FOREACH_SUBDEV(sdev, i, dev) {
+               if (sdev->state != DEV_PROBED)
+                       continue;
+               DEBUG("Checking capabilities for sub_device %d", i);
+               while ((capa_flag = fs_port_offload_validate(dev, sdev))) {
+                       /*
+                        * Refuse to change configuration if multiple devices
+                        * are present and we already have configured at least
+                        * some of them.
+                        */
+                       if (PRIV(dev)->state >= DEV_ACTIVE &&
+                           PRIV(dev)->subs_tail > 1) {
+                               ERROR("device already configured, cannot fix live configuration");
+                               return -1;
+                       }
+                       ret = fs_port_disable_offload(&dev->data->dev_conf,
+                                                     capa_flag);
+                       if (ret) {
+                               ERROR("Unable to disable offload capability");
+                               return ret;
+                       }
+               }
+       }
        FOREACH_SUBDEV(sdev, i, dev) {
                if (sdev->state != DEV_PROBED)
                        continue;