mlx5: some fixes
cover mlx5: some fixes
Backport some fixes to 20.11.5
The upstream commits:
10599cf83e common/mlx5: add minimum WQE size for striding RQ 8928997a13 common/mlx5: fix error handling in multi-class probe 147f6fb42b net/mlx5: fix memory socket selection in ASO management 34776af600 net/mlx5: fix MPRQ stride devargs adjustment 0947ed380f net/mlx5: improve stride parameter names
The following commit [1] sent by Alexander Kozyrev fixes one of them [2], so I integrated it inside.
[1] 728b6447e7 net/mlx5: fix MPRQ WQE size assertion
[2] 34776af600 net/mlx5: fix MPRQ stride devargs adjustment
Michael Baum (5):
common/mlx5: add minimum WQE size for striding RQ net/mlx5: improve stride parameter names net/mlx5: fix MPRQ stride devargs adjustment net/mlx5: fix memory socket selection in ASO management common/mlx5: fix error handling in multi-class probe
drivers/common/mlx5/mlx5_common_pci.c | 7 +- drivers/common/mlx5/mlx5_devx_cmds.c | 28 +++ drivers/common/mlx5/mlx5_devx_cmds.h | 1 + drivers/common/mlx5/mlx5_prm.h | 38 +++- drivers/net/mlx5/linux/mlx5_os.c | 48 ++--- drivers/net/mlx5/linux/mlx5_verbs.c | 4 +- drivers/net/mlx5/mlx5.c | 4 +- drivers/net/mlx5/mlx5.h | 12 +- drivers/net/mlx5/mlx5_defs.h | 4 +- drivers/net/mlx5/mlx5_devx.c | 4 +- drivers/net/mlx5/mlx5_flow_age.c | 27 ++- drivers/net/mlx5/mlx5_rxq.c | 249 +++++++++++++++++--------- drivers/net/mlx5/mlx5_rxtx.c | 22 +-- drivers/net/mlx5/mlx5_rxtx.h | 10 +- drivers/net/mlx5/mlx5_rxtx_vec.c | 8 +- 15 files changed, 290 insertions(+), 176 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 common/mlx5: add minimum WQE size for striding RQ
[ upstream commit 10599cf83ebe768fe5ebe3e430c2a3c4250aafca ]
Some devices have a WQE size limit for striding RQ. On some newer devices, this limitation is smaller and information on its size is provided by the firmware.
This patch adds the attribute query from firmware: the minimum required size of WQE buffer for striding RQ in granularity of Bytes.
Signed-off-by Michael Baum <[email protected]>
Acked-by Matan Azrad <[email protected]>
--- drivers/common/mlx5/mlx5_devx_cmds.c | 28 ++++++++++++++++++++ drivers/common/mlx5/mlx5_devx_cmds.h | 1 + drivers/common/mlx5/mlx5_prm.h | 38 +++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletion(-)
drivers/common/mlx5/mlx5_devx_cmds.c +28 -0
@@ -653,6 +653,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,uint32_t out[MLX5_ST_SZ_DW (query_hca_cap_out)] = {0 };void *hcattr;int status, syndrome, rc, i; +bool hca_cap_2_sup;MLX5_SET (query_hca_cap_in, in, opcode,MLX5_CMD_OP_QUERY_HCA_CAP ); MLX5_SET(query_hca_cap_in, in, op_mod,
@@ -672,6 +673,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,return -1 ; } hcattr =MLX5_ADDR_OF (query_hca_cap_out, out, capability); + hca_cap_2_sup =MLX5_GET (cmd_hca_cap, hcattr, hca_cap_2); attr->flow_counter_bulk_alloc_bitmap =MLX5_GET (cmd_hca_cap, hcattr, flow_counter_bulk_alloc); attr->flow_counters_dump = MLX5_GET(cmd_hca_cap, hcattr,
@@ -733,6 +735,32 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, mini_cqe_resp_flow_tag); attr->mini_cqe_resp_l3_l4_tag =MLX5_GET (cmd_hca_cap, hcattr, mini_cqe_resp_l3_l4_tag); +if (hca_cap_2_sup) { +memset (in,0 ,sizeof (in)); +memset (out,0 ,sizeof (out)); +MLX5_SET (query_hca_cap_in, in, opcode, +MLX5_CMD_OP_QUERY_HCA_CAP ); +MLX5_SET (query_hca_cap_in, in, op_mod, +MLX5_GET_HCA_CAP_OP_MOD_GENERAL_DEVICE_2 | +MLX5_HCA_CAP_OPMOD_GET_CUR ); + rc = mlx5_glue->devx_general_cmd (ctx, in,sizeof (in), + out,sizeof (out)); +if (rc) + goto error; + status =MLX5_GET (query_hca_cap_out, out, status); + syndrome =MLX5_GET (query_hca_cap_out, out, syndrome); +if (status) { +DRV_LOG (DEBUG , +"Failed to query DevX HCA capabilities 2," +" status %x, syndrome = %x" , status, syndrome); +return -1 ; + } + hcattr =MLX5_ADDR_OF (query_hca_cap_out, out, capability); + attr->log_min_stride_wqe_sz =MLX5_GET (cmd_hca_cap_2, hcattr, + log_min_stride_wqe_sz); + } +if (attr->log_min_stride_wqe_sz ==0 ) + attr->log_min_stride_wqe_sz =MLX5_MPRQ_LOG_MIN_STRIDE_WQE_SIZE ;if (attr->qos.sup) { MLX5_SET(query_hca_cap_in, in, op_mod, MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP |
drivers/common/mlx5/mlx5_devx_cmds.h +1 -0
@@ -79,6 +79,7 @@ struct mlx5_hca_attr { uint32_t eswitch_manager:1; uint32_t flow_counters_dump:1; uint32_t log_max_rqt_size:5; + uint32_t log_min_stride_wqe_sz:5; uint32_t parse_graph_flex_node:1;uint8_t flow_counter_bulk_alloc_bitmap; uint32_t eth_net_offloads:1;
drivers/common/mlx5/mlx5_prm.h +37 -1
@@ -264,6 +264,9 @@/* The maximum log value of segments per RQ WQE. */ #define MLX5_MAX_LOG_RQ_SEGS 5u +/* Log 2 of the default size of a WQE for Multi-Packet RQ. */ +#define MLX5_MPRQ_LOG_MIN_STRIDE_WQE_SIZE 14U +/* The alignment needed for WQ buffer. */ #define MLX5_WQE_BUF_ALIGNMENT rte_mem_page_size()
@@ -1059,6 +1062,7 @@ enum {MLX5_GET_HCA_CAP_OP_MOD_ROCE =0x4 <<1 ,MLX5_GET_HCA_CAP_OP_MOD_NIC_FLOW_TABLE =0x7 <<1 ,MLX5_GET_HCA_CAP_OP_MOD_VDPA_EMULATION =0x13 <<1 , + MLX5_GET_HCA_CAP_OP_MOD_GENERAL_DEVICE_2 = 0x20 << 1, };#define MLX5_GENERAL_OBJ_TYPES_CAP_VIRTQ_NET_Q \
@@ -1119,7 +1123,9 @@ enum {#define MLX5_HCA_FLEX_ICMPV6_ENABLED (1UL << 9)struct mlx5_ifc_cmd_hca_cap_bits { -u8 reserved_at_0[0x30 ]; +u8 reserved_at_0[0x20 ]; +u8 hca_cap_2[0x1 ]; +u8 reserved_at_21[0xf ];u8 vhca_id[0x10 ];u8 reserved_at_40[0x40 ];u8 log_max_srq_sz[0x8 ];
@@ -1572,8 +1578,38 @@ struct mlx5_ifc_flow_table_nic_cap_bits {struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties; }; +/* +* HCA Capabilities 2 +*/ +struct mlx5_ifc_cmd_hca_cap_2_bits { +u8 reserved_at_0[0x80 ];/* End of DW4. */ +u8 reserved_at_80[0x3 ]; +u8 max_num_prog_sample_field[0x5 ]; +u8 reserved_at_88[0x3 ]; +u8 log_max_num_reserved_qpn[0x5 ]; +u8 reserved_at_90[0x3 ]; +u8 log_reserved_qpn_granularity[0x5 ]; +u8 reserved_at_98[0x3 ]; +u8 log_reserved_qpn_max_alloc[0x5 ];/* End of DW5. */ +u8 max_reformat_insert_size[0x8 ]; +u8 max_reformat_insert_offset[0x8 ]; +u8 max_reformat_remove_size[0x8 ]; +u8 max_reformat_remove_offset[0x8 ];/* End of DW6. */ +u8 reserved_at_c0[0x3 ]; +u8 log_min_stride_wqe_sz[0x5 ]; +u8 reserved_at_c8[0x3 ]; +u8 log_conn_track_granularity[0x5 ]; +u8 reserved_at_d0[0x3 ]; +u8 log_conn_track_max_alloc[0x5 ]; +u8 reserved_at_d8[0x3 ]; +u8 log_max_conn_track_offload[0x5 ]; +u8 reserved_at_e0[0x20 ];/* End of DW7. */ +u8 reserved_at_100[0x700 ]; +}; +union mlx5_ifc_hca_cap_union_bits {struct mlx5_ifc_cmd_hca_cap_bits cmd_hca_cap; +struct mlx5_ifc_cmd_hca_cap_2_bits cmd_hca_cap_2;struct mlx5_ifc_per_protocol_networking_offload_caps_bits per_protocol_networking_offload_caps;struct mlx5_ifc_qos_cap_bits qos_cap;
Signature · 1 line
2.25.1
PATCH 2/5 net/mlx5: improve stride parameter names
In reply to Michael Baum[ upstream commit 0947ed380febad9d6f794b6f4e9aa9137860a06e ]
In the striding RQ management there are two important parameters, the size of the single stride in bytes and the number of strides.
Both the data-path structure and config structure keep the log of the above parameters. However, in their names there is no mention that the value is a log which may be misleading as if the fields represent the values themselves.
This patch updates their names describing the values more accurately.
Fixes ecb160456aed ("net/mlx5: add device parameter for MPRQ stride size")
Signed-off-by Michael Baum <[email protected]>
Acked-by Matan Azrad <[email protected]>
--- drivers/net/mlx5/linux/mlx5_os.c | 36 +++++----- drivers/net/mlx5/linux/mlx5_verbs.c | 4 +- drivers/net/mlx5/mlx5.c | 4 +- drivers/net/mlx5/mlx5.h | 8 +-- drivers/net/mlx5/mlx5_defs.h | 4 +- drivers/net/mlx5/mlx5_devx.c | 4 +- drivers/net/mlx5/mlx5_rxq.c | 104 +++++++++++++++------------- drivers/net/mlx5/mlx5_rxtx.c | 22 +++--- drivers/net/mlx5/mlx5_rxtx.h | 10 +-- drivers/net/mlx5/mlx5_rxtx_vec.c | 8 +-- 10 files changed, 105 insertions(+), 99 deletions(-)
drivers/net/mlx5/linux/mlx5_os.c +18 -18
@@ -1383,34 +1383,34 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,DRV_LOG (DEBUG ,"FCS stripping configuration is %ssupported" , (config->hw_fcs_strip ?"" :"not " ));if (config->mprq.enabled && mprq) { -if (config->mprq.stride_num_n && - (config->mprq.stride_num_n > mprq_max_stride_num_n || - config->mprq.stride_num_n < mprq_min_stride_num_n)) { - config->mprq.stride_num_n = -RTE_MIN (RTE_MAX (MLX5_MPRQ_STRIDE_NUM_N , - mprq_min_stride_num_n), - mprq_max_stride_num_n); +if (config->mprq.log_stride_num && + (config->mprq.log_stride_num > mprq_max_stride_num_n || + config->mprq.log_stride_num < mprq_min_stride_num_n)) { + config->mprq.log_stride_num = +RTE_MIN (RTE_MAX (MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM , + mprq_min_stride_num_n), + mprq_max_stride_num_n);DRV_LOG (WARNING ,"the number of strides" " for Multi-Packet RQ is out of range," " setting default value (%u)" , -1 << config->mprq.stride_num_n); +1 << config->mprq.log_stride_num); } -if (config->mprq.stride_size_n && - (config->mprq.stride_size_n > mprq_max_stride_size_n || - config->mprq.stride_size_n < mprq_min_stride_size_n)) { - config->mprq.stride_size_n = -RTE_MIN (RTE_MAX (MLX5_MPRQ_STRIDE_SIZE_N , - mprq_min_stride_size_n), - mprq_max_stride_size_n); +if (config->mprq.log_stride_size && + (config->mprq.log_stride_size > mprq_max_stride_size_n || + config->mprq.log_stride_size < mprq_min_stride_size_n)) { + config->mprq.log_stride_size = +RTE_MIN (RTE_MAX (MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE , + mprq_min_stride_size_n), + mprq_max_stride_size_n);DRV_LOG (WARNING ,"the size of a stride" " for Multi-Packet RQ is out of range," " setting default value (%u)" , -1 << config->mprq.stride_size_n); +1 << config->mprq.log_stride_size); } - config->mprq.min_stride_size_n = mprq_min_stride_size_n; - config->mprq.max_stride_size_n = mprq_max_stride_size_n; + config->mprq.log_min_stride_size = mprq_min_stride_size_n; + config->mprq.log_max_stride_size = mprq_max_stride_size_n; }else if (config->mprq.enabled && !mprq) {DRV_LOG (WARNING ,"Multi-Packet RQ isn't supported" ); config->mprq.enabled =0 ;
drivers/net/mlx5/linux/mlx5_verbs.c +2 -2
@@ -317,8 +317,8 @@ mlx5_rxq_ibv_wq_create(struct rte_eth_dev *dev, uint16_t idx) wq_attr.mlx5.comp_mask |=MLX5DV_WQ_INIT_ATTR_MASK_STRIDING_RQ ; *mprq_attr = (struct mlx5dv_striding_rq_init_attr ){ - .single_stride_log_num_of_bytes = rxq_data->strd_sz_n, - .single_wqe_log_num_of_strides = rxq_data->strd_num_n, + .single_stride_log_num_of_bytes = rxq_data->log_strd_sz, + .single_wqe_log_num_of_strides = rxq_data->log_strd_num, .two_byte_shift_en =MLX5_MPRQ_TWO_BYTE_SHIFT , }; }
drivers/net/mlx5/mlx5.c +2 -2
@@ -1645,9 +1645,9 @@ mlx5_args_check(const char *key, const char *val, void *opaque) }else if (strcmp (MLX5_RX_MPRQ_EN , key) ==0 ) { config->mprq.enabled = !!tmp; }else if (strcmp (MLX5_RX_MPRQ_LOG_STRIDE_NUM , key) ==0 ) { - config->mprq.stride_num_n = tmp; + config->mprq.log_stride_num = tmp; }else if (strcmp (MLX5_RX_MPRQ_LOG_STRIDE_SIZE , key) ==0 ) { - config->mprq.stride_size_n = tmp; + config->mprq.log_stride_size = tmp; }else if (strcmp (MLX5_RX_MPRQ_MAX_MEMCPY_LEN , key) ==0 ) { config->mprq.max_memcpy_len = tmp; }else if (strcmp (MLX5_RXQS_MIN_MPRQ , key) ==0 ) {
drivers/net/mlx5/mlx5.h +4 -4
@@ -228,10 +228,10 @@ struct mlx5_dev_config { unsigned int dv_miss_info:1; /* restore packet after partial hw miss */struct {unsigned int enabled:1 ;/* Whether MPRQ is enabled. */ -unsigned int stride_num_n;/* Number of strides. */ -unsigned int stride_size_n;/* Size of a stride. */ -unsigned int min_stride_size_n;/* Min size of a stride. */ -unsigned int max_stride_size_n;/* Max size of a stride. */ +unsigned int log_stride_num;/* Log number of strides. */ +unsigned int log_stride_size;/* Log size of a stride. */ +unsigned int log_min_stride_size;/* Log min size of a stride.*/ +unsigned int log_max_stride_size;/* Log max size of a stride.*/ unsigned int max_memcpy_len;/* Maximum packet size to memcpy Rx packets. */ unsigned int min_rxqs_num;
drivers/net/mlx5/mlx5_defs.h +2 -2
@@ -138,10 +138,10 @@#endif /* Log 2 of the default number of strides per WQE for Multi-Packet RQ. */ -#define MLX5_MPRQ_STRIDE_NUM_N 6U +#define MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM 6U/* Log 2 of the default size of a stride per WQE for Multi-Packet RQ. */ -#define MLX5_MPRQ_STRIDE_SIZE_N 11U +#define MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE 11U/* Two-byte shift is disabled for Multi-Packet RQ. */ #define MLX5_MPRQ_TWO_BYTE_SHIFT 0
drivers/net/mlx5/mlx5_devx.c +2 -2
@@ -348,11 +348,11 @@ mlx5_rxq_create_devx_rq_resources(struct rte_eth_dev *dev, uint16_t idx)* 512*2^single_wqe_log_num_of_strides. */ rq_attr.wq_attr.single_wqe_log_num_of_strides = - rxq_data->strd_num_n - + rxq_data->log_strd_num -MLX5_MIN_SINGLE_WQE_LOG_NUM_STRIDES ;/* Stride size = (2^single_stride_log_num_of_bytes)*64B. */ rq_attr.wq_attr.single_stride_log_num_of_bytes = - rxq_data->strd_sz_n - + rxq_data->log_strd_sz -MLX5_MIN_SINGLE_STRIDE_LOG_NUM_BYTES ; wqe_size =sizeof (struct mlx5_wqe_mprq ); }else {
drivers/net/mlx5/mlx5_rxq.c +55 -49
190 lines not on this page · raw message
drivers/net/mlx5/mlx5_rxtx.c +11 -11
@@ -465,7 +465,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)const unsigned int cqe_n = (1 << rxq->cqe_n);const unsigned int sges_n = (1 << rxq->sges_n);const unsigned int elts_n = (1 << rxq->elts_n); -const unsigned int strd_n = (1 << rxq->strd_num_n); +const unsigned int strd_n =RTE_BIT32 (rxq->log_strd_num);const unsigned int cqe_cnt = cqe_n -1 ;unsigned int cq_ci, used;
@@ -566,8 +566,8 @@ mlx5_rxq_info_get(struct rte_eth_dev *dev, uint16_t rx_queue_id, qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads; qinfo->scattered_rx = dev->data->scattered_rx; qinfo->nb_desc =mlx5_rxq_mprq_enabled (rxq) ? - (1 << rxq->elts_n) * (1 << rxq->strd_num_n) : - (1 << rxq->elts_n); +RTE_BIT32 (rxq->elts_n) *RTE_BIT32 (rxq->log_strd_num) : +RTE_BIT32 (rxq->elts_n); }/**
@@ -872,10 +872,10 @@ mlx5_rxq_initialize(struct mlx5_rxq_data *rxq) scat = &((volatile struct mlx5_wqe_mprq *) rxq->wqes)[i].dseg; - addr = (uintptr_t )mlx5_mprq_buf_addr (buf, -1 << rxq->strd_num_n); - byte_count = (1 << rxq->strd_sz_n) * - (1 << rxq->strd_num_n); + addr = (uintptr_t )mlx5_mprq_buf_addr + (buf,RTE_BIT32 (rxq->log_strd_num)); + byte_count =RTE_BIT32 (rxq->log_strd_sz) * +RTE_BIT32 (rxq->log_strd_num); }else {struct rte_mbuf *buf = (*rxq->elts)[i];
@@ -899,7 +899,7 @@ mlx5_rxq_initialize(struct mlx5_rxq_data *rxq) .ai = 0, }; rxq->elts_ci =mlx5_rxq_mprq_enabled (rxq) ? - (wqe_n >> rxq->sges_n) * (1 << rxq->strd_num_n) :0 ; + (wqe_n >> rxq->sges_n) *RTE_BIT32 (rxq->log_strd_num) :0 ;/* Update doorbell counter. */ rxq->rq_ci = wqe_n >> rxq->sges_n;rte_io_wmb ();
@@ -1004,7 +1004,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)const uint16_t cqe_n =1 << rxq->cqe_n;const uint16_t cqe_mask = cqe_n -1 ;const uint16_t wqe_n =1 << rxq->elts_n; -const uint16_t strd_n =1 << rxq->strd_num_n; +const uint16_t strd_n =RTE_BIT32 (rxq->log_strd_num);struct mlx5_rxq_ctrl *rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq);union {
@@ -1651,8 +1651,8 @@ uint16_t mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) {struct mlx5_rxq_data *rxq = dpdk_rxq; -const uint32_t strd_n =1 << rxq->strd_num_n; -const uint32_t strd_sz =1 << rxq->strd_sz_n; +const uint32_t strd_n =RTE_BIT32 (rxq->log_strd_num); +const uint32_t strd_sz =RTE_BIT32 (rxq->log_strd_sz);const uint32_t cq_mask = (1 << rxq->cqe_n) -1 ;const uint32_t wq_mask = (1 << rxq->elts_n) -1 ;volatile struct mlx5_cqe *cqe = &(*rxq->cqes)[rxq->cq_ci & cq_mask];
drivers/net/mlx5/mlx5_rxtx.h +5 -5
@@ -118,8 +118,8 @@ struct mlx5_rxq_data { unsigned int elts_n:4; /* Log 2 of Mbufs. */ unsigned int rss_hash:1; /* RSS hash result is enabled. */ unsigned int mark:1; /* Marked flow available on the queue. */ - unsigned int strd_num_n:5; /* Log 2 of the number of stride. */ - unsigned int strd_sz_n:4; /* Log 2 of stride size. */ + unsigned int log_strd_num:5; /* Log 2 of the number of stride. */ + unsigned int log_strd_sz:4; /* Log 2 of stride size. */ unsigned int strd_shift_en:1; /* Enable 2bytes shift on a stride. */ unsigned int err_state:2; /* enum mlx5_rxq_err_state. */ unsigned int strd_scatter_en:1; /* Scattered packets from a stride. */
@@ -748,7 +748,7 @@ mlx5_timestamp_set(struct rte_mbuf *mbuf, int offset, static __rte_always_inline voidmprq_buf_replace (struct mlx5_rxq_data *rxq,uint16_t rq_idx) { -const uint32_t strd_n =1 << rxq->strd_num_n; +const uint32_t strd_n =RTE_BIT32 (rxq->log_strd_num);struct mlx5_mprq_buf *rep = rxq->mprq_repl;volatile struct mlx5_wqe_data_seg *wqe = &((volatile struct mlx5_wqe_mprq *)rxq->wqes)[rq_idx].dseg;
@@ -806,8 +806,8 @@ static __rte_always_inline enum mlx5_rqx_code mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len, struct mlx5_mprq_buf *buf, uint16_t strd_idx, uint16_t strd_cnt) { - const uint32_t strd_n = 1 << rxq->strd_num_n; -const uint16_t strd_sz =1 << rxq->strd_sz_n; + const uint32_t strd_n = RTE_BIT32(rxq->log_strd_num); +const uint16_t strd_sz =RTE_BIT32 (rxq->log_strd_sz);const uint16_t strd_shift =MLX5_MPRQ_STRIDE_SHIFT_BYTE * rxq->strd_shift_en; const int32_t hdrm_overlap =
drivers/net/mlx5/mlx5_rxtx_vec.c +4 -4
@@ -142,7 +142,7 @@ static inline void mlx5_rx_mprq_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq) {const uint16_t wqe_n =1 << rxq->elts_n; -const uint32_t strd_n =1 << rxq->strd_num_n; +const uint32_t strd_n =RTE_BIT32 (rxq->log_strd_num);const uint32_t elts_n = wqe_n * strd_n;const uint32_t wqe_mask = elts_n -1 ;uint32_t n = elts_n - (rxq->elts_ci - rxq->rq_pi);
@@ -191,8 +191,8 @@ rxq_copy_mprq_mbuf_v(struct mlx5_rxq_data *rxq, {const uint16_t wqe_n =1 << rxq->elts_n;const uint16_t wqe_mask = wqe_n -1 ; -const uint16_t strd_sz =1 << rxq->strd_sz_n; -const uint32_t strd_n =1 << rxq->strd_num_n; +const uint16_t strd_sz =RTE_BIT32 (rxq->log_strd_sz); +const uint32_t strd_n =RTE_BIT32 (rxq->log_strd_num);const uint32_t elts_n = wqe_n * strd_n;const uint32_t elts_mask = elts_n -1 ;uint32_t elts_idx = rxq->rq_pi & elts_mask;
@@ -422,7 +422,7 @@ rxq_burst_mprq_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts,const uint16_t q_n =1 << rxq->cqe_n;const uint16_t q_mask = q_n -1 ;const uint16_t wqe_n =1 << rxq->elts_n; -const uint32_t strd_n =1 << rxq->strd_num_n; +const uint32_t strd_n =RTE_BIT32 (rxq->log_strd_num);const uint32_t elts_n = wqe_n * strd_n;const uint32_t elts_mask = elts_n -1 ;volatile struct mlx5_cqe *cq;
Signature · 1 line
2.25.1
PATCH 3/5 net/mlx5: fix MPRQ stride devargs adjustment
In reply to Michael Baum[ upstream commit 34776af600df4475799ad8004e76d0eb77c163ff ]
In Multi-Packet RQ creation, the user can choose the number of strides and their size in bytes. The user updates it using specific devargs for both of these parameters.
The above two parameters determine the size of the WQE which is actually their product of multiplication.
If the user selects values that are not in the supported range, the PMD changes them to default values. However, apart from the range limitations for each parameter individually there is also a minimum value on their multiplication. When the user selects values that their multiplication are lower than minimum value, no adjustment is made and the creation of the WQE fails.
This patch adds an adjustment in these cases as well. When the user selects values whose multiplication is lower than the minimum, they are replaced with the default values.
Fixes ecb160456aed ("net/mlx5: add device parameter for MPRQ stride size")
Signed-off-by Michael Baum <[email protected]>
Acked-by Matan Azrad <[email protected]>
--- drivers/net/mlx5/linux/mlx5_os.c | 48 ++----- drivers/net/mlx5/mlx5.h | 4 + drivers/net/mlx5/mlx5_rxq.c | 209 +++++++++++++++++++++---------- 3 files changed, 154 insertions(+), 107 deletions(-)
drivers/net/mlx5/linux/mlx5_os.c +10 -38
@@ -758,10 +758,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,unsigned int mpls_en =0 ;unsigned int swp =0 ;unsigned int mprq =0 ; -unsigned int mprq_min_stride_size_n =0 ; -unsigned int mprq_max_stride_size_n =0 ; -unsigned int mprq_min_stride_num_n =0 ; -unsigned int mprq_max_stride_num_n =0 ;struct rte_ether_addr mac;char name[RTE_ETH_NAME_MAX_LEN ];int own_domain_id =0 ;
@@ -934,13 +930,13 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, mprq_caps.supported_qpts);DRV_LOG (DEBUG ,"device supports Multi-Packet RQ" ); mprq =1 ; - mprq_min_stride_size_n = + config->mprq.log_min_stride_size = mprq_caps.min_single_stride_log_num_of_bytes; - mprq_max_stride_size_n = + config->mprq.log_max_stride_size = mprq_caps.max_single_stride_log_num_of_bytes; - mprq_min_stride_num_n = + config->mprq.log_min_stride_num = mprq_caps.min_single_wqe_log_num_of_strides; - mprq_max_stride_num_n = + config->mprq.log_max_stride_num = mprq_caps.max_single_wqe_log_num_of_strides; }#endif
@@ -1178,12 +1174,17 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, config->mps ==MLX5_MPW_ENHANCED ?"enhanced " : config->mps ==MLX5_MPW ?"legacy " :"" , config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled"); + config->mprq.log_min_stride_wqe_size = +MLX5_MPRQ_LOG_MIN_STRIDE_WQE_SIZE ; + config->mprq.log_stride_num =MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM ;if (config->devx) { err =mlx5_devx_cmd_query_hca_attr (sh->ctx, &config->hca_attr);if (err) { err = -err; goto error; } + config->mprq.log_min_stride_wqe_size = + config->hca_attr.log_min_stride_wqe_sz; sh->rq_ts_format = config->hca_attr.rq_ts_format; sh->sq_ts_format = config->hca_attr.sq_ts_format; sh->qp_ts_format = config->hca_attr.qp_ts_format;
@@ -1382,36 +1383,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, config->hw_fcs_strip =0 ;DRV_LOG (DEBUG ,"FCS stripping configuration is %ssupported" , (config->hw_fcs_strip ?"" :"not " )); -if (config->mprq.enabled && mprq) { -if (config->mprq.log_stride_num && - (config->mprq.log_stride_num > mprq_max_stride_num_n || - config->mprq.log_stride_num < mprq_min_stride_num_n)) { - config->mprq.log_stride_num = -RTE_MIN (RTE_MAX (MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM , - mprq_min_stride_num_n), - mprq_max_stride_num_n); -DRV_LOG (WARNING , -"the number of strides" -" for Multi-Packet RQ is out of range," -" setting default value (%u)" , -1 << config->mprq.log_stride_num); - } -if (config->mprq.log_stride_size && - (config->mprq.log_stride_size > mprq_max_stride_size_n || - config->mprq.log_stride_size < mprq_min_stride_size_n)) { - config->mprq.log_stride_size = -RTE_MIN (RTE_MAX (MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE , - mprq_min_stride_size_n), - mprq_max_stride_size_n); -DRV_LOG (WARNING , -"the size of a stride" -" for Multi-Packet RQ is out of range," -" setting default value (%u)" , -1 << config->mprq.log_stride_size); - } - config->mprq.log_min_stride_size = mprq_min_stride_size_n; - config->mprq.log_max_stride_size = mprq_max_stride_size_n; - }else if (config->mprq.enabled && !mprq) { +if (config->mprq.enabled && !mprq) {DRV_LOG (WARNING ,"Multi-Packet RQ isn't supported" ); config->mprq.enabled =0 ; }
drivers/net/mlx5/mlx5.h +4 -0
@@ -232,6 +232,10 @@ struct mlx5_dev_config {unsigned int log_stride_size;/* Log size of a stride. */ unsigned int log_min_stride_size;/* Log min size of a stride.*/ unsigned int log_max_stride_size;/* Log max size of a stride.*/ +unsigned int log_min_stride_num;/* Log min num of strides. */ +unsigned int log_max_stride_num;/* Log max num of strides. */ +unsigned int log_min_stride_wqe_size; +/* Log min WQE size, (size of single stride)*(num of strides).*/ unsigned int max_memcpy_len;/* Maximum packet size to memcpy Rx packets. */ unsigned int min_rxqs_num;
drivers/net/mlx5/mlx5_rxq.c +140 -69
261 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 4/5 net/mlx5: fix memory socket selection in ASO management
In reply to Michael Baum[ upstream commit 147f6fb42bd7637b37a9180b0774275531c05f9b ]
In ASO objects creation (WQE, CQE and MR), socket number is given as a parameter.
The selection was wrongly socket 0 hardcoded even if the user didn't configure memory for this socket.
This patch replaces the selection to default socket (SOCKET_ID_ANY).
Fixes f935ed4b645a ("net/mlx5: support flow hit action for aging")
Signed-off-by Michael Baum <[email protected]>
Acked-by Matan Azrad <[email protected]>
--- drivers/net/mlx5/mlx5_flow_age.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/net/mlx5/mlx5_flow_age.c +11 -16
@@ -38,8 +38,6 @@ mlx5_aso_cq_destroy(struct mlx5_aso_cq *cq)* Pointer to CQ to create. * @param[in] log_desc_n * Log of number of descriptors in queue. -* @param[in] socket -* Socket to use for allocation. * @param[in] uar_page_id * UAR page ID to use. * @param[in] eqn
@@ -50,7 +48,7 @@ mlx5_aso_cq_destroy(struct mlx5_aso_cq *cq)*/ static int mlx5_aso_cq_create (void *ctx,struct mlx5_aso_cq *cq,uint16_t log_desc_n, -int socket,int uar_page_id,uint32_t eqn) +int uar_page_id,uint32_t eqn) {struct mlx5_devx_cq_attr attr = {0 };size_t pgsize =sysconf (_SC_PAGESIZE);
@@ -60,7 +58,7 @@ mlx5_aso_cq_create(void *ctx, struct mlx5_aso_cq *cq, uint16_t log_desc_n, cq->log_desc_n = log_desc_n; umem_size =sizeof (struct mlx5_cqe ) * cq_size +sizeof (*cq->db_rec) *2 ; cq->umem_buf =mlx5_malloc (MLX5_MEM_RTE |MLX5_MEM_ZERO , umem_size, -4096 , socket); +4096 ,SOCKET_ID_ANY );if (!cq->umem_buf) {DRV_LOG (ERR ,"Failed to allocate memory for CQ." ); rte_errno =ENOMEM ;
@@ -123,8 +121,6 @@ mlx5_aso_devx_dereg_mr(struct mlx5_aso_devx_mr *mr)* Size of MR buffer. * @param[in/out] mr * Pointer to MR to create. -* @param[in] socket -* Socket to use for allocation. * @param[in] pdn * Protection Domain number to use. *
@@ -133,12 +129,12 @@ mlx5_aso_devx_dereg_mr(struct mlx5_aso_devx_mr *mr)*/ static int mlx5_aso_devx_reg_mr (void *ctx,size_t length,struct mlx5_aso_devx_mr *mr, -int socket,int pdn) +int pdn) {struct mlx5_devx_mkey_attr mkey_attr; mr->buf =mlx5_malloc (MLX5_MEM_RTE |MLX5_MEM_ZERO , length,4096 , - socket); +SOCKET_ID_ANY );if (!mr->buf) {DRV_LOG (ERR ,"Failed to create ASO bits mem for MR by Devx." );return -1 ;
@@ -240,8 +236,6 @@ mlx5_aso_init_sq(struct mlx5_aso_sq *sq)* Context returned from mlx5 open_device() glue function. * @param[in/out] sq * Pointer to SQ to create. -* @param[in] socket -* Socket to use for allocation. * @param[in] uar * User Access Region object. * @param[in] pdn
@@ -255,7 +249,7 @@ mlx5_aso_init_sq(struct mlx5_aso_sq *sq)* 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -mlx5_aso_sq_create (void *ctx,struct mlx5_aso_sq *sq,int socket, +mlx5_aso_sq_create (void *ctx,struct mlx5_aso_sq *sq,struct mlx5dv_devx_uar *uar,uint32_t pdn,uint32_t eqn,uint16_t log_desc_n,uint32_t ts_format) {
@@ -268,14 +262,15 @@ mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket,int ret;if (mlx5_aso_devx_reg_mr (ctx, (MLX5_ASO_AGE_ACTIONS_PER_POOL /8 ) * - sq_desc_n, &sq->mr, socket, pdn)) + sq_desc_n, &sq->mr, pdn))return -1 ; -if (mlx5_aso_cq_create (ctx, &sq->cq, log_desc_n, socket, +if (mlx5_aso_cq_create (ctx, &sq->cq, log_desc_n,mlx5_os_get_devx_uar_page_id (uar), eqn)) goto error; sq->log_desc_n = log_desc_n; - sq->umem_buf =mlx5_malloc (MLX5_MEM_RTE |MLX5_MEM_ZERO , wq_size + -sizeof (*sq->db_rec) *2 ,4096 , socket); + sq->umem_buf =mlx5_malloc (MLX5_MEM_RTE |MLX5_MEM_ZERO , + wq_size +sizeof (*sq->db_rec) *2 , +4096 ,SOCKET_ID_ANY );if (!sq->umem_buf) {DRV_LOG (ERR ,"Can't allocate wqe buffer." ); rte_errno =ENOMEM ;
@@ -347,7 +342,7 @@ mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket,int mlx5_aso_queue_init (struct mlx5_dev_ctx_shared *sh) { -return mlx5_aso_sq_create (sh->ctx, &sh->aso_age_mng->aso_sq,0 , +return mlx5_aso_sq_create (sh->ctx, &sh->aso_age_mng->aso_sq, sh->tx_uar, sh->pdn, sh->eqn,MLX5_ASO_QUEUE_LOG_DESC , sh->sq_ts_format); }
Signature · 1 line
2.25.1
PATCH 5/5 common/mlx5: fix error handling in multi-class probe
In reply to Michael Baum[ upstream commit 8928997a1388ba1b045a55732acced4baf00b21d ]
The common drivers_probe function calls in a loop to all probe functions for classes requested by the user. After it manages to probe them all, it updates this on the device in the "classes_loaded" field.
If one of them fails, all those probed to it are remove using the drivers_remove function. However, this function only releases the classes in the "classes_loaded" field on the given device and misses the newly probed classes.
This patch removes the condition from the release function, and ensures that the caller function sends a more accurate parameter.
Fixes 8a41f4deccc3 ("common/mlx5: introduce layer for multiple class drivers")
Signed-off-by Michael Baum <[email protected]>
Acked-by Matan Azrad <[email protected]>
--- drivers/common/mlx5/mlx5_common_pci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/common/mlx5/mlx5_common_pci.c +4 -3
@@ -203,7 +203,6 @@ drivers_remove(struct mlx5_pci_device *dev, uint32_t enabled_classes)unsigned int i =0 ;int ret =0 ; - enabled_classes &= dev->classes_loaded;while (enabled_classes) { driver =driver_get (RTE_BIT64 (i));if (driver) {
@@ -254,9 +253,11 @@ drivers_probe(struct mlx5_pci_device *dev, struct rte_pci_driver *pci_drv, dev->classes_loaded |= enabled_classes;return 0 ; probe_err: -/* Only unload drivers which are enabled which were enabled -* in this probe instance. +/* +* Need to remove only drivers which were not probed before this probe +* instance, but have already been probed before this failure. */ + enabled_classes &= ~dev->classes_loaded;drivers_remove (dev, enabled_classes);return ret; }
Signature · 1 line
2.25.1