[PATCH v5 02/15] net/xsc: add xsc device initialization

[WanRenyong]

XSC device is a hardware abstract level device serving as a handle
to interact with hardware.

Signed-off-by: WanRenyong 

---

v5:
* Fix coding style issue with misspelling
* Rearrange the elements in struct xsc_hwinfo to reduce holes
---
 drivers/net/xsc/meson.build  |   1 +
 drivers/net/xsc/xsc_defs.h   |  16 
 drivers/net/xsc/xsc_dev.c| 181 +++
 drivers/net/xsc/xsc_dev.h| 131 +
 drivers/net/xsc/xsc_ethdev.c |  16 +++-
 drivers/net/xsc/xsc_ethdev.h |   3 +
 6 files changed, 347 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/xsc/xsc_dev.c
 create mode 100644 drivers/net/xsc/xsc_dev.h

diff --git a/drivers/net/xsc/meson.build b/drivers/net/xsc/meson.build
index 84a09a23de..683a1f6632 100644
--- a/drivers/net/xsc/meson.build
+++ b/drivers/net/xsc/meson.build
@@ -8,4 +8,5 @@ endif
 
 sources = files(
 'xsc_ethdev.c',
+'xsc_dev.c',
 )
diff --git a/drivers/net/xsc/xsc_defs.h b/drivers/net/xsc/xsc_defs.h
index 7c91d3443f..60244425cd 100644
--- a/drivers/net/xsc/xsc_defs.h
+++ b/drivers/net/xsc/xsc_defs.h
@@ -12,4 +12,20 @@
 #define XSC_PCI_DEV_ID_MVHVF   0x1152
 #define XSC_PCI_DEV_ID_MVS 0x1153
 
+#define XSC_VFREP_BASE_LOGICAL_PORT1081
+
+enum xsc_nic_mode {
+   XSC_NIC_MODE_LEGACY,
+   XSC_NIC_MODE_SWITCHDEV,
+   XSC_NIC_MODE_SOC,
+};
+
+enum xsc_pph_type {
+   XSC_PPH_NONE= 0,
+   XSC_RX_PPH  = 0x1,
+   XSC_TX_PPH  = 0x2,
+   XSC_VFREP_PPH   = 0x4,
+   XSC_UPLINK_PPH  = 0x8,
+};
+
 #endif /* XSC_DEFS_H_ */
diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
new file mode 100644
index 00..b030eb3410
--- /dev/null
+++ b/drivers/net/xsc/xsc_dev.c
@@ -0,0 +1,181 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Yunsilicon Technology Co., Ltd.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "xsc_log.h"
+#include "xsc_defs.h"
+#include "xsc_dev.h"
+
+#define XSC_DEV_DEF_FLOW_MODE  7
+
+TAILQ_HEAD(xsc_dev_ops_list, xsc_dev_ops);
+static struct xsc_dev_ops_list dev_ops_list = 
TAILQ_HEAD_INITIALIZER(dev_ops_list);
+
+static const struct xsc_dev_ops *
+xsc_dev_ops_get(enum rte_pci_kernel_driver kdrv)
+{
+   const struct xsc_dev_ops *ops;
+
+   TAILQ_FOREACH(ops, &dev_ops_list, entry) {
+   if (ops->kdrv == kdrv)
+   return ops;
+   }
+
+   return NULL;
+}
+
+void
+xsc_dev_ops_register(struct xsc_dev_ops *new_ops)
+{
+   struct xsc_dev_ops *ops;
+
+   TAILQ_FOREACH(ops, &dev_ops_list, entry) {
+   if (ops->kdrv == new_ops->kdrv) {
+   PMD_DRV_LOG(ERR, "xsc dev ops exists, kdrv=%d", 
new_ops->kdrv);
+   return;
+   }
+   }
+
+   TAILQ_INSERT_TAIL(&dev_ops_list, new_ops, entry);
+}
+
+int
+xsc_dev_close(struct xsc_dev *xdev, int __rte_unused repr_id)
+{
+   return xdev->dev_ops->dev_close(xdev);
+}
+
+static int
+xsc_dev_alloc_vfos_info(struct xsc_dev *xdev)
+{
+   struct xsc_hwinfo *hwinfo;
+   int base_lp = 0;
+
+   if (xsc_dev_is_vf(xdev))
+   return 0;
+
+   hwinfo = &xdev->hwinfo;
+   if (hwinfo->pcie_no == 1) {
+   xdev->vfrep_offset = hwinfo->func_id -
+   hwinfo->pcie1_pf_funcid_base +
+   hwinfo->pcie0_pf_funcid_top -
+   hwinfo->pcie0_pf_funcid_base  + 1;
+   } else {
+   xdev->vfrep_offset = hwinfo->func_id - 
hwinfo->pcie0_pf_funcid_base;
+   }
+
+   base_lp = XSC_VFREP_BASE_LOGICAL_PORT;
+   if (xdev->devargs.nic_mode == XSC_NIC_MODE_LEGACY)
+   base_lp += xdev->vfrep_offset;
+   xdev->vfos_logical_in_port = base_lp;
+   return 0;
+}
+
+static void
+xsc_dev_args_parse(struct xsc_dev *xdev, struct rte_devargs *devargs)
+{
+   struct rte_kvargs *kvlist;
+   struct xsc_devargs *xdevargs = &xdev->devargs;
+   const char *tmp;
+
+   kvlist = rte_kvargs_parse(devargs->args, NULL);
+   if (kvlist == NULL)
+   return;
+
+   tmp = rte_kvargs_get(kvlist, XSC_PPH_MODE_ARG);
+   if (tmp != NULL)
+   xdevargs->pph_mode = atoi(tmp);
+   else
+   xdevargs->pph_mode = XSC_PPH_NONE;
+
+   tmp = rte_kvargs_get(kvlist, XSC_NIC_MODE_ARG);
+   if (tmp != NULL)
+   xdevargs->nic_mode = atoi(tmp);
+   else
+   xdevargs->nic_mode = XSC_NIC_MODE_LEGACY;
+
+   tmp = rte_kvargs_get(kvlist, XSC_FLOW_MODE_ARG);
+   if (tmp != NULL)
+   xdevargs->flow_mode = atoi(tmp);
+   else
+   xdevargs->flow_mode = XSC_DEV_DEF_FLOW_MODE;
+
+   rte_kvargs_free(kvlist);
+}
+
+void
+xsc_dev_uninit(struct xsc_dev *xdev)
+{
+   PMD_INIT_FUNC_TRACE();
+   xsc_dev_close(xdev, XSC_DEV_REPR_ID_INVALID);
+   rte_free(xdev)

[PATCH v5 03/15] net/xsc: add xsc mailbox

[WanRenyong]

XSC mailbox is a mechanism used for interaction between PMD and firmware.

Signed-off-by: WanRenyong 
Signed-off-by: Rong Qian 
---
 drivers/net/xsc/meson.build |   1 +
 drivers/net/xsc/xsc_cmd.h   | 387 ++
 drivers/net/xsc/xsc_defs.h  |   2 +
 drivers/net/xsc/xsc_vfio_mbox.c | 691 
 drivers/net/xsc/xsc_vfio_mbox.h | 142 +++
 5 files changed, 1223 insertions(+)
 create mode 100644 drivers/net/xsc/xsc_cmd.h
 create mode 100644 drivers/net/xsc/xsc_vfio_mbox.c
 create mode 100644 drivers/net/xsc/xsc_vfio_mbox.h

diff --git a/drivers/net/xsc/meson.build b/drivers/net/xsc/meson.build
index 683a1f6632..df4c8ea499 100644
--- a/drivers/net/xsc/meson.build
+++ b/drivers/net/xsc/meson.build
@@ -9,4 +9,5 @@ endif
 sources = files(
 'xsc_ethdev.c',
 'xsc_dev.c',
+'xsc_vfio_mbox.c',
 )
diff --git a/drivers/net/xsc/xsc_cmd.h b/drivers/net/xsc/xsc_cmd.h
new file mode 100644
index 00..433dcd0afa
--- /dev/null
+++ b/drivers/net/xsc/xsc_cmd.h
@@ -0,0 +1,387 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Yunsilicon Technology Co., Ltd.
+ */
+
+#ifndef _XSC_CMD_H_
+#define _XSC_CMD_H_
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define XSC_BOARD_SN_LEN   32
+#define XSC_CMD_QUERY_HCA_CAP_V1   1
+
+enum xsc_cmd_opcode {
+   XSC_CMD_OP_QUERY_HCA_CAP= 0x100,
+   XSC_CMD_OP_CREATE_CQ= 0x400,
+   XSC_CMD_OP_DESTROY_CQ   = 0x401,
+   XSC_CMD_OP_CREATE_QP= 0x500,
+   XSC_CMD_OP_DESTROY_QP   = 0x501,
+   XSC_CMD_OP_RTR2RTS_QP   = 0x504,
+   XSC_CMD_OP_QP_2RST  = 0x50A,
+   XSC_CMD_OP_CREATE_MULTI_QP  = 0x515,
+   XSC_CMD_OP_MODIFY_NIC_HCA   = 0x812,
+   XSC_CMD_OP_MODIFY_RAW_QP= 0x81f,
+   XSC_CMD_OP_EXEC_NP  = 0x900,
+   XSC_CMD_OP_SET_MTU  = 0x1100,
+   XSC_CMD_OP_QUERY_ETH_MAC= 0X1101,
+   XSC_CMD_OP_MAX
+};
+
+enum xsc_cmd_status {
+   XSC_CMD_SUCC = 0,
+   XSC_CMD_FAIL,
+   XSC_CMD_TIMEOUT,
+};
+
+struct xsc_cmd_inbox_hdr {
+   rte_be16_t opcode;
+   uint8_t rsvd[4];
+   rte_be16_t ver;
+};
+
+struct xsc_cmd_outbox_hdr {
+   uint8_t status;
+   uint8_t rsvd[5];
+   rte_be16_t ver;
+};
+
+struct xsc_cmd_fw_version {
+   uint8_t major;
+   uint8_t minor;
+   rte_be16_t patch;
+   rte_be32_t tweak;
+   uint8_t extra_flag;
+   uint8_t rsv[7];
+};
+
+struct xsc_cmd_hca_cap {
+   uint8_t rsvd1[12];
+   uint8_t send_seg_num;
+   uint8_t send_wqe_shift;
+   uint8_t recv_seg_num;
+   uint8_t recv_wqe_shift;
+   uint8_t log_max_srq_sz;
+   uint8_t log_max_qp_sz;
+   uint8_t log_max_mtt;
+   uint8_t log_max_qp;
+   uint8_t log_max_strq_sz;
+   uint8_t log_max_srqs;
+   uint8_t rsvd2[2];
+   uint8_t log_max_tso;
+   uint8_t log_max_cq_sz;
+   uint8_t rsvd3;
+   uint8_t log_max_cq;
+   uint8_t log_max_eq_sz;
+   uint8_t log_max_mkey;
+   uint8_t log_max_msix;
+   uint8_t log_max_eq;
+   uint8_t max_indirection;
+   uint8_t log_max_mrw_sz;
+   uint8_t log_max_bsf_list_sz;
+   uint8_t log_max_klm_list_sz;
+   uint8_t rsvd4;
+   uint8_t log_max_ra_req_dc;
+   uint8_t rsvd5;
+   uint8_t log_max_ra_res_dc;
+   uint8_t rsvd6;
+   uint8_t log_max_ra_req_qp;
+   uint8_t log_max_qp_depth;
+   uint8_t log_max_ra_res_qp;
+   rte_be16_t max_vfs;
+   rte_be16_t raweth_qp_id_end;
+   rte_be16_t raw_tpe_qp_num;
+   rte_be16_t max_qp_count;
+   rte_be16_t raweth_qp_id_base;
+   uint8_t rsvd7;
+   uint8_t local_ca_ack_delay;
+   uint8_t max_num_eqs;
+   uint8_t num_ports;
+   uint8_t log_max_msg;
+   uint8_t mac_port;
+   rte_be16_t raweth_rss_qp_id_base;
+   rte_be16_t stat_rate_support;
+   uint8_t rsvd8[2];
+   rte_be64_t flags;
+   uint8_t rsvd9;
+   uint8_t uar_sz;
+   uint8_t rsvd10;
+   uint8_t log_pg_sz;
+   rte_be16_t bf_log_bf_reg_size;
+   rte_be16_t msix_base;
+   rte_be16_t msix_num;
+   rte_be16_t max_desc_sz_sq;
+   uint8_t rsvd11[2];
+   rte_be16_t max_desc_sz_rq;
+   uint8_t rsvd12[2];
+   rte_be16_t max_desc_sz_sq_dc;
+   uint8_t rsvd13[4];
+   rte_be16_t max_qp_mcg;
+   uint8_t rsvd14;
+   uint8_t log_max_mcg;
+   uint8_t rsvd15;
+   uint8_t log_max_pd;
+   uint8_t rsvd16;
+   uint8_t log_max_xrcd;
+   uint8_t rsvd17[40];
+   rte_be32_t uar_page_sz;
+   uint8_t rsvd18[8];
+   rte_be32_t hw_feature_flag;
+   rte_be16_t pf0_vf_funcid_base;
+   rte_be16_t pf0_vf_funcid_top;
+   rte_be16_t pf1_vf_funcid_base;
+   rte_be16_t pf1_vf_funcid_top;
+   rte_be16_t pcie0_pf_funcid_base;
+   rte_be16_t pcie0_pf_funcid_top;
+   rte_be16_t pcie1_pf_funcid_base;
+   rte_be16_

[PATCH v5 01/15] net/xsc: add xsc PMD framework

[WanRenyong]

Add xsc PMD framework, doc and build infrastructure, supporting
PCI probe.

Signed-off-by: WanRenyong 
---
 .mailmap   |  5 ++
 MAINTAINERS| 10 +++
 doc/guides/nics/features/xsc.ini   |  9 +++
 doc/guides/nics/index.rst  |  1 +
 doc/guides/nics/xsc.rst| 31 +
 doc/guides/rel_notes/release_25_03.rst |  4 ++
 drivers/net/meson.build|  1 +
 drivers/net/xsc/meson.build| 11 
 drivers/net/xsc/xsc_defs.h | 15 +
 drivers/net/xsc/xsc_ethdev.c   | 89 ++
 drivers/net/xsc/xsc_ethdev.h   | 15 +
 drivers/net/xsc/xsc_log.h  | 24 +++
 12 files changed, 215 insertions(+)
 create mode 100644 doc/guides/nics/features/xsc.ini
 create mode 100644 doc/guides/nics/xsc.rst
 create mode 100644 drivers/net/xsc/meson.build
 create mode 100644 drivers/net/xsc/xsc_defs.h
 create mode 100644 drivers/net/xsc/xsc_ethdev.c
 create mode 100644 drivers/net/xsc/xsc_ethdev.h
 create mode 100644 drivers/net/xsc/xsc_log.h

diff --git a/.mailmap b/.mailmap
index 818798273f..18293215c3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -370,6 +370,7 @@ Dongdong Liu 
 Dongsheng Rong 
 Dongsu Han 
 Dong Wang 
+Dongwei Xu 
 Dongyang Pan <197020...@qq.com>
 Dong Zhou  
 Don Provan 
@@ -1062,6 +1063,7 @@ Nagadheeraj Rottela 
 Naga Harish K S V 
 Naga Suresh Somarowthu 
 Nalla Pradeep 
+Na Na 
 Na Na 
 Nan Chen 
 Nandini Persad 
@@ -1306,6 +1308,7 @@ Ronak Doshi  
 Ron Beider 
 Ronghua Zhang 
 RongQiang Xie 
+Rong Qian 
 RongQing Li 
 Rongwei Liu 
 Rory Sexton 
@@ -1633,6 +1636,7 @@ Waldemar Dworakowski 
 Walter Heymans 
 Wang Sheng-Hui 
 Wangyu (Eric) 
+WanRenyong 
 Waterman Cao 
 Wathsala Vithanage 
 Weichun Chen 
@@ -1686,6 +1690,7 @@ Xiaonan Zhang 
 Xiao Wang 
 Xiaoxiao Zeng 
 Xiaoxin Peng 
+Xiaoxiong Zhang 
 Xiaoyu Min  
 Xiaoyun Li 
 Xiaoyun Wang 
diff --git a/MAINTAINERS b/MAINTAINERS
index 60bdcce543..3426658486 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1075,6 +1075,16 @@ F: drivers/net/avp/
 F: doc/guides/nics/avp.rst
 F: doc/guides/nics/features/avp.ini
 
+Yunsilicon xsc
+M: WanRenyong 
+M: Na Na 
+M: Rong Qian 
+M: Xiaoxiong Zhang 
+M: Dongwei Xu 
+F: drivers/net/xsc/
+F: doc/guides/nics/xsc.rst
+F: doc/guides/nics/features/xsc.ini
+
 ZTE zxdh - EXPERIMENTAL
 M: Junlong Wang 
 M: Lijie Shan 
diff --git a/doc/guides/nics/features/xsc.ini b/doc/guides/nics/features/xsc.ini
new file mode 100644
index 00..b5c44ce535
--- /dev/null
+++ b/doc/guides/nics/features/xsc.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'xsc' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux= Y
+ARMv8= Y
+x86-64   = Y
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index 50688d9f64..10a2eca3b0 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -70,4 +70,5 @@ Network Interface Controller Drivers
 vhost
 virtio
 vmxnet3
+xsc
 zxdh
diff --git a/doc/guides/nics/xsc.rst b/doc/guides/nics/xsc.rst
new file mode 100644
index 00..8e189db541
--- /dev/null
+++ b/doc/guides/nics/xsc.rst
@@ -0,0 +1,31 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright 2024 Yunsilicon Technology Co., Ltd
+
+XSC Poll Mode Driver
+==
+
+The xsc PMD (**librte_net_xsc**) provides poll mode driver support for
+10/25/50/100/200 Gbps Yunsilicon metaScale Series Network Adapters.
+
+Supported NICs
+--
+
+The following Yunsilicon device models are supported by the same xsc driver:
+
+  - metaScale-200S
+  - metaScale-200
+  - metaScale-100Q
+  - metaScale-50
+
+Prerequisites
+--
+
+- Follow the DPDK :ref:`Getting Started Guide for Linux ` to setup 
the basic DPDK environment.
+
+- Learning about Yunsilicon metaScale Series NICs using
+  ``_.
+
+Limitations or Known issues
+---
+32bit ARCHs are not supported.
+Windows and BSD are not supported yet.
diff --git a/doc/guides/rel_notes/release_25_03.rst 
b/doc/guides/rel_notes/release_25_03.rst
index 426dfcd982..6f766add72 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -55,6 +55,10 @@ New Features
  Also, make sure to start the actual text at the margin.
  ===
 
+* **Added Yunsilicon xsc net driver [EXPERIMENTAL].**
+
+  * Added the PMD for Yunsilicon metaScale serials NICs.
+
 
 Removed Items
 -
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index dafd637ba4..c1ca7b0b39 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -63,6 +63,7 @@ drivers = [
 'vhost',
 'virtio',
 'vmxnet3',
+'xsc',
 'zxdh',
 ]
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mb

[PATCH v5 04/15] net/xsc: add xsc dev ops to support VFIO driver

[WanRenyong]

XSC PMD is designed to support both VFIO and private kernel drivers.
This commit add xsc dev ops to support VFIO driver.

Signed-off-by: WanRenyong 
Signed-off-by: Na Na 

---

v5
* Using RTE_ETHER_ADDR_LEN instead of numeral 6.
* Initialize some local variables while be defined.
* Fix compilation warnings.
---
 drivers/net/xsc/meson.build |   1 +
 drivers/net/xsc/xsc_defs.h  |   8 +
 drivers/net/xsc/xsc_dev.h   |  32 ++
 drivers/net/xsc/xsc_rxtx.h  | 102 +
 drivers/net/xsc/xsc_vfio.c  | 746 
 5 files changed, 889 insertions(+)
 create mode 100644 drivers/net/xsc/xsc_rxtx.h
 create mode 100644 drivers/net/xsc/xsc_vfio.c

diff --git a/drivers/net/xsc/meson.build b/drivers/net/xsc/meson.build
index df4c8ea499..4e20b30438 100644
--- a/drivers/net/xsc/meson.build
+++ b/drivers/net/xsc/meson.build
@@ -10,4 +10,5 @@ sources = files(
 'xsc_ethdev.c',
 'xsc_dev.c',
 'xsc_vfio_mbox.c',
+'xsc_vfio.c',
 )
diff --git a/drivers/net/xsc/xsc_defs.h b/drivers/net/xsc/xsc_defs.h
index a4b36685a6..8fd59133bc 100644
--- a/drivers/net/xsc/xsc_defs.h
+++ b/drivers/net/xsc/xsc_defs.h
@@ -16,6 +16,14 @@
 
 #define XSC_VFREP_BASE_LOGICAL_PORT1081
 
+#define XSC_PF_TX_DB_ADDR  0x4802000
+#define XSC_PF_RX_DB_ADDR  0x4804000
+#define XSC_PF_CQ_DB_ADDR  0x212
+
+#define XSC_VF_RX_DB_ADDR  0x8d4
+#define XSC_VF_TX_DB_ADDR  0x8d0
+#define XSC_VF_CQ_DB_ADDR  0x8c4
+
 enum xsc_nic_mode {
XSC_NIC_MODE_LEGACY,
XSC_NIC_MODE_SWITCHDEV,
diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h
index e013d954b9..059d7d37ff 100644
--- a/drivers/net/xsc/xsc_dev.h
+++ b/drivers/net/xsc/xsc_dev.h
@@ -14,6 +14,7 @@
 
 #include "xsc_defs.h"
 #include "xsc_log.h"
+#include "xsc_rxtx.h"
 
 #define XSC_PPH_MODE_ARG   "pph_mode"
 #define XSC_NIC_MODE_ARG   "nic_mode"
@@ -25,6 +26,18 @@
 #define XSC_DEV_PCT_IDX_INVALID0x
 #define XSC_DEV_REPR_ID_INVALID0x7FFF
 
+enum xsc_queue_type {
+   XSC_QUEUE_TYPE_RDMA_RC  = 0,
+   XSC_QUEUE_TYPE_RDMA_MAD = 1,
+   XSC_QUEUE_TYPE_RAW  = 2,
+   XSC_QUEUE_TYPE_VIRTIO_NET   = 3,
+   XSC_QUEUE_TYPE_VIRTIO_BLK   = 4,
+   XSC_QUEUE_TYPE_RAW_TPE  = 5,
+   XSC_QUEUE_TYPE_RAW_TSO  = 6,
+   XSC_QUEUE_TYPE_RAW_TX   = 7,
+   XSC_QUEUE_TYPE_INVALID  = 0xFF,
+};
+
 struct xsc_hwinfo {
uint32_t pcie_no; /* pcie number , 0 or 1 */
uint32_t func_id; /* pf glb func id */
@@ -120,6 +133,25 @@ struct xsc_dev_ops {
enum rte_pci_kernel_driver kdrv;
int (*dev_init)(struct xsc_dev *xdev);
int (*dev_close)(struct xsc_dev *xdev);
+   int (*get_mac)(struct xsc_dev *xdev, uint8_t *mac);
+   int (*set_link_up)(struct xsc_dev *xdev);
+   int (*set_link_down)(struct xsc_dev *xdev);
+   int (*link_update)(struct xsc_dev *xdev, uint8_t funcid_type, int 
wait_to_complete);
+   int (*set_mtu)(struct xsc_dev *xdev, uint16_t mtu);
+   int (*destroy_qp)(void *qp);
+   int (*destroy_cq)(void *cq);
+   int (*modify_qp_status)(struct xsc_dev *xdev,
+   uint32_t qpn, int num, int opcode);
+   int (*modify_qp_qostree)(struct xsc_dev *xdev, uint16_t qpn);
+
+   int (*rx_cq_create)(struct xsc_dev *xdev, struct xsc_rx_cq_params 
*cq_params,
+   struct xsc_rx_cq_info *cq_info);
+   int (*tx_cq_create)(struct xsc_dev *xdev, struct xsc_tx_cq_params 
*cq_params,
+   struct xsc_tx_cq_info *cq_info);
+   int (*tx_qp_create)(struct xsc_dev *xdev, struct xsc_tx_qp_params 
*qp_params,
+   struct xsc_tx_qp_info *qp_info);
+   int (*mailbox_exec)(struct xsc_dev *xdev, void *data_in,
+   int in_len, void *data_out, int out_len);
 };
 
 void xsc_dev_ops_register(struct xsc_dev_ops *new_ops);
diff --git a/drivers/net/xsc/xsc_rxtx.h b/drivers/net/xsc/xsc_rxtx.h
new file mode 100644
index 00..725a5f18d1
--- /dev/null
+++ b/drivers/net/xsc/xsc_rxtx.h
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Yunsilicon Technology Co., Ltd.
+ */
+
+#ifndef _XSC_RXTX_H_
+#define _XSC_RXTX_H_
+
+#include 
+
+struct xsc_wqe_data_seg {
+   union {
+   struct {
+   uint8_t in_line:1;
+   uint8_t rsv0:7;
+   };
+   struct {
+   rte_le32_t  rsv1:1;
+   rte_le32_t  seg_len:31;
+   rte_le32_t  lkey;
+   rte_le64_t  va;
+   };
+   struct {
+   uint8_t rsv2:1;
+   uint8_t len:7;
+   uint8_t in_line_data[15];
+   };
+   };
+} __rt

[PATCH v5 05/15] net/xsc: add PCT interfaces

[WanRenyong]

PCT is the abbreviation of Packet classifier table, which is built
in NP to define behavior of various packets.

Signed-off-by: WanRenyong 
---
 drivers/net/xsc/meson.build |   1 +
 drivers/net/xsc/xsc_defs.h  |  29 +++
 drivers/net/xsc/xsc_dev.c   |  19 +-
 drivers/net/xsc/xsc_dev.h   |   3 +
 drivers/net/xsc/xsc_np.c| 492 
 drivers/net/xsc/xsc_np.h| 154 +++
 6 files changed, 697 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/xsc/xsc_np.c
 create mode 100644 drivers/net/xsc/xsc_np.h

diff --git a/drivers/net/xsc/meson.build b/drivers/net/xsc/meson.build
index 4e20b30438..5ee03ea835 100644
--- a/drivers/net/xsc/meson.build
+++ b/drivers/net/xsc/meson.build
@@ -11,4 +11,5 @@ sources = files(
 'xsc_dev.c',
 'xsc_vfio_mbox.c',
 'xsc_vfio.c',
+'xsc_np.c',
 )
diff --git a/drivers/net/xsc/xsc_defs.h b/drivers/net/xsc/xsc_defs.h
index 8fd59133bc..b1e37a5870 100644
--- a/drivers/net/xsc/xsc_defs.h
+++ b/drivers/net/xsc/xsc_defs.h
@@ -16,6 +16,26 @@
 
 #define XSC_VFREP_BASE_LOGICAL_PORT1081
 
+#define XSC_RSS_HASH_KEY_LEN   52
+#define XSC_RSS_HASH_BIT_IPV4_SIP  (1ULL << 0)
+#define XSC_RSS_HASH_BIT_IPV4_DIP  (1ULL << 1)
+#define XSC_RSS_HASH_BIT_IPV6_SIP  (1ULL << 2)
+#define XSC_RSS_HASH_BIT_IPV6_DIP  (1ULL << 3)
+#define XSC_RSS_HASH_BIT_IPV4_SPORT(1ULL << 4)
+#define XSC_RSS_HASH_BIT_IPV4_DPORT(1ULL << 5)
+#define XSC_RSS_HASH_BIT_IPV6_SPORT(1ULL << 6)
+#define XSC_RSS_HASH_BIT_IPV6_DPORT(1ULL << 7)
+#define XSC_RSS_HASH_BIT_TNL_ID(1ULL << 8)
+#define XSC_RSS_HASH_BIT_NXT_PRO   (1ULL << 9)
+
+#define XSC_EPAT_VLD_FLAG  (1ULL)
+#define XSC_EPAT_RX_QP_ID_OFST_FLAG(1ULL << 2)
+#define XSC_EPAT_QP_NUM_FLAG   (1ULL << 3)
+#define XSC_EPAT_RSS_EN_FLAG   (1ULL << 4)
+#define XSC_EPAT_RSS_HASH_TEMPLATE_FLAG(1ULL << 5)
+#define XSC_EPAT_RSS_HASH_FUNC_FLAG(1ULL << 6)
+#define XSC_EPAT_HAS_PPH_FLAG  (1ULL << 9)
+
 #define XSC_PF_TX_DB_ADDR  0x4802000
 #define XSC_PF_RX_DB_ADDR  0x4804000
 #define XSC_PF_CQ_DB_ADDR  0x212
@@ -38,4 +58,13 @@ enum xsc_pph_type {
XSC_UPLINK_PPH  = 0x8,
 };
 
+enum xsc_port_type {
+   XSC_PORT_TYPE_NONE = 0,
+   XSC_PORT_TYPE_UPLINK,
+   XSC_PORT_TYPE_UPLINK_BOND,
+   XSC_PORT_TYPE_PFVF,
+   XSC_PORT_TYPE_PFHPF,
+   XSC_PORT_TYPE_UNKNOWN,
+};
+
 #endif /* XSC_DEFS_H_ */
diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index b030eb3410..8933f77b8f 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -54,8 +54,17 @@ xsc_dev_ops_register(struct xsc_dev_ops *new_ops)
 }
 
 int
-xsc_dev_close(struct xsc_dev *xdev, int __rte_unused repr_id)
+xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
+int in_len, void *data_out, int out_len)
 {
+   return xdev->dev_ops->mailbox_exec(xdev, data_in, in_len,
+  data_out, out_len);
+}
+
+int
+xsc_dev_close(struct xsc_dev *xdev, int repr_id)
+{
+   xsc_dev_clear_pct(xdev, repr_id);
return xdev->dev_ops->dev_close(xdev);
 }
 
@@ -121,6 +130,7 @@ void
 xsc_dev_uninit(struct xsc_dev *xdev)
 {
PMD_INIT_FUNC_TRACE();
+   xsc_dev_pct_uninit();
xsc_dev_close(xdev, XSC_DEV_REPR_ID_INVALID);
rte_free(xdev);
 }
@@ -159,6 +169,13 @@ xsc_dev_init(struct rte_pci_device *pci_dev, struct 
xsc_dev **xdev)
goto hwinfo_init_fail;
}
 
+   ret = xsc_dev_pct_init();
+   if (ret) {
+   PMD_DRV_LOG(ERR, "Failed to init xsc pct");
+   ret = -EINVAL;
+   goto hwinfo_init_fail;
+   }
+
*xdev = d;
 
return 0;
diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h
index 059d7d37ff..54e0275411 100644
--- a/drivers/net/xsc/xsc_dev.h
+++ b/drivers/net/xsc/xsc_dev.h
@@ -15,6 +15,7 @@
 #include "xsc_defs.h"
 #include "xsc_log.h"
 #include "xsc_rxtx.h"
+#include "xsc_np.h"
 
 #define XSC_PPH_MODE_ARG   "pph_mode"
 #define XSC_NIC_MODE_ARG   "nic_mode"
@@ -154,6 +155,8 @@ struct xsc_dev_ops {
int in_len, void *data_out, int out_len);
 };
 
