Skip to contentSkip to conversation

mmc: fix host release issue after discard operation

PATCH In review Ray Jui 3 participants 5 messages Oct 26, 2013 – Nov 26, 2013 MMC, SD and SDIO

lore
Share & tools
lore

Ray Jui

author
#0 lore raw

PATCH v2 1/1 mmc: fix host release issue after discard operation

Under function mmc_blk_issue_rq, after an MMC discard operation, the MMC request data structure may be freed in memory. Later in the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK is dangerous and invalid. It causes the MMC host not to be released when it should

This patch fixes the issue by marking the special request down before the discard/flush operation

Reported by: Harold (SoonYeal) Yang <[email protected]>

---
 drivers/mmc/card/block.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/card/block.c +4 -3
index 1a3163f..4e8212c 100644
@@ -1959,6 +1959,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 	struct mmc_card *card = md->queue.card;
 	struct mmc_host *host = card->host;
 	unsigned long flags;
+	unsigned int cmd_flags = req ? req->cmd_flags : 0;
 
 	if (req && !mq->mqrq_prev->req)
 		/* claim host only for the first request */
@@ -1974,7 +1975,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 	}
 
 	mq->flags &= ~MMC_QUEUE_NEW_REQUEST;
-	if (req && req->cmd_flags & REQ_DISCARD) {
+	if (cmd_flags & REQ_DISCARD) {
 		/* complete ongoing async transfer before issuing discard */
 		if (card->host->areq)
 			mmc_blk_issue_rw_rq(mq, NULL);
@@ -1983,7 +1984,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 			ret = mmc_blk_issue_secdiscard_rq(mq, req);
 		else
 			ret = mmc_blk_issue_discard_rq(mq, req);
-	} else if (req && req->cmd_flags & REQ_FLUSH) {
+	} else if (cmd_flags & REQ_FLUSH) {
 		/* complete ongoing async transfer before issuing flush */
 		if (card->host->areq)
 			mmc_blk_issue_rw_rq(mq, NULL);
@@ -1999,7 +2000,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 
 out:
 	if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) ||
-	     (req && (req->cmd_flags & MMC_REQ_SPECIAL_MASK)))
+	     (cmd_flags & MMC_REQ_SPECIAL_MASK))
 		/*
 		 * Release host when there are no more requests
 		 * and after special request(discard, flush) is done.
Signature · 1 line
1.7.9.5
author
#1 lore raw
Quoted 48 lines · Ray Jui

Under function mmc_blk_issue_rq, after an MMC discard operation, the MMC request data structure may be freed in memory. Later in the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK is dangerous and invalid. It causes the MMC host not to be released when it should

This patch fixes the issue by marking the special request down before the discard/flush operation

Reported by: Harold (SoonYeal) Yang <[email protected]>

---
  drivers/mmc/card/block.c |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/card/block.c +3 -2
index 1a3163f..4e8212c 100644
@@ -1959,6 +1959,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
  	struct mmc_card *card = md->queue.card;
  	struct mmc_host *host = card->host;
  	unsigned long flags;
+	unsigned int cmd_flags = req ? req->cmd_flags : 0;
 
  	if (req && !mq->mqrq_prev->req)
  		/* claim host only for the first request */
@@ -1974,7 +1975,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
  	}
 
  	mq->flags &= ~MMC_QUEUE_NEW_REQUEST;
-	if (req && req->cmd_flags & REQ_DISCARD) {
+	if (cmd_flags & REQ_DISCARD) {
  		/* complete ongoing async transfer before issuing discard */
  		if (card->host->areq)
  			mmc_blk_issue_rw_rq(mq, NULL);
@@ -1983,7 +1984,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
  			ret = mmc_blk_issue_secdiscard_rq(mq, req);
  		else
  			ret = mmc_blk_issue_discard_rq(mq, req);
-	} else if (req && req->cmd_flags & REQ_FLUSH) {
+	} else if (cmd_flags & REQ_FLUSH) {
  		/* complete ongoing async transfer before issuing flush */
  		if (card->host->areq)
  			mmc_blk_issue_rw_rq(mq, NULL);

drivers/mmc/card/block.c static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) · line 2006

Quoted 8 lines
drivers/mmc/card/block.c +1 -1
@@ -1999,7 +2000,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 
  out:
  	if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) ||
