net/ice: add memory allocation check in RSS init

[dpdk.git] / drivers / net / ice / ice_dcf_parent.c

diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c
index ff08292..c5dfdd3 100644 (file)
--- a/drivers/net/ice/ice_dcf_parent.c
+++ b/drivers/net/ice/ice_dcf_parent.c
@@ -9,6 +9,7 @@
 #include <rte_spinlock.h>
 
 #include "ice_dcf_ethdev.h"
+#include "ice_generic_flow.h"
 
 #define ICE_DCF_VSI_UPDATE_SERVICE_INTERVAL    100000 /* us */
 static rte_spinlock_t vsi_update_lock = RTE_SPINLOCK_INITIALIZER;
@@ -18,6 +19,8 @@ ice_dcf_update_vsi_ctx(struct ice_hw *hw, uint16_t vsi_handle,
                       uint16_t vsi_map)
 {
        struct ice_vsi_ctx *vsi_ctx;
+       bool first_update = false;
+       uint16_t new_vsi_num;
 
        if (unlikely(vsi_handle >= ICE_MAX_VSI)) {
                PMD_DRV_LOG(ERR, "Invalid vsi handle %u", vsi_handle);
@@ -34,11 +37,25 @@ ice_dcf_update_vsi_ctx(struct ice_hw *hw, uint16_t vsi_handle,
                                            vsi_handle);
                                return;
                        }
+                       hw->vsi_ctx[vsi_handle] = vsi_ctx;
+                       first_update = true;
                }
 
-               vsi_ctx->vsi_num = (vsi_map & VIRTCHNL_DCF_VF_VSI_ID_M) >>
-                                             VIRTCHNL_DCF_VF_VSI_ID_S;
-               hw->vsi_ctx[vsi_handle] = vsi_ctx;
+               new_vsi_num = (vsi_map & VIRTCHNL_DCF_VF_VSI_ID_M) >>
+                       VIRTCHNL_DCF_VF_VSI_ID_S;
+
+               /* Redirect rules if vsi mapping table changes. */
+               if (!first_update) {
+                       struct ice_flow_redirect rd;
+
+                       memset(&rd, 0, sizeof(struct ice_flow_redirect));
+                       rd.type = ICE_FLOW_REDIRECT_VSI;
+                       rd.vsi_handle = vsi_handle;
+                       rd.new_vsi_num = new_vsi_num;
+                       ice_flow_redirect((struct ice_adapter *)hw->back, &rd);
+               } else {
+                       vsi_ctx->vsi_num = new_vsi_num;
+               }
 
                PMD_DRV_LOG(DEBUG, "VF%u is assigned with vsi number %u",
                            vsi_handle, vsi_ctx->vsi_num);
@@ -209,12 +226,34 @@ ice_dcf_request_pkg_name(struct ice_hw *hw, char *pkg_name)
 {
        struct ice_dcf_adapter *dcf_adapter =
                        container_of(hw, struct ice_dcf_adapter, parent.hw);
+       struct virtchnl_pkg_info pkg_info;
+       struct dcf_virtchnl_cmd vc_cmd;
+       uint64_t dsn;
+
+       vc_cmd.v_op = VIRTCHNL_OP_DCF_GET_PKG_INFO;
+       vc_cmd.req_msglen = 0;
+       vc_cmd.req_msg = NULL;
+       vc_cmd.rsp_buflen = sizeof(pkg_info);
+       vc_cmd.rsp_msgbuf = (uint8_t *)&pkg_info;
+
+       if (ice_dcf_execute_virtchnl_cmd(&dcf_adapter->real_hw, &vc_cmd))
+               goto pkg_file_direct;
+
+       rte_memcpy(&dsn, pkg_info.dsn, sizeof(dsn));
+
+       snprintf(pkg_name, ICE_MAX_PKG_FILENAME_SIZE,
+                ICE_PKG_FILE_SEARCH_PATH_UPDATES "ice-%016llx.pkg",
+                (unsigned long long)dsn);
+       if (!access(pkg_name, 0))
+               return 0;
 
-       /* TODO: check with DSN firstly by iAVF */
-       PMD_INIT_LOG(DEBUG,
-                    "DCF VSI_ID = %u",
-                    dcf_adapter->real_hw.vsi_id);
+       snprintf(pkg_name, ICE_MAX_PKG_FILENAME_SIZE,
+                ICE_PKG_FILE_SEARCH_PATH_DEFAULT "ice-%016llx.pkg",
+                (unsigned long long)dsn);
+       if (!access(pkg_name, 0))
+               return 0;
 
+pkg_file_direct:
        snprintf(pkg_name,
                 ICE_MAX_PKG_FILENAME_SIZE, "%s", ICE_PKG_FILE_UPDATES);
        if (!access(pkg_name, 0))
@@ -296,6 +335,14 @@ ice_dcf_init_parent_adapter(struct rte_eth_dev *eth_dev)
        parent_adapter->eth_dev = eth_dev;
        parent_adapter->pf.adapter = parent_adapter;
        parent_adapter->pf.dev_data = eth_dev->data;
+       /* create a dummy main_vsi */
+       parent_adapter->pf.main_vsi =
+               rte_zmalloc(NULL, sizeof(struct ice_vsi), 0);
+       if (!parent_adapter->pf.main_vsi)
+               return -ENOMEM;
+       parent_adapter->pf.main_vsi->adapter = parent_adapter;
+       parent_adapter->pf.adapter_stopped = 1;
+
        parent_hw->back = parent_adapter;
        parent_hw->mac_type = ICE_MAC_GENERIC;
        parent_hw->vendor_id = ICE_INTEL_VENDOR_ID;
@@ -321,6 +368,12 @@ ice_dcf_init_parent_adapter(struct rte_eth_dev *eth_dev)
        }
        parent_adapter->active_pkg_type = ice_load_pkg_type(parent_hw);
 
+       err = ice_flow_init(parent_adapter);
+       if (err) {
+               PMD_INIT_LOG(ERR, "Failed to initialize flow");
+               goto uninit_hw;
+       }
+
        ice_dcf_update_vf_vsi_map(parent_hw, hw->num_vfs, hw->vf_vsi_map);
 
        mac = (const struct rte_ether_addr *)hw->avf.mac.addr;
@@ -347,5 +400,6 @@ ice_dcf_uninit_parent_adapter(struct rte_eth_dev *eth_dev)
 
        eth_dev->data->mac_addrs = NULL;
 
+       ice_flow_uninit(parent_adapter);
        ice_dcf_uninit_parent_hw(parent_hw);
 }