The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=fba8d61550edb8d158398db23e1610aa62e5cd55

commit fba8d61550edb8d158398db23e1610aa62e5cd55
Author:     Vag Singh <[email protected]>
AuthorDate: 2025-08-14 06:44:55 +0000
Commit:     Konstantin Belousov <[email protected]>
CommitDate: 2026-09-16 14:12:09 +0000

    IB/mlx5: Expose multi-packet RQ capabilities
    
    [PATCH 21/31] FreeBSD OFED support for DPDK MLX5 PMD
    
    a) This patch reports the device's striding RQ capabilities to
    the user-space:
    - min/max_single_stride_log_num_of_bytes: Log of min/max number of
    bytes in a single stride.
    - min/max_single_wqe_log_num_of_strides: Log of min/max number of
    strides in a single WQE.
    - supported_qpts: A bit mask to know which QP types support multi-
    packet RQ, for now only Raw Packet QPs.
    
    b) Allow creation of a multi-packet receive queue.
    In order to create a multi-packet RQ, the following fields in
    the mlx5_ib_rwq should be set:
    - log_num_strides: Log of number of strides per WQE
    - single_stride_log_num_of_bytes: Log of a single stride size
    - two_byte_shift_en: When enabled, hardware pads 2 bytes of zeros
    before writing the message to memory (e.g. for the IP alignment).
    
    Differential revision:  https://reviews.freebsd.org/D32195
    MFC after:      1 month
---
 sys/dev/mlx5/mlx5_ib/mlx5_ib.h        | 13 +++++++++++
 sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c   | 16 +++++++++++++
 sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c     | 44 ++++++++++++++++++++++++++++-------
 sys/dev/mlx5/mlx5_ifc.h               |  3 +--
 sys/ofed/include/uapi/rdma/mlx5-abi.h | 21 ++++++++++++++++-
 5 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
index b869fcb96d49..7deb7e1fcbab 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
@@ -231,6 +231,10 @@ struct wr_list {
        u16     next;
 };
 
+enum mlx5_ib_wq_flags {
+       MLX5_IB_WQ_FLAGS_STRIDING_RQ = 0x2,
+};
+
 enum mlx5_ib_rq_flags {
        MLX5_IB_RQ_CVLAN_STRIPPING  = 1 << 0,
 };
@@ -257,6 +261,11 @@ struct mlx5_ib_wq {
        void                   *qend;
 };
 