+int xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
+int in_len, void *data_out, int out_len);
 void xsc_dev_ops_register(struct xsc_dev_ops *new_ops);
 int xsc_dev_init(struct rte_pci_device *pci_dev, struct xsc_dev **dev);
 void xsc_dev_uninit(struct xsc_dev *xdev);
diff --git a/drivers/net/xsc/xsc_np.c b/drivers/net/xsc/xsc_np.c
new file mode 100644
index 00..d4eb833bf6
--- /dev/null
+++ b/drivers/net/xsc/xsc_np.c
@@ -0,0 +1,492 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Yunsilicon Technology Co., Ltd.
+ */
+
+#include 
+#include 
+
+#include "xsc_log.h"
+#include "xsc_defs.h"
+#include "xsc_np.h"
+#include "xsc_cmd.h"
+#include "xsc_

[PATCH v5 06/15] net/xsc: initialize xsc representors

[WanRenyong]

For the design of the xsc PMD, each ethdev corresponds to a representor.

Signed-off-by: WanRenyong 
---
 drivers/net/xsc/xsc_defs.h   |  11 +++
 drivers/net/xsc/xsc_dev.c|  95 
 drivers/net/xsc/xsc_dev.h|   3 +
 drivers/net/xsc/xsc_ethdev.c | 170 +++
 drivers/net/xsc/xsc_ethdev.h |  19 
 5 files changed, 298 insertions(+)

diff --git a/drivers/net/xsc/xsc_defs.h b/drivers/net/xsc/xsc_defs.h
index b1e37a5870..111776f37e 100644
--- a/drivers/net/xsc/xsc_defs.h
+++ b/drivers/net/xsc/xsc_defs.h
@@ -6,6 +6,7 @@
 #define XSC_DEFS_H_
 
 #define XSC_PAGE_SIZE  4096
+#define XSC_PHY_PORT_NUM   1
 
 #define XSC_PCI_VENDOR_ID  0x1f67
 #define XSC_PCI_DEV_ID_MS  0x
@@ -15,6 +16,7 @@
 #define XSC_PCI_DEV_ID_MVS 0x1153
 
 #define XSC_VFREP_BASE_LOGICAL_PORT1081
+#define XSC_MAX_MAC_ADDRESSES  3
 
 #define XSC_RSS_HASH_KEY_LEN   52
 #define XSC_RSS_HASH_BIT_IPV4_SIP  (1ULL << 0)
@@ -58,6 +60,15 @@ enum xsc_pph_type {
XSC_UPLINK_PPH  = 0x8,
 };
 
+enum xsc_funcid_type {
+   XSC_FUNCID_TYPE_INVAL   = 0x0,
+   XSC_EMU_FUNCID  = 0x1,
+   XSC_PHYPORT_MAC_FUNCID  = 0x2,
+   XSC_VF_IOCTL_FUNCID = 0x3,
+   XSC_PHYPORT_LAG_FUNCID  = 0x4,
+   XSC_FUNCID_TYPE_UNKNOWN = 0x5,
+};
+
 enum xsc_port_type {
XSC_PORT_TYPE_NONE = 0,
XSC_PORT_TYPE_UPLINK,
diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index 8933f77b8f..aaf18bf8e5 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -61,6 +61,12 @@ xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
   data_out, out_len);
 }
 
+int
+xsc_dev_get_mac(struct xsc_dev *xdev, uint8_t *mac)
+{
+   return xdev->dev_ops->get_mac(xdev, mac);
+}
+
 int
 xsc_dev_close(struct xsc_dev *xdev, int repr_id)
 {
@@ -126,6 +132,95 @@ xsc_dev_args_parse(struct xsc_dev *xdev, struct 
rte_devargs *devargs)
rte_kvargs_free(kvlist);
 }
 
