|WARNING| pw117861 [PATCH] [v1, 33/35] net/ionic: use a helper variable for page size

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Andrew Boyer <Andrew.Boyer at amd.com>
Date: Tuesday, October 11 2022 00:50:30 
Applied on: CommitID:f13604fad12a81383da7b04821a4befb3d01e2ed
Apply patch set 117861 failed:

Checking patch drivers/net/ionic/ionic_lif.c...
Hunk #1 succeeded at 604 (offset 28 lines).
error: while searching for:
	cq_size = num_descs * cq_desc_size;
	sg_size = num_descs * sg_desc_size;

	total_size = RTE_ALIGN(q_size, rte_mem_page_size()) +
			RTE_ALIGN(cq_size, rte_mem_page_size());
	/*
	 * Note: aligning q_size/cq_size is not enough due to cq_base address
	 * aligning as q_base could be not aligned to the page.
	 * Adding rte_mem_page_size().
	 */
	total_size += rte_mem_page_size();

	if (flags & IONIC_QCQ_F_SG) {
		total_size += RTE_ALIGN(sg_size, rte_mem_page_size());
		total_size += rte_mem_page_size();
	}

	new = rte_zmalloc_socket("ionic", struct_size,

error: patch failed: drivers/net/ionic/ionic_lif.c:584
error: while searching for:
	/* Most queue types will store 1 ptr per descriptor */
	new->q.info = rte_calloc_socket("ionic",
				num_descs * num_segs, sizeof(void *),
				rte_mem_page_size(), socket_id);
	if (!new->q.info) {
		IONIC_PRINT(ERR, "Cannot allocate queue info");
		err = -ENOMEM;

error: patch failed: drivers/net/ionic/ionic_lif.c:610
Hunk #4 succeeded at 674 (offset 25 lines).
Applying patch drivers/net/ionic/ionic_lif.c with 2 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
diff a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c	(rejected hunks)
@@ -584,18 +585,18 @@ ionic_qcq_alloc(struct ionic_lif *lif,
 	cq_size = num_descs * cq_desc_size;
 	sg_size = num_descs * sg_desc_size;
 
-	total_size = RTE_ALIGN(q_size, rte_mem_page_size()) +
-			RTE_ALIGN(cq_size, rte_mem_page_size());
+	total_size = RTE_ALIGN(q_size, page_size) +
+			RTE_ALIGN(cq_size, page_size);
 	/*
 	 * Note: aligning q_size/cq_size is not enough due to cq_base address
 	 * aligning as q_base could be not aligned to the page.
-	 * Adding rte_mem_page_size().
+	 * Adding page_size.
 	 */
-	total_size += rte_mem_page_size();
+	total_size += page_size;
 
 	if (flags & IONIC_QCQ_F_SG) {
-		total_size += RTE_ALIGN(sg_size, rte_mem_page_size());
-		total_size += rte_mem_page_size();
+		total_size += RTE_ALIGN(sg_size, page_size);
+		total_size += page_size;
 	}
 
 	new = rte_zmalloc_socket("ionic", struct_size,
@@ -610,7 +611,7 @@ ionic_qcq_alloc(struct ionic_lif *lif,
 	/* Most queue types will store 1 ptr per descriptor */
 	new->q.info = rte_calloc_socket("ionic",
 				num_descs * num_segs, sizeof(void *),
-				rte_mem_page_size(), socket_id);
+				page_size, socket_id);
 	if (!new->q.info) {
 		IONIC_PRINT(ERR, "Cannot allocate queue info");
 		err = -ENOMEM;

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

UNH-IOL DPDK Community Lab