|WARNING| pw104612 [PATCH] common/mlx5: fix shared MR ranges allocation

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/104612

_apply patch failure_

Submitter: Bing Zhao <bingz at nvidia.com>
Date: Tuesday, November 23 2021 12:48:35 
Applied on: CommitID:0c6e27549c03695f85d949f5195a166b449b419c
Apply patch set 104612 failed:

Checking patch drivers/common/mlx5/mlx5_common_mr.c...
error: while searching for:
	struct mlx5_mempool_reg *mpr = NULL;

	mpr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
			  sizeof(*mpr) + mrs_n * sizeof(mpr->mrs[0]),
			  RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
	if (mpr == NULL) {
		DRV_LOG(ERR, "Cannot allocate mempool %s registration object",
			mp->name);
		return NULL;
	}
	mpr->mp = mp;
	mpr->mrs = (struct mlx5_mempool_mr *)(mpr + 1);
	mpr->mrs_n = mrs_n;
	mpr->is_extmem = is_extmem;
	return mpr;

error: patch failed: drivers/common/mlx5/mlx5_common_mr.c:1515
Hunk #2 succeeded at 1540 (offset -12 lines).
Applying patch drivers/common/mlx5/mlx5_common_mr.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
diff a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c	(rejected hunks)
@@ -1515,15 +1515,23 @@ mlx5_mempool_reg_create(struct rte_mempool *mp, unsigned int mrs_n,
 	struct mlx5_mempool_reg *mpr = NULL;
 
 	mpr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
-			  sizeof(*mpr) + mrs_n * sizeof(mpr->mrs[0]),
+			  sizeof(struct mlx5_mempool_reg),
 			  RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
 	if (mpr == NULL) {
 		DRV_LOG(ERR, "Cannot allocate mempool %s registration object",
 			mp->name);
 		return NULL;
 	}
+	mpr->mrs = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
+			       mrs_n * sizeof(struct mlx5_mempool_mr),
+			       RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+	if (!mpr->mrs) {
+		DRV_LOG(ERR, "Cannot allocate mempool %s registration MRs",
+			mp->name);
+		mlx5_free(mpr);
+		return NULL;
+	}
 	mpr->mp = mp;
-	mpr->mrs = (struct mlx5_mempool_mr *)(mpr + 1);
 	mpr->mrs_n = mrs_n;
 	mpr->is_extmem = is_extmem;
 	return mpr;

https://lab.dpdk.org/results/dashboard/patchsets/20330/

UNH-IOL DPDK Community Lab