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

Currently, hns3 PMD driver needs know the PVID configuration state and
do different processing in the 'rx_pkt_burst' ops implementation
function.

This patch adds a member to struct hns3_rx_queue/hns3_tx_queue of the
driver to indicate the PVID configuration status, so it isn't need
to access other data structure in the 'rx_pkt_burst' ops implementation,
to avoid performance loss because of reducing cache miss.

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 39136d2..76ee921 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -905,6 +905,8 @@ hns3_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t pvid, int on)
 {
        struct hns3_adapter *hns = dev->data->dev_private;
        struct hns3_hw *hw = &hns->hw;
+       bool pvid_en_state_change;
+       uint16_t pvid_state;
        int ret;
 
        if (pvid > RTE_ETHER_MAX_VLAN_ID) {
@@ -913,10 +915,27 @@ hns3_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t pvid, int on)
                return -EINVAL;
        }
 
+       /*
+        * If PVID configuration state change, should refresh the PVID
+        * configuration state in struct hns3_tx_queue/hns3_rx_queue.
+        */
+       pvid_state = hw->port_base_vlan_cfg.state;
+       if ((on && pvid_state == HNS3_PORT_BASE_VLAN_ENABLE) ||
+           (!on && pvid_state == HNS3_PORT_BASE_VLAN_DISABLE))
+               pvid_en_state_change = false;
+       else
+               pvid_en_state_change = true;
+
        rte_spinlock_lock(&hw->lock);
        ret = hns3_vlan_pvid_configure(hns, pvid, on);
        rte_spinlock_unlock(&hw->lock);
-       return ret;
+       if (ret)
+               return ret;
+
+       if (pvid_en_state_change)
+               hns3_update_all_queues_pvid_state(hw);
+
+       return 0;
 }
 
 static void

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 4e3391d..d744d85 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -315,6 +315,31 @@ hns3_init_tx_queue_hw(struct hns3_tx_queue *txq)
                       HNS3_CFG_DESC_NUM(txq->nb_tx_desc));
 }
 
+void
+hns3_update_all_queues_pvid_state(struct hns3_hw *hw)
+{
+       uint16_t nb_rx_q = hw->data->nb_rx_queues;
+       uint16_t nb_tx_q = hw->data->nb_tx_queues;
+       struct hns3_rx_queue *rxq;
+       struct hns3_tx_queue *txq;
+       int pvid_state;
+       int i;
+
+       pvid_state = hw->port_base_vlan_cfg.state;
+       for (i = 0; i < hw->cfg_max_queues; i++) {
+               if (i < nb_rx_q) {
+                       rxq = hw->data->rx_queues[i];
+                       if (rxq != NULL)
+                               rxq->pvid_state = pvid_state;
+               }
+               if (i < nb_tx_q) {
+                       txq = hw->data->tx_queues[i];
+                       if (txq != NULL)
+                               txq->pvid_state = pvid_state;
+               }
+       }
+}
+
 void
 hns3_enable_all_queues(struct hns3_hw *hw, bool en)
 {
@@ -1223,6 +1248,7 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
        rxq->pkt_first_seg = NULL;
        rxq->pkt_last_seg = NULL;
        rxq->port_id = dev->data->port_id;
+       rxq->pvid_state = hw->port_base_vlan_cfg.state;
        rxq->configured = true;
        rxq->io_base = (void *)((char *)hw->io_base + HNS3_TQP_REG_OFFSET +
                                idx * HNS3_TQP_REG_SIZE);
@@ -1451,7 +1477,7 @@ hns3_rx_set_cksum_flag(struct rte_mbuf *rxm, uint64_t packet_type,
 }
 
 static inline void
-hns3_rxd_to_vlan_tci(struct rte_eth_dev *dev, struct rte_mbuf *mb,
+hns3_rxd_to_vlan_tci(struct hns3_rx_queue *rxq, struct rte_mbuf *mb,
                     uint32_t l234_info, const struct hns3_desc *rxd)
 {
 #define HNS3_STRP_STATUS_NUM           0x4
@@ -1459,8 +1485,6 @@ hns3_rxd_to_vlan_tci(struct rte_eth_dev *dev, struct rte_mbuf *mb,
 #define HNS3_NO_STRP_VLAN_VLD          0x0
 #define HNS3_INNER_STRP_VLAN_VLD       0x1
 #define HNS3_OUTER_STRP_VLAN_VLD       0x2
-       struct hns3_adapter *hns = dev->data->dev_private;
-       struct hns3_hw *hw = &hns->hw;
        uint32_t strip_status;
        uint32_t report_mode;
 
@@ -1486,7 +1510,7 @@ hns3_rxd_to_vlan_tci(struct rte_eth_dev *dev, struct rte_mbuf *mb,
        };
        strip_status = hns3_get_field(l234_info, HNS3_RXD_STRP_TAGP_M,
                                      HNS3_RXD_STRP_TAGP_S);
-       report_mode = report_type[hw->port_base_vlan_cfg.state][strip_status];
+       report_mode = report_type[rxq->pvid_state][strip_status];
        switch (report_mode) {
        case HNS3_NO_STRP_VLAN_VLD:
                mb->vlan_tci = 0;
@@ -1532,7 +1556,6 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        nb_rx = 0;
        nb_rx_bd = 0;
        rxq = rx_queue;
-       dev = &rte_eth_devices[rxq->port_id];
 
        rx_id = rxq->next_to_clean;
        rx_ring = rxq->rx_ring;
@@ -1609,6 +1632,7 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
                if (unlikely(nmb == NULL)) {
+                       dev = &rte_eth_devices[rxq->port_id];
                        dev->data->rx_mbuf_alloc_failed++;
                        break;
                }
@@ -1685,7 +1709,7 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        hns3_rx_set_cksum_flag(first_seg,
                                               first_seg->packet_type,
                                               cksum_err);
-               hns3_rxd_to_vlan_tci(dev, first_seg, l234_info, &rxd);
+               hns3_rxd_to_vlan_tci(rxq, first_seg, l234_info, &rxd);
 
                rx_pkts[nb_rx++] = first_seg;
                first_seg = NULL;
@@ -1763,6 +1787,7 @@ hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
        txq->next_to_clean = 0;
        txq->tx_bd_ready = txq->nb_tx_desc - 1;
        txq->port_id = dev->data->port_id;
+       txq->pvid_state = hw->port_base_vlan_cfg.state;
        txq->configured = true;
        txq->io_base = (void *)((char *)hw->io_base + HNS3_TQP_REG_OFFSET +
                                idx * HNS3_TQP_REG_SIZE);

diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 380d27b..b85c64f 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -242,6 +242,12 @@ struct hns3_rx_queue {
        uint16_t rx_buf_len;
        uint16_t rx_free_thresh;
 
+       /*
+        * port based vlan configuration state.
+        * value range: HNS3_PORT_BASE_VLAN_DISABLE / HNS3_PORT_BASE_VLAN_ENABLE
+        */
+       uint16_t pvid_state;
+
        bool rx_deferred_start; /* don't start this queue in dev start */
        bool configured;        /* indicate if rx queue has been configured */
 
@@ -268,6 +274,12 @@ struct hns3_tx_queue {
        uint16_t next_to_use;
        uint16_t tx_bd_ready;
 
+       /*
+        * port based vlan configuration state.
+        * value range: HNS3_PORT_BASE_VLAN_DISABLE / HNS3_PORT_BASE_VLAN_ENABLE
+        */
+       uint16_t pvid_state;
+
        bool tx_deferred_start; /* don't start this queue in dev start */
        bool configured;        /* indicate if tx queue has been configured */
 
@@ -378,5 +390,6 @@ int hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q,
                                  uint16_t nb_tx_q);
 int hns3_config_gro(struct hns3_hw *hw, bool en);
 int hns3_restore_gro_conf(struct hns3_hw *hw);
+void hns3_update_all_queues_pvid_state(struct hns3_hw *hw);
 
 #endif /* _HNS3_RXTX_H_ */