+#define MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES 9
+#define MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES 16
+#define MLX5_MIN_SINGLE_STRIDE_LOG_NUM_BYTES 6
+#define MLX5_MAX_SINGLE_STRIDE_LOG_NUM_BYTES 13
+
 struct mlx5_ib_rwq {
        struct ib_wq            ibwq;
        struct mlx5_core_qp     core_qp;
@@ -265,6 +274,9 @@ struct mlx5_ib_rwq {
        u32                     log_rq_size;
        u32                     rq_page_offset;
        u32                     log_page_size;
+       u32                     log_num_strides;
+       u32                     two_byte_shift_en;
+       u32                     single_stride_log_num_of_bytes;
        struct ib_umem          *umem;
        size_t                  buf_size;
        unsigned int            page_shift;
@@ -274,6 +286,7 @@ struct mlx5_ib_rwq {
        u32                     wqe_count;
        u32                     wqe_shift;
        int                     wq_sig;
+       u32                     create_flags; /* Use enum mlx5_ib_wq_flags */
 };
 
 enum {
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c 
b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
index 48ce8a00b66f..8cb7c0bf22d2 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
@@ -905,6 +905,22 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
                }
        }
 
+       if (field_avail(typeof(resp), striding_rq_caps, uhw->outlen)) {
+               resp.response_length += sizeof(resp.striding_rq_caps);
+               if (MLX5_CAP_GEN(mdev, striding_rq)) {
+                       
resp.striding_rq_caps.min_single_stride_log_num_of_bytes =
+                               MLX5_MIN_SINGLE_STRIDE_LOG_NUM_BYTES;
+                       
resp.striding_rq_caps.max_single_stride_log_num_of_bytes =
+                               MLX5_MAX_SINGLE_STRIDE_LOG_NUM_BYTES;
+                       resp.striding_rq_caps.min_single_wqe_log_num_of_strides 
=
+                               MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES;
+                       resp.striding_rq_caps.max_single_wqe_log_num_of_strides 
=
+                               MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES;
+                       resp.striding_rq_caps.supported_qpts =
+                               BIT(IB_QPT_RAW_PACKET);
+               }
+       }
+
        if (uhw->outlen) {
                err = ib_copy_to_udata(uhw, &resp, resp.response_length);
 
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c 
b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
index 10f06e710ead..6d504471994c 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
@@ -4736,7 +4736,9 @@ static int  create_rq(struct mlx5_ib_rwq *rwq, struct 
ib_pd *pd,
        MLX5_SET(rqc,  rqc, state, MLX5_RQC_STATE_RST);
        MLX5_SET(rqc,  rqc, flush_in_error_en, 1);
        wq = MLX5_ADDR_OF(rqc, rqc, wq);
-       MLX5_SET(wq, wq, wq_type, MLX5_WQ_TYPE_CYCLIC);
+       MLX5_SET(wq, wq, wq_type,
+                rwq->create_flags & MLX5_IB_WQ_FLAGS_STRIDING_RQ ?
+                MLX5_WQ_TYPE_CYCLIC_STRIDING_RQ : MLX5_WQ_TYPE_CYCLIC);
        MLX5_SET(wq, wq, end_padding_mode, MLX5_WQ_END_PAD_MODE_ALIGN);
        MLX5_SET(wq, wq, log_wq_stride, rwq->log_rq_stride);
        MLX5_SET(wq, wq, log_wq_sz, rwq->log_rq_size);
@@ -4801,7 +4803,8 @@ static int prepare_user_rq(struct ib_pd *pd,
        int err;
        size_t required_cmd_sz;
 
-       required_cmd_sz = offsetof(typeof(ucmd), reserved) + 
sizeof(ucmd.reserved);
+       required_cmd_sz = offsetof(typeof(ucmd), single_stride_log_num_of_bytes)
+                         + sizeof(ucmd.single_stride_log_num_of_bytes);
        if (udata->inlen < required_cmd_sz) {
                mlx5_ib_dbg(dev, "invalid inlen\n");
                return -EINVAL;
@@ -4819,14 +4822,39 @@ static int prepare_user_rq(struct ib_pd *pd,
                return -EFAULT;
        }
 
-       if (ucmd.comp_mask) {
+       if (ucmd.comp_mask & (~MLX5_IB_CREATE_WQ_STRIDING_RQ)) {
                mlx5_ib_dbg(dev, "invalid comp mask\n");
                return -EOPNOTSUPP;
-       }
-
-       if (ucmd.reserved) {
-               mlx5_ib_dbg(dev, "invalid reserved\n");
-               return -EOPNOTSUPP;
+       } else if (ucmd.comp_mask & MLX5_IB_CREATE_WQ_STRIDING_RQ) {
+               if (!MLX5_CAP_GEN(dev->mdev, striding_rq)) {
+                       mlx5_ib_dbg(dev, "Striding RQ is not supported\n");
+                       return -EOPNOTSUPP;
+               }
+               if ((ucmd.single_stride_log_num_of_bytes <
+                   MLX5_MIN_SINGLE_STRIDE_LOG_NUM_BYTES) ||
+                   (ucmd.single_stride_log_num_of_bytes >
+                    MLX5_MAX_SINGLE_STRIDE_LOG_NUM_BYTES)) {
+                       mlx5_ib_dbg(dev, "Invalid log stride size (%u. Range is 
%u - %u)\n",
+                                   ucmd.single_stride_log_num_of_bytes,
+                                   MLX5_MIN_SINGLE_STRIDE_LOG_NUM_BYTES,
+                                   MLX5_MAX_SINGLE_STRIDE_LOG_NUM_BYTES);
+                       return -EINVAL;
+               }
+               if ((ucmd.single_wqe_log_num_of_strides >
+                   MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES) ||
+                    (ucmd.single_wqe_log_num_of_strides <
+                       MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES)) {
+                       mlx5_ib_dbg(dev, "Invalid log num strides (%u. Range is 
%u - %u)\n",
+                                   ucmd.single_wqe_log_num_of_strides,
+                                   MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES,
+                                   MLX5_MAX_SINGLE_WQE_LOG_NUM_STRIDES);
+                       return -EINVAL;
+               }
+               rwq->single_stride_log_num_of_bytes =
+                       ucmd.single_stride_log_num_of_bytes;
+               rwq->log_num_strides = ucmd.single_wqe_log_num_of_strides;
+               rwq->two_byte_shift_en = !!ucmd.two_byte_shift_en;
+               rwq->create_flags |= MLX5_IB_WQ_FLAGS_STRIDING_RQ;
        }
 
        err = set_user_rq_size(dev, init_attr, &ucmd, rwq);
diff --git a/sys/dev/mlx5/mlx5_ifc.h b/sys/dev/mlx5/mlx5_ifc.h
index a42fd920dc6c..a82d8543902d 100644
--- a/sys/dev/mlx5/mlx5_ifc.h
+++ b/sys/dev/mlx5/mlx5_ifc.h
@@ -1765,8 +1765,7 @@ struct mlx5_ifc_tls_capabilities_bits {
 enum {
        MLX5_WQ_TYPE_LINKED_LIST                 = 0x0,
        MLX5_WQ_TYPE_CYCLIC                      = 0x1,
-       MLX5_WQ_TYPE_STRQ_LINKED_LIST            = 0x2,
-       MLX5_WQ_TYPE_STRQ_CYCLIC                 = 0x3,
+       MLX5_WQ_TYPE_CYCLIC_STRIDING_RQ          = 0x3,
 };
 
 enum rq_type {
diff --git a/sys/ofed/include/uapi/rdma/mlx5-abi.h 
b/sys/ofed/include/uapi/rdma/mlx5-abi.h
index 2e474f5c2d76..fbd4ce8d86b0 100644
--- a/sys/ofed/include/uapi/rdma/mlx5-abi.h
+++ b/sys/ofed/include/uapi/rdma/mlx5-abi.h
@@ -184,6 +184,18 @@ struct mlx5_ib_sw_parsing_caps {
        __u32 supported_qpts;
 };
 
+struct mlx5_ib_striding_rq_caps {
+       __u32 min_single_stride_log_num_of_bytes;
+       __u32 max_single_stride_log_num_of_bytes;
+       __u32 min_single_wqe_log_num_of_strides;
+       __u32 max_single_wqe_log_num_of_strides;
+
+       /* Corresponding bit will be set if qp type from
+        * 'enum ib_qp_type' is supported, e.g.
+        * supported_qpts |= 1 << IB_QPT_RAW_PACKET
+        */
+       __u32 supported_qpts;
+};
 
 struct mlx5_ib_query_device_resp {
        __u32   comp_mask;
@@ -195,6 +207,7 @@ struct mlx5_ib_query_device_resp {
        __u32   mlx5_ib_support_multi_pkt_send_wqes;
        __u32   reserved;
        struct  mlx5_ib_sw_parsing_caps sw_parsing_caps;
+       struct  mlx5_ib_striding_rq_caps striding_rq_caps;
 };
 
 enum mlx5_ib_create_cq_flags {
@@ -297,6 +310,10 @@ struct mlx5_ib_alloc_mw {
        __u16   reserved2;
 };
 
+enum mlx5_ib_create_wq_mask {
+       MLX5_IB_CREATE_WQ_STRIDING_RQ   = (1 << 0),
+};
+
 struct mlx5_ib_create_wq {
        __u64   buf_addr;
        __u64   db_addr;
@@ -305,7 +322,9 @@ struct mlx5_ib_create_wq {
        __u32   user_index;
        __u32   flags;
        __u32   comp_mask;
-       __u32   reserved;
+       __u32   single_stride_log_num_of_bytes;
+       __u32   single_wqe_log_num_of_strides;
+       __u32   two_byte_shift_en;
 };
 
 struct mlx5_ib_create_ah_resp {

Reply via email to