Skip to contentSkip to conversation

staging: qlge: qlge_main.c: convert do-while loops to for loops

PATCH In review Srivathsan Sivakumar 2 participants 5 messages Jun 9, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: qlge: qlge_main.c: convert do-while loops to for loops

simplify do-while loops to for loops

---
 drivers/staging/qlge/qlge_main.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/staging/qlge/qlge_main.c +14 -14
index 8c35d4c4b851..308e8b621185 100644
@@ -3006,13 +3006,13 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		cqicb->flags |= FLAGS_LL;	/* Load lbq values */
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;
-		page_entries = 0;
-		do {
-			*base_indirect_ptr = cpu_to_le64(tmp);
-			tmp += DB_PAGE_SIZE;
-			base_indirect_ptr++;
-			page_entries++;
-		} while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+		for (page_entries = 0; page_entries <
+			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++) {
+				*base_indirect_ptr = cpu_to_le64(tmp);
+				tmp += DB_PAGE_SIZE;
+				base_indirect_ptr++;
+		}
 		cqicb->lbq_addr = cpu_to_le64(rx_ring->lbq.base_indirect_dma);
 		cqicb->lbq_buf_size =
 			cpu_to_le16(QLGE_FIT16(qdev->lbq_buf_size));
@@ -3023,13 +3023,13 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		cqicb->flags |= FLAGS_LS;	/* Load sbq values */
 		tmp = (u64)rx_ring->sbq.base_dma;
 		base_indirect_ptr = rx_ring->sbq.base_indirect;
-		page_entries = 0;
-		do {
-			*base_indirect_ptr = cpu_to_le64(tmp);
-			tmp += DB_PAGE_SIZE;
-			base_indirect_ptr++;
-			page_entries++;
-		} while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+		for (page_entries = 0; page_entries <
+			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++) {
+				*base_indirect_ptr = cpu_to_le64(tmp);
+				tmp += DB_PAGE_SIZE;
+				base_indirect_ptr++;
+		}
 		cqicb->sbq_addr =
 			cpu_to_le64(rx_ring->sbq.base_indirect_dma);
 		cqicb->sbq_buf_size = cpu_to_le16(SMALL_BUFFER_SIZE);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 12 lines · Srivathsan Sivakumar
drivers/staging/qlge/qlge_main.c +0 -4
index 8c35d4c4b851..308e8b621185 100644
@@ -3006,13 +3006,13 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		cqicb->flags |= FLAGS_LL;	/* Load lbq values */
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;
-		page_entries = 0;
-		do {
-			*base_indirect_ptr = cpu_to_le64(tmp);
-			tmp += DB_PAGE_SIZE;

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3015

Quoted 10 lines
drivers/staging/qlge/qlge_main.c +7 -3
-			base_indirect_ptr++;
-			page_entries++;
-		} while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+		for (page_entries = 0; page_entries <
+			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++) {
+				*base_indirect_ptr = cpu_to_le64(tmp);
+				tmp += DB_PAGE_SIZE;
+				base_indirect_ptr++;
+		}

It's better than the original, but wouldn't it be better yet to write something like this (untested):

		for (i = 0; i <	MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); i++)
			base_indirect_ptr[i] = cpu_to_le64(tmp + (i * DB_PAGE_SIZE));

Same with the other as well, obviously.

regards,
dan carpenter

#2 lore raw

PATCH 1/1 staging: qlge: qlge_main.c: convert do-while loops to for loops

Quoted 27 lines · Dan Carpenter
Quoted 12 lines · Srivathsan Sivakumar
drivers/staging/qlge/qlge_main.c +0 -4
index 8c35d4c4b851..308e8b621185 100644
@@ -3006,13 +3006,13 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		cqicb->flags |= FLAGS_LL;	/* Load lbq values */
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;
-		page_entries = 0;
-		do {
-			*base_indirect_ptr = cpu_to_le64(tmp);
-			tmp += DB_PAGE_SIZE;

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3015

Quoted 10 lines
drivers/staging/qlge/qlge_main.c +7 -3
-			base_indirect_ptr++;
-			page_entries++;
-		} while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+		for (page_entries = 0; page_entries <
+			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++) {
+				*base_indirect_ptr = cpu_to_le64(tmp);
+				tmp += DB_PAGE_SIZE;
+				base_indirect_ptr++;
+		}

