net/hns3: decrease non-nearby memory access in Rx

[dpdk.git] / drivers / net / hns3 / hns3_ethdev_vf.c

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 2964991..ccf44a1 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -713,7 +713,8 @@ hns3vf_init_ring_with_vector(struct hns3_hw *hw)
         * Rx interrupt.
         */
        vec = hw->num_msi - 1; /* vector 0 for misc interrupt, not for queue */
-       hw->intr_tqps_num = vec - 1; /* the last interrupt is reserved */
+       /* vec - 1: the last interrupt is reserved */
+       hw->intr_tqps_num = vec > hw->tqps_num ? hw->tqps_num : vec - 1;
        for (i = 0; i < hw->intr_tqps_num; i++) {
                /*
                 * Set gap limiter and rate limiter configuration of queue's
@@ -756,6 +757,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
        uint16_t nb_tx_q = dev->data->nb_tx_queues;
        struct rte_eth_rss_conf rss_conf;
        uint16_t mtu;
+       bool gro_en;
        int ret;
 
        /*
@@ -783,6 +785,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
 
        /* When RSS is not configured, redirect the packet queue 0 */
        if ((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG) {
+               conf->rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
                rss_conf = conf->rx_adv_conf.rss_conf;
                if (rss_conf.rss_key == NULL) {
                        rss_conf.rss_key = rss_cfg->key;
@@ -815,6 +818,12 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
        if (ret)
                goto cfg_err;
 
+       /* config hardware GRO */
+       gro_en = conf->rxmode.offloads & DEV_RX_OFFLOAD_TCP_LRO ? true : false;
+       ret = hns3_config_gro(hw, gro_en);
+       if (ret)
+               goto cfg_err;
+
        hw->adapter_state = HNS3_NIC_CONFIGURED;
        return 0;
 
@@ -896,6 +905,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
        info->min_rx_bufsize = hw->rx_buf_len;
        info->max_mac_addrs = HNS3_VF_UC_MACADDR_NUM;
        info->max_mtu = info->max_rx_pktlen - HNS3_ETH_OVERHEAD;
+       info->max_lro_pkt_size = HNS3_MAX_LRO_SIZE;
 
        info->rx_offload_capa = (DEV_RX_OFFLOAD_IPV4_CKSUM |
                                 DEV_RX_OFFLOAD_UDP_CKSUM |
@@ -906,9 +916,10 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
                                 DEV_RX_OFFLOAD_KEEP_CRC |
                                 DEV_RX_OFFLOAD_SCATTER |
                                 DEV_RX_OFFLOAD_VLAN_STRIP |
-                                DEV_RX_OFFLOAD_QINQ_STRIP |
                                 DEV_RX_OFFLOAD_VLAN_FILTER |
-                                DEV_RX_OFFLOAD_JUMBO_FRAME);
+                                DEV_RX_OFFLOAD_JUMBO_FRAME |
+                                DEV_RX_OFFLOAD_RSS_HASH |
+                                DEV_RX_OFFLOAD_TCP_LRO);
        info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
        info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
                                 DEV_TX_OFFLOAD_IPV4_CKSUM |
@@ -1472,7 +1483,7 @@ hns3_query_vf_resource(struct hns3_hw *hw)
                return -EINVAL;
        }
 
-       hw->num_msi = (num_msi > hw->tqps_num + 1) ? hw->tqps_num + 1 : num_msi;
+       hw->num_msi = num_msi;
 
        return 0;
 }
@@ -1646,6 +1657,7 @@ hns3vf_uninit_vf(struct rte_eth_dev *eth_dev)
        PMD_INIT_FUNC_TRACE();
 
        hns3_rss_uninit(hns);
+       (void)hns3_config_gro(hw, false);
        (void)hns3vf_set_alive(hw, false);
        (void)hns3vf_set_promisc_mode(hw, false, false, false);
        hns3vf_disable_irq0(hw);
@@ -1762,6 +1774,31 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
        hns3_warn(hw, "Close port %d finished", hw->data->port_id);
 }
 
+static int
+hns3vf_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
+                     size_t fw_size)
+{
+       struct hns3_adapter *hns = eth_dev->data->dev_private;
+       struct hns3_hw *hw = &hns->hw;
+       uint32_t version = hw->fw_version;
+       int ret;
+
+       ret = snprintf(fw_version, fw_size, "%lu.%lu.%lu.%lu",
+                      hns3_get_field(version, HNS3_FW_VERSION_BYTE3_M,
+                                     HNS3_FW_VERSION_BYTE3_S),
+                      hns3_get_field(version, HNS3_FW_VERSION_BYTE2_M,
+                                     HNS3_FW_VERSION_BYTE2_S),
+                      hns3_get_field(version, HNS3_FW_VERSION_BYTE1_M,
+                                     HNS3_FW_VERSION_BYTE1_S),
+                      hns3_get_field(version, HNS3_FW_VERSION_BYTE0_M,
+                                     HNS3_FW_VERSION_BYTE0_S));
+       ret += 1; /* add the size of '\0' */
+       if (fw_size < (uint32_t)ret)
+               return ret;
+       else
+               return 0;
+}
+
 static int
 hns3vf_dev_link_update(struct rte_eth_dev *eth_dev,
                       __rte_unused int wait_to_complete)
@@ -2192,6 +2229,10 @@ hns3vf_restore_conf(struct hns3_adapter *hns)
        if (ret)
                goto err_vlan_table;
 
+       ret = hns3_restore_gro_conf(hw);
+       if (ret)
+               goto err_vlan_table;
+
        if (hw->adapter_state == HNS3_NIC_STARTED) {
                ret = hns3vf_do_start(hns, false);
                if (ret)
@@ -2346,6 +2387,7 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
        .xstats_get_by_id   = hns3_dev_xstats_get_by_id,
        .xstats_get_names_by_id = hns3_dev_xstats_get_names_by_id,
        .dev_infos_get      = hns3vf_dev_infos_get,
+       .fw_version_get     = hns3vf_fw_version_get,
        .rx_queue_setup     = hns3_rx_queue_setup,
        .tx_queue_setup     = hns3_tx_queue_setup,
        .rx_queue_release   = hns3_dev_rx_queue_release,
@@ -2382,12 +2424,25 @@ static const struct hns3_reset_ops hns3vf_reset_ops = {
 static int
 hns3vf_dev_init(struct rte_eth_dev *eth_dev)
 {
+       struct rte_device *dev = eth_dev->device;
+       struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev);
        struct hns3_adapter *hns = eth_dev->data->dev_private;
        struct hns3_hw *hw = &hns->hw;
+       uint8_t revision;
        int ret;
 
        PMD_INIT_FUNC_TRACE();
 
+       /* Get PCI revision id */
+       ret = rte_pci_read_config(pci_dev, &revision, HNS3_PCI_REVISION_ID_LEN,
+                                 HNS3_PCI_REVISION_ID);
+       if (ret != HNS3_PCI_REVISION_ID_LEN) {
+               PMD_INIT_LOG(ERR, "Failed to read pci revision id, ret = %d",
+                            ret);
+               return -EIO;
+       }
+       hw->revision = revision;
+
        eth_dev->process_private = (struct hns3_process_private *)
            rte_zmalloc_socket("hns3_filter_list",
                               sizeof(struct hns3_process_private),