Skip to contentSkip to conversation

mspro_block: Fix an error code in mspro_block_issue_req()

PATCH In review Dan Carpenter 3 participants 6 messages May 10, 2019 – May 28, 2019

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

PATCH 1/1 mspro_block: Fix an error code in mspro_block_issue_req()

We accidentally changed the error code from -EAGAIN to 1 when we did the blk-mq conversion.

Maybe a contributing factor to this mistake is that it wasn't obvious that the "while (chunk) {" condition is always true. I have cleaned that up as well.

Fixes d0be12274dad ("mspro_block: convert to blk-mq")
---
 drivers/memstick/core/mspro_block.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/memstick/core/mspro_block.c +6 -7
index aba50ec98b4d..9fc22c755dbf 100644
@@ -694,13 +694,13 @@ static void h_mspro_block_setup_cmd(struct memstick_dev *card, u64 offset,
 
 /*** Data transfer ***/
 
-static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
+static int mspro_block_issue_req(struct memstick_dev *card)
 {
 	struct mspro_block_data *msb = memstick_get_drvdata(card);
 	u64 t_off;
 	unsigned int count;
 
-	while (chunk) {
+	while (true) {
 		msb->current_page = 0;
 		msb->current_seg = 0;
 		msb->seg_count = blk_rq_map_sg(msb->block_req->q,
@@ -709,6 +709,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 
 		if (!msb->seg_count) {
 			unsigned int bytes = blk_rq_cur_bytes(msb->block_req);
+			bool chunk;
 
 			chunk = blk_update_request(msb->block_req,
 							BLK_STS_RESOURCE,
@@ -718,7 +719,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 			__blk_mq_end_request(msb->block_req,
 						BLK_STS_RESOURCE);
 			msb->block_req = NULL;
-			break;
+			return -EAGAIN;
 		}
 
 		t_off = blk_rq_pos(msb->block_req);
@@ -735,8 +736,6 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 		memstick_new_req(card->host);
 		return 0;
 	}
-
-	return 1;
 }
 
 static int mspro_block_complete_req(struct memstick_dev *card, int error)
@@ -779,7 +778,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
 		chunk = blk_update_request(msb->block_req,
 				errno_to_blk_status(error), t_len);
 		if (chunk) {
-			error = mspro_block_issue_req(card, chunk);
+			error = mspro_block_issue_req(card);
 			if (!error)
 				goto out;
 		} else {
@@ -849,7 +848,7 @@ static blk_status_t mspro_queue_rq(struct blk_mq_hw_ctx *hctx,
 	msb->block_req = bd->rq;
 	blk_mq_start_request(bd->rq);
 
-	if (mspro_block_issue_req(card, true))
+	if (mspro_block_issue_req(card))
 		msb->block_req = NULL;
 
 	spin_unlock_irq(&msb->q_lock);
Signature · 1 line
2.18.0
#1 lore raw

Am 10.05.2019 13:24, schrieb Dan Carpenter:

Quoted 51 lines

We accidentally changed the error code from -EAGAIN to 1 when we did the blk-mq conversion.

Maybe a contributing factor to this mistake is that it wasn't obvious that the "while (chunk) {" condition is always true. I have cleaned that up as well.

Fixes d0be12274dad ("mspro_block: convert to blk-mq")
---
 drivers/memstick/core/mspro_block.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/memstick/core/mspro_block.c +4 -3
index aba50ec98b4d..9fc22c755dbf 100644
@@ -694,13 +694,13 @@ static void h_mspro_block_setup_cmd(struct memstick_dev *card, u64 offset,
 
 /*** Data transfer ***/
 
-static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
+static int mspro_block_issue_req(struct memstick_dev *card)
 {
 	struct mspro_block_data *msb = memstick_get_drvdata(card);
 	u64 t_off;
 	unsigned int count;
 
-	while (chunk) {
+	while (true) {
 		msb->current_page = 0;
 		msb->current_seg = 0;
 		msb->seg_count = blk_rq_map_sg(msb->block_req->q,
@@ -709,6 +709,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 
 		if (!msb->seg_count) {
 			unsigned int bytes = blk_rq_cur_bytes(msb->block_req);
+			bool chunk;
 
 			chunk = blk_update_request(msb->block_req,
 							BLK_STS_RESOURCE,
@@ -718,7 +719,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 			__blk_mq_end_request(msb->block_req,
 						BLK_STS_RESOURCE);
 			msb->block_req = NULL;
-			break;
+			return -EAGAIN;
 		}
 
 		t_off = blk_rq_pos(msb->block_req);

drivers/memstick/core/mspro_block.c static int mspro_block_issue_req(struct memstick_dev *card, bool chunk) · line 740

Quoted 7 lines
drivers/memstick/core/mspro_block.c +0 -2
@@ -735,8 +736,6 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 		memstick_new_req(card->host);
 		return 0;
 	}
-
-	return 1;
 }
 

If i see this correcly everybody leaving the loop making the function return something. I do not know how would do that but IMHO is better to be defensive and end the function with a propper return code (perhaps 0).

re,
wh

Quoted 19 lines
drivers/memstick/core/mspro_block.c +2 -2
 static int mspro_block_complete_req(struct memstick_dev *card, int error)
@@ -779,7 +778,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
 		chunk = blk_update_request(msb->block_req,
 				errno_to_blk_status(error), t_len);
 		if (chunk) {
-			error = mspro_block_issue_req(card, chunk);
+			error = mspro_block_issue_req(card);
 			if (!error)
 				goto out;
 		} else {
@@ -849,7 +848,7 @@ static blk_status_t mspro_queue_rq(struct blk_mq_hw_ctx *hctx,
 	msb->block_req = bd->rq;
 	blk_mq_start_request(bd->rq);
 
-	if (mspro_block_issue_req(card, true))
+	if (mspro_block_issue_req(card))
 		msb->block_req = NULL;
 
 	spin_unlock_irq(&msb->q_lock);
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · walter harms

If i see this correcly everybody leaving the loop making the function return something. I do not know how would do that but IMHO is better to be defensive and end the function with a propper return code (perhaps 0).

It's a forever loop. If we add another break statement without adding at return then GCC will complain.

I feel like maybe you're saying that you don't like forever loops? That becomes a pretty complicated position to take...

regards,
dan carpenter

#3 lore raw
In reply to Dan Carpenter

Am 10.05.2019 15:23, schrieb Dan Carpenter:

Quoted 6 lines · walter harms
Quoted 4 lines

If i see this correcly everybody leaving the loop making the function return something. I do not know how would do that but IMHO is better to be defensive and end the function with a propper return code (perhaps 0).

Quoted 6 lines

It's a forever loop. If we add another break statement without adding at return then GCC will complain.

I feel like maybe you're saying that you don't like forever loops? That becomes a pretty complicated position to take...

No, not really,
but after several years of programming i have learned that forever() is never forever and a break statement is easily added (in future).

Also it also looks strange to have a function returning int but the last thing is not returning something.

just my 2 cents,

re,
wh

ps: you could easily do
memstick_new_req(card->host);
break;
}
return 0;

#5 lore raw
In reply to Dan Carpenter
Quoted 10 lines · Dan Carpenter

We accidentally changed the error code from -EAGAIN to 1 when we did the blk-mq conversion.

Maybe a contributing factor to this mistake is that it wasn't obvious that the "while (chunk) {" condition is always true. I have cleaned that up as well.

Fixes d0be12274dad ("mspro_block: convert to blk-mq")

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe

Quoted 71 lines
---
 drivers/memstick/core/mspro_block.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/memstick/core/mspro_block.c +6 -8
index aba50ec98b4d..9fc22c755dbf 100644
@@ -694,13 +694,13 @@ static void h_mspro_block_setup_cmd(struct memstick_dev *card, u64 offset,
 
 /*** Data transfer ***/
 
-static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
+static int mspro_block_issue_req(struct memstick_dev *card)
 {
        struct mspro_block_data *msb = memstick_get_drvdata(card);
        u64 t_off;
        unsigned int count;
 
-       while (chunk) {
+       while (true) {
                msb->current_page = 0;
                msb->current_seg = 0;
                msb->seg_count = blk_rq_map_sg(msb->block_req->q,
@@ -709,6 +709,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
 
                if (!msb->seg_count) {
                        unsigned int bytes = blk_rq_cur_bytes(msb->block_req);
+                       bool chunk;
 
                        chunk = blk_update_request(msb->block_req,
                                                        BLK_STS_RESOURCE,
@@ -718,7 +719,7 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
                        __blk_mq_end_request(msb->block_req,
                                                BLK_STS_RESOURCE);
                        msb->block_req = NULL;
-                       break;
+                       return -EAGAIN;
                }
 
                t_off = blk_rq_pos(msb->block_req);
@@ -735,8 +736,6 @@ static int mspro_block_issue_req(struct memstick_dev *card, bool chunk)
                memstick_new_req(card->host);
                return 0;
        }
-
-       return 1;
 }
 
 static int mspro_block_complete_req(struct memstick_dev *card, int error)
@@ -779,7 +778,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error)
                chunk = blk_update_request(msb->block_req,
                                errno_to_blk_status(error), t_len);
                if (chunk) {
-                       error = mspro_block_issue_req(card, chunk);
+                       error = mspro_block_issue_req(card);
                        if (!error)
                                goto out;
                } else {
@@ -849,7 +848,7 @@ static blk_status_t mspro_queue_rq(struct blk_mq_hw_ctx *hctx,
        msb->block_req = bd->rq;
        blk_mq_start_request(bd->rq);
 
-       if (mspro_block_issue_req(card, true))
+       if (mspro_block_issue_req(card))
                msb->block_req = NULL;
 
        spin_unlock_irq(&msb->q_lock);
--

2.18.0