+int
+xsc_dev_qp_set_id_get(struct xsc_dev *xdev, int repr_id)
+{
+   if (xsc_dev_is_vf(xdev))
+   return 0;
+
+   return (repr_id % 511 + 1);
+}
+
+static void
+xsc_repr_info_init(struct xsc_dev *xdev, struct xsc_repr_info *info,
+  enum xsc_port_type port_type,
+  enum xsc_funcid_type funcid_type, int32_t repr_id)
+{
+   int qp_set_id, logical_port;
+   struct xsc_hwinfo *hwinfo = &xdev->hwinfo;
+
+   info->repr_id = repr_id;
+   info->port_type = port_type;
+   if (port_type == XSC_PORT_TYPE_UPLINK_BOND) {
+   info->pf_bond = 1;
+   info->funcid = XSC_PHYPORT_LAG_FUNCID << 14;
+   } else if (port_type == XSC_PORT_TYPE_UPLINK) {
+   info->pf_bond = -1;
+   info->funcid = funcid_type << 14;
+   } else if (port_type == XSC_PORT_TYPE_PFVF) {
+   info->funcid = funcid_type << 14;
+   }
+
+   qp_set_id = xsc_dev_qp_set_id_get(xdev, repr_id);
+   if (xsc_dev_is_vf(xdev))
+   logical_port = xdev->hwinfo.func_id +
+  xdev->hwinfo.funcid_to_logic_port_off;
+   else
+   logical_port = xdev->vfos_logical_in_port + qp_set_id - 1;
+
+   info->logical_port = logical_port;
+   info->local_dstinfo = logical_port;
+   info->peer_logical_port = hwinfo->mac_phy_port;
+   info->peer_dstinfo = hwinfo->mac_phy_port;
+}
+
+int
+xsc_dev_repr_ports_probe(struct xsc_dev *xdev, int nb_repr_ports, int 
max_eth_ports)
+{
+   int funcid_type;
+   struct xsc_repr_port *repr_port;
+   int i;
+
+   PMD_INIT_FUNC_TRACE();
+
+   xdev->num_repr_ports = nb_repr_ports + XSC_PHY_PORT_NUM;
+   if (xdev->num_repr_ports > max_eth_ports) {
+   PMD_DRV_LOG(ERR, "Repr ports num %u, should be less than max 
%u",
+   xdev->num_repr_ports, max_eth_ports);
+   return -EINVAL;
+   }
+
+   xdev->repr_ports = rte_zmalloc(NULL,
+  sizeof(struct xsc_repr_port) * 
xdev->num_repr_ports,
+  RTE_CACHE_LINE_SIZE);
+   if (xdev->repr_ports == NULL) {
+   PMD_DRV_LOG(ERR, "Failed to allocate memory for repr ports");
+   return -ENOMEM;
+   }
+
+   funcid_type = (xdev->devargs.nic_mode == XSC_NIC_MODE_SWITCHDEV) ?
+   XSC_VF_IOCTL_FUNCID : XSC_PHYPORT_MAC_FUNCID;
+
+   /* PF representor use the last repr_ports */
+   repr_port = &xdev->repr_ports[xdev->num_repr_ports - 1];
+   xsc_repr_info_init(xdev, &repr_port->info, XSC_PORT_TYPE_UPLINK,
+  XSC_PHYPORT_MAC_FUNCID, xdev->num_repr_ports - 1);
+   repr_port->info.ifindex = xdev->ifindex;
+   repr_port->xdev = xdev;
+   LIST_INIT(&repr_port->def_pct_list);
+
+   /* VF representor start from 0 */
+   for (i = 0; 

[PATCH v5 09/15] net/xsc: add ethdev start

[WanRenyong]

Implement xsc ethdev start function.

Signed-off-by: WanRenyong 
Signed-off-by: Rong Qian 

---
v5:
* Remove unnecessary call of rte_wmb.
---
 drivers/net/xsc/meson.build  |   2 +
 drivers/net/xsc/xsc_dev.c|  33 
 drivers/net/xsc/xsc_dev.h|   8 +
 drivers/net/xsc/xsc_ethdev.c | 172 +
 drivers/net/xsc/xsc_ethdev.h |  19 +++
 drivers/net/xsc/xsc_rx.c | 291 +++
 drivers/net/xsc/xsc_rx.h |   3 +
 drivers/net/xsc/xsc_rxtx.h   |  27 
 drivers/net/xsc/xsc_tx.c |  93 +++
 drivers/net/xsc/xsc_tx.h |   4 +
 10 files changed, 652 insertions(+)
 create mode 100644 drivers/net/xsc/xsc_rx.c
 create mode 100644 drivers/net/xsc/xsc_tx.c

diff --git a/drivers/net/xsc/meson.build b/drivers/net/xsc/meson.build
index 5ee03ea835..79664374e3 100644
--- a/drivers/net/xsc/meson.build
+++ b/drivers/net/xsc/meson.build
@@ -12,4 +12,6 @@ sources = files(
 'xsc_vfio_mbox.c',
 'xsc_vfio.c',
 'xsc_np.c',
+'xsc_rx.c',
+'xsc_tx.c',
 )
diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index 74d577c7d0..054a08bf84 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -68,6 +68,39 @@ xsc_dev_get_mac(struct xsc_dev *xdev, uint8_t *mac)
return xdev->dev_ops->get_mac(xdev, mac);
 }
 
+int
+xsc_dev_modify_qp_status(struct xsc_dev *xdev, uint32_t qpn, int num, int 
opcode)
+{
+   return xdev->dev_ops->modify_qp_status(xdev, qpn, num, opcode);
+}
+
+int
+xsc_dev_modify_qp_qostree(struct xsc_dev *xdev, uint16_t qpn)
+{
+   return xdev->dev_ops->modify_qp_qostree(xdev, qpn);
+}
+
+int
+xsc_dev_rx_cq_create(struct xsc_dev *xdev, struct xsc_rx_cq_params *cq_params,
+struct xsc_rx_cq_info *cq_info)
+{
+   return xdev->dev_ops->rx_cq_create(xdev, cq_params, cq_info);
+}
+
+int
+xsc_dev_tx_cq_create(struct xsc_dev *xdev, struct xsc_tx_cq_params *cq_params,
+struct xsc_tx_cq_info *cq_info)
+{
+   return xdev->dev_ops->tx_cq_create(xdev, cq_params, cq_info);
+}
+
+int
+xsc_dev_tx_qp_create(struct xsc_dev *xdev, struct xsc_tx_qp_params *qp_params,
+struct xsc_tx_qp_info *qp_info)
+{
+   return xdev->dev_ops->tx_qp_create(xdev, qp_params, qp_info);
+}
+
 int
 xsc_dev_close(struct xsc_dev *xdev, int repr_id)
 {
diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h
index 2072f9ccb8..d867084d78 100644
--- a/drivers/net/xsc/xsc_dev.h
+++ b/drivers/net/xsc/xsc_dev.h
@@ -158,6 +158,14 @@ struct xsc_dev_ops {
 int xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
 int in_len, void *data_out, int out_len);
 void xsc_dev_ops_register(struct xsc_dev_ops *new_ops);
+int xsc_dev_modify_qp_status(struct xsc_dev *xdev, uint32_t qpn, int num, int 
opcode);
+int xsc_dev_modify_qp_qostree(struct xsc_dev *xdev, uint16_t qpn);
+int xsc_dev_rx_cq_create(struct xsc_dev *xdev, struct xsc_rx_cq_params 
*cq_params,
+struct xsc_rx_cq_info *cq_info);
+int xsc_dev_tx_cq_create(struct xsc_dev *xdev, struct xsc_tx_cq_params 
*cq_params,
+struct xsc_tx_cq_info *cq_info);
+int xsc_dev_tx_qp_create(struct xsc_dev *xdev, struct xsc_tx_qp_params 
*qp_params,
+struct xsc_tx_qp_info *qp_info);
 int xsc_dev_init(struct rte_pci_device *pci_dev, struct xsc_dev **dev);
 void xsc_dev_uninit(struct xsc_dev *xdev);
 int xsc_dev_close(struct xsc_dev *xdev, int repr_id);
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 7867b63f41..c940669fca 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -10,6 +10,8 @@
 #include "xsc_ethdev.h"
 #include "xsc_rx.h"
 #include "xsc_tx.h"
+#include "xsc_dev.h"
+#include "xsc_cmd.h"
 
 static int
 xsc_ethdev_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -86,6 +88,175 @@ xsc_ethdev_configure(struct rte_eth_dev *dev)
return -rte_errno;
 }
 
+static int
+xsc_ethdev_enable(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_hwinfo *hwinfo;
+   int peer_dstinfo = 0;
+   int peer_logicalport = 0;
+   int logical_port = 0;
+   int local_dstinfo = 0;
+   int pcie_logic_port = 0;
+   int qp_set_id;
+   int repr_id;
+   struct xsc_rxq_data *rxq = xsc_rxq_get(priv, 0);
+   uint16_t rx_qpn = (uint16_t)rxq->qpn;
+   int i, vld;
+   struct xsc_txq_data *txq;
+   struct xsc_repr_port *repr;
+   struct xsc_repr_info *repr_info;
+
+   if (priv->funcid_type != XSC_PHYPORT_MAC_FUNCID)
+   return -ENODEV;
+
+   hwinfo = &priv->xdev->hwinfo;
+   repr_id = priv->representor_id;
+   repr = &priv->xdev->repr_ports[repr_id];
+   repr_info = &repr->info;
+
+   qp_set_id = xsc_dev_qp_set_id_get(priv->xdev, repr_id);
+   logical_port = repr_info->logical_port;
+   local_dstinfo = repr_info->local_dstinfo;
+ 

[PATCH v5 10/15] net/xsc: add ethdev stop and close

[WanRenyong]

Implement xsc ethdev close and stop functions.

Signed-off-by: WanRenyong 
---
 drivers/net/xsc/xsc_dev.c|  12 
 drivers/net/xsc/xsc_dev.h|   2 +
 drivers/net/xsc/xsc_ethdev.c | 108 +++
 drivers/net/xsc/xsc_rx.c |  47 +++
 drivers/net/xsc/xsc_rx.h |   2 +
 drivers/net/xsc/xsc_tx.c |  33 +++
 drivers/net/xsc/xsc_tx.h |   2 +
 7 files changed, 206 insertions(+)

diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index 054a08bf84..350a1fbc70 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -68,6 +68,18 @@ xsc_dev_get_mac(struct xsc_dev *xdev, uint8_t *mac)
return xdev->dev_ops->get_mac(xdev, mac);
 }
 
+int
+xsc_dev_destroy_qp(struct xsc_dev *xdev, void *qp)
+{
+   return xdev->dev_ops->destroy_qp(qp);
+}
+
+int
+xsc_dev_destroy_cq(struct xsc_dev *xdev, void *cq)
+{
+   return xdev->dev_ops->destroy_cq(cq);
+}
+
 int
 xsc_dev_modify_qp_status(struct xsc_dev *xdev, uint32_t qpn, int num, int 
opcode)
 {
diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h
index d867084d78..686d3b664d 100644
--- a/drivers/net/xsc/xsc_dev.h
+++ b/drivers/net/xsc/xsc_dev.h
@@ -158,6 +158,8 @@ struct xsc_dev_ops {
 int xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
 int in_len, void *data_out, int out_len);
 void xsc_dev_ops_register(struct xsc_dev_ops *new_ops);
+int xsc_dev_destroy_qp(struct xsc_dev *xdev, void *qp);
+int xsc_dev_destroy_cq(struct xsc_dev *xdev, void *cq);
 int xsc_dev_modify_qp_status(struct xsc_dev *xdev, uint32_t qpn, int num, int 
opcode);
 int xsc_dev_modify_qp_qostree(struct xsc_dev *xdev, uint16_t qpn);
 int xsc_dev_rx_cq_create(struct xsc_dev *xdev, struct xsc_rx_cq_params 
*cq_params,
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index c940669fca..f873fb2ebc 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -88,6 +88,44 @@ xsc_ethdev_configure(struct rte_eth_dev *dev)
return -rte_errno;
 }
 
+static void
+xsc_ethdev_txq_release(struct rte_eth_dev *dev, uint16_t idx)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_txq_data *txq_data = xsc_txq_get(priv, idx);
+
+   if (txq_data == NULL)
+   return;
+
+   xsc_dev_set_qpsetid(priv->xdev, txq_data->qpn, 0);
+   xsc_txq_obj_release(priv->xdev, txq_data);
+   rte_free(txq_data->fcqs);
+   txq_data->fcqs = NULL;
+   xsc_txq_elts_free(txq_data);
+   rte_free(txq_data);
+   (*priv->txqs)[idx] = NULL;
+
+   dev->data->tx_queues[idx] = NULL;
+   dev->data->tx_queue_state[idx] = RTE_ETH_QUEUE_STATE_STOPPED;
+}
+
+static void
+xsc_ethdev_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_rxq_data *rxq_data = xsc_rxq_get(priv, idx);
+
+   if (rxq_data == NULL)
+   return;
+   xsc_rxq_rss_obj_release(priv->xdev, rxq_data);
+   xsc_rxq_elts_free(rxq_data);
+   rte_free(rxq_data);
+   (*priv->rxqs)[idx] = NULL;
+
+   dev->data->rx_queues[idx] = NULL;
+   dev->data->rx_queue_state[idx] = RTE_ETH_QUEUE_STATE_STOPPED;
+}
+
 static int
 xsc_ethdev_enable(struct rte_eth_dev *dev)
 {
@@ -150,6 +188,30 @@ xsc_ethdev_enable(struct rte_eth_dev *dev)
return 0;
 }
 
+static void
+xsc_rxq_stop(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   uint16_t i;
+
+   for (i = 0; i != priv->num_rq; ++i)
+   xsc_ethdev_rxq_release(dev, i);
+   priv->rxqs = NULL;
+   priv->flags &= ~XSC_FLAG_RX_QUEUE_INIT;
+}
+
+static void
+xsc_txq_stop(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   uint16_t i;
+
+   for (i = 0; i != priv->num_sq; ++i)
+   xsc_ethdev_txq_release(dev, i);
+   priv->txqs = NULL;
+   priv->flags &= ~XSC_FLAG_TX_QUEUE_INIT;
+}
+
 static int
 xsc_txq_start(struct xsc_ethdev_priv *priv)
 {
@@ -254,9 +316,51 @@ xsc_ethdev_start(struct rte_eth_dev *dev)
 
 error:
dev->data->dev_started = 0;
+   xsc_txq_stop(dev);
+   xsc_rxq_stop(dev);
return -rte_errno;
 }
 
+static int
+xsc_ethdev_stop(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   uint16_t i;
+
+   PMD_DRV_LOG(DEBUG, "Port %u stopping", dev->data->port_id);
+   dev->data->dev_started = 0;
+   dev->rx_pkt_burst = rte_eth_pkt_burst_dummy;
+   dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;
+   rte_wmb();
+
+   rte_delay_us_sleep(1000 * priv->num_rq);
+   for (i = 0; i < priv->num_rq; ++i)
+   dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+   for (i = 0; i < priv->num_sq; ++i)
+   dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+   return 0;
+}
+
+static int
+

[PATCH v5 08/15] net/xsc: add Rx and Tx queue setup

[WanRenyong]

Implement xsc ethdev Rx and Tx queue setup functions.

Signed-off-by: WanRenyong 
Signed-off-by: Rong Qian 
---
 drivers/net/xsc/xsc_defs.h   |  4 ++
 drivers/net/xsc/xsc_ethdev.c | 83 
 drivers/net/xsc/xsc_rx.h | 59 +
 drivers/net/xsc/xsc_rxtx.h   | 49 +
 drivers/net/xsc/xsc_tx.h | 55 
 5 files changed, 250 insertions(+)
 create mode 100644 drivers/net/xsc/xsc_rx.h
 create mode 100644 drivers/net/xsc/xsc_tx.h

diff --git a/drivers/net/xsc/xsc_defs.h b/drivers/net/xsc/xsc_defs.h
index c445eadca1..6497b53e1e 100644
--- a/drivers/net/xsc/xsc_defs.h
+++ b/drivers/net/xsc/xsc_defs.h
@@ -38,6 +38,10 @@
 #define XSC_EPAT_RSS_HASH_FUNC_FLAG(1ULL << 6)
 #define XSC_EPAT_HAS_PPH_FLAG  (1ULL << 9)
 
+#define XSC_MAX_DESC_NUMBER1024
+#define XSC_SEND_WQE_DS3
+#define XSC_ESEG_EXTRA_DATA_SIZE   48u
+
 #define XSC_PF_TX_DB_ADDR  0x4802000
 #define XSC_PF_RX_DB_ADDR  0x4804000
 #define XSC_PF_CQ_DB_ADDR  0x212
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 631d9c9819..7867b63f41 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -8,6 +8,8 @@
 #include "xsc_log.h"
 #include "xsc_defs.h"
 #include "xsc_ethdev.h"
+#include "xsc_rx.h"
+#include "xsc_tx.h"
 
 static int
 xsc_ethdev_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -84,6 +86,85 @@ xsc_ethdev_configure(struct rte_eth_dev *dev)
return -rte_errno;
 }
 
+static int
+xsc_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+ uint32_t socket, const struct rte_eth_rxconf *conf,
+ struct rte_mempool *mp)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_rxq_data *rxq_data = NULL;
+   uint16_t desc_n;
+   uint16_t rx_free_thresh;
+   uint64_t offloads = conf->offloads | 
dev->data->dev_conf.rxmode.offloads;
+
+   desc = (desc > XSC_MAX_DESC_NUMBER) ? XSC_MAX_DESC_NUMBER : desc;
+   desc_n = desc;
+
+   if (!rte_is_power_of_2(desc))
+   desc_n = 1 << rte_log2_u32(desc);
+
+   rxq_data = rte_malloc_socket(NULL, sizeof(*rxq_data) + desc_n * 
sizeof(struct rte_mbuf *),
+RTE_CACHE_LINE_SIZE, socket);
+   if (rxq_data == NULL) {
+   PMD_DRV_LOG(ERR, "Port %u create rxq idx %d failure",
+   dev->data->port_id, idx);
+   rte_errno = ENOMEM;
+   return -rte_errno;
+   }
+   rxq_data->idx = idx;
+   rxq_data->priv = priv;
+   (*priv->rxqs)[idx] = rxq_data;
+
+   rx_free_thresh = (conf->rx_free_thresh) ? conf->rx_free_thresh : 
XSC_RX_FREE_THRESH;
+   rxq_data->rx_free_thresh = rx_free_thresh;
+
+   rxq_data->elts = (struct rte_mbuf *(*)[desc_n])(rxq_data + 1);
+   rxq_data->mp = mp;
+   rxq_data->socket = socket;
+
+   rxq_data->csum = !!(offloads & RTE_ETH_RX_OFFLOAD_CHECKSUM);
+   rxq_data->hw_timestamp = !!(offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP);
+   rxq_data->crc_present = 0;
+
+   rxq_data->wqe_n = rte_log2_u32(desc_n);
+   rxq_data->wqe_s = desc_n;
+   rxq_data->wqe_m = desc_n - 1;
+
+   rxq_data->port_id = dev->data->port_id;
+   dev->data->rx_queues[idx] = rxq_data;
+   return 0;
+}
+
+static int
+xsc_ethdev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+ uint32_t socket, const struct rte_eth_txconf *conf)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_txq_data *txq;
+   uint16_t desc_n;
+
+   desc = (desc > XSC_MAX_DESC_NUMBER) ? XSC_MAX_DESC_NUMBER : desc;
+   desc_n = desc;
+
+   if (!rte_is_power_of_2(desc))
+   desc_n = 1 << rte_log2_u32(desc);
+
+   txq = rte_malloc_socket(NULL, sizeof(*txq) + desc_n * sizeof(struct 
rte_mbuf *),
+   RTE_CACHE_LINE_SIZE, socket);
+   txq->offloads = conf->offloads | dev->data->dev_conf.txmode.offloads;
+   txq->priv = priv;
+   txq->socket = socket;
+
+   txq->elts_n = rte_log2_u32(desc_n);
+   txq->elts_s = desc_n;
+   txq->elts_m = desc_n - 1;
+   txq->port_id = dev->data->port_id;
+   txq->idx = idx;
+
+   (*priv->txqs)[idx] = txq;
+   return 0;
+}
+
 static int
 xsc_ethdev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac, 