-	     (req && (req->cmd_flags & MMC_REQ_SPECIAL_MASK)))
+	     (cmd_flags & MMC_REQ_SPECIAL_MASK))
  		/*
  		 * Release host when there are no more requests
  		 * and after special request(discard, flush) is done.

Hi Seungwon/Chris,

Have you got a chance to review the MMC discard patch V2? The patch v2 makes changes from v1 based on Seungwon's review comments.

Thanks,

Ray Jui

Acked-by
#2 lore raw
Quoted 6 lines · Ray Jui
Quoted 5 lines · Ray Jui

Under function mmc_blk_issue_rq, after an MMC discard operation, the MMC request data structure may be freed in memory. Later in the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK is dangerous and invalid. It causes the MMC host not to be released when it should

Is commit message cut here?

Quoted 53 lines
Quoted 43 lines

This patch fixes the issue by marking the special request down before the discard/flush operation

Reported by: Harold (SoonYeal) Yang <[email protected]>

---
  drivers/mmc/card/block.c |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/card/block.c +3 -2
index 1a3163f..4e8212c 100644
@@ -1959,6 +1959,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
  	struct mmc_card *card = md->queue.card;
  	struct mmc_host *host = card->host;
  	unsigned long flags;
+	unsigned int cmd_flags = req ? req->cmd_flags : 0;
 
  	if (req && !mq->mqrq_prev->req)
  		/* claim host only for the first request */
@@ -1974,7 +1975,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
  	}
 
  	mq->flags &= ~MMC_QUEUE_NEW_REQUEST;
-	if (req && req->cmd_flags & REQ_DISCARD) {
+	if (cmd_flags & REQ_DISCARD) {
  		/* complete ongoing async transfer before issuing discard */
  		if (card->host->areq)
  			mmc_blk_issue_rw_rq(mq, NULL);
@@ -1983,7 +1984,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
  			ret = mmc_blk_issue_secdiscard_rq(mq, req);
  		else
  			ret = mmc_blk_issue_discard_rq(mq, req);
-	} else if (req && req->cmd_flags & REQ_FLUSH) {
+	} else if (cmd_flags & REQ_FLUSH) {
  		/* complete ongoing async transfer before issuing flush */
  		if (card->host->areq)
  			mmc_blk_issue_rw_rq(mq, NULL);

drivers/mmc/card/block.c static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) · line 2006

Quoted 8 lines
drivers/mmc/card/block.c +1 -1
@@ -1999,7 +2000,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 
  out:
  	if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) ||
-	     (req && (req->cmd_flags & MMC_REQ_SPECIAL_MASK)))
+	     (cmd_flags & MMC_REQ_SPECIAL_MASK))
  		/*
  		 * Release host when there are no more requests
  		 * and after special request(discard, flush) is done.

Hi Seungwon/Chris,

Quoted 2 lines

Have you got a chance to review the MMC discard patch V2? The patch v2 makes changes from v1 based on Seungwon's review comments.

Adding linux-mmc. It has been omitted.
(+linux-mmc)

Thanks,
Seungwon Jeon

#3 lore raw
In reply to Ray Jui

Hi Ray,

Quoted 6 lines · Ray Jui

Under function mmc_blk_issue_rq, after an MMC discard operation, the MMC request data structure may be freed in memory. Later in the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK is dangerous and invalid. It causes the MMC host not to be released when it should

Quoted 6 lines

This patch fixes the issue by marking the special request down before the discard/flush operation

Reported by: Harold (SoonYeal) Yang <[email protected]>

Thanks, pushed to mmc-next for 3.14 and -stable.

- Chris.

Signature · 1 line
Chris Ball   <[email protected]>   <http://printf.net/>
author
#4 lore raw
Quoted 12 lines · Chris Ball

Hi Ray,

Quoted 9 lines · Ray Jui

Under function mmc_blk_issue_rq, after an MMC discard operation, the MMC request data structure may be freed in memory. Later in the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK is dangerous and invalid. It causes the MMC host not to be released when it should

This patch fixes the issue by marking the special request down before the discard/flush operation

Quoted 8 lines
Quoted 3 lines

Reported by: Harold (SoonYeal) Yang <[email protected]>

Thanks, pushed to mmc-next for 3.14 and -stable.

- Chris.

Great!

Thanks,

Ray