It's better than the original, but wouldn't it be better yet to write something like this (untested):

Quoted 8 lines
		for (i = 0; i <	MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); i++)
			base_indirect_ptr[i] = cpu_to_le64(tmp + (i * DB_PAGE_SIZE));

Same with the other as well, obviously.

regards,
dan carpenter

Hello Dan,

Thanks for your input

wouldn't base_indirect_ptr point at a different endian value if tmp is added with (i * DB_PAGE_SIZE)?

Thanks,
Srivathsan

#3 lore raw
Quoted 37 lines · Srivathsan Sivakumar
Quoted 27 lines · Dan Carpenter
Quoted 12 lines · Srivathsan Sivakumar
drivers/staging/qlge/qlge_main.c +0 -4
index 8c35d4c4b851..308e8b621185 100644
@@ -3006,13 +3006,13 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		cqicb->flags |= FLAGS_LL;	/* Load lbq values */
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;
-		page_entries = 0;
-		do {
-			*base_indirect_ptr = cpu_to_le64(tmp);
-			tmp += DB_PAGE_SIZE;

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3015

Quoted 10 lines
drivers/staging/qlge/qlge_main.c +7 -3
-			base_indirect_ptr++;
-			page_entries++;
-		} while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+		for (page_entries = 0; page_entries <
+			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++) {
+				*base_indirect_ptr = cpu_to_le64(tmp);
+				tmp += DB_PAGE_SIZE;
+				base_indirect_ptr++;
+		}

It's better than the original, but wouldn't it be better yet to write something like this (untested):

Quoted 8 lines
		for (i = 0; i <	MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); i++)
			base_indirect_ptr[i] = cpu_to_le64(tmp + (i * DB_PAGE_SIZE));

Same with the other as well, obviously.

regards,
dan carpenter

Quoted 6 lines

Hello Dan,

Thanks for your input

wouldn't base_indirect_ptr point at a different endian value if tmp is added with (i * DB_PAGE_SIZE)?

tmp is cpu endian so we can do math on it. Then we convert the result to le64. This is how it works before and after. What isn't allowed (doesn't make sense) is to do math on endian data so "cpu_to_le64(tmp) + i * DB_PAGE_SIZE" is wrong.

Sparse can detect endian bugs like that:
https://lwn.net/Articles/205624/

regards,
dan carpenter

#4 lore raw

PATCH 1/1 staging: qlge: qlge_main.c: convert do-while loops to for loops

Quoted 50 lines · Dan Carpenter
Quoted 37 lines · Srivathsan Sivakumar
Quoted 27 lines · Dan Carpenter
Quoted 12 lines · Srivathsan Sivakumar
drivers/staging/qlge/qlge_main.c +0 -4
index 8c35d4c4b851..308e8b621185 100644
@@ -3006,13 +3006,13 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		cqicb->flags |= FLAGS_LL;	/* Load lbq values */
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;
-		page_entries = 0;
-		do {
-			*base_indirect_ptr = cpu_to_le64(tmp);
-			tmp += DB_PAGE_SIZE;

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3015

Quoted 10 lines
drivers/staging/qlge/qlge_main.c +7 -3
-			base_indirect_ptr++;
-			page_entries++;
-		} while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+		for (page_entries = 0; page_entries <
+			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++) {
+				*base_indirect_ptr = cpu_to_le64(tmp);
+				tmp += DB_PAGE_SIZE;
+				base_indirect_ptr++;
+		}

It's better than the original, but wouldn't it be better yet to write something like this (untested):

Quoted 8 lines
		for (i = 0; i <	MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); i++)
			base_indirect_ptr[i] = cpu_to_le64(tmp + (i * DB_PAGE_SIZE));

Same with the other as well, obviously.

regards,
dan carpenter

Quoted 6 lines

Hello Dan,

Thanks for your input

wouldn't base_indirect_ptr point at a different endian value if tmp is added with (i * DB_PAGE_SIZE)?

tmp is cpu endian so we can do math on it. Then we convert the result to le64. This is how it works before and after. What isn't allowed (doesn't make sense) is to do math on endian data so "cpu_to_le64(tmp) + i * DB_PAGE_SIZE" is wrong.

Quoted 6 lines

Sparse can detect endian bugs like that:
https://lwn.net/Articles/205624/

regards,
dan carpenter

I understand now, I'll send the revised patch soon

thanks,
Srivathsan