uint32_t index)
 {
@@ -112,6 +193,8 @@ xsc_ethdev_mac_addr_add(struct rte_eth_dev *dev, struct 
rte_ether_addr *mac, uin
 
 const struct eth_dev_ops xsc_eth_dev_ops = {
.dev_configure = xsc_ethdev_configure,
+   .rx_queue_setup = xsc_ethdev_rx_queue_setup,
+   .tx_queue_setup = xsc_ethdev_tx_queue_setup,
.rss_hash_update = xsc_ethdev_rss_hash_update,
.rss_hash_conf_get = xsc_ethdev_rss_hash_conf_get,

[PATCH v5 07/15] net/xsc: add ethdev configure and RSS ops

[WanRenyong]

Implement xsc ethdev configure and RSS hash functions.

Signed-off-by: WanRenyong 

---

v5:
* Remove some unnecessary parameter checks.
---
 doc/guides/nics/features/xsc.ini |  3 ++
 drivers/net/xsc/xsc_defs.h   | 15 ++
 drivers/net/xsc/xsc_dev.c| 26 ++
 drivers/net/xsc/xsc_dev.h|  1 +
 drivers/net/xsc/xsc_ethdev.c | 82 
 drivers/net/xsc/xsc_ethdev.h |  7 +++
 6 files changed, 134 insertions(+)

diff --git a/doc/guides/nics/features/xsc.ini b/doc/guides/nics/features/xsc.ini
index b5c44ce535..bdeb7a984b 100644
--- a/doc/guides/nics/features/xsc.ini
+++ b/doc/guides/nics/features/xsc.ini
@@ -4,6 +4,9 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+RSS hash = Y
+RSS key update   = Y
+RSS reta update  = Y
 Linux= Y
 ARMv8= Y
 x86-64   = Y
diff --git a/drivers/net/xsc/xsc_defs.h b/drivers/net/xsc/xsc_defs.h
index 111776f37e..c445eadca1 100644
--- a/drivers/net/xsc/xsc_defs.h
+++ b/drivers/net/xsc/xsc_defs.h
@@ -78,4 +78,19 @@ enum xsc_port_type {
XSC_PORT_TYPE_UNKNOWN,
 };
 
+enum xsc_tbm_cap {
+   XSC_TBM_CAP_HASH_PPH = 0,
+   XSC_TBM_CAP_RSS,
+   XSC_TBM_CAP_PP_BYPASS,
+   XSC_TBM_CAP_PCT_DROP_CONFIG,
+};
+
+enum xsc_rss_hf {
+   XSC_RSS_HASH_KEY_UPDATE = 0,
+   XSC_RSS_HASH_TEMP_UPDATE,
+   XSC_RSS_HASH_FUNC_UPDATE,
+   XSC_RSS_RXQ_UPDATE,
+   XSC_RSS_RXQ_DROP,
+};
+
 #endif /* XSC_DEFS_H_ */
diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index aaf18bf8e5..74d577c7d0 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -19,6 +19,7 @@
 #include "xsc_log.h"
 #include "xsc_defs.h"
 #include "xsc_dev.h"
+#include "xsc_cmd.h"
 
 #define XSC_DEV_DEF_FLOW_MODE  7
 
@@ -74,6 +75,31 @@ xsc_dev_close(struct xsc_dev *xdev, int repr_id)
return xdev->dev_ops->dev_close(xdev);
 }
 
+int
+xsc_dev_rss_key_modify(struct xsc_dev *xdev, uint8_t *rss_key, uint8_t 
rss_key_len)
+{
+   struct xsc_cmd_modify_nic_hca_mbox_in in = {};
+   struct xsc_cmd_modify_nic_hca_mbox_out out = {};
+   uint8_t rss_caps_mask = 0;
+   int ret, key_len = 0;
+
+   in.hdr.opcode = rte_cpu_to_be_16(XSC_CMD_OP_MODIFY_NIC_HCA);
+
+   key_len = RTE_MIN(rss_key_len, XSC_RSS_HASH_KEY_LEN);
+   rte_memcpy(in.rss.hash_key, rss_key, key_len);
+   rss_caps_mask |= RTE_BIT32(XSC_RSS_HASH_KEY_UPDATE);
+
+   in.rss.caps_mask = rss_caps_mask;
+   in.rss.rss_en = 1;
+   in.nic.caps_mask = rte_cpu_to_be_16(RTE_BIT32(XSC_TBM_CAP_RSS));
+   in.nic.caps = in.nic.caps_mask;
+
+   ret = xsc_dev_mailbox_exec(xdev, &in, sizeof(in), &out, sizeof(out));
+   if (ret != 0 || out.hdr.status != 0)
+   return -1;
+   return 0;
+}
+
 static int
 xsc_dev_alloc_vfos_info(struct xsc_dev *xdev)
 {
diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h
index 297c5d2324..2072f9ccb8 100644
--- a/drivers/net/xsc/xsc_dev.h
+++ b/drivers/net/xsc/xsc_dev.h
@@ -162,6 +162,7 @@ int xsc_dev_init(struct rte_pci_device *pci_dev, struct 
xsc_dev **dev);
 void xsc_dev_uninit(struct xsc_dev *xdev);
 int xsc_dev_close(struct xsc_dev *xdev, int repr_id);
 int xsc_dev_repr_ports_probe(struct xsc_dev *xdev, int nb_repr_ports, int 
max_eth_ports);
+int xsc_dev_rss_key_modify(struct xsc_dev *xdev, uint8_t *rss_key, uint8_t 
rss_key_len);
 bool xsc_dev_is_vf(struct xsc_dev *xdev);
 int xsc_dev_qp_set_id_get(struct xsc_dev *xdev, int repr_id);
 int xsc_dev_get_mac(struct xsc_dev *xdev, uint8_t *mac);
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 9fc5464754..631d9c9819 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -9,6 +9,81 @@
 #include "xsc_defs.h"
 #include "xsc_ethdev.h"
 
+static int
+xsc_ethdev_rss_hash_conf_get(struct rte_eth_dev *dev,
+struct rte_eth_rss_conf *rss_conf)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+
+   if (rss_conf->rss_key != NULL && rss_conf->rss_key_len >= 
priv->rss_conf.rss_key_len)
+   memcpy(rss_conf->rss_key, priv->rss_conf.rss_key, 
priv->rss_conf.rss_key_len);
+
+   rss_conf->rss_key_len = priv->rss_conf.rss_key_len;
+   rss_conf->rss_hf = priv->rss_conf.rss_hf;
+   return 0;
+}
+
+static int
+xsc_ethdev_rss_hash_update(struct rte_eth_dev *dev,
+  struct rte_eth_rss_conf *rss_conf)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   int ret = 0;
+
+   ret = xsc_dev_rss_key_modify(priv->xdev, rss_conf->rss_key, 
rss_conf->rss_key_len);
+   if (ret == 0) {
+   rte_memcpy(priv->rss_conf.rss_key, rss_conf->rss_key,
+  priv->rss_conf.rss_key_len);
+   priv->rss_conf.rss_key_len = rss_conf->rss_key_len;
+   priv->rss_conf.rss_hf = rss_conf->rss_hf;
+   }
+
+   return

[PATCH v5 11/15] net/xsc: add ethdev Rx burst

[WanRenyong]

Implement xsc ethdev Rx burst function.

Signed-off-by: WanRenyong 
Signed-off-by: Xiaoxiong Zhang 
---
 drivers/net/xsc/xsc_ethdev.c |   3 +
 drivers/net/xsc/xsc_rx.c | 174 +++
 drivers/net/xsc/xsc_rx.h |   1 +
 drivers/net/xsc/xsc_rxtx.h   |  13 +++
 4 files changed, 191 insertions(+)

diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index f873fb2ebc..2f3fe04d3c 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -310,6 +310,9 @@ xsc_ethdev_start(struct rte_eth_dev *dev)
}
 
dev->data->dev_started = 1;
+
+   dev->rx_pkt_burst = xsc_rx_burst;
+
ret = xsc_ethdev_enable(dev);
 
return 0;
diff --git a/drivers/net/xsc/xsc_rx.c b/drivers/net/xsc/xsc_rx.c
index 2081f3b619..58a9cc2f26 100644
--- a/drivers/net/xsc/xsc_rx.c
+++ b/drivers/net/xsc/xsc_rx.c
@@ -13,6 +13,180 @@
 
 #define XSC_MAX_RECV_LEN 9800
 
+static inline void
+xsc_cq_to_mbuf(struct xsc_rxq_data *rxq, struct rte_mbuf *pkt,
+  volatile struct xsc_cqe *cqe)
+{
+   uint32_t rss_hash_res = 0;
+
+   pkt->port = rxq->port_id;
+   if (rxq->rss_hash) {
+   rss_hash_res = rte_be_to_cpu_32(cqe->vni);
+   if (rss_hash_res) {
+   pkt->hash.rss = rss_hash_res;
+   pkt->ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
+   }
+   }
+}
+
+static inline int
+xsc_rx_poll_len(struct xsc_rxq_data *rxq, volatile struct xsc_cqe *cqe)
+{
+   int len;
+
+   do {
+   len = 0;
+   int ret;
+
+   ret = xsc_check_cqe_own(cqe, rxq->cqe_n, rxq->cq_ci);
+   if (unlikely(ret != XSC_CQE_OWNER_SW)) {
+   if (unlikely(ret == XSC_CQE_OWNER_ERR)) {
+   ++rxq->stats.rx_errors;
+   if (ret == XSC_CQE_OWNER_HW || ret == -1)
+   return 0;
+   } else {
+   return 0;
+   }
+   }
+
+   rxq->cq_ci += 1;
+   len = rte_le_to_cpu_32(cqe->msg_len);
+   return len;
+   } while (1);
+}
+
+static __rte_always_inline void
+xsc_pkt_info_sync(struct rte_mbuf *rep, struct rte_mbuf *seg)
+{
+   if (rep != NULL && seg != NULL) {
+   rep->data_len = seg->data_len;
+   rep->pkt_len = seg->pkt_len;
+   rep->data_off = seg->data_off;
+   rep->port = seg->port;
+   }
+}
+
+uint16_t
+xsc_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
+{
+   struct xsc_rxq_data *rxq = dpdk_rxq;
+   const uint32_t wqe_m = rxq->wqe_m;
+   const uint32_t cqe_m = rxq->cqe_m;
+   const uint32_t sge_n = rxq->sge_n;
+   struct rte_mbuf *pkt = NULL;
+   struct rte_mbuf *seg = NULL;
+   volatile struct xsc_cqe *cqe = &(*rxq->cqes)[rxq->cq_ci & cqe_m];
+   uint32_t nb_pkts = 0;
+   uint64_t nb_bytes = 0;
+   uint32_t rq_ci = rxq->rq_ci;
+   int len = 0;
+   uint32_t cq_ci_two = 0;
+   int valid_cqe_num = 0;
+   int cqe_msg_len = 0;
+   volatile struct xsc_cqe_u64 *cqe_u64 = NULL;
+   struct rte_mbuf *rep;
+
+   while (pkts_n) {
+   uint32_t idx = rq_ci & wqe_m;
+   volatile struct xsc_wqe_data_seg *wqe =
+   &((volatile struct xsc_wqe_data_seg *)rxq->wqes)[idx << 
sge_n];
+
+   seg = (*rxq->elts)[idx];
+   rte_prefetch0(cqe);
+   rte_prefetch0(wqe);
+
+   rep = rte_mbuf_raw_alloc(seg->pool);
+   if (unlikely(rep == NULL)) {
+   ++rxq->stats.rx_nombuf;
+   break;
+   }
+
+   if (!pkt) {
+   if (valid_cqe_num) {
+   cqe = cqe + 1;
+   len = cqe_msg_len;
+   valid_cqe_num = 0;
+   } else if ((rxq->cq_ci % 2 == 0) && (pkts_n > 1)) {
+   cq_ci_two = (rxq->cq_ci & rxq->cqe_m) / 2;
+   cqe_u64 = &(*rxq->cqes_u64)[cq_ci_two];
+   cqe = (volatile struct xsc_cqe *)cqe_u64;
+   len = xsc_rx_poll_len(rxq, cqe);
+   if (len > 0) {
+   cqe_msg_len = xsc_rx_poll_len(rxq, cqe 
+ 1);
+   if (cqe_msg_len > 0)
+   valid_cqe_num = 1;
+   }
+   } else {
+   cqe = &(*rxq->cqes)[rxq->cq_ci & rxq->cqe_m];
+   len = xsc_rx_poll_len(rxq, cqe);
+   }
+
+   if (!len) {
+   rte_mbuf_raw_free(rep);
+

[PATCH v5 14/15] net/xsc: add ethdev infos get

[WanRenyong]

Implement xsc ethdev information get ops.

Signed-off-by: WanRenyong 
---
 drivers/net/xsc/xsc_ethdev.c | 61 
 1 file changed, 61 insertions(+)

diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 000e27222d..584890aa6f 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -365,6 +365,66 @@ xsc_ethdev_close(struct rte_eth_dev *dev)
return 0;
 }
 
+static uint64_t
+xsc_get_rx_queue_offloads(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_dev_config *config = &priv->config;
+   uint64_t offloads = 0;
+
+   if (config->hw_csum)
+   offloads |= (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
+RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
+RTE_ETH_RX_OFFLOAD_TCP_CKSUM);
+
+   return offloads;
+}
+
+static uint64_t
+xsc_get_tx_port_offloads(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   uint64_t offloads = 0;
+   struct xsc_dev_config *config = &priv->config;
+
+   if (config->hw_csum)
+   offloads |= (RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |
+RTE_ETH_TX_OFFLOAD_UDP_CKSUM |
+RTE_ETH_TX_OFFLOAD_TCP_CKSUM);
+   if (config->tso)
+   offloads |= RTE_ETH_TX_OFFLOAD_TCP_TSO;
+   return offloads;
+}
+
+static int
+xsc_ethdev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+
+   info->min_rx_bufsize = 64;
+   info->max_rx_pktlen = 65536;
+   info->max_lro_pkt_size = 0;
+   info->max_rx_queues = 256;
+   info->max_tx_queues = 1024;
+   info->rx_desc_lim.nb_max = 4096;
+   info->rx_desc_lim.nb_min = 16;
+   info->tx_desc_lim.nb_max = 8192;
+   info->tx_desc_lim.nb_min = 128;
+
+   info->rx_queue_offload_capa = xsc_get_rx_queue_offloads(dev);
+   info->rx_offload_capa = info->rx_queue_offload_capa;
+   info->tx_offload_capa = xsc_get_tx_port_offloads(dev);
+
+   info->if_index = priv->ifindex;
+   info->speed_capa = priv->xdev->link_speed_capa;
+   info->hash_key_size = XSC_RSS_HASH_KEY_LEN;
+   info->tx_desc_lim.nb_seg_max = 8;
+   info->tx_desc_lim.nb_mtu_seg_max = 8;
+   info->switch_info.name = dev->data->name;
+   info->switch_info.port_id = priv->representor_id;
+   return 0;
+}
+
 static int
 xsc_ethdev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
  uint32_t socket, const struct rte_eth_rxconf *conf,
@@ -550,6 +610,7 @@ const struct eth_dev_ops xsc_eth_dev_ops = {
.dev_close = xsc_ethdev_close,
.stats_get = xsc_ethdev_stats_get,
.stats_reset = xsc_ethdev_stats_reset,
+   .dev_infos_get = xsc_ethdev_infos_get,
.rx_queue_setup = xsc_ethdev_rx_queue_setup,
.tx_queue_setup = xsc_ethdev_tx_queue_setup,
.rx_queue_release = xsc_ethdev_rxq_release,
-- 
2.25.1

[PATCH v5 12/15] net/xsc: add ethdev Tx burst

[WanRenyong]

Implement xsc ethdev Tx burst function.

Signed-off-by: WanRenyong 
Signed-off-by: Dongwei Xu 
---
 doc/guides/nics/features/xsc.ini |   4 +
 drivers/net/xsc/xsc_ethdev.c |   1 +
 drivers/net/xsc/xsc_tx.c | 228 +++
 drivers/net/xsc/xsc_tx.h |   1 +
 4 files changed, 234 insertions(+)

diff --git a/doc/guides/nics/features/xsc.ini b/doc/guides/nics/features/xsc.ini
index bdeb7a984b..772c6418c4 100644
--- a/doc/guides/nics/features/xsc.ini
+++ b/doc/guides/nics/features/xsc.ini
@@ -7,6 +7,10 @@
 RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
+L3 checksum offload  = Y
+L4 checksum offload  = Y
+Inner L3 checksum= Y
+Inner L4 checksum= Y
 Linux= Y
 ARMv8= Y
 x86-64   = Y
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 2f3fe04d3c..9cfb07b023 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -312,6 +312,7 @@ xsc_ethdev_start(struct rte_eth_dev *dev)
dev->data->dev_started = 1;
 
dev->rx_pkt_burst = xsc_rx_burst;
+   dev->tx_pkt_burst = xsc_tx_burst;
 
ret = xsc_ethdev_enable(dev);
 
diff --git a/drivers/net/xsc/xsc_tx.c b/drivers/net/xsc/xsc_tx.c
index 56daf6b4c6..406fa95381 100644
--- a/drivers/net/xsc/xsc_tx.c
+++ b/drivers/net/xsc/xsc_tx.c
@@ -124,3 +124,231 @@ xsc_txq_elts_free(struct xsc_txq_data *txq_data)
}
PMD_DRV_LOG(DEBUG, "Port %u txq %u free elts", txq_data->port_id, 
txq_data->idx);
 }
+
+static __rte_always_inline void
+xsc_tx_elts_flush(struct xsc_txq_data *__rte_restrict txq, uint16_t tail)
+{
+   uint16_t elts_n = tail - txq->elts_tail;
+   uint32_t free_n;
+
+   do {
+   free_n = txq->elts_s - (txq->elts_tail & txq->elts_m);
+   free_n = RTE_MIN(free_n, elts_n);
+   rte_pktmbuf_free_bulk(&txq->elts[txq->elts_tail & txq->elts_m], 
free_n);
+   txq->elts_tail += free_n;
+   elts_n -= free_n;
+   } while (elts_n > 0);
+}
+
+static void
+xsc_tx_cqes_handle(struct xsc_txq_data *__rte_restrict txq)
+{
+   uint32_t count = XSC_TX_COMP_CQE_HANDLE_MAX;
+   volatile struct xsc_cqe *last_cqe = NULL;
+   volatile struct xsc_cqe *cqe;
+   bool doorbell = false;
+   int ret;
+   uint16_t tail;
+
+   do {
+   cqe = &txq->cqes[txq->cq_ci & txq->cqe_m];
+   ret = xsc_check_cqe_own(cqe, txq->cqe_n, txq->cq_ci);
+   if (unlikely(ret != XSC_CQE_OWNER_SW)) {
+   if (likely(ret != XSC_CQE_OWNER_ERR))
+   /* No new CQEs in completion queue. */
+   break;
+   doorbell = true;
+   ++txq->cq_ci;
+   txq->cq_pi = txq->cq_ci;
+   last_cqe = NULL;
+   ++txq->stats.tx_errors;
+   continue;
+   }
+
+   doorbell = true;
+   ++txq->cq_ci;
+   last_cqe = cqe;
+   } while (--count > 0);
+
+   if (likely(doorbell)) {
+   union xsc_cq_doorbell cq_db = {
+   .cq_data = 0
+   };
+   cq_db.next_cid = txq->cq_ci;
+   cq_db.cq_num = txq->cqn;
+
+   /* Ring doorbell */
+   rte_write32(rte_cpu_to_le_32(cq_db.cq_data), txq->cq_db);
+
+   /* Release completed elts */
+   if (likely(last_cqe != NULL)) {
+   txq->wqe_pi = rte_le_to_cpu_16(last_cqe->wqe_id) >> 
txq->wqe_ds_n;
+   tail = txq->fcqs[(txq->cq_ci - 1) & txq->cqe_m];
+   if (likely(tail != txq->elts_tail))
+   xsc_tx_elts_flush(txq, tail);
+   }
+   }
+}
+
+static __rte_always_inline void
+xsc_tx_wqe_ctrl_seg_init(struct xsc_txq_data *__rte_restrict txq,
+struct rte_mbuf *__rte_restrict mbuf,
+struct xsc_wqe *__rte_restrict wqe)
+{
+   struct xsc_send_wqe_ctrl_seg *cs = &wqe->cseg;
+   int i = 0;
+   int ds_max = (1 << txq->wqe_ds_n) - 1;
+
+   cs->msg_opcode = XSC_OPCODE_RAW;
+   cs->wqe_id = rte_cpu_to_le_16(txq->wqe_ci << txq->wqe_ds_n);
+   cs->has_pph = 0;
+   /* Clear dseg's seg len */
+   if (cs->ds_data_num > 1 && cs->ds_data_num <= ds_max) {
+   for (i = 1; i < cs->ds_data_num; i++)
+   wqe->dseg[i].seg_len = 0;
+   }
+
+   cs->ds_data_num = mbuf->nb_segs;
+   if (mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM)
+   cs->csum_en = 0x2;
+   else
+   cs->csum_en = 0;
+
+   if (txq->tso_en == 1 && (mbuf->ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
+   cs->has_pph = 0;
+   cs->so_type = 1;
+   cs->so_hdr_len = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len;
+   cs->

[PATCH v5 00/15] XSC PMD for Yunsilicon NICs

[WanRenyong]

This xsc PMD (**librte_net_xsc**) provides poll mode driver for 
Yunsilicon metaScale serials NICs.

Features:
-
- MTU update
- TSO
- RSS hash
- RSS key update
- RSS reta update
- L3 checksum offload
- L4 checksum offload
- Inner L3 checksum
- Inner L4 checksum
- Basic stats 

Support NICs:
-
- metaScale-200S   Single QSFP56 Port 200GE SmartNIC
- metaScale-200Quad QSFP28 Ports 100GE SmartNIC
- metaScale-50 Dual QSFP28 Port 25GE SmartNIC
- metaScale-100Q   Quad QSFP28 Port 25GE SmartNIC

---

v5:
* fix compilation errors.
* fix coding style issue with misspelling.
* remove some unnecessary parameter checks.
* remove unnecessary call of rte_wmb.
* Rearrange elements in structure to avoid holes.

v4:
* Based on the review comments from previous versions, reconstruct the xsc PMD 
to eliminate
  the dependency on rdma core library and proprietary kernel driver, while 
adding support for
  the vfio kernel driver.

v3:
* fix compilation errors

v2:
* fix checkpatch warnings and errors

---
WanRenyong (15):
  net/xsc: add xsc PMD framework
  net/xsc: add xsc device initialization
  net/xsc: add xsc mailbox
  net/xsc: add xsc dev ops to support VFIO driver
  net/xsc: add PCT interfaces
  net/xsc: initialize xsc representors
  net/xsc: add ethdev configure and RSS ops
  net/xsc: add Rx and Tx queue setup
  net/xsc: add ethdev start
  net/xsc: add ethdev stop and close
  net/xsc: add ethdev Rx burst
  net/xsc: add ethdev Tx burst
  net/xsc: add basic stats ops
  net/xsc: add ethdev infos get
  net/xsc: add ethdev link and MTU ops

 .mailmap   |   5 +
 MAINTAINERS|  10 +
 doc/guides/nics/features/xsc.ini   |  18 +
 doc/guides/nics/index.rst  |   1 +
 doc/guides/nics/xsc.rst|  31 +
 doc/guides/rel_notes/release_25_03.rst |   4 +
 drivers/net/meson.build|   1 +
 drivers/net/xsc/meson.build|  17 +
 drivers/net/xsc/xsc_cmd.h  | 387 +++
 drivers/net/xsc/xsc_defs.h | 100 +++
 drivers/net/xsc/xsc_dev.c  | 397 +++
 drivers/net/xsc/xsc_dev.h  | 184 +
 drivers/net/xsc/xsc_ethdev.c   | 918 +
 drivers/net/xsc/xsc_ethdev.h   |  63 ++
 drivers/net/xsc/xsc_log.h  |  24 +
 drivers/net/xsc/xsc_np.c   | 492 +
 drivers/net/xsc/xsc_np.h   | 154 +
 drivers/net/xsc/xsc_rx.c   | 512 ++
 drivers/net/xsc/xsc_rx.h   |  65 ++
 drivers/net/xsc/xsc_rxtx.h | 191 +
 drivers/net/xsc/xsc_tx.c   | 354 ++
 drivers/net/xsc/xsc_tx.h   |  62 ++
 drivers/net/xsc/xsc_vfio.c | 746 
 drivers/net/xsc/xsc_vfio_mbox.c| 691 +++
 drivers/net/xsc/xsc_vfio_mbox.h| 142 
 25 files changed, 5569 insertions(+)
 create mode 100644 doc/guides/nics/features/xsc.ini
 create mode 100644 doc/guides/nics/xsc.rst
 create mode 100644 drivers/net/xsc/meson.build
 create mode 100644 drivers/net/xsc/xsc_cmd.h
 create mode 100644 drivers/net/xsc/xsc_defs.h
 create mode 100644 drivers/net/xsc/xsc_dev.c
 create mode 100644 drivers/net/xsc/xsc_dev.h
 create mode 100644 drivers/net/xsc/xsc_ethdev.c
 create mode 100644 drivers/net/xsc/xsc_ethdev.h
 create mode 100644 drivers/net/xsc/xsc_log.h
 create mode 100644 drivers/net/xsc/xsc_np.c
 create mode 100644 drivers/net/xsc/xsc_np.h
 create mode 100644 drivers/net/xsc/xsc_rx.c
 create mode 100644 drivers/net/xsc/xsc_rx.h
 create mode 100644 drivers/net/xsc/xsc_rxtx.h
 create mode 100644 drivers/net/xsc/xsc_tx.c
 create mode 100644 drivers/net/xsc/xsc_tx.h
 create mode 100644 drivers/net/xsc/xsc_vfio.c
 create mode 100644 drivers/net/xsc/xsc_vfio_mbox.c
 create mode 100644 drivers/net/xsc/xsc_vfio_mbox.h

-- 
2.25.1

[PATCH v5 15/15] net/xsc: add ethdev link and MTU ops

[WanRenyong]

Implement xsc ethdev link and MTU ops.

Signed-off-by: WanRenyong 
---
 doc/guides/nics/features/xsc.ini |  1 +
 drivers/net/xsc/xsc_dev.c| 33 ++
 drivers/net/xsc/xsc_dev.h|  4 +++
 drivers/net/xsc/xsc_ethdev.c | 60 
 4 files changed, 98 insertions(+)

diff --git a/doc/guides/nics/features/xsc.ini b/doc/guides/nics/features/xsc.ini
index eb88517104..d73cf9d136 100644
--- a/doc/guides/nics/features/xsc.ini
+++ b/doc/guides/nics/features/xsc.ini
@@ -4,6 +4,7 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+MTU update   = Y
 RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index 350a1fbc70..c836f2f35a 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -62,6 +62,39 @@ xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
   data_out, out_len);
 }
 
+int
+xsc_dev_set_link_up(struct xsc_dev *xdev)
+{
+   if (xdev->dev_ops->set_link_up == NULL)
+   return -ENOTSUP;
+
+   return xdev->dev_ops->set_link_up(xdev);
+}
+
+int
+xsc_dev_set_link_down(struct xsc_dev *xdev)
+{
+   if (xdev->dev_ops->set_link_down == NULL)
+   return -ENOTSUP;
+
+   return xdev->dev_ops->set_link_down(xdev);
+}
+
+int
+xsc_dev_link_update(struct xsc_dev *xdev, uint8_t funcid_type, int 
wait_to_complete)
+{
+   if (xdev->dev_ops->link_update == NULL)
+   return -ENOTSUP;
+
+   return xdev->dev_ops->link_update(xdev, funcid_type, wait_to_complete);
+}
+
+int
+xsc_dev_set_mtu(struct xsc_dev *xdev, uint16_t mtu)
+{
+   return xdev->dev_ops->set_mtu(xdev, mtu);
+}
+
 int
 xsc_dev_get_mac(struct xsc_dev *xdev, uint8_t *mac)
 {
diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h
index 686d3b664d..d661523e13 100644
--- a/drivers/net/xsc/xsc_dev.h
+++ b/drivers/net/xsc/xsc_dev.h
@@ -158,6 +158,9 @@ struct xsc_dev_ops {
 int xsc_dev_mailbox_exec(struct xsc_dev *xdev, void *data_in,
 int in_len, void *data_out, int out_len);
 void xsc_dev_ops_register(struct xsc_dev_ops *new_ops);
+int xsc_dev_set_link_up(struct xsc_dev *xdev);
+int xsc_dev_set_link_down(struct xsc_dev *xde);
+int xsc_dev_link_update(struct xsc_dev *xdev, uint8_t funcid_type, int 
wait_to_complete);
 int xsc_dev_destroy_qp(struct xsc_dev *xdev, void *qp);
 int xsc_dev_destroy_cq(struct xsc_dev *xdev, void *cq);
 int xsc_dev_modify_qp_status(struct xsc_dev *xdev, uint32_t qpn, int num, int 
opcode);
@@ -175,6 +178,7 @@ int xsc_dev_repr_ports_probe(struct xsc_dev *xdev, int 
nb_repr_ports, int max_et
 int xsc_dev_rss_key_modify(struct xsc_dev *xdev, uint8_t *rss_key, uint8_t 
rss_key_len);
 bool xsc_dev_is_vf(struct xsc_dev *xdev);
 int xsc_dev_qp_set_id_get(struct xsc_dev *xdev, int repr_id);
+int xsc_dev_set_mtu(struct xsc_dev *xdev, uint16_t mtu);
 int xsc_dev_get_mac(struct xsc_dev *xdev, uint8_t *mac);
 
 #endif /* _XSC_DEV_H_ */
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 584890aa6f..c1dbdf5be9 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -365,6 +365,41 @@ xsc_ethdev_close(struct rte_eth_dev *dev)
return 0;
 }
 
+static int
+xsc_ethdev_set_link_up(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_dev *xdev = priv->xdev;
+
+   return xsc_dev_set_link_up(xdev);
+}
+
+static int
+xsc_ethdev_set_link_down(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_dev *xdev = priv->xdev;
+
+   return xsc_dev_set_link_down(xdev);
+}
+
+static int
+xsc_ethdev_link_update(struct rte_eth_dev *dev,
+  int wait_to_complete)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   struct xsc_dev *xdev = priv->xdev;
+   int ret = 0;
+
+   ret = xsc_dev_link_update(xdev, priv->funcid_type, wait_to_complete);
+   if (ret == 0) {
+   dev->data->dev_link = xdev->pf_dev_link;
+   dev->data->dev_link.link_autoneg = 
!(dev->data->dev_conf.link_speeds &
+ RTE_ETH_LINK_SPEED_FIXED);
+   }
+   return ret;
+}
+
 static uint64_t
 xsc_get_rx_queue_offloads(struct rte_eth_dev *dev)
 {
@@ -504,6 +539,27 @@ xsc_ethdev_tx_queue_setup(struct rte_eth_dev *dev, 
uint16_t idx, uint16_t desc,
return 0;
 }
 
+static int
+xsc_ethdev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   int ret = 0;
+
+   if (priv->eth_type != RTE_ETH_REPRESENTOR_PF) {
+   priv->mtu = mtu;
+   return 0;
+   }
+
+   ret = xsc_dev_set_mtu(priv->xdev, mtu);
+   if (ret) {
+   PMD_DRV_LOG(ERR, "Mtu set to %u failure", mtu);
+   

[PATCH v5 13/15] net/xsc: add basic stats ops

[WanRenyong]

Implement xsc ethdev basic statatics ops.

Signed-off-by: WanRenyong 
---
 doc/guides/nics/features/xsc.ini |  1 +
 drivers/net/xsc/xsc_ethdev.c | 75 
 2 files changed, 76 insertions(+)

diff --git a/doc/guides/nics/features/xsc.ini b/doc/guides/nics/features/xsc.ini
index 772c6418c4..eb88517104 100644
--- a/doc/guides/nics/features/xsc.ini
+++ b/doc/guides/nics/features/xsc.ini
@@ -11,6 +11,7 @@ L3 checksum offload  = Y
 L4 checksum offload  = Y
 Inner L3 checksum= Y
 Inner L4 checksum= Y
+Basic stats  = Y
 Linux= Y
 ARMv8= Y
 x86-64   = Y
diff --git a/drivers/net/xsc/xsc_ethdev.c b/drivers/net/xsc/xsc_ethdev.c
index 9cfb07b023..000e27222d 100644
--- a/drivers/net/xsc/xsc_ethdev.c
+++ b/drivers/net/xsc/xsc_ethdev.c
@@ -444,6 +444,79 @@ xsc_ethdev_tx_queue_setup(struct rte_eth_dev *dev, 
uint16_t idx, uint16_t desc,
return 0;
 }
 
+static int
+xsc_ethdev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   uint32_t rxqs_n = priv->num_rq;
+   uint32_t txqs_n = priv->num_sq;
+   uint32_t i, idx;
+   struct xsc_rxq_data *rxq;
+   struct xsc_txq_data *txq;
+
+   for (i = 0; i < rxqs_n; ++i) {
+   rxq = xsc_rxq_get(priv, i);
+   if (unlikely(rxq == NULL))
+   continue;
+
+   idx = rxq->idx;
+   if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+   stats->q_ipackets[idx] += rxq->stats.rx_pkts;
+   stats->q_ibytes[idx] += rxq->stats.rx_bytes;
+   stats->q_errors[idx] += (rxq->stats.rx_errors +
+rxq->stats.rx_nombuf);
+   }
+   stats->ipackets += rxq->stats.rx_pkts;
+   stats->ibytes += rxq->stats.rx_bytes;
+   stats->ierrors += rxq->stats.rx_errors;
+   stats->rx_nombuf += rxq->stats.rx_nombuf;
+   }
+
+   for (i = 0; i < txqs_n; ++i) {
+   txq = xsc_txq_get(priv, i);
+   if (unlikely(txq == NULL))
+   continue;
+
+   idx = txq->idx;
+   if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+   stats->q_opackets[idx] += txq->stats.tx_pkts;
+   stats->q_obytes[idx] += txq->stats.tx_bytes;
+   stats->q_errors[idx] += txq->stats.tx_errors;
+   }
+   stats->opackets += txq->stats.tx_pkts;
+   stats->obytes += txq->stats.tx_bytes;
+   stats->oerrors += txq->stats.tx_errors;
+   }
+
+   return 0;
+}
+
+static int
+xsc_ethdev_stats_reset(struct rte_eth_dev *dev)
+{
+   struct xsc_ethdev_priv *priv = TO_XSC_ETHDEV_PRIV(dev);
+   uint32_t rxqs_n = priv->num_rq;
+   uint32_t txqs_n = priv->num_sq;
+   uint32_t i;
+   struct xsc_rxq_data *rxq;
+   struct xsc_txq_data *txq;
+
+   for (i = 0; i < rxqs_n; ++i) {
+   rxq = xsc_rxq_get(priv, i);
+   if (unlikely(rxq == NULL))
+   continue;
+   memset(&rxq->stats, 0, sizeof(struct xsc_rxq_stats));
+   }
+   for (i = 0; i < txqs_n; ++i) {
+   txq = xsc_txq_get(priv, i);
+   if (unlikely(txq == NULL))
+   continue;
+   memset(&txq->stats, 0, sizeof(struct xsc_txq_stats));
+   }
+
+   return 0;
+}
+
 static int
 xsc_ethdev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac, 
uint32_t index)
 {
@@ -475,6 +548,8 @@ const struct eth_dev_ops xsc_eth_dev_ops = {
.dev_start = xsc_ethdev_start,
.dev_stop = xsc_ethdev_stop,
.dev_close = xsc_ethdev_close,
+   .stats_get = xsc_ethdev_stats_get,
+   .stats_reset = xsc_ethdev_stats_reset,
.rx_queue_setup = xsc_ethdev_rx_queue_setup,
.tx_queue_setup = xsc_ethdev_tx_queue_setup,
.rx_queue_release = xsc_ethdev_rxq_release,
-- 
2.25.1

Re: [PATCH] drivers_net: use 64-bit shift and avoid signed/unsigned mismatch

[Andre Muezerie]

On Mon, Jan 06, 2025 at 10:54:43AM +, Bruce Richardson wrote:
> On Thu, Dec 26, 2024 at 12:59:30PM -0800, Andre Muezerie wrote:
> > This patch avoids warnings like the ones below emitted by MSVC:
> > 
> > 1)
> > ../drivers/net/ice/base/ice_flg_rd.c(71): warning C4334: '<<':
> > result of 32-bit shift implicitly converted to 64 bits
> > (was 64-bit shift intended?)
> > 
> > 2)
> > ../drivers/net/ice/ice_dcf_sched.c(177): warning C4018: '>=':
> > signed/unsigned mismatch
> > 
> > The fix for (1) is to use 64-bit shifting when appropriate
> > (according to what the result is used for).
> > 
> > The fix for (2) is to explicitly cast the variables used in the
> > comparison.
> > 
> > Signed-off-by: Andre Muezerie 
> > ---
> >  drivers/net/i40e/i40e_ethdev.c   | 22 +++---
> >  drivers/net/iavf/iavf_ethdev.c   |  2 +-
> >  drivers/net/iavf/iavf_rxtx.c |  2 +-
> >  drivers/net/iavf/iavf_vchnl.c|  2 +-
> >  drivers/net/ice/base/ice_flg_rd.c|  4 ++--
> >  drivers/net/ice/base/ice_parser_rt.c | 16 
> >  drivers/net/ice/base/ice_xlt_kb.c|  2 +-
> >  drivers/net/ice/ice_dcf_sched.c  |  2 +-
> >  drivers/net/ice/ice_ethdev.c |  4 ++--
> >  drivers/net/ice/ice_rxtx.c   |  2 +-
> >  drivers/net/ixgbe/ixgbe_ethdev.c |  2 +-
> 
> Most of these changes to the intel drivers look fine to me. However, for
> the base code files, we try to avoid modifying those as they come from a
> common, shared internal source which we regularly sync with. Therefore, for
> the 3 base files, can the errors/warning be suppressed instead?
> 
> Regards,
> /Bruce

I wasn't aware of that. Thanks for letting me know.
I'll make the modifications suggested in v2 of this series.

RE: [PATCH v2 2/5] lib/eal: add portable version of __builtin_add_overflow

[Morten Brørup]

> From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> Sent: Monday, 6 January 2025 12.34
> 
> On Mon, Jan 06, 2025 at 12:21:39PM +0100, Morten Brørup wrote:
> > > From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> > > Sent: Monday, 6 January 2025 12.07
> > >
> > > On Fri, Jan 03, 2025 at 12:39:38PM -0800, Andre Muezerie wrote:
> > > > __builtin_add_overflow is gcc specific. There's a need for a
> portable
> > > > version that can also be used with other compilers.
> > > >
> > > > This patch introduces rte_add_overflow.
> > > >
> > > > +/*
> > > > + * Function that allows performing simple arithmetic operations
> > > together with
> > > > + * checking whether the operation overflowed.
> > > > + * Example of usage:
> > > > + * uint8_t overflow;
> > > > + * uint16_t a, b, result;
> > > > + * a = 1;
> > > > + * b = 2;
> > > > + * overflow = rte_add_overflow(a, b, &result);
> > > > + */
> > > > +#ifdef RTE_TOOLCHAIN_MSVC
> > > > +#define rte_add_overflow(a, b, res) _Generic((a), \
> > > > +   uint8_t : _addcarry_u8, \
> > > > +   uint16_t : _addcarry_u16, \
> > > > +   uint32_t : _addcarry_u32, \
> > > > +   uint64_t : _addcarry_u64)(0, a, b, res)
> > > > +#else
> > > > +#define rte_add_overflow(a, b, res) _Generic((a), \
> > > > +   uint8_t : __builtin_add_overflow, \
> > > > +   uint16_t : __builtin_add_overflow, \
> > > > +   uint32_t : __builtin_add_overflow, \
> > > > +   uint64_t : __builtin_add_overflow)(a, b, res)
> > > > +#endif
> > >
> > > For the gcc version, can you just simplify to the one-line below?
> > >
> > > #define rte_add_overflow __builtin_add_overflow
> >
> > Yes, but then GCC compilation would not fail if "a" has some other
> type than the four types explicitly supported.
> > I prefer keeping the method used this v2 patch.
> >
> Is that really a problem? Should our DPDK macro not support all the
> types
> that the GCC builtin supports?

