* |WARNING| pw106620-106639 [PATCH] [20/20] common/mlx5: refactor devargs management
@ 2022-01-27 15:58 dpdklab
0 siblings, 0 replies; only message in thread
From: dpdklab @ 2022-01-27 15:58 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
[-- Attachment #1: Type: text/plain, Size: 21399 bytes --]
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/106620
_apply patch failure_
Submitter: Michael Baum <michaelba@nvidia.com>
Date: Thursday, January 27 2022 15:39:50
Applied on: CommitID:5f6bc8a4edc50ba74eb28f974b6ebacdb799a5db
Apply patch set 106620-106639 failed:
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
Hunk #5 succeeded at 1025 (offset 4 lines).
error: while searching for:
mps = MLX5_MPW_DISABLED;
}
#ifdef HAVE_IBV_MLX5_MOD_SWP
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
swp = dv_attr.sw_parsing_caps.sw_parsing_offloads;
DRV_LOG(DEBUG, "SWP support: %u", swp);
#endif
config->swp = swp & (MLX5_SW_PARSING_CAP | MLX5_SW_PARSING_CSUM_CAP |
MLX5_SW_PARSING_TSO_CAP);
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
struct mlx5dv_striding_rq_caps mprq_caps =
dv_attr.striding_rq_caps;
DRV_LOG(DEBUG, "\tmin_single_stride_log_num_of_bytes: %d",
mprq_caps.min_single_stride_log_num_of_bytes);
DRV_LOG(DEBUG, "\tmax_single_stride_log_num_of_bytes: %d",
mprq_caps.max_single_stride_log_num_of_bytes);
DRV_LOG(DEBUG, "\tmin_single_wqe_log_num_of_strides: %d",
mprq_caps.min_single_wqe_log_num_of_strides);
DRV_LOG(DEBUG, "\tmax_single_wqe_log_num_of_strides: %d",
mprq_caps.max_single_wqe_log_num_of_strides);
DRV_LOG(DEBUG, "\tsupported_qpts: %d",
mprq_caps.supported_qpts);
DRV_LOG(DEBUG, "\tmin_stride_wqe_log_size: %d",
config->mprq.log_min_stride_wqe_size);
DRV_LOG(DEBUG, "device supports Multi-Packet RQ");
mprq = 1;
config->mprq.log_min_stride_size =
mprq_caps.min_single_stride_log_num_of_bytes;
config->mprq.log_max_stride_size =
mprq_caps.max_single_stride_log_num_of_bytes;
config->mprq.log_min_stride_num =
mprq_caps.min_single_wqe_log_num_of_strides;
config->mprq.log_max_stride_num =
mprq_caps.max_single_wqe_log_num_of_strides;
}
#endif
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
config->tunnel_en = dv_attr.tunnel_offloads_caps &
(MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN |
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE |
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE);
error: patch failed: drivers/net/mlx5/linux/mlx5_os.c:1039
Hunk #7 succeeded at 1100 (offset 5 lines).
Hunk #8 succeeded at 1431 (offset 5 lines).
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
Hunk #1 succeeded at 302 (offset -16 lines).
Hunk #2 succeeded at 359 (offset -16 lines).
Applying patch drivers/net/mlx5/linux/mlx5_os.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Applied patch drivers/net/mlx5/windows/mlx5_os.c cleanly.
diff a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c (rejected hunks)
@@ -1039,44 +1039,41 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mps = MLX5_MPW_DISABLED;
}
#ifdef HAVE_IBV_MLX5_MOD_SWP
- if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
- swp = dv_attr.sw_parsing_caps.sw_parsing_offloads;
+ if (sh->device_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
+ swp = sh->device_attr.sw_parsing_offloads;
DRV_LOG(DEBUG, "SWP support: %u", swp);
#endif
config->swp = swp & (MLX5_SW_PARSING_CAP | MLX5_SW_PARSING_CSUM_CAP |
MLX5_SW_PARSING_TSO_CAP);
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
- if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
- struct mlx5dv_striding_rq_caps mprq_caps =
- dv_attr.striding_rq_caps;
-
+ if (sh->device_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
DRV_LOG(DEBUG, "\tmin_single_stride_log_num_of_bytes: %d",
- mprq_caps.min_single_stride_log_num_of_bytes);
+ sh->device_attr.min_single_stride_log_num_of_bytes);
DRV_LOG(DEBUG, "\tmax_single_stride_log_num_of_bytes: %d",
- mprq_caps.max_single_stride_log_num_of_bytes);
+ sh->device_attr.max_single_stride_log_num_of_bytes);
DRV_LOG(DEBUG, "\tmin_single_wqe_log_num_of_strides: %d",
- mprq_caps.min_single_wqe_log_num_of_strides);
+ sh->device_attr.min_single_wqe_log_num_of_strides);
DRV_LOG(DEBUG, "\tmax_single_wqe_log_num_of_strides: %d",
- mprq_caps.max_single_wqe_log_num_of_strides);
+ sh->device_attr.max_single_wqe_log_num_of_strides);
DRV_LOG(DEBUG, "\tsupported_qpts: %d",
- mprq_caps.supported_qpts);
+ sh->device_attr.stride_supported_qpts);
DRV_LOG(DEBUG, "\tmin_stride_wqe_log_size: %d",
config->mprq.log_min_stride_wqe_size);
DRV_LOG(DEBUG, "device supports Multi-Packet RQ");
mprq = 1;
config->mprq.log_min_stride_size =
- mprq_caps.min_single_stride_log_num_of_bytes;
+ sh->device_attr.min_single_stride_log_num_of_bytes;
config->mprq.log_max_stride_size =
- mprq_caps.max_single_stride_log_num_of_bytes;
+ sh->device_attr.max_single_stride_log_num_of_bytes;
config->mprq.log_min_stride_num =
- mprq_caps.min_single_wqe_log_num_of_strides;
+ sh->device_attr.min_single_wqe_log_num_of_strides;
config->mprq.log_max_stride_num =
- mprq_caps.max_single_wqe_log_num_of_strides;
+ sh->device_attr.max_single_wqe_log_num_of_strides;
}
#endif
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
- if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
- config->tunnel_en = dv_attr.tunnel_offloads_caps &
+ if (sh->device_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
+ config->tunnel_en = sh->device_attr.tunnel_offloads_caps &
(MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN |
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE |
MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE);
Checking patch drivers/common/mlx5/mlx5_common.h...
Checking patch drivers/common/mlx5/mlx5_common_pci.c...
Checking patch drivers/common/mlx5/version.map...
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/common/mlx5/mlx5_common.h cleanly.
Applied patch drivers/common/mlx5/mlx5_common_pci.c cleanly.
Applied patch drivers/common/mlx5/version.map cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
Checking patch drivers/net/mlx5/mlx5.h...
Hunk #1 succeeded at 1512 (offset -5 lines).
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/net/mlx5/mlx5.c cleanly.
Applied patch drivers/net/mlx5/mlx5.h cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
Hunk #1 succeeded at 6611 (offset 11 lines).
Hunk #2 succeeded at 13618 (offset 11 lines).
Hunk #3 succeeded at 16176 (offset 9 lines).
Hunk #4 succeeded at 16228 (offset 9 lines).
Checking patch drivers/net/mlx5/mlx5_trigger.c...
Applied patch drivers/net/mlx5/mlx5_ethdev.c cleanly.
Applied patch drivers/net/mlx5/mlx5_flow_dv.c cleanly.
Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_verbs.c...
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_devx.c...
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
error: drivers/net/mlx5/mlx5_ethdev.c: does not match index
Checking patch drivers/net/mlx5/mlx5_trigger.c...
error: drivers/net/mlx5/mlx5_trigger.c: does not match index
Checking patch drivers/net/mlx5/mlx5_txq.c...
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/net/mlx5/linux/mlx5_verbs.c cleanly.
Applied patch drivers/net/mlx5/mlx5_devx.c cleanly.
Applied patch drivers/net/mlx5/mlx5_txq.c cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_vlan_os.c...
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_devx.c...
error: drivers/net/mlx5/mlx5_devx.c: does not match index
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
error: drivers/net/mlx5/mlx5_ethdev.c: does not match index
Checking patch drivers/net/mlx5/mlx5_flow.c...
Hunk #1 succeeded at 1746 (offset -13 lines).
Hunk #2 succeeded at 3125 (offset -13 lines).
Checking patch drivers/net/mlx5/mlx5_rxmode.c...
Checking patch drivers/net/mlx5/mlx5_rxq.c...
Hunk #1 succeeded at 365 (offset -3 lines).
error: while searching for:
{
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_dev_config *config = &priv->config;
uint32_t log_min_stride_num = config->mprq.log_min_stride_num;
uint32_t log_max_stride_num = config->mprq.log_max_stride_num;
uint32_t log_def_stride_num =
RTE_MIN(RTE_MAX(MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM,
log_min_stride_num),
log_max_stride_num);
uint32_t log_min_stride_size = config->mprq.log_min_stride_size;
uint32_t log_max_stride_size = config->mprq.log_max_stride_size;
uint32_t log_def_stride_size =
RTE_MIN(RTE_MAX(MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE,
log_min_stride_size),
error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1564
error: while searching for:
}
log_stride_wqe_size = *actual_log_stride_num + *actual_log_stride_size;
/* Check if WQE buffer size is supported by hardware. */
if (log_stride_wqe_size < config->mprq.log_min_stride_wqe_size) {
*actual_log_stride_num = log_def_stride_num;
*actual_log_stride_size = log_def_stride_size;
DRV_LOG(WARNING,
error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1610
error: while searching for:
RTE_BIT32(log_def_stride_size));
log_stride_wqe_size = log_def_stride_num + log_def_stride_size;
}
MLX5_ASSERT(log_stride_wqe_size >= config->mprq.log_min_stride_wqe_size);
if (desc <= RTE_BIT32(*actual_log_stride_num))
goto unsupport;
if (min_mbuf_size > RTE_BIT32(log_stride_wqe_size)) {
error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1619
error: while searching for:
RTE_BIT32(config->mprq.log_stride_size),
RTE_BIT32(config->mprq.log_stride_num),
config->mprq.min_rxqs_num,
RTE_BIT32(config->mprq.log_min_stride_wqe_size),
RTE_BIT32(config->mprq.log_min_stride_size),
RTE_BIT32(config->mprq.log_max_stride_size),
rx_seg_en ? "" : "not ");
return -1;
}
error: patch failed: drivers/net/mlx5/mlx5_rxq.c:1648
Hunk #6 succeeded at 2291 (offset -81 lines).
Hunk #7 succeeded at 2416 (offset -81 lines).
Hunk #8 succeeded at 2497 (offset -81 lines).
Hunk #9 succeeded at 2915 (offset -81 lines).
Checking patch drivers/net/mlx5/mlx5_trigger.c...
error: drivers/net/mlx5/mlx5_trigger.c: does not match index
Checking patch drivers/net/mlx5/mlx5_txq.c...
error: drivers/net/mlx5/mlx5_txq.c: does not match index
Checking patch drivers/net/mlx5/mlx5_vlan.c...
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/net/mlx5/linux/mlx5_vlan_os.c cleanly.
Applied patch drivers/net/mlx5/mlx5_flow.c cleanly.
Applied patch drivers/net/mlx5/mlx5_rxmode.c cleanly.
Applying patch drivers/net/mlx5/mlx5_rxq.c with 4 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
Rejected hunk #5.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Applied patch drivers/net/mlx5/mlx5_vlan.c cleanly.
diff a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c (rejected hunks)
@@ -1564,14 +1564,15 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
{
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_dev_config *config = &priv->config;
- uint32_t log_min_stride_num = config->mprq.log_min_stride_num;
- uint32_t log_max_stride_num = config->mprq.log_max_stride_num;
+ struct mlx5_dev_cap *dev_cap = &priv->sh->dev_cap;
+ uint32_t log_min_stride_num = dev_cap->mprq.log_min_stride_num;
+ uint32_t log_max_stride_num = dev_cap->mprq.log_max_stride_num;
uint32_t log_def_stride_num =
RTE_MIN(RTE_MAX(MLX5_MPRQ_DEFAULT_LOG_STRIDE_NUM,
log_min_stride_num),
log_max_stride_num);
- uint32_t log_min_stride_size = config->mprq.log_min_stride_size;
- uint32_t log_max_stride_size = config->mprq.log_max_stride_size;
+ uint32_t log_min_stride_size = dev_cap->mprq.log_min_stride_size;
+ uint32_t log_max_stride_size = dev_cap->mprq.log_max_stride_size;
uint32_t log_def_stride_size =
RTE_MIN(RTE_MAX(MLX5_MPRQ_DEFAULT_LOG_STRIDE_SIZE,
log_min_stride_size),
@@ -1610,7 +1611,7 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
}
log_stride_wqe_size = *actual_log_stride_num + *actual_log_stride_size;
/* Check if WQE buffer size is supported by hardware. */
- if (log_stride_wqe_size < config->mprq.log_min_stride_wqe_size) {
+ if (log_stride_wqe_size < dev_cap->mprq.log_min_stride_wqe_size) {
*actual_log_stride_num = log_def_stride_num;
*actual_log_stride_size = log_def_stride_size;
DRV_LOG(WARNING,
@@ -1619,7 +1620,8 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
RTE_BIT32(log_def_stride_size));
log_stride_wqe_size = log_def_stride_num + log_def_stride_size;
}
- MLX5_ASSERT(log_stride_wqe_size >= config->mprq.log_min_stride_wqe_size);
+ MLX5_ASSERT(log_stride_wqe_size >=
+ dev_cap->mprq.log_min_stride_wqe_size);
if (desc <= RTE_BIT32(*actual_log_stride_num))
goto unsupport;
if (min_mbuf_size > RTE_BIT32(log_stride_wqe_size)) {
@@ -1648,9 +1650,9 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
RTE_BIT32(config->mprq.log_stride_size),
RTE_BIT32(config->mprq.log_stride_num),
config->mprq.min_rxqs_num,
- RTE_BIT32(config->mprq.log_min_stride_wqe_size),
- RTE_BIT32(config->mprq.log_min_stride_size),
- RTE_BIT32(config->mprq.log_max_stride_size),
+ RTE_BIT32(dev_cap->mprq.log_min_stride_wqe_size),
+ RTE_BIT32(dev_cap->mprq.log_min_stride_size),
+ RTE_BIT32(dev_cap->mprq.log_max_stride_size),
rx_seg_en ? "" : "not ");
return -1;
}
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
error: drivers/net/mlx5/mlx5_ethdev.c: does not match index
Checking patch drivers/net/mlx5/mlx5_flow.c...
error: drivers/net/mlx5/mlx5_flow.c: does not match index
Checking patch drivers/net/mlx5/mlx5_flow.h...
Hunk #1 succeeded at 964 (offset 1 line).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: drivers/net/mlx5/mlx5_flow_dv.c: does not match index
Checking patch drivers/net/mlx5/mlx5_flow_meter.c...
Hunk #3 succeeded at 1204 (offset -1 lines).
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: drivers/net/mlx5/mlx5_rxq.c: does not match index
Checking patch drivers/net/mlx5/mlx5_trigger.c...
error: drivers/net/mlx5/mlx5_trigger.c: does not match index
Checking patch drivers/net/mlx5/mlx5_txpp.c...
Checking patch drivers/net/mlx5/mlx5_txq.c...
error: drivers/net/mlx5/mlx5_txq.c: does not match index
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/net/mlx5/mlx5_flow.h cleanly.
Applied patch drivers/net/mlx5/mlx5_flow_meter.c cleanly.
Applied patch drivers/net/mlx5/mlx5_txpp.c cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
error: drivers/net/mlx5/mlx5_ethdev.c: does not match index
Checking patch drivers/net/mlx5/mlx5_trigger.c...
error: drivers/net/mlx5/mlx5_trigger.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_devx.c...
error: drivers/net/mlx5/mlx5_devx.c: does not match index
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
error: drivers/net/mlx5/mlx5_ethdev.c: does not match index
Checking patch drivers/net/mlx5/mlx5_rxq.c...
error: drivers/net/mlx5/mlx5_rxq.c: does not match index
Checking patch drivers/net/mlx5/mlx5_tx.c...
Checking patch drivers/net/mlx5/mlx5_txq.c...
error: drivers/net/mlx5/mlx5_txq.c: does not match index
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/net/mlx5/mlx5_tx.c cleanly.
Checking patch drivers/common/mlx5/mlx5_common.c...
error: while searching for:
struct mlx5_common_dev_config *config = opaque;
signed long tmp;
if (val == NULL || *val == '\0') {
DRV_LOG(ERR, "Key %s is missing value.", key);
rte_errno = EINVAL;
return -rte_errno;
}
errno = 0;
tmp = strtol(val, NULL, 0);
if (errno) {
error: patch failed: drivers/common/mlx5/mlx5_common.c:111
Hunk #4 succeeded at 252 (offset -3 lines).
Hunk #5 succeeded at 261 (offset -3 lines).
Hunk #6 succeeded at 283 (offset -3 lines).
Hunk #7 succeeded at 359 (offset -3 lines).
Hunk #8 succeeded at 370 (offset -3 lines).
Hunk #9 succeeded at 694 (offset -3 lines).
Hunk #10 succeeded at 710 (offset -3 lines).
Hunk #11 succeeded at 755 (offset -3 lines).
Hunk #12 succeeded at 772 (offset -3 lines).
Hunk #13 succeeded at 785 (offset -3 lines).
Hunk #14 succeeded at 854 (offset -2 lines).
Hunk #15 succeeded at 874 (offset -2 lines).
Hunk #16 succeeded at 896 (offset -6 lines).
Hunk #17 succeeded at 934 (offset -6 lines).
Hunk #18 succeeded at 960 (offset -6 lines).
Checking patch drivers/common/mlx5/mlx5_common.h...
error: drivers/common/mlx5/mlx5_common.h: does not match index
Checking patch drivers/common/mlx5/version.map...
error: drivers/common/mlx5/version.map: does not match index
Checking patch drivers/compress/mlx5/mlx5_compress.c...
Checking patch drivers/crypto/mlx5/mlx5_crypto.c...
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Checking patch drivers/regex/mlx5/mlx5_regex.c...
Checking patch drivers/vdpa/mlx5/mlx5_vdpa.c...
Applying patch drivers/common/mlx5/mlx5_common.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Hunk #17 applied cleanly.
Hunk #18 applied cleanly.
Applied patch drivers/compress/mlx5/mlx5_compress.c cleanly.
Applied patch drivers/crypto/mlx5/mlx5_crypto.c cleanly.
Applied patch drivers/regex/mlx5/mlx5_regex.c cleanly.
Applied patch drivers/vdpa/mlx5/mlx5_vdpa.c cleanly.
diff a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c (rejected hunks)
@@ -111,11 +245,9 @@ mlx5_common_args_check_handler(const char *key, const char *val, void *opaque)
struct mlx5_common_dev_config *config = opaque;
signed long tmp;
- if (val == NULL || *val == '\0') {
- DRV_LOG(ERR, "Key %s is missing value.", key);
- rte_errno = EINVAL;
- return -rte_errno;
- }
+ if (strcmp(MLX5_DRIVER_KEY, key) == 0 ||
+ strcmp(RTE_DEVARGS_KEY_CLASS, key) == 0)
+ return 0;
errno = 0;
tmp = strtol(val, NULL, 0);
if (errno) {
https://lab.dpdk.org/results/dashboard/patchsets/20845/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-27 15:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 15:58 |WARNING| pw106620-106639 [PATCH] [20/20] common/mlx5: refactor devargs management dpdklab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).