[dpdk-dev] [PATCH v3 3/9] net/hns3: modify the return value of enable msix
From: "Wei Hu (Xavier)" This patch replaces the return value "-1" with "-ENXIO". Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index bd52e199b..b5f3e9a86 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -131,7 +131,7 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) (pos + PCI_MSIX_FLAGS)); return 0; } - return -1; + return -ENXIO; } static int -- 2.23.0
[dpdk-dev] [PATCH v3 0/9] updates for hns3 PMD driver
This series are updates for hns3 ethernet PMD driver. Hao Chen (4): net/hns3: support Rx interrupt net/hns3: optimize RSS's default algorithm net/hns3: remove the redundant function call net/hns3: remove the unused macros Hongbo Zheng (1): net/hns3: get link state change through mailbox Huisong Li (1): net/hns3: modify custom macro Wei Hu (Xavier) (3): net/hns3: modify the return value of enable msix net/hns3: remove the redundant variable initialization net/hns3: remove the unnecessary assignment doc/guides/nics/features/hns3.ini| 1 + doc/guides/nics/features/hns3_vf.ini | 1 + drivers/net/hns3/hns3_cmd.h | 28 + drivers/net/hns3/hns3_ethdev.c | 181 --- drivers/net/hns3/hns3_ethdev.h | 2 +- drivers/net/hns3/hns3_ethdev_vf.c| 166 +--- drivers/net/hns3/hns3_mbx.c | 37 ++ drivers/net/hns3/hns3_mbx.h | 21 drivers/net/hns3/hns3_regs.h | 3 + drivers/net/hns3/hns3_rss.c | 14 ++- drivers/net/hns3/hns3_rss.h | 10 -- drivers/net/hns3/hns3_rxtx.c | 55 ++-- drivers/net/hns3/hns3_rxtx.h | 3 + 13 files changed, 468 insertions(+), 54 deletions(-) -- 2.23.0
[dpdk-dev] [PATCH v3 2/9] net/hns3: get link state change through mailbox
From: Hongbo Zheng
Currently, firmware adds the function of sending message to PF driver
through mailbox when the link status is changed, hns3 PMD driver can
usually recognize link state change faster through the message.
And in some extreme cases, this way is not faster than existing method
regularly updating link status by issing the command every second in PF
driver, because of the parallel processing of mailbox and command messages
in firmware. So we reserve updating link status using timers in PF driver,
and add querying link status by issuing command to the firmware in
'.link_update' ops implementation function named hns3_dev_link_update to
solve the out of date link status.
Signed-off-by: Hongbo Zheng
Signed-off-by: Wei Hu (Xavier)
Signed-off-by: Huisong Li
---
v2 -> v3:
1.No change.
v1 -> v2:
1.Add querying link status by issuing command to the firmware
in '.link_update' ops implementation function named
hns3_dev_link_update to solve the out of date link status.
---
drivers/net/hns3/hns3_ethdev.c | 14 +++--
drivers/net/hns3/hns3_ethdev.h | 1 +
drivers/net/hns3/hns3_mbx.c| 37 ++
drivers/net/hns3/hns3_mbx.h| 8
4 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 8243ade21..fa0af847a 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -77,6 +77,7 @@ static enum hns3_reset_level hns3_get_reset_level(struct
hns3_adapter *hns,
static int hns3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
static int hns3_vlan_pvid_configure(struct hns3_adapter *hns, uint16_t pvid,
int on);
+static int hns3_update_speed_duplex(struct rte_eth_dev *eth_dev);
static void
hns3_pf_disable_irq0(struct hns3_hw *hw)
@@ -218,6 +219,8 @@ hns3_interrupt_handler(void *param)
hns3_schedule_reset(hns);
} else if (event_cause == HNS3_VECTOR0_EVENT_RST)
hns3_schedule_reset(hns);
+ else if (event_cause == HNS3_VECTOR0_EVENT_MBX)
+ hns3_dev_handle_mbx_msg(hw);
else
hns3_err(hw, "Received unknown event");
@@ -2302,6 +2305,11 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev,
struct hns3_mac *mac = &hw->mac;
struct rte_eth_link new_link;
+ if (!hns3_is_reset_pending(hns)) {
+ hns3_update_speed_duplex(eth_dev);
+ hns3_update_link_status(hw);
+ }
+
memset(&new_link, 0, sizeof(new_link));
switch (mac->link_speed) {
case ETH_SPEED_NUM_10M:
@@ -3806,14 +3814,16 @@ hns3_get_mac_link_status(struct hns3_hw *hw)
return !!link_status;
}
-static void
+void
hns3_update_link_status(struct hns3_hw *hw)
{
int state;
state = hns3_get_mac_link_status(hw);
- if (state != hw->mac.link_status)
+ if (state != hw->mac.link_status) {
hw->mac.link_status = state;
+ hns3_warn(hw, "Link status change to %s!", state ? "up" :
"down");
+ }
}
static void
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index e9a3fe410..004cd75a9 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -631,6 +631,7 @@ int hns3_dev_filter_ctrl(struct rte_eth_dev *dev,
enum rte_filter_op filter_op, void *arg);
bool hns3_is_reset_pending(struct hns3_adapter *hns);
bool hns3vf_is_reset_pending(struct hns3_adapter *hns);
+void hns3_update_link_status(struct hns3_hw *hw);
static inline bool
is_reset_pending(struct hns3_adapter *hns)
diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
index c1647af4b..26807bc4b 100644
--- a/drivers/net/hns3/hns3_mbx.c
+++ b/drivers/net/hns3/hns3_mbx.c
@@ -282,6 +282,40 @@ hns3_update_resp_position(struct hns3_hw *hw, uint32_t
resp_msg)
resp->tail = tail;
}
+static void
+hns3_link_fail_parse(struct hns3_hw *hw, uint8_t link_fail_code)
+{
+ switch (link_fail_code) {
+ case HNS3_MBX_LF_NORMAL:
+ break;
+ case HNS3_MBX_LF_REF_CLOCK_LOST:
+ hns3_warn(hw, "Reference clock lost!");
+ break;
+ case HNS3_MBX_LF_XSFP_TX_DISABLE:
+ hns3_warn(hw, "SFP tx is disabled!");
+ break;
+ case HNS3_MBX_LF_XSFP_ABSENT:
+ hns3_warn(hw, "SFP is absent!");
+ break;
+ default:
+ hns3_warn(hw, "Unknown fail code:%u!", link_fail_code);
+ break;
+ }
+}
+
+static void
+hns3_handle_link_change_event(struct hns3_hw *hw,
+ struct hns3_mbx_pf_to_vf_cmd *req)
+{
+#define LINK_STATUS_OFFSET 1
+#define LINK_FAIL_CODE_OFFSET 2
+
+ if (!req->msg[LINK_STATUS_OFFSET])
+ hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
+
+ hns3_update_link_st
[dpdk-dev] [PATCH v3 9/9] net/hns3: remove the unused macros
From: Hao Chen
This patch removed some unused macros defined in hns3_rss.h,
these macros are used to set tuples for abandoned RTE_ETH_FILTER_HASH
in hns3_dev_filter_ctrl().
Signed-off-by: Hao Chen
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_rss.h | 10 --
1 file changed, 10 deletions(-)
diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h
index 7ffc15131..725970f89 100644
--- a/drivers/net/hns3/hns3_rss.h
+++ b/drivers/net/hns3/hns3_rss.h
@@ -27,7 +27,6 @@
#define HNS3_RSS_HASH_ALGO_TOEPLITZ0
#define HNS3_RSS_HASH_ALGO_SIMPLE 1
-#define HNS3_RSS_HASH_ALGO_SYMMETRIC 2
#define HNS3_RSS_HASH_ALGO_MASK0xf
#define HNS3_RSS_INPUT_TUPLE_OTHER GENMASK(3, 0)
@@ -56,15 +55,6 @@ struct hns3_rss_conf {
uint16_t queue[HNS3_RSS_QUEUES_BUFFER_NUM]; /* Queues indices to use */
};
-/* Bit 8 ~Bit 15 */
-#define HNS3_INSET_IPV4_SRC0x0100UL
-#define HNS3_INSET_IPV4_DST0x0200UL
-#define HNS3_INSET_IPV6_SRC0x0400UL
-#define HNS3_INSET_IPV6_DST0x0800UL
-#define HNS3_INSET_SRC_PORT0x1000UL
-#define HNS3_INSET_DST_PORT0x2000UL
-#define HNS3_INSET_SCTP_VT 0x4000UL
-
#ifndef ilog2
static inline int rss_ilog2(uint32_t x)
{
--
2.23.0
[dpdk-dev] [PATCH v3 4/9] net/hns3: modify custom macro
From: Huisong Li
This patch replaces custom macro named HNS3_MIN_FRAME_LEN for ethernet
minimum frame length with the macro named RTE_ETHER_MIN_LEN that defined
in dpdk framework.
Signed-off-by: Huisong Li
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_ethdev.c | 2 +-
drivers/net/hns3/hns3_ethdev.h | 1 -
drivers/net/hns3/hns3_rxtx.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index fa0af847a..4ce9515a9 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2148,7 +2148,7 @@ hns3_set_mac_mtu(struct hns3_hw *hw, uint16_t new_mps)
req = (struct hns3_config_max_frm_size_cmd *)desc.data;
req->max_frm_size = rte_cpu_to_le_16(new_mps);
- req->min_frm_size = HNS3_MIN_FRAME_LEN;
+ req->min_frm_size = RTE_ETHER_MIN_LEN;
return hns3_cmd_send(hw, &desc, 1);
}
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 004cd75a9..7422706a8 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -33,7 +33,6 @@
#define HNS3_MAX_BD_SIZE 65535
#define HNS3_MAX_TX_BD_PER_PKT 8
#define HNS3_MAX_FRAME_LEN 9728
-#define HNS3_MIN_FRAME_LEN 64
#define HNS3_VLAN_TAG_SIZE 4
#define HNS3_DEFAULT_RX_BUF_LEN2048
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index e1bdba972..d9219d123 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1551,7 +1551,7 @@ hns3_prep_pkts(__rte_unused void *tx_queue, struct
rte_mbuf **tx_pkts,
m = tx_pkts[i];
/* check the size of packet */
- if (m->pkt_len < HNS3_MIN_FRAME_LEN) {
+ if (m->pkt_len < RTE_ETHER_MIN_LEN) {
rte_errno = EINVAL;
return i;
}
--
2.23.0
[dpdk-dev] [PATCH v3 1/9] net/hns3: support Rx interrupt
From: Hao Chen
This patch adds supports of receive packets through interrupt mode for hns3
PF/VF driver. The following ops functions should be implemented defined in
the struct eth_dev_ops:
rx_queue_intr_enable
rx_queue_intr_disable
Signed-off-by: Hao Chen
Signed-off-by: Wei Hu (Xavier)
---
v2 -> v3:
1.Remove the irrelevant '.rx_queue_count' ops implementation
function from this patch.
v1 -> v2:
1.No change.
---
doc/guides/nics/features/hns3.ini| 1 +
doc/guides/nics/features/hns3_vf.ini | 1 +
drivers/net/hns3/hns3_cmd.h | 28 +
drivers/net/hns3/hns3_ethdev.c | 159 --
drivers/net/hns3/hns3_ethdev_vf.c| 165 ---
drivers/net/hns3/hns3_mbx.h | 13 +++
drivers/net/hns3/hns3_regs.h | 3 +
drivers/net/hns3/hns3_rxtx.c | 41 +++
drivers/net/hns3/hns3_rxtx.h | 3 +
9 files changed, 392 insertions(+), 22 deletions(-)
diff --git a/doc/guides/nics/features/hns3.ini
b/doc/guides/nics/features/hns3.ini
index 6df789ed1..cd5c08a9d 100644
--- a/doc/guides/nics/features/hns3.ini
+++ b/doc/guides/nics/features/hns3.ini
@@ -5,6 +5,7 @@
;
[Features]
Link status = Y
+Rx interrupt = Y
MTU update = Y
Jumbo frame = Y
Promiscuous mode = Y
diff --git a/doc/guides/nics/features/hns3_vf.ini
b/doc/guides/nics/features/hns3_vf.ini
index 41497c4c2..fd00ac3e2 100644
--- a/doc/guides/nics/features/hns3_vf.ini
+++ b/doc/guides/nics/features/hns3_vf.ini
@@ -5,6 +5,7 @@
;
[Features]
Link status = Y
+Rx interrupt = Y
MTU update = Y
Jumbo frame = Y
Unicast MAC filter = Y
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index be0ecbe86..897dc1420 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -209,6 +209,10 @@ enum hns3_opcode_type {
/* SFP command */
HNS3_OPC_SFP_GET_SPEED = 0x7104,
+ /* Interrupts commands */
+ HNS3_OPC_ADD_RING_TO_VECTOR = 0x1503,
+ HNS3_OPC_DEL_RING_TO_VECTOR = 0x1504,
+
/* Error INT commands */
HNS3_QUERY_MSIX_INT_STS_BD_NUM = 0x1513,
HNS3_QUERY_CLEAR_ALL_MPF_MSIX_INT = 0x1514,
@@ -673,6 +677,30 @@ struct hns3_tqp_map_cmd {
uint8_t rsv[18];
};
+#define HNS3_RING_TYPE_B 0
+#define HNS3_RING_TYPE_TX 0
+#define HNS3_RING_TYPE_RX 1
+#define HNS3_RING_GL_IDX_S 0
+#define HNS3_RING_GL_IDX_M GENMASK(1, 0)
+#define HNS3_RING_GL_RX0
+#define HNS3_RING_GL_TX1
+
+#define HNS3_VECTOR_ELEMENTS_PER_CMD 10
+
+#define HNS3_INT_TYPE_S0
+#define HNS3_INT_TYPE_MGENMASK(1, 0)
+#define HNS3_TQP_ID_S 2
+#define HNS3_TQP_ID_M GENMASK(12, 2)
+#define HNS3_INT_GL_IDX_S 13
+#define HNS3_INT_GL_IDX_M GENMASK(14, 13)
+struct hns3_ctrl_vector_chain_cmd {
+ uint8_t int_vector_id;
+ uint8_t int_cause_num;
+ uint16_t tqp_type_and_id[HNS3_VECTOR_ELEMENTS_PER_CMD];
+ uint8_t vfid;
+ uint8_t rsv;
+};
+
struct hns3_config_max_frm_size_cmd {
uint16_t max_frm_size;
uint8_t min_frm_size;
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 72315718a..8243ade21 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2021,6 +2021,40 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev)
return hns3_check_mq_mode(dev);
}
+static int
+hns3_bind_ring_with_vector(struct rte_eth_dev *dev, uint8_t vector_id,
+ bool mmap, uint16_t queue_id)
+{
+ struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct hns3_cmd_desc desc;
+ struct hns3_ctrl_vector_chain_cmd *req =
+ (struct hns3_ctrl_vector_chain_cmd *)desc.data;
+ enum hns3_cmd_status status;
+ enum hns3_opcode_type op;
+ uint16_t tqp_type_and_id = 0;
+
+ op = mmap ? HNS3_OPC_ADD_RING_TO_VECTOR : HNS3_OPC_DEL_RING_TO_VECTOR;
+ hns3_cmd_setup_basic_desc(&desc, op, false);
+ req->int_vector_id = vector_id;
+
+ hns3_set_field(tqp_type_and_id, HNS3_INT_TYPE_M, HNS3_INT_TYPE_S,
+ HNS3_RING_TYPE_RX);
+ hns3_set_field(tqp_type_and_id, HNS3_TQP_ID_M, HNS3_TQP_ID_S, queue_id);
+ hns3_set_field(tqp_type_and_id, HNS3_INT_GL_IDX_M, HNS3_INT_GL_IDX_S,
+ HNS3_RING_GL_RX);
+ req->tqp_type_and_id[0] = rte_cpu_to_le_16(tqp_type_and_id);
+
+ req->int_cause_num = 1;
+ status = hns3_cmd_send(hw, &desc, 1);
+ if (status) {
+ hns3_err(hw, "Map TQP %d fail, vector_id is %d, status is %d.",
+queue_id, vector_id, status);
+ return -EIO;
+ }
+
+ return 0;
+}
+
static int
hns3_dev_configure(struct rte_eth_dev *dev)
{
@@ -4020,15 +4054,83 @@ hns3_do_start(struct hns3
[dpdk-dev] [PATCH v3 6/9] net/hns3: remove the redundant function call
From: Hao Chen This patch removes the redundant statement calling hns3_stats_reset() to clear statistical information explicitly in the initialization of VF device, because hardware has been reseted by FLR in the initialization and the initial hardware and software statistics values are 0. Signed-off-by: Hao Chen Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_ethdev_vf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index b5f3e9a86..92ed32631 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1167,7 +1167,6 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev) hns3_set_default_rss_args(hw); - (void)hns3_stats_reset(eth_dev); return 0; err_get_config: -- 2.23.0
[dpdk-dev] [PATCH v3 7/9] net/hns3: remove the redundant variable initialization
From: "Wei Hu (Xavier)"
This patch removes the redundant initialization of the variable
named ret.
Signed-off-by: Hongbo Zheng
Signed-off-by: Hao Chen
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_ethdev.c| 10 +-
drivers/net/hns3/hns3_ethdev_vf.c | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 4ce9515a9..49aef7dbc 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3597,7 +3597,7 @@ hns3_dev_promiscuous_enable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_mc_pmc = (dev->data->all_multicast == 1) ? true : false;
- int ret = 0;
+ int ret;
rte_spinlock_lock(&hw->lock);
ret = hns3_set_promisc_mode(hw, true, en_mc_pmc);
@@ -3614,7 +3614,7 @@ hns3_dev_promiscuous_disable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_mc_pmc = (dev->data->all_multicast == 1) ? true : false;
- int ret = 0;
+ int ret;
/* If now in all_multicast mode, must remain in all_multicast mode. */
rte_spinlock_lock(&hw->lock);
@@ -3632,7 +3632,7 @@ hns3_dev_allmulticast_enable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_uc_pmc = (dev->data->promiscuous == 1) ? true : false;
- int ret = 0;
+ int ret;
rte_spinlock_lock(&hw->lock);
ret = hns3_set_promisc_mode(hw, en_uc_pmc, true);
@@ -3649,7 +3649,7 @@ hns3_dev_allmulticast_disable(struct rte_eth_dev *dev)
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
bool en_uc_pmc = (dev->data->promiscuous == 1) ? true : false;
- int ret = 0;
+ int ret;
/* If now in promiscuous mode, must remain in all_multicast mode. */
if (dev->data->promiscuous == 1)
@@ -4135,7 +4135,7 @@ hns3_dev_start(struct rte_eth_dev *dev)
{
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
- int ret = 0;
+ int ret;
PMD_INIT_FUNC_TRACE();
if (rte_atomic16_read(&hw->reset.resetting))
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 92ed32631..10969011b 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1465,7 +1465,7 @@ hns3vf_dev_start(struct rte_eth_dev *dev)
{
struct hns3_adapter *hns = dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
- int ret = 0;
+ int ret;
PMD_INIT_FUNC_TRACE();
if (rte_atomic16_read(&hw->reset.resetting))
--
2.23.0
[dpdk-dev] [PATCH v3 5/9] net/hns3: optimize RSS's default algorithm
From: Hao Chen This patch changed the default algorithm of RSS from simle_xor to toeplitz because toeplitz is used more frequently by upper applications such as ceph. Signed-off-by: Hao Chen Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_rss.c | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index b8c20e6d9..dfc42f840 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -211,7 +211,11 @@ hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, req->ipv6_fragment_en |= HNS3_IP_OTHER_BIT_MASK; break; default: - /* Other unsupported flow types won't change tuples */ + /* +* rss_hf doesn't include unsupported flow types +* because the API framework has checked it, and +* this branch will never go unless rss_hf is zero. +*/ break; } } @@ -251,8 +255,8 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev, struct hns3_hw *hw = &hns->hw; struct hns3_rss_tuple_cfg *tuple = &hw->rss_info.rss_tuple_sets; struct hns3_rss_conf *rss_cfg = &hw->rss_info; - uint8_t algo = rss_cfg->conf.func; uint8_t key_len = rss_conf->rss_key_len; + uint8_t algo; uint64_t rss_hf = rss_conf->rss_hf; uint8_t *key = rss_conf->rss_key; int ret; @@ -285,6 +289,8 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev, ret = -EINVAL; goto conf_err; } + algo = rss_cfg->conf.func == RTE_ETH_HASH_FUNCTION_SIMPLE_XOR ? + HNS3_RSS_HASH_ALGO_SIMPLE : HNS3_RSS_HASH_ALGO_TOEPLITZ; ret = hns3_set_rss_algo_key(hw, algo, key); if (ret) goto conf_err; @@ -500,7 +506,9 @@ hns3_set_default_rss_args(struct hns3_hw *hw) int i; /* Default hash algorithm */ - rss_cfg->conf.func = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR; + rss_cfg->conf.func = RTE_ETH_HASH_FUNCTION_TOEPLITZ; + + /* Default RSS key */ memcpy(rss_cfg->key, hns3_hash_key, HNS3_RSS_KEY_SIZE); /* Initialize RSS indirection table */ -- 2.23.0
[dpdk-dev] [PATCH v3 8/9] net/hns3: remove the unnecessary assignment
From: "Wei Hu (Xavier)"
This patch removes the unncessary assignment in the '.tx_pkt_burst' ops
implementation function to avoid performance loss.
Signed-off-by: Wei Hu (Xavier)
Signed-off-by: Yisen Zhuang
---
drivers/net/hns3/hns3_rxtx.c | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index d9219d123..003a5bde4 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1181,8 +1181,7 @@ hns3_tx_free_useless_buffer(struct hns3_tx_queue *txq)
(tx_next_use != tx_next_clean || tx_bd_ready < tx_bd_max)) {
mbuf = tx_bak_pkt->mbuf;
if (mbuf) {
- mbuf->next = NULL;
- rte_pktmbuf_free(mbuf);
+ rte_pktmbuf_free_seg(mbuf);
tx_bak_pkt->mbuf = NULL;
}
@@ -1600,9 +1599,7 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
struct rte_mbuf *new_pkt;
struct rte_mbuf *tx_pkt;
struct rte_mbuf *m_seg;
- struct rte_mbuf *temp;
uint32_t nb_hold = 0;
- uint16_t tx_next_clean;
uint16_t tx_next_use;
uint16_t tx_bd_ready;
uint16_t tx_pkt_num;
@@ -1617,11 +1614,8 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf
**tx_pkts, uint16_t nb_pkts)
if (tx_bd_ready == 0)
return 0;
- tx_next_clean = txq->next_to_clean;
tx_next_use = txq->next_to_use;
tx_bd_max = txq->nb_tx_desc;
- tx_bak_pkt = &txq->sw_ring[tx_next_clean];
-
tx_pkt_num = (tx_bd_ready < nb_pkts) ? tx_bd_ready : nb_pkts;
/* send packets */
@@ -1676,9 +1670,8 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
i = 0;
do {
fill_desc(txq, tx_next_use, m_seg, (i == 0), 0);
- temp = m_seg->next;
tx_bak_pkt->mbuf = m_seg;
- m_seg = temp;
+ m_seg = m_seg->next;
tx_next_use++;
tx_bak_pkt++;
if (tx_next_use >= tx_bd_max) {
@@ -1697,7 +1690,6 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
if (likely(nb_tx)) {
hns3_queue_xmit(txq, nb_hold);
- txq->next_to_clean = tx_next_clean;
txq->tx_bd_ready = tx_bd_ready - nb_hold;
}
--
2.23.0
Re: [dpdk-dev] [PATCH v6 1/6] lib/eal: implement the family of rte bit operation APIs
> > Subject: [PATCH v6 1/6] lib/eal: implement the family of rte bit
> > operation APIs
> >
> > There are a lot functions of bit operations scattered and duplicated
> > in PMDs, consolidating them into a common API family is necessary.
> > Furthermore, when the bit operation is applied to the IO devices, use
> > __ATOMIC_ACQ_REL to ensure the ordering for io bit operation.
> >
> > Signed-off-by: Joyce Kong
> > Reviewed-by: Gavin Hu
> > Reviewed-by: Phil Yang
> > Acked-by: Morten Brørup
> > ---
> > MAINTAINERS| 5 +
> > doc/api/doxy-api-index.md | 5 +-
> > lib/librte_eal/common/Makefile | 1 +
> > lib/librte_eal/common/include/rte_bitops.h | 474
> > +
> > lib/librte_eal/common/meson.build | 3 +-
> > 5 files changed, 485 insertions(+), 3 deletions(-) create mode
> > 100644 lib/librte_eal/common/include/rte_bitops.h
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS index 4395d8d..d2a29a2 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -236,6 +236,11 @@ M: Cristian Dumitrescu
> >
> > F: lib/librte_eal/common/include/rte_bitmap.h
> > F: app/test/test_bitmap.c
> >
> > +Bitops
> > +M: Joyce Kong
> > +F: lib/librte_eal/common/include/rte_bitops.h
> > +F: app/test/test_bitops.c
> > +
> > MCSlock - EXPERIMENTAL
> > M: Phil Yang
> > F: lib/librte_eal/common/include/generic/rte_mcslock.h
> > diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
> > index
> > dff496b..ade7c01 100644
> > --- a/doc/api/doxy-api-index.md
> > +++ b/doc/api/doxy-api-index.md
> > @@ -133,12 +133,13 @@ The public API headers are grouped by topics:
> >[BPF](@ref rte_bpf.h)
> >
> > - **containers**:
> > + [bitmap] (@ref rte_bitmap.h),
> > + [bitops] (@ref rte_bitops.h),
> >[mbuf] (@ref rte_mbuf.h),
> >[mbuf pool ops] (@ref rte_mbuf_pool_ops.h),
> >[ring] (@ref rte_ring.h),
> >[stack] (@ref rte_stack.h),
> > - [tailq] (@ref rte_tailq.h),
> > - [bitmap] (@ref rte_bitmap.h)
> > + [tailq] (@ref rte_tailq.h)
> >
> > - **packet framework**:
> >* [port] (@ref rte_port.h):
> > diff --git a/lib/librte_eal/common/Makefile
> > b/lib/librte_eal/common/Makefile index c2c6d92..dd025c1 100644
> > --- a/lib/librte_eal/common/Makefile
> > +++ b/lib/librte_eal/common/Makefile
> > @@ -19,6 +19,7 @@ INC += rte_malloc.h rte_keepalive.h rte_time.h INC
> > += rte_service.h rte_service_component.h INC += rte_bitmap.h
> > rte_vfio.h rte_hypervisor.h rte_test.h INC += rte_reciprocal.h
> > rte_fbarray.h rte_uuid.h
> > +INC += rte_bitops.h
> >
> > GENERIC_INC := rte_atomic.h rte_byteorder.h rte_cycles.h
> > rte_prefetch.h GENERIC_INC += rte_memcpy.h rte_cpuflags.h diff --git
> > a/lib/librte_eal/common/include/rte_bitops.h
> > b/lib/librte_eal/common/include/rte_bitops.h
> > new file mode 100644
> > index 000..34158d1
> > --- /dev/null
> > +++ b/lib/librte_eal/common/include/rte_bitops.h
> > @@ -0,0 +1,474 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2019 Arm Limited
> > + */
> > +
> > +#ifndef _RTE_BITOPS_H_
> > +#define _RTE_BITOPS_H_
> > +
> > +/**
> > + * @file
> > + * Bit Operations
> > + *
> > + * This file defines a API for bit operations without/with memory ordering.
> > + */
> > +
> > +#include
> > +#include
> > +#include
> > +
> > +/* 32 bit operations
> > +*/
> > +
> > +/**
> > + * @warning
> > + * @b EXPERIMENTAL: this API may change, or be removed, without prior
> > +notice
> > + *
> > + * Get the target bit from a 32-bit value without memory ordering.
> > + *
> > + * @param nr
> > + * The target bit to get.
> > + * @param addr
> > + * The address holding the bit.
> > + * @return
> > + * The target bit.
> > + */
> > +__rte_experimental
> > +static inline uint32_t
> > +rte_get_bit32_relaxed(unsigned int nr, uint32_t *addr) {
> Why not pass the memory order as a parameter? It would reduce the number
> of API calls by half.
I think these APIs should be modelled according to C11 __atomic_xxx APIs.
Otherwise, the programmers have to understand another interface. It will also
help reduce the number of APIs.
Converting these into macros will help remove the size based duplication of
APIs. I came up with the following macro:
#define RTE_GET_BIT(nr, var, ret, memorder) \
({ \
if (sizeof(var) == sizeof(uint32_t)) { \
uint32_t mask1 = 1U << (nr)%32; \
ret = __atomic_load_n(&var, (memorder)) & mask1;\
} \
else {\
uint64_t mask2 = 1UL << (nr)%64;\
ret = __atomic_load_n(&var, (memorder)) & mask2;\
} \
})
The '%' is required to avoid a compiler warning/error. But the '%' operation
will get removed by the compiler since 'nr' is a constant.
IMO, the macro itself is not complex and should not be a pain for debugging.
Cur
Re: [dpdk-dev] [PATCH v6 1/6] lib/eal: implement the family of rte bit operation APIs
On Sat, 21 Dec 2019 16:07:23 +
Honnappa Nagarahalli wrote:
> Converting these into macros will help remove the size based duplication of
> APIs. I came up with the following macro:
>
> #define RTE_GET_BIT(nr, var, ret, memorder) \
> ({ \
> if (sizeof(var) == sizeof(uint32_t)) { \
> uint32_t mask1 = 1U << (nr)%32; \
> ret = __atomic_load_n(&var, (memorder)) & mask1;\
> } \
> else {\
> uint64_t mask2 = 1UL << (nr)%64;\
> ret = __atomic_load_n(&var, (memorder)) & mask2;\
> } \
> })
Macros are more error prone. Especially because this is in exposed header file
Re: [dpdk-dev] [PATCH v6 1/6] lib/eal: implement the family of rte bit operation APIs
On Sat, 21 Dec 2019 16:07:23 +
Honnappa Nagarahalli wrote:
> Converting these into macros will help remove the size based duplication of
> APIs. I came up with the following macro:
>
> #define RTE_GET_BIT(nr, var, ret, memorder) \
> ({ \
> if (sizeof(var) == sizeof(uint32_t)) { \
> uint32_t mask1 = 1U << (nr)%32; \
> ret = __atomic_load_n(&var, (memorder)) & mask1;\
> } \
> else {\
> uint64_t mask2 = 1UL << (nr)%64;\
> ret = __atomic_load_n(&var, (memorder)) & mask2;\
> } \
> })
Follow on if you want to do it as macros, then use typeof() to make the
mask any size.