The DPDK macro should support all the types that both MSVC and GCC supports.
Using _Generic() for GCC is an improvement for the CI to catch MSVC 
incompatible code when building for GCC.

Only these four unsigned types are supported by the x86_64 intrinsics.
I don't think we need support for more types; but if the need should arise, it 
can be added later.

[PATCH v3 1/2] config/arm: strict use of -mcpu for supported CPUs

[Wathsala Vithanage]

Arm recommends using -mcpu over -march and march-extensions when the
compiler supports the target CPU (neoverse-n1 etc.). Arm build so far
has been an amalgam of -mcpu and -march. When march is in use, it has
been the case so far to silently fall back to a downgraded march when
the compiler does not support the requested march. This is unnecessary
and confusing to an end user who could be building DPDK with a
particular ISA version and performance expectations in mind.

This patch aims to rectify both the above issues. For part numbers that
has a corresponding -mcpu, this patch removes all references to march
and march_features from meson.build. For those SOCs that do not have a
corresponding -mcpu, a pseudo cpu name in the format mcpu_ is
introduced and referenced in the mcpu field in the part number
dictionary of the part_number_config dictionary. The definition of the
mcpu_ must be provided in the mcpu_defs dictionary.
Each mcpu_ dictionary in the mcpu_defs have a march field and
a march_extensions field to construct the optimal compiler setting for
an SOC that has no corresponding -mcpu value. This patch alters the
behavior of the build system such that it will no longer silently fall
back to an older ISA version, it will only perform what's specified in
the build dictionaries, if the compiler does not support the specified
configuration it will fail with an error message.

How to add a new SOC to the build system with these changes?
If compiler supports mcpu follow the usual practice but without march
and march_features fields in the part number dictionary. If mcpu is not
available or buggy (misses certain features) for some reason follow the
same process but set mcpu field to a string in the form 'mcpu_foo'
(pseudo mcpu mentioned earlier). Then in the mcpu_defs dictionary add
mcpu_foo dictionary as shown.

'mcpu_foo': {
   'march': 'armv8.2-a',
   'march_extensions': [rcpc]
}

march_extensions is a comma separated list of march extensions supported
by the compiler such as sve, crypto etc. Empty match_extensions allowed
as use of such extensions are optional.

Signed-off-by: Wathsala Vithanage 
Reviewed-by: Dhruv Tripathi 

---
 config/arm/meson.build | 193 +
 1 file changed, 80 insertions(+), 113 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 55be7c8711..9ed36d9907 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -39,14 +39,11 @@ implementer_generic = {
 ],
 'part_number_config': {
 'generic': {
-'march': 'armv8-a',
-'march_features': ['crc'],
+'mcpu': 'mcpu_generic',
 'compiler_options': ['-moutline-atomics']
 },
 'generic_aarch32': {
-'march': 'armv8-a',
-'force_march': true,
-'march_features': ['simd'],
+'mcpu': 'mcpu_generic_aarch32',
 'compiler_options': ['-mfpu=auto'],
 'flags': [
 ['RTE_ARCH_ARM_NEON_MEMCPY', false],
@@ -69,8 +66,6 @@ part_number_config_arm = {
 '0xd0a': {'mcpu': 'cortex-a75'},
 '0xd0b': {'mcpu': 'cortex-a76'},
 '0xd0c': {
-'march': 'armv8.2-a',
-'march_features': ['crypto', 'rcpc'],
 'mcpu': 'neoverse-n1',
 'flags': [
 ['RTE_MACHINE', '"neoverse-n1"'],
@@ -81,8 +76,6 @@ part_number_config_arm = {
 ]
 },
 '0xd40': {
-'march': 'armv8.4-a',
-'march_features': ['sve'],
 'mcpu': 'neoverse-v1',
 'flags': [
 ['RTE_MACHINE', '"neoverse-v1"'],
@@ -94,9 +87,6 @@ part_number_config_arm = {
 'march': 'armv8.4-a',
 },
 '0xd49': {
-'march': 'armv9-a',
-'march_features': ['sve2'],
-'fallback_march': 'armv8.5-a',
 'mcpu': 'neoverse-n2',
 'flags': [
 ['RTE_MACHINE', '"neoverse-n2"'],
@@ -106,10 +96,7 @@ part_number_config_arm = {
 ]
 },
 '0xd4f': {
-'march': 'armv9-a',
-'march_features': ['sve2'],
 'mcpu' : 'neoverse-v2',
-'fallback_march': 'armv8.5-a',
 'flags': [
 ['RTE_MACHINE', '"neoverse-v2"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -171,15 +158,11 @@ implementer_cavium = {
 'flags': flags_part_number_thunderx
 },
 '0xa3': {
-'march': 'armv8-a',
-'march_features': ['crc', 'crypto'],
-'mcpu': 'thunderxt83',
+'mcpu': 'mcpu_thunderxt83',
 'flags': flags_part_number_thunderx
 },
 '0xaf': {
-'march': 'armv8.1-a',
-'march_features': ['crc', 'crypto'],
-'mcpu': 'thunderx2t99',
+'mcpu': 'mcpu_thunderx2t99',
 'flags': [
 ['RTE_MACHINE', '"thunderx2"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -189,8 +172,6 @@ implementer_cavium = {
 ]
 },
 '0xb2': {
-'

Re: [PATCH v2 2/5] lib/eal: add portable version of __builtin_add_overflow

[Bruce Richardson]

On Mon, Jan 06, 2025 at 12:21:39PM +0100, Morten Brørup wrote:
> > From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> > Sent: Monday, 6 January 2025 12.07
> > 
> > On Fri, Jan 03, 2025 at 12:39:38PM -0800, Andre Muezerie wrote:
> > > __builtin_add_overflow is gcc specific. There's a need for a portable
> > > version that can also be used with other compilers.
> > >
> > > This patch introduces rte_add_overflow.
> > >
> > > +/*
> > > + * Function that allows performing simple arithmetic operations
> > together with
> > > + * checking whether the operation overflowed.
> > > + * Example of usage:
> > > + * uint8_t overflow;
> > > + * uint16_t a, b, result;
> > > + * a = 1;
> > > + * b = 2;
> > > + * overflow = rte_add_overflow(a, b, &result);
> > > + */
> > > +#ifdef RTE_TOOLCHAIN_MSVC
> > > +#define rte_add_overflow(a, b, res) _Generic((a), \
> > > + uint8_t : _addcarry_u8, \
> > > + uint16_t : _addcarry_u16, \
> > > + uint32_t : _addcarry_u32, \
> > > + uint64_t : _addcarry_u64)(0, a, b, res)
> > > +#else
> > > +#define rte_add_overflow(a, b, res) _Generic((a), \
> > > + uint8_t : __builtin_add_overflow, \
> > > + uint16_t : __builtin_add_overflow, \
> > > + uint32_t : __builtin_add_overflow, \
> > > + uint64_t : __builtin_add_overflow)(a, b, res)
> > > +#endif
> > 
> > For the gcc version, can you just simplify to the one-line below?
> > 
> > #define rte_add_overflow __builtin_add_overflow
> 
> Yes, but then GCC compilation would not fail if "a" has some other type than 
> the four types explicitly supported.
> I prefer keeping the method used this v2 patch.
>
Is that really a problem? Should our DPDK macro not support all the types
that the GCC builtin supports?

/Bruce

[PATCH v2] drivers/net: use 64-bit shift and avoid signed/unsigned mismatch

[Andre Muezerie]

This patch avoids warnings like the ones below emitted by MSVC:

1)
../drivers/net/ice/base/ice_flg_rd.c(71): warning C4334: '<<':
result of 32-bit shift implicitly converted to 64 bits
(was 64-bit shift intended?)

2)
../drivers/net/ice/ice_dcf_sched.c(177): warning C4018: '>=':
signed/unsigned mismatch

The fix for (1) is to use 64-bit shifting when appropriate
(according to what the result is used for).

The fix for (2) is to explicitly cast the variables used in the
comparison.

Signed-off-by: Andre Muezerie 
---
 drivers/net/i40e/i40e_ethdev.c   | 22 +++---
 drivers/net/iavf/iavf_ethdev.c   |  2 +-
 drivers/net/iavf/iavf_rxtx.c |  2 +-
 drivers/net/iavf/iavf_vchnl.c|  2 +-
 drivers/net/ice/base/ice_flg_rd.c|  4 ++--
 drivers/net/ice/base/ice_parser_rt.c | 16 
 drivers/net/ice/base/ice_xlt_kb.c|  2 +-
 drivers/net/ice/base/meson.build | 19 +--
 drivers/net/ice/ice_dcf_sched.c  |  2 +-
 drivers/net/ice/ice_ethdev.c |  4 ++--
 drivers/net/ice/ice_rxtx.c   |  2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c |  2 +-
 drivers/net/vmxnet3/vmxnet3_ethdev.h |  6 +++---
 13 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 30dcdc68a8..e565c953e2 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3094,7 +3094,7 @@ i40e_stat_update_48_in_64(struct i40e_hw *hw, uint32_t 
hireg,
/* enlarge the limitation when statistics counters overflowed */
if (offset_loaded) {
if (I40E_RXTX_BYTES_L_48_BIT(*prev_stat) > *stat)
-   *stat += (uint64_t)1 << I40E_48_BIT_WIDTH;
+   *stat += RTE_BIT64(I40E_48_BIT_WIDTH);
*stat += I40E_RXTX_BYTES_H_16_BIT(*prev_stat);
}
*prev_stat = *stat;
@@ -4494,7 +4494,7 @@ i40e_macaddr_remove(struct rte_eth_dev *dev, uint32_t 
index)
pool_sel = dev->data->mac_pool_sel[index];
 
for (i = 0; i < sizeof(pool_sel) * CHAR_BIT; i++) {
-   if (pool_sel & (1ULL << i)) {
+   if (pool_sel & RTE_BIT64(i)) {
if (i == 0)
vsi = pf->main_vsi;
else {
@@ -4630,7 +4630,7 @@ i40e_dev_rss_reta_update(struct rte_eth_dev *dev,
for (i = 0; i < reta_size; i++) {
idx = i / RTE_ETH_RETA_GROUP_SIZE;
shift = i % RTE_ETH_RETA_GROUP_SIZE;
-   if (reta_conf[idx].mask & (1ULL << shift))
+   if (reta_conf[idx].mask & RTE_BIT64(shift))
lut[i] = reta_conf[idx].reta[shift];
}
ret = i40e_set_rss_lut(pf->main_vsi, lut, reta_size);
@@ -4674,7 +4674,7 @@ i40e_dev_rss_reta_query(struct rte_eth_dev *dev,
for (i = 0; i < reta_size; i++) {
idx = i / RTE_ETH_RETA_GROUP_SIZE;
shift = i % RTE_ETH_RETA_GROUP_SIZE;
-   if (reta_conf[idx].mask & (1ULL << shift))
+   if (reta_conf[idx].mask & RTE_BIT64(shift))
reta_conf[idx].reta[shift] = lut[i];
}
 
@@ -6712,7 +6712,7 @@ i40e_vmdq_setup(struct rte_eth_dev *dev)
loop = sizeof(vmdq_conf->pool_map[0].pools) * CHAR_BIT;
for (i = 0; i < vmdq_conf->nb_pool_maps; i++) {
for (j = 0; j < loop && j < pf->nb_cfg_vmdq_vsi; j++) {
-   if (vmdq_conf->pool_map[i].pools & (1UL << j)) {
+   if (vmdq_conf->pool_map[i].pools & RTE_BIT64(j)) {
PMD_INIT_LOG(INFO, "Add vlan %u to vmdq pool 
%u",
vmdq_conf->pool_map[i].vlan_id, j);
 
@@ -6761,7 +6761,7 @@ i40e_stat_update_32(struct i40e_hw *hw,
*stat = (uint64_t)(new_data - *offset);
else
*stat = (uint64_t)((new_data +
-   ((uint64_t)1 << I40E_32_BIT_WIDTH)) - *offset);
+   RTE_BIT64(I40E_32_BIT_WIDTH)) - *offset);
 }
 
 static void
@@ -6789,7 +6789,7 @@ i40e_stat_update_48(struct i40e_hw *hw,
*stat = new_data - *offset;
else
*stat = (uint64_t)((new_data +
-   ((uint64_t)1 << I40E_48_BIT_WIDTH)) - *offset);
+   RTE_BIT64(I40E_48_BIT_WIDTH)) - *offset);
 
*stat &= I40E_48_BIT_MASK;
 }
@@ -7730,7 +7730,7 @@ i40e_config_hena(const struct i40e_adapter *adapter, 
uint64_t flags)
return hena;
 
for (i = RTE_ETH_FLOW_UNKNOWN + 1; i < I40E_FLOW_TYPE_MAX; i++) {
-   if (flags & (1ULL << i))
+   if (flags & RTE_BIT64(i))
hena |= adapter->pctypes_tbl[i];
}
 
@@ -7749,7 +7749,7 @@ i40e_parse_hena(const struct i40e_adapter *adapter, 
uint64_t flags)
 
for (i = RTE_ETH_FLOW_UNKNOWN + 1; i < I40E_FLOW_TYPE_MAX; i++) {
if (flags & adapter-

[PATCH v3 2/2] config/arm: sort SOCs alphabetically

[Wathsala Vithanage]

Order SOC configurations and names alphabetically.

Signed-off-by: Wathsala Vithanage 
Reviewed-by: Dhruv Tripathi 

---
 config/arm/meson.build | 86 +-
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 9ed36d9907..7f6a0e1b16 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -394,6 +394,17 @@ soc_bluefield = {
 'numa': false
 }

+soc_bluefield3 = {
+  'description': 'NVIDIA BlueField-3',
+  'implementer': '0x41',
+   'flags': [
+  ['RTE_MAX_LCORE', 32],
+  ['RTE_MAX_NUMA_NODES', 1]
+  ],
+   'part_number': '0xd42',
+   'numa': false
+}
+
 soc_capri = {
 'description': 'AMD Pensando Capri',
 'implementer': '0x75',
@@ -476,13 +487,6 @@ soc_ft2000plus = {
 'numa': true
 }

-soc_tys2500 = {
-'description': 'Phytium TengYun S2500',
-'implementer': '0x70',
-'part_number': '0x663',
-'numa': true
-}
-
 soc_grace = {
 'description': 'NVIDIA Grace',
 'implementer': '0x41',
@@ -593,27 +597,23 @@ soc_thunderx2 = {
 'part_number': '0xaf'
 }

-soc_thunderxt88 = {
-'description': 'Marvell ThunderX T88',
-'implementer': '0x43',
-'part_number': '0xa1'
-}
-
 soc_thunderxt83 = {
 'description': 'Marvell ThunderX T83',
 'implementer': '0x43',
 'part_number': '0xa3'
 }

-soc_bluefield3 = {
-  'description': 'NVIDIA BlueField-3',
-  'implementer': '0x41',
-   'flags': [
-  ['RTE_MAX_LCORE', 32],
-  ['RTE_MAX_NUMA_NODES', 1]
-  ],
-   'part_number': '0xd42',
-   'numa': false
+soc_thunderxt88 = {
+'description': 'Marvell ThunderX T88',
+'implementer': '0x43',
+'part_number': '0xa1'
+}
+
+soc_tys2500 = {
+'description': 'Phytium TengYun S2500',
+'implementer': '0x70',
+'part_number': '0x663',
+'numa': true
 }

 soc_v2 = {
@@ -624,23 +624,31 @@ soc_v2 = {
 }

 mcpu_defs = {
-'mcpu_kunpeng930': {
-'march': 'armv8.2-a',
-'march_extensions': ['crypto', 'sve']
+'mcpu_centriq2400': {
+'march': 'armv8-a',
+'march_extensions': ['crc']
+},
+'mcpu_ft2000plus': {
+'march': 'armv8-a',
+'march_extensions': ['crc']
 },
 'mcpu_hip10': {
 'march': 'armv8.5-a',
 'march_extensions': ['crypto', 'sve']
 },
-'mcpu_ft2000plus': {
-'march': 'armv8-a',
-'march_extensions': ['crc']
+'mcpu_kunpeng930': {
+'march': 'armv8.2-a',
+'march_extensions': ['crypto', 'sve']
 },
-'mcpu_tys2500': {
+'mcpu_thunderxt83': {
 'march': 'armv8-a',
-'march_extensions': ['crc']
+'march_extensions': ['crc', 'crypto']
 },
-'mcpu_centriq2400': {
+'mcpu_thunderx2t99': {
+'march': 'armv8.1-a',
+'march_extensions': ['crc', 'crypto']
+},
+'mcpu_tys2500': {
 'march': 'armv8-a',
 'march_extensions': ['crc']
 },
@@ -652,14 +660,6 @@ mcpu_defs = {
 'march': 'armv8-a',
 'march_extensions': ['simd'],
 }
-'mcpu_thunderx2t99': {
-'march': 'armv8.1-a',
-'march_extensions': ['crc', 'crypto']
-},
-'mcpu_thunderxt83': {
-'march': 'armv8-a',
-'march_extensions': ['crc', 'crypto']
-},
 }

 '''
@@ -681,7 +681,6 @@ dpaa:NXP DPAA
 elba:AMD Pensando Elba
 emag:Ampere eMAG
 ft2000plus:  Phytium FT-2000+
-tys2500: Phytium TengYun S2500
 grace:   NVIDIA Grace
 graviton2:   AWS Graviton2
 graviton3:   AWS Graviton3
@@ -694,8 +693,9 @@ n2:  Arm Neoverse N2
 odyssey: Marvell Odyssey
 stingray:Broadcom Stingray
 thunderx2:   Marvell ThunderX2 T99
-thunderxt88: Marvell ThunderX T88
 thunderxt83: Marvell ThunderX T83
+thunderxt88: Marvell ThunderX T88
+tys2500: Phytium TengYun S2500
 v2:  Arm Neoverse V2
 End of SoCs list
 '''
@@ -719,7 +719,6 @@ socs = {
 'elba': soc_elba,
 'emag': soc_emag,
 'ft2000plus': soc_ft2000plus,
-'tys2500': soc_tys2500,
 'grace': soc_grace,
 'graviton2': soc_graviton2,
 'graviton3': soc_graviton3,
@@ -733,8 +732,9 @@ socs = {
 'odyssey' : soc_odyssey,
 'stingray': soc_stingray,
 'thunderx2': soc_thunderx2,
-'thunderxt88': soc_thunderxt88,
 'thunderxt83': soc_thunderxt83,
+'thunderxt88': soc_thunderxt88,
+'tys2500': soc_tys2500,
 'v2': soc_v2,
 }

--
2.43.0

[PATCH v14] dts: port over queue start/stop suite

[Dean Marx]

This suite tests the ability of the Poll Mode Driver
to enable and disable Rx/Tx queues on a port.
The verify argument in the deferred start method has been excluded
due to a bug in testpmd, which renders checking port queue info
for deferred start status impossible within a single method.

Signed-off-by: Dean Marx 
Reviewed-by: Jeremy Spewock 
---
 dts/framework/remote_session/testpmd_shell.py |  18 +++
 dts/tests/TestSuite_queue_start_stop.py   | 141 ++
 2 files changed, 159 insertions(+)
 create mode 100644 dts/tests/TestSuite_queue_start_stop.py

diff --git a/dts/framework/remote_session/testpmd_shell.py 
b/dts/framework/remote_session/testpmd_shell.py
index d187eaea94..3c5372614b 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -2242,6 +2242,24 @@ def set_queue_ring_size(
 f"Failed to update ring size of queue {queue_id} on port 
{port_id}"
 )
 
+@requires_stopped_ports
+def set_queue_deferred_start(
+self, port_id: int, queue_id: int, is_rx_queue: bool, on: bool
+) -> None:
+"""Set the deferred start attribute of the specified queue on/off.
+
+Args:
+port_id: The port that the queue resides on.
+queue_id: The ID of the queue on the port.
+is_rx_queue: Whether to modify an RX or TX queue. If :data:`True` 
an RX queue will be
+updated, otherwise a TX queue will be updated.
+on: Whether to set deferred start mode on or off. If :data:`True` 
deferred start will
+be turned on, otherwise it will be turned off.
+"""
+queue_type = "rxq" if is_rx_queue else "txq"
+action = "on" if on else "off"
+self.send_command(f"port {port_id} {queue_type} {queue_id} 
deferred_start {action}")
+
 def _update_capabilities_from_flag(
 self,
 supported_capabilities: MutableSet["NicCapability"],
diff --git a/dts/tests/TestSuite_queue_start_stop.py 
b/dts/tests/TestSuite_queue_start_stop.py
new file mode 100644
index 00..c0ab7d67df
--- /dev/null
+++ b/dts/tests/TestSuite_queue_start_stop.py
@@ -0,0 +1,141 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Rx/Tx queue start and stop functionality suite.
+
+This suite tests the ability of the poll mode driver to start and
+stop either the Rx or Tx queue (depending on the port) during runtime,
+and verify that packets are not received when one is disabled.
+
+Given a paired port topology, the Rx queue will be disabled on port 0,
+and the Tx queue will be disabled on port 1.
+
+"""
+
+from scapy.layers.inet import IP  # type: ignore[import-untyped]
+from scapy.layers.l2 import Ether  # type: ignore[import-untyped]
+from scapy.packet import Raw  # type: ignore[import-untyped]
+
+from framework.remote_session.testpmd_shell import SimpleForwardingModes, 
TestPmdShell
+from framework.test_suite import TestSuite, func_test
+from framework.testbed_model.capability import NicCapability, TopologyType, 
requires
+
+
+@requires(topology_type=TopologyType.two_links)
+@requires(NicCapability.RUNTIME_RX_QUEUE_SETUP)
+@requires(NicCapability.RUNTIME_TX_QUEUE_SETUP)
+class TestQueueStartStop(TestSuite):
+"""DPDK Queue start/stop test suite.
+
+Ensures Rx/Tx queue on a port can be disabled and enabled.
+Verifies packets are not received when either queue is disabled.
+The suite contains four test cases, two Rx queue start/stop and
+two Tx queue start/stop, which each disable the corresponding
+queue and verify that packets are not received/forwarded. There
+are two cases that verify deferred start mode produces the expected
+behavior in both the Rx and Tx queue.
+"""
+
+def send_packet_and_verify(self, should_receive: bool = True) -> None:
+"""Generate a packet, send to the DUT, and verify it is forwarded back.
+
+Args:
+should_receive: Indicate whether the packet should be received.
+"""
+packet = Ether() / IP() / Raw(load="x")
+received = self.send_packet_and_capture(packet)
+contains_packet = any(
+packet.haslayer(Raw) and b"x" in packet.load for packet in 
received
+)
+self.verify(
+should_receive == contains_packet,
+f"Packet was {'dropped' if should_receive else 'received'}",
+)
+
+@func_test
+def test_rx_queue_start_stop(self) -> None:
+"""Rx queue start stop test.
+
+Steps:
+Launch testpmd, stop Rx queue 0 on port 0.
+Verify:
+Send a packet on port 0, ensure it is not received.
+"""
+with TestPmdShell(node=self.sut_node) as testpmd:
+testpmd.set_forward_mode(SimpleForwardingModes.mac)
+testpmd.stop_port_queue(0, 0, True)
+testpmd.start()
+self.send_packet_and_verify(sh

[DPDK/other Bug 1610] dpdk-dumpcap does not support packet capture on vhost-user-client interfaces.

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1610

Bug ID: 1610
   Summary: dpdk-dumpcap does not support packet capture on
vhost-user-client interfaces.
   Product: DPDK
   Version: 23.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: other
  Assignee: dev@dpdk.org
  Reporter: junwan...@cestc.cn
  Target Milestone: ---

dpdk-dumpcap does not support packet capture on vhost-user-client interfaces.
Currently, it seems to only support packet capture on virtio-user interfaces
and physical interfaces.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[PATCH v2] net/af_packet: allow changing fanout mode

[Tudor Cornea]

This allows us to control the algorithm used to spread traffic between
sockets, adding more fine grained control. If the user does not
specify a fanout mode, the PMD driver will default to
PACKET_FANOUT_HASH.

Signed-off-by: Tudor Cornea 

---
v2:
* Renamed the patch
* Replaced packet_fanout argument with fanout_mode, which allows
more fine grained control
---
 doc/guides/nics/af_packet.rst |  4 +-
 drivers/net/af_packet/rte_eth_af_packet.c | 92 ---
 2 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/doc/guides/nics/af_packet.rst b/doc/guides/nics/af_packet.rst
index a343d3a961..3443f95004 100644
--- a/doc/guides/nics/af_packet.rst
+++ b/doc/guides/nics/af_packet.rst
@@ -25,6 +25,8 @@ Some of these, in turn, will be used to configure the 
PACKET_MMAP settings.
 *   ``qpairs`` - number of Rx and Tx queues (optional, default 1);
 *   ``qdisc_bypass`` - set PACKET_QDISC_BYPASS option in AF_PACKET (optional,
 disabled by default);
+*   ``fanout_mode`` - set fanout algorithm. Possible choices: 
hash,lb,cpu,rollover,rnd,qm (optional,
+default hash);
 *   ``blocksz`` - PACKET_MMAP block size (optional, default 4096);
 *   ``framesz`` - PACKET_MMAP frame size (optional, default 2048B; Note: 
multiple
 of 16B);
@@ -64,7 +66,7 @@ framecnt=512):
 
 .. code-block:: console
 
-
--vdev=eth_af_packet0,iface=tap0,blocksz=4096,framesz=2048,framecnt=512,qpairs=1,qdisc_bypass=0
+
--vdev=eth_af_packet0,iface=tap0,blocksz=4096,framesz=2048,framecnt=512,qpairs=1,qdisc_bypass=0,fanout_mode=hash
 
 Features and Limitations
 
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c 
b/drivers/net/af_packet/rte_eth_af_packet.c
index ceb8d9356a..8449975384 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -36,6 +36,7 @@
 #define ETH_AF_PACKET_FRAMESIZE_ARG"framesz"
 #define ETH_AF_PACKET_FRAMECOUNT_ARG   "framecnt"
 #define ETH_AF_PACKET_QDISC_BYPASS_ARG "qdisc_bypass"
+#define ETH_AF_PACKET_FANOUT_MODE_ARG  "fanout_mode"
 
 #define DFLT_FRAME_SIZE(1 << 11)
 #define DFLT_FRAME_COUNT   (1 << 9)
@@ -96,6 +97,7 @@ static const char *valid_arguments[] = {
ETH_AF_PACKET_FRAMESIZE_ARG,
ETH_AF_PACKET_FRAMECOUNT_ARG,
ETH_AF_PACKET_QDISC_BYPASS_ARG,
+   ETH_AF_PACKET_FANOUT_MODE_ARG,
NULL
 };
 
@@ -700,6 +702,61 @@ open_packet_iface(const char *key __rte_unused,
return 0;
 }
 
+#if defined(PACKET_FANOUT)
+#define PACKET_FANOUT_INVALID -1
+
+static int
+get_fanout_group_id(int if_index)
+{
+   return (getpid() ^ if_index) & 0x;
+}
+
+static int
+get_fanout_mode(const char *fanout_mode)
+{
+   int mode = PACKET_FANOUT_FLAG_DEFRAG;
+
+#if defined(PACKET_FANOUT_FLAG_ROLLOVER)
+   mode |= PACKET_FANOUT_FLAG_ROLLOVER;
+#endif
+
+   if (!fanout_mode) {
+   /* Default */
+   mode |= PACKET_FANOUT_HASH;
+   } else if (!strcmp(fanout_mode, "hash")) {
+   mode |= PACKET_FANOUT_HASH;
+   } else if (!strcmp(fanout_mode, "lb")) {
+   mode |= PACKET_FANOUT_LB;
+   } else if (!strcmp(fanout_mode, "cpu")) {
+   mode |= PACKET_FANOUT_CPU;
+   } else if (!strcmp(fanout_mode, "rollover")) {
+   mode |= PACKET_FANOUT_ROLLOVER;
+   } else if (!strcmp(fanout_mode, "rnd")) {
+   mode |= PACKET_FANOUT_RND;
+   } else if (!strcmp(fanout_mode, "qm")) {
+   mode |= PACKET_FANOUT_QM;
+   } else {
+   /* Invalid Fanout Mode */
+   mode = PACKET_FANOUT_INVALID;
+   }
+
+   return mode;
+}
+
+static int
+get_fanout(const char *fanout_mode, int if_index)
+{
+   int group_id = get_fanout_group_id(if_index);
+   int mode = get_fanout_mode(fanout_mode);
+   int fanout = PACKET_FANOUT_INVALID;
+
+   if (mode != PACKET_FANOUT_INVALID)
+   fanout = group_id | (mode << 16);
+
+   return fanout;
+}
+#endif
+
 static int
 rte_pmd_init_internals(struct rte_vdev_device *dev,
const int sockfd,
@@ -709,6 +766,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
unsigned int framesize,
unsigned int framecnt,
   unsigned int qdisc_bypass,
+  const char *fanout_mode,
struct pmd_internals **internals,
struct rte_eth_dev **eth_dev,
struct rte_kvargs *kvlist)
@@ -810,11 +868,12 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
sockaddr.sll_ifindex = (*internals)->if_index;
 
 #if defined(PACKET_FANOUT)
-   fanout_arg = (getpid() ^ (*internals)->if_index) & 0x;
-   fanout_arg |= (PACKET_FANOUT_HASH | PACKET_FANOUT_FLAG_DEFRAG) << 16;
-#if defined(PACKET_FANOUT_FLAG_ROLLOVER)
-   fanout_arg |= PACKET_FANOUT_FLAG_ROLLOVER << 16;
-#endif
+   fanout_arg = get_fanout(fa

Re: [PATCH v4 01/24] net/_common_intel: add pkt reassembly fn for intel drivers

[Bruce Richardson]

On Fri, Dec 20, 2024 at 08:15:40AM -0800, Stephen Hemminger wrote:
> On Fri, 20 Dec 2024 14:38:58 +
> Bruce Richardson  wrote:
> 
> > +
> > +   if (!split_flags[buf_idx]) {
> > +   /* it's the last packet of the set */
> > +   start->hash = end->hash;
> > +   start->vlan_tci = end->vlan_tci;
> > +   start->ol_flags = end->ol_flags;
> > +   /* we need to strip crc for the whole packet */
> > +   start->pkt_len -= crc_len;
> > +   if (end->data_len > crc_len) {
> > +   end->data_len -= crc_len;
> > +   } else {
> > +   /* free up last mbuf */
> > +   struct rte_mbuf *secondlast = start;
> > +
> > +   start->nb_segs--;
> > +   while (secondlast->next != end)
> > +   secondlast = secondlast->next;
> > +   secondlast->data_len -= (crc_len - 
> > end->data_len);
> > +   secondlast->next = NULL;
> > +   rte_pktmbuf_free_seg(end);
> > +   }
> 
> The problem with freeing the last buffer is that the CRC will be garbage.
> What if the CRC is sitting past the last mbuf?
> 
> +---++-+
> | Data  +--->+ CRC |
> +---++-+
> 
> This part (from original code) will free the second mbuf which contains
> the CRC. The whole "don't strip CRC and leave it past the mbuf data" model
> of mbuf's is a danger trap.

Can you explain more clearly what you see as the issue with the current
code above?

The "crc_len" variable contains the length of the CRC included in the
packet, which should be removed from that before returning the mbuf from RX.
It contains "0" if the CRC is HW stripped, and "4" if the CRC needs to be
removed by software - something that is done just by subtracting the CRC
length from the packet and buffer lengths. The freeing of the last segment
occurs only in the case that the last segment contains the CRC only - or
part of the CRC only, as otherwise we would have an extra empty buffer at
the end of the chain.

/Bruce

[PATCH 2/2] app/test: enable ipsec-related tests

[Andre Muezerie]

Removed ifdefs which were bypassing the ipsec tests on Windows.

Removed "return" from void function to avoid warning on MSVC.

Signed-off-by: Andre Muezerie 
---
 app/test/test_ipsec.c | 17 ++---
 app/test/test_ipsec_perf.c| 13 -
 app/test/test_ipsec_sad.c | 13 -
 app/test/test_security_inline_proto.c | 26 --
 4 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index ac63c3b6d3..b0e4384d0b 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -17,17 +17,6 @@
 #include 
 #include 
 #include 
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_ipsec(void)
-{
-   printf("ipsec not supported on Windows, skipping test\n");
-   return TEST_SKIPPED;
-}
-
-#else
-
 #include 
 #include 
 #include 
@@ -1185,9 +1174,9 @@ destroy_session(struct ipsec_unitest_params *ut,
uint8_t crypto_dev, uint32_t j)
 {
if (ut->ss[j].type == RTE_SECURITY_ACTION_TYPE_NONE)
-   return destroy_crypto_session(ut, crypto_dev, j);
+   destroy_crypto_session(ut, crypto_dev, j);
else
-   return destroy_dummy_sec_session(ut, j);
+   destroy_dummy_sec_session(ut, j);
 }
 
 static void
@@ -2615,6 +2604,4 @@ test_ipsec(void)
return unit_test_suite_runner(&ipsec_testsuite);
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
 REGISTER_FAST_TEST(ipsec_autotest, true, true, test_ipsec);
diff --git a/app/test/test_ipsec_perf.c b/app/test/test_ipsec_perf.c
index a32a2086e9..d609bae57e 100644
--- a/app/test/test_ipsec_perf.c
+++ b/app/test/test_ipsec_perf.c
@@ -10,17 +10,6 @@
 #include 
 #include 
 #include 
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_libipsec_perf(void)
-{
-   printf("ipsec_perf not supported on Windows, skipping test\n");
-   return TEST_SKIPPED;
-}
-
-#else
-
 #include 
 #include 
 
@@ -629,6 +618,4 @@ test_libipsec_perf(void)
return TEST_SUCCESS;
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
 REGISTER_PERF_TEST(ipsec_perf_autotest, test_libipsec_perf);
diff --git a/app/test/test_ipsec_sad.c b/app/test/test_ipsec_sad.c
index 642643eb63..378ba3f871 100644
--- a/app/test/test_ipsec_sad.c
+++ b/app/test/test_ipsec_sad.c
@@ -8,17 +8,6 @@
 #include 
 #include 
 #include 
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_ipsec_sad(void)
-{
-   printf("ipsec_sad not supported on Windows, skipping test\n");
-   return TEST_SKIPPED;
-}
-
-#else
-
 #include 
 #include 
 
@@ -897,6 +886,4 @@ test_ipsec_sad(void)
return unit_test_suite_runner(&ipsec_sad_tests);
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
 REGISTER_TEST_COMMAND(ipsec_sad_autotest, test_ipsec_sad);
diff --git a/app/test/test_security_inline_proto.c 
b/app/test/test_security_inline_proto.c
index 480469f672..f085ec716f 100644
--- a/app/test/test_security_inline_proto.c
+++ b/app/test/test_security_inline_proto.c
@@ -14,30 +14,6 @@
 #include "test_security_inline_proto_vectors.h"
 #include "test_security_proto.h"
 
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_inline_ipsec(void)
-{
-   printf("Inline ipsec not supported on Windows, skipping test\n");
-   return TEST_SKIPPED;
-}
-
-static int
-test_event_inline_ipsec(void)
-{
-   printf("Event inline ipsec not supported on Windows, skipping test\n");
-   return TEST_SKIPPED;
-}
-
-static int
-test_inline_ipsec_sg(void)
-{
-   printf("Inline ipsec SG not supported on Windows, skipping test\n");
-   return TEST_SKIPPED;
-}
-
-#else
-
 #include 
 #include 
 #include 
@@ -3619,8 +3595,6 @@ test_event_inline_ipsec(void)
return unit_test_suite_runner(&inline_ipsec_testsuite);
 }
 
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
 REGISTER_TEST_COMMAND(inline_ipsec_autotest, test_inline_ipsec);
 REGISTER_TEST_COMMAND(inline_ipsec_sg_autotest, test_inline_ipsec_sg);
 REGISTER_TEST_COMMAND(event_inline_ipsec_autotest, test_event_inline_ipsec);
-- 
2.47.0.vfs.0.3

[PATCH 0/2] compile ipsec on Windows

[Andre Muezerie]

Removed VLA for compatibility with MSVC (which does not support VLAs).
Used alloca when a constant fixed length that can be used instead is
not known.

Implementation for rte_ipsec_pkt_crypto_group and
rte_ipsec_ses_from_crypto was moved to new file
lib\ipsec\ipsec_group.c because these functions get exported in a
shared library (lib\ipsec\version.map).

Implementation for rte_ipsec_pkt_crypto_prepare and
rte_ipsec_pkt_process was moved to new file lib\ipsec\ipsec.c because
these functions get exported in a shared library
(lib\ipsec\version.map).

Removed logic which was skipping ipsec on Windows.

Andre Muezerie (2):
  lib/ipsec: compile ipsec on Windows
  app/test: enable ipsec-related tests

 app/test/test_ipsec.c | 17 +
 app/test/test_ipsec_perf.c| 13 
 app/test/test_ipsec_sad.c | 13 
 app/test/test_security_inline_proto.c | 26 
 lib/ipsec/esp_inb.c   | 57 +++-
 lib/ipsec/esp_outb.c  | 48 ++
 lib/ipsec/ipsec.c | 19 ++
 lib/ipsec/ipsec_group.c   | 93 +++
 lib/ipsec/ipsec_sad.c |  1 +
 lib/ipsec/ipsec_telemetry.c   |  1 +
 lib/ipsec/meson.build | 10 +--
 lib/ipsec/misc.h  | 10 ++-
 lib/ipsec/rte_ipsec.h | 15 ++---
 lib/ipsec/rte_ipsec_group.h   | 84 ++--
 lib/ipsec/sa.c|  4 +-
 15 files changed, 210 insertions(+), 201 deletions(-)
 create mode 100644 lib/ipsec/ipsec.c
 create mode 100644 lib/ipsec/ipsec_group.c

--
2.47.0.vfs.0.3

[PATCH 1/2] lib/ipsec: compile ipsec on Windows

[Andre Muezerie]

Removed VLA for compatibility with MSVC (which does not support VLAs).
Used alloca when a constant fixed length that can be used instead is
not known.

Implementation for rte_ipsec_pkt_crypto_group and
rte_ipsec_ses_from_crypto was moved to new file
lib\ipsec\ipsec_group.c because these functions get exported in a
shared library (lib\ipsec\version.map).

Implementation for rte_ipsec_pkt_crypto_prepare and
rte_ipsec_pkt_process was moved to new file lib\ipsec\ipsec.c because
these functions get exported in a shared library
(lib\ipsec\version.map).

Removed code in meson.build which was skipping ipsec on Windows.

Signed-off-by: Andre Muezerie 
---
 lib/ipsec/esp_inb.c | 57 ---
 lib/ipsec/esp_outb.c| 48 +--
 lib/ipsec/ipsec.c   | 19 
 lib/ipsec/ipsec_group.c | 93 +
 lib/ipsec/ipsec_sad.c   |  1 +
 lib/ipsec/ipsec_telemetry.c |  1 +
 lib/ipsec/meson.build   | 10 +---
 lib/ipsec/misc.h| 10 ++--
 lib/ipsec/rte_ipsec.h   | 15 ++
 lib/ipsec/rte_ipsec_group.h | 84 ++---
 lib/ipsec/sa.c  |  4 +-
 11 files changed, 208 insertions(+), 134 deletions(-)
 create mode 100644 lib/ipsec/ipsec.c
 create mode 100644 lib/ipsec/ipsec_group.c

diff --git a/lib/ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
index f159bf7460..305ac48dc5 100644
--- a/lib/ipsec/esp_inb.c
+++ b/lib/ipsec/esp_inb.c
@@ -370,8 +370,9 @@ esp_inb_pkt_prepare(const struct rte_ipsec_session *ss, 
struct rte_mbuf *mb[],
struct rte_cryptodev_sym_session *cs;
struct replay_sqn *rsn;
union sym_op_data icv;
-   uint32_t dr[num];
+   uint32_t *dr;
 
+   dr = alloca(sizeof(uint32_t) * num);
sa = ss->sa;
cs = ss->crypto.ses;
rsn = rsn_acquire(sa);
@@ -576,12 +577,16 @@ tun_process(struct rte_ipsec_sa *sa, struct rte_mbuf 
*mb[],
uint32_t sqn[], uint32_t dr[], uint16_t num, uint8_t sqh_len)
 {
uint32_t adj, i, k, tl, bytes;
-   uint32_t hl[num], to[num];
-   struct rte_esp_tail espt[num];
-   struct rte_mbuf *ml[num];
+   uint32_t *hl, *to;
+   struct rte_esp_tail *espt;
+   struct rte_mbuf **ml;
const void *outh;
void *inh;
 
+   hl = alloca(sizeof(uint32_t) * num);
+   to = alloca(sizeof(uint32_t) * num);
+   espt = alloca(sizeof(struct rte_esp_tail) * num);
+   ml = alloca(sizeof(struct rte_mbuf *) * num);
/*
 * remove icv, esp trailer and high-order
 * 32 bits of esn from packet length
@@ -640,10 +645,14 @@ trs_process(struct rte_ipsec_sa *sa, struct rte_mbuf 
*mb[],
 {
char *np;
uint32_t i, k, l2, tl, bytes;
-   uint32_t hl[num], to[num];
-   struct rte_esp_tail espt[num];
-   struct rte_mbuf *ml[num];
-
+   uint32_t *hl, *to;
+   struct rte_esp_tail *espt;
+   struct rte_mbuf **ml;
+
+   hl = alloca(sizeof(uint32_t) * num);
+   to = alloca(sizeof(uint32_t) * num);
+   espt = alloca(sizeof(struct rte_esp_tail) * num);
+   ml = alloca(sizeof(struct rte_mbuf *) * num);
/*
 * remove icv, esp trailer and high-order
 * 32 bits of esn from packet length
@@ -724,8 +733,11 @@ esp_inb_pkt_process(struct rte_ipsec_sa *sa, struct 
rte_mbuf *mb[],
uint16_t num, uint8_t sqh_len, esp_inb_process_t process)
 {
uint32_t k, n;
-   uint32_t sqn[num];
-   uint32_t dr[num];
+   uint32_t *sqn;
+   uint32_t *dr;
+
+   sqn = alloca(sizeof(uint32_t) * num);
+   dr = alloca(sizeof(uint32_t) * num);
 
/* process packets, extract seq numbers */
k = process(sa, mb, sqn, dr, num, sqh_len);
@@ -760,13 +772,24 @@ cpu_inb_pkt_prepare(const struct rte_ipsec_session *ss,
struct rte_ipsec_sa *sa;
struct replay_sqn *rsn;
union sym_op_data icv;
-   struct rte_crypto_va_iova_ptr iv[num];
-   struct rte_crypto_va_iova_ptr aad[num];
-   struct rte_crypto_va_iova_ptr dgst[num];
-   uint32_t dr[num];
-   uint32_t l4ofs[num];
-   uint32_t clen[num];
-   uint64_t ivbuf[num][IPSEC_MAX_IV_QWORD];
+   struct rte_crypto_va_iova_ptr *iv;
+   struct rte_crypto_va_iova_ptr *aad;
+   struct rte_crypto_va_iova_ptr *dgst;
+   uint32_t *dr;
+   uint32_t *l4ofs;
+   uint32_t *clen;
+   uint64_t **ivbuf;
+
+   iv = alloca(sizeof(struct rte_crypto_va_iova_ptr) * num);
+   aad = alloca(sizeof(struct rte_crypto_va_iova_ptr) * num);
+   dgst = alloca(sizeof(struct rte_crypto_va_iova_ptr) * num);
+   dr = alloca(sizeof(uint32_t) * num);
+   l4ofs = alloca(sizeof(uint32_t) * num);
+   clen = alloca(sizeof(uint32_t) * num);
+
+   ivbuf = alloca(sizeof(uint64_t *) * num);
+   for (i = 0; i < num; i++)
+   ivbuf[i] = alloca(sizeof(uint64_t) * IPSEC_MAX_IV_QWORD);
 
sa = ss->sa;
 
diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c
index

[PATCH v3] dts: reform hello world test suite

[Dean Marx]

Add a test suite to replace hello_world which simply
starts and stops a testpmd session. The user can use
this as a confidence check to verify their configuration.

Signed-off-by: Dean Marx 
Reviewed-by: Paul Szczepanek 
---
 dts/tests/TestSuite_hello_world.py | 68 ++
 1 file changed, 12 insertions(+), 56 deletions(-)

diff --git a/dts/tests/TestSuite_hello_world.py 
b/dts/tests/TestSuite_hello_world.py
index 734f006026..75f168bc9f 100644
--- a/dts/tests/TestSuite_hello_world.py
+++ b/dts/tests/TestSuite_hello_world.py
@@ -1,71 +1,27 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2024 University of New Hampshire
 
-"""The DPDK hello world app test suite.
+"""DPDK Hello World test suite.
 
-Run the helloworld example app and verify it prints a message for each used 
core.
-No other EAL parameters apart from cores are used.
+Starts and stops a testpmd session to verify EAL parameters
+are properly configured.
 """
 
-from framework.remote_session.dpdk_shell import compute_eal_params
+from framework.remote_session.testpmd_shell import TestPmdShell
 from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import TopologyType, requires
-from framework.testbed_model.cpu import (
-LogicalCoreCount,
-LogicalCoreCountFilter,
-LogicalCoreList,
-)
 
 
-@requires(topology_type=TopologyType.no_link)
 class TestHelloWorld(TestSuite):
-"""DPDK hello world app test suite."""
-
-def set_up_suite(self) -> None:
-"""Set up the test suite.
-
-Setup:
-Build the app we're about to test - helloworld.
-"""
-self.app_helloworld_path = self.sut_node.build_dpdk_app("helloworld")
-
-@func_test
-def hello_world_single_core(self) -> None:
-"""Single core test case.
-
-Steps:
-Run the helloworld app on the first usable logical core.
-Verify:
-The app prints a message from the used core:
-"hello from core "
-"""
-# get the first usable core
-lcore_amount = LogicalCoreCount(1, 1, 1)
-lcores = LogicalCoreCountFilter(self.sut_node.lcores, 
lcore_amount).filter()
-eal_para = compute_eal_params(self.sut_node, 
lcore_filter_specifier=lcore_amount)
-result = self.sut_node.run_dpdk_app(self.app_helloworld_path, eal_para)
-self.verify(
-f"hello from core {int(lcores[0])}" in result.stdout,
-f"helloworld didn't start on lcore{lcores[0]}",
-)
+"""Hello World test suite. One test case, which starts and stops a testpmd 
session."""
 
 @func_test
-def hello_world_all_cores(self) -> None:
-"""All cores test case.
+def test_hello_world(self) -> None:
+"""EAL confidence test.
 
 Steps:
-Run the helloworld app on all usable logical cores.
+Start testpmd session and check status.
 Verify:
-The app prints a message from all used cores:
-"hello from core "
+The testpmd session throws no errors.
 """
-# get the maximum logical core number
-eal_para = compute_eal_params(
-self.sut_node, 
lcore_filter_specifier=LogicalCoreList(self.sut_node.lcores)
-)
-result = self.sut_node.run_dpdk_app(self.app_helloworld_path, 
eal_para, 50)
-for lcore in self.sut_node.lcores:
-self.verify(
-f"hello from core {int(lcore)}" in result.stdout,
-f"helloworld didn't start on lcore{lcore}",
-)
+with TestPmdShell(node=self.sut_node) as testpmd:
+testpmd.start()
-- 
2.44.0

Re: [PATCH] net/af_packet: allow disabling packet fanout

[Tudor Cornea]

> This is a great idea. Would introducing a new devarg, (e.g
> 'fanout_mode') be the proper way to allow the application to customize
> fanout in more detail ?
>
> --vdev=net_af_packet0,iface=eth1,blocksz=4096,framesz=2048,framecnt=512,qpairs=1,fanout_mode=[fanout_hash|fanout_cpu|fanout_rnd|fanout_qm]

I'll send a new version of the patch which will add some additional
customization

RE: [PATCH v16 1/4] lib: add generic support for reading PMU events

[Tomasz Duszynski]

>> Add support for programming PMU counters and reading their values in
>> runtime bypassing kernel completely.
>>
>> This is especially useful in cases where CPU cores are isolated i.e
>> run dedicated tasks. In such cases one cannot use standard perf
>> utility without sacrificing latency and performance.
>>
>> Signed-off-by: Tomasz Duszynski 
>> ---
>
>Acked-by: Konstantin Ananyev 
>
>As future possible enhancements - I think it would be useful to make control-
>path API MT safe, plus probably try to hide some of the exposed internal
>structures (rte_pmu_event_group, etc.) inside .c (to minimize surface for
>possible ABI breakage).
>

Thanks. Yes sure, that series is not one time-addition. It will be improved 
over time. 

>> --
>> 2.34.1

[DPDK/ethdev Bug 1611] net/af_xdp, numa_node and socket_id is assigned incorrectly for numa scenario

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1611

Bug ID: 1611
   Summary: net/af_xdp, numa_node and socket_id is assigned
incorrectly for numa scenario
   Product: DPDK
   Version: 22.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: xiaohua.w...@ericsson.com
  Target Milestone: ---

1. in rte_pmd_af_xdp_probe() function, can't assign device.numa_node with
current socket id. Since the CPU core socket to start app can be different to
virtual xdp/device socket to attach. 
===code in rte_eth_af_xdp.c===
if (dev->device.numa_node == SOCKET_ID_ANY)
dev->device.numa_node = rte_socket_id();
===code in rte_eth_af_xdp.c===

Same issue for rte_pmd_af_xdp_remove() and eth_dev_close().

2. For xdp_umem_configure() in xsk_configure(), also can't allocate umem at CPU
core socket which get from during eth_rx_queue_setup() phase. Because it will
probably be different to socket which "umem" wants to attach port device
belongs to.
===code in rte_eth_af_xdp.c===
umem = rte_zmalloc_socket("umem", sizeof(*umem), 0, rte_socket_id());
if (umem == NULL) {
AF_XDP_LOG(ERR, "Failed to allocate umem info\n");
return NULL;
}

snprintf(ring_name, sizeof(ring_name), "af_xdp_ring_%s_%u",
   internals->if_name, rxq->xsk_queue_idx);
umem->buf_ring = rte_ring_create(ring_name,
 ETH_AF_XDP_NUM_BUFFERS,
 rte_socket_id(),
 0x0);
===code in rte_eth_af_xdp.c===

-- 
You are receiving this mail because:
You are the assignee for the bug.

Re: [PATCH 1/2] drivers/common: remove unused variables and add MSVC compiler flag

[Bruce Richardson]

On Thu, Dec 26, 2024 at 10:41:43AM -0800, Andre Muezerie wrote:
> Removed unused variables and added MSVC specific compiler flag to
> ignore warnings about unused variables, like is being done for
> other compilers.
> 
> Signed-off-by: Andre Muezerie 
> ---
>  drivers/common/idpf/base/meson.build   | 13 ++---
>  drivers/common/idpf/idpf_common_rxtx.c |  2 --
>  drivers/common/idpf/idpf_common_virtchnl.c |  4 ++--
>  drivers/common/sfc_efx/base/efx_mae.c  |  2 +-
>  drivers/common/sfc_efx/base/efx_table.c|  1 -
>  drivers/common/sfc_efx/base/meson.build| 20 +---
>  6 files changed, 26 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/common/idpf/base/meson.build 
> b/drivers/common/idpf/base/meson.build
> index f30ec7dfc2..c069507f12 100644
> --- a/drivers/common/idpf/base/meson.build
> +++ b/drivers/common/idpf/base/meson.build
> @@ -6,9 +6,16 @@ sources += files(
>  'idpf_controlq_setup.c',
>  )
>  
> -error_cflags = [
> -'-Wno-unused-variable',
> -]
> +if is_ms_compiler
> +error_cflags = [
> +'/wd4101', # unreferenced local variable
> +]

Just an idea here, since I see this same flag with the same constant
appearing multiple times in the patches: Would it be worthwhile defining
these MSVC flags as global strings in meson e.g. in a file in the "config"
directory. That would then allow them to put in the flags array using
meaningful names, and avoid the need for putting in the same comment each
time.

if is_ms_compiler
error_cflags = [
msvc_no_unref_local_var
]

If we want to take this a step further, we could define all common error
flags across all compilers this way, so that we avoid the need for
conditional in each individual meson.build file - we just define the names
of the errors we want and let the string replacement handle the conversion
to the appropriate compiler flag. The names could be, for example, the
gcc/clang error names without the "-W" bit. If no MSVC equivalent they
could be empty strings in those builds.

WDYT?

/Bruce

Re: [PATCH] drivers_net: use 64-bit shift and avoid signed/unsigned mismatch

[Bruce Richardson]

On Thu, Dec 26, 2024 at 12:59:30PM -0800, Andre Muezerie wrote:
> This patch avoids warnings like the ones below emitted by MSVC:
> 
> 1)
> ../drivers/net/ice/base/ice_flg_rd.c(71): warning C4334: '<<':
> result of 32-bit shift implicitly converted to 64 bits
> (was 64-bit shift intended?)
> 
> 2)
> ../drivers/net/ice/ice_dcf_sched.c(177): warning C4018: '>=':
> signed/unsigned mismatch
> 
> The fix for (1) is to use 64-bit shifting when appropriate
> (according to what the result is used for).
> 
> The fix for (2) is to explicitly cast the variables used in the
> comparison.
> 
> Signed-off-by: Andre Muezerie 
> ---
>  drivers/net/i40e/i40e_ethdev.c   | 22 +++---
>  drivers/net/iavf/iavf_ethdev.c   |  2 +-
>  drivers/net/iavf/iavf_rxtx.c |  2 +-
>  drivers/net/iavf/iavf_vchnl.c|  2 +-
>  drivers/net/ice/base/ice_flg_rd.c|  4 ++--
>  drivers/net/ice/base/ice_parser_rt.c | 16 
>  drivers/net/ice/base/ice_xlt_kb.c|  2 +-
>  drivers/net/ice/ice_dcf_sched.c  |  2 +-
>  drivers/net/ice/ice_ethdev.c |  4 ++--
>  drivers/net/ice/ice_rxtx.c   |  2 +-
>  drivers/net/ixgbe/ixgbe_ethdev.c |  2 +-

Most of these changes to the intel drivers look fine to me. However, for
the base code files, we try to avoid modifying those as they come from a
common, shared internal source which we regularly sync with. Therefore, for
the 3 base files, can the errors/warning be suppressed instead?

Regards,
/Bruce

Re: [PATCH v11 0/3] add diagnostics macros to make code portable

[Bruce Richardson]

On Fri, Jan 03, 2025 at 01:26:34PM -0800, Andre Muezerie wrote:
> On Fri, Jan 03, 2025 at 11:24:02AM -0800, Stephen Hemminger wrote:
> > On Fri,  3 Jan 2025 07:36:48 -0800
> > Andre Muezerie  wrote:
> > 
> > > From: Andre Muezerie 
> > > To: andre...@linux.microsoft.com
> > > Cc: dev@dpdk.org,  step...@networkplumber.org
> > > Subject: [PATCH v11 0/3] add diagnostics macros to make code portable
> > > Date: Fri,  3 Jan 2025 07:36:48 -0800
> > > X-Mailer: git-send-email 1.8.3.1
> > > 
> > > It was a common pattern to have "GCC diagnostic ignored" pragmas
> > > sprinkled over the code and only activate these pragmas for certain
> > > compilers (gcc and clang). Clang supports GCC's pragma for
> > > compatibility with existing source code, so #pragma GCC diagnostic
> > > and #pragma clang diagnostic are synonyms for Clang
> > > (https://clang.llvm.org/docs/UsersManual.html).
> > > 
> > > Now that effort is being made to make the code compatible with MSVC
> > > these expressions would become more complex. It makes sense to hide
> > > this complexity behind macros. This makes maintenance easier as these
> > > macros are defined in a single place. As a plus the code becomes
> > > more readable as well.
> > 
> > Since 90% of these cases are about removing const from a pointer,
> > maybe it would be better to have a macro that did that?
> > 
> > Would not work for base driver code which is pretending to be platform 
> > independent.
> 
> Most of the warnings I've seen were about dropping the volatile qualifier, 
> like the one below:
> 
> ../drivers/net/i40e/i40e_rxtx_vec_sse.c:42:32: warning: cast from 'volatile 
> struct i40e_32byte_rx_desc::(unnamed at 
> ../drivers/net/i40e/base/i40e_type.h:803:2) *' to 
> '__attribute__((__vector_size__(2 * sizeof(long long long long *' drops 
> volatile qualifier [-Wcast-qual]
>42 | _mm_store_si128((__m128i 
> *)&rxdp[i].read,
>   |^
> 
> To make sure I understood your suggestion correctly, you're proposing to 
> replace this
> 
> __rte_diagnostic_push
> __rte_diagnostic_ignored_wcast_qual
>   _mm_store_si128((__m128i *)&rxdp[i].read, dma_addr0);
> __rte_diagnostic_pop
> 
> 
> with something like this?
> 
>   _mm_store_si128(RTE_IGNORE_CAST_QUAL((__m128i *)&rxdp[i].read), 
> dma_addr0);
> 
> This could be done, and I think it does look better, despite the slight line 
> length increase.

+1 for this option. One macro can be used to drop all qualifiers, both
const and volatile, right?

Re: [PATCH v2 2/5] lib/eal: add portable version of __builtin_add_overflow

[Bruce Richardson]

On Fri, Jan 03, 2025 at 12:39:38PM -0800, Andre Muezerie wrote:
> __builtin_add_overflow is gcc specific. There's a need for a portable
> version that can also be used with other compilers.
> 
> This patch introduces rte_add_overflow.
> 
> Signed-off-by: Andre Muezerie 
> ---
>  lib/eal/include/meson.build |  1 +
>  lib/eal/include/rte_math.h  | 46 +
>  2 files changed, 47 insertions(+)
>  create mode 100644 lib/eal/include/rte_math.h
> 
> diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
> index d903577caa..041a4105b5 100644
> --- a/lib/eal/include/meson.build
> +++ b/lib/eal/include/meson.build
> @@ -31,6 +31,7 @@ headers += files(
>  'rte_lcore_var.h',
>  'rte_lock_annotations.h',
>  'rte_malloc.h',
> +'rte_math.h',
>  'rte_mcslock.h',
>  'rte_memory.h',
>  'rte_memzone.h',
> diff --git a/lib/eal/include/rte_math.h b/lib/eal/include/rte_math.h
> new file mode 100644
> index 00..2f4581f81b
> --- /dev/null
> +++ b/lib/eal/include/rte_math.h
> @@ -0,0 +1,46 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2025 Microsoft Corporation
> + */
> +
> +#ifndef _RTE_MATH_H_
> +#define _RTE_MATH_H_
> +
> +/**
> + * @file
> + *
> + * Math function definitions for DPDK.
> + */
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +/*
> + * Function that allows performing simple arithmetic operations together with
> + * checking whether the operation overflowed.
> + * Example of usage:
> + * uint8_t overflow;
> + * uint16_t a, b, result;
> + * a = 1;
> + * b = 2;
> + * overflow = rte_add_overflow(a, b, &result);
> + */
> +#ifdef RTE_TOOLCHAIN_MSVC
> +#define rte_add_overflow(a, b, res) _Generic((a), \
> + uint8_t : _addcarry_u8, \
> + uint16_t : _addcarry_u16, \
> + uint32_t : _addcarry_u32, \
> + uint64_t : _addcarry_u64)(0, a, b, res)
> +#else
> +#define rte_add_overflow(a, b, res) _Generic((a), \
> + uint8_t : __builtin_add_overflow, \
> + uint16_t : __builtin_add_overflow, \
> + uint32_t : __builtin_add_overflow, \
> + uint64_t : __builtin_add_overflow)(a, b, res)
> +#endif

For the gcc version, can you just simplify to the one-line below?

#define rte_add_overflow __builtin_add_overflow

/Bruce

Re: [PATCH] doc: install guides and api docs to different directories

[Bruce Richardson]

On Mon, Dec 23, 2024 at 03:38:40PM +, luca.bocca...@gmail.com wrote:
> From: Luca Boccassi 
> 
> Otherwise they both get installed to /usr/share/doc/dpdk/html/ and overwrite
> each other's files
> 
> Signed-off-by: Luca Boccassi 
> ---
>  doc/api/meson.build| 2 +-
>  doc/guides/meson.build | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 

Acked-by: Bruce Richardson 

Re: [PATCH] doc: add install_tag to meson

[Bruce Richardson]

On Mon, Dec 23, 2024 at 01:21:13PM +, luca.bocca...@gmail.com wrote:
> From: "bl...@debian.org" 
> 
> This allows building and installing only the documentation, without
> recompiling the whole project, using:
> 
> meson build -Denable_docs=true
> meson compile -C build doc
> meson install -C build --no-rebuild --tags doc
> 
> In Debian/Ubuntu the documentation is built separately from the binaries,
> in a separate architecture-independent build job, so that it has to be
> done only once, instead of once per supported architecture.
> 
> Signed-off-by: Luca Boccassi 
> ---
> This requires meson 0.60, so there's a warning printed as the minimum
> defined is 0.57, but it's harmless, and the feature is only used when
> explicitly invoked with --tags, which simply has to be done with newer
> meson versions. If install --tags is not used, then there's no issue.
> 
>  doc/api/meson.build| 3 +++
>  doc/guides/meson.build | 1 +
>  2 files changed, 4 insertions(+)
> 
Acked-by: Bruce Richardson 

RE: [PATCH v2 2/5] lib/eal: add portable version of __builtin_add_overflow

[Morten Brørup]

> From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> Sent: Monday, 6 January 2025 12.07
> 
> On Fri, Jan 03, 2025 at 12:39:38PM -0800, Andre Muezerie wrote:
> > __builtin_add_overflow is gcc specific. There's a need for a portable
> > version that can also be used with other compilers.
> >
> > This patch introduces rte_add_overflow.
> >
> > +/*
> > + * Function that allows performing simple arithmetic operations
> together with
> > + * checking whether the operation overflowed.
> > + * Example of usage:
> > + * uint8_t overflow;
> > + * uint16_t a, b, result;
> > + * a = 1;
> > + * b = 2;
> > + * overflow = rte_add_overflow(a, b, &result);
> > + */
> > +#ifdef RTE_TOOLCHAIN_MSVC
> > +#define rte_add_overflow(a, b, res) _Generic((a), \
> > +   uint8_t : _addcarry_u8, \
> > +   uint16_t : _addcarry_u16, \
> > +   uint32_t : _addcarry_u32, \
> > +   uint64_t : _addcarry_u64)(0, a, b, res)
> > +#else
> > +#define rte_add_overflow(a, b, res) _Generic((a), \
> > +   uint8_t : __builtin_add_overflow, \
> > +   uint16_t : __builtin_add_overflow, \
> > +   uint32_t : __builtin_add_overflow, \
> > +   uint64_t : __builtin_add_overflow)(a, b, res)
> > +#endif
> 
> For the gcc version, can you just simplify to the one-line below?
> 
> #define rte_add_overflow __builtin_add_overflow

Yes, but then GCC compilation would not fail if "a" has some other type than 
the four types explicitly supported.
I prefer keeping the method used this v2 patch.