|WARNING| pw122077-122078 [PATCH] [2/2] Memory Allocation: Alternative fix for ignore_msk during find_next_n() in fb_array library

[dpdklab@iol.unh.edu]

[-- Attachment #1: Type: text/plain, Size: 3686 bytes --]

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

_apply patch failure_

Submitter: Vipin P R <vipinp@vmware.com>
Date: Friday, January 13 2023 13:14:29 
Applied on: CommitID:83397b9f073904438965e1fda2efe76f7850fe01
Apply patch set 122077-122078 failed:

.git/rebase-apply/patch:18: trailing whitespace.
					/* There aren't "need" number of contiguous bits anywhere in the mask. 
.git/rebase-apply/patch:19: trailing whitespace.
					 * Ignore these many number of bits from LSB for the next iteration. 
Checking patch lib/eal/common/eal_common_fbarray.c...
error: while searching for:
				 * no runs in the space we've lookahead-scanned
				 * as well, so skip that on next iteration.
				 */
				ignore_msk = ~((1ULL << need) - 1);
				msk_idx = lookahead_idx - 1;
				break;
			}

error: patch failed: lib/eal/common/eal_common_fbarray.c:235
Applying patch lib/eal/common/eal_common_fbarray.c with 1 reject...
Rejected hunk #1.
diff a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c	(rejected hunks)
@@ -235,7 +235,12 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n,
 				 * no runs in the space we've lookahead-scanned
 				 * as well, so skip that on next iteration.
 				 */
-				ignore_msk = ~((1ULL << need) - 1);
+				if (!lookahead_msk) {
+					/* There aren't "need" number of contiguous bits anywhere in the mask. 
+					 * Ignore these many number of bits from LSB for the next iteration. 
+					 */
+					ignore_msk = ~((1ULL << need) - 1);
+				}
 				msk_idx = lookahead_idx - 1;
 				break;
 			}
.git/rebase-apply/patch:32: trailing whitespace.
			
.git/rebase-apply/patch:56: trailing whitespace.
					 * starting from LSB of lookahead_msk_. 
Checking patch lib/eal/common/eal_common_fbarray.c...
error: while searching for:
				 * as well, so skip that on next iteration.
				 */
				if (!lookahead_msk) {
					/* There aren't "need" number of contiguous bits anywhere in the mask. 
					 * Ignore these many number of bits from LSB for the next iteration. 
					 */
					ignore_msk = ~((1ULL << need) - 1);
				}
				msk_idx = lookahead_idx - 1;
				break;

error: patch failed: lib/eal/common/eal_common_fbarray.c:236
Applying patch lib/eal/common/eal_common_fbarray.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
diff a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c	(rejected hunks)
@@ -236,10 +238,23 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n,
 				 * as well, so skip that on next iteration.
 				 */
 				if (!lookahead_msk) {
-					/* There aren't "need" number of contiguous bits anywhere in the mask. 
+					/* There aren't "need" number of contiguous bits anywhere in the mask.
 					 * Ignore these many number of bits from LSB for the next iteration. 
 					 */
 					ignore_msk = ~((1ULL << need) - 1);
+				} else {
+					/* Find the first clear bit */
+					fcb_idx = __builtin_ffsll((~lookahead_msk_));
+					/* clear all bits upto the first clear bit in lookahead_msk_. */
+					lookahead_msk_ = lookahead_msk_ & ((~0ULL) << fcb_idx);
+					/* find the first set bit in the modified mask */
+					fsb_idx = __builtin_ffsll(lookahead_msk_);
+					/* number of bits to ignore from the next iteration */
+					ignore_bits = fsb_idx - 1;
+					/* ignore all bits preceding the first set bit after the first clear bit
+					 * starting from LSB of lookahead_msk_. 
+					 */
+					ignore_msk = ~((1ULL << ignore_bits) - 1);
 				}
 				msk_idx = lookahead_idx - 1;
 				break;

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

UNH-IOL DPDK Community Lab