Patchwork [3/8] mtd: use generic helper to set max_discard_sectors

login
register
mail settings
Submitter NamJae Jeon
Date April 13, 2013, 1:38 p.m.
Message ID <1365860324-21295-1-git-send-email-linkinjeon@gmail.com>
Download mbox | patch
Permalink /patch/236349/
State New
Headers show

Comments

NamJae Jeon - April 13, 2013, 1:38 p.m.
From: Namjae Jeon <namjae.jeon@samsung.com>

It is better to use blk_queue_max_discard_sectors helper
function to set max_discard_sectors as it checks
max_discard_sectors upper limit UINT_MAX >> 9

similar issue was reported for mmc in below link
https://lkml.org/lkml/2013/4/1/292

If multiple discard requests get merged, merged discard request's
size exceeds 4GB, there is possibility that merged discard request's
__data_len field may overflow.

This patch fixes this issue.

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Vivek Trivedi <t.vivek@samsung.com>
---
 drivers/mtd/mtd_blkdevs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Artem Bityutskiy - May 13, 2013, 7:08 a.m.
On Sat, 2013-04-13 at 22:38 +0900, Namjae Jeon wrote:
> From: Namjae Jeon <namjae.jeon@samsung.com>
> 
> It is better to use blk_queue_max_discard_sectors helper
> function to set max_discard_sectors as it checks
> max_discard_sectors upper limit UINT_MAX >> 9
> 
> similar issue was reported for mmc in below link
> https://lkml.org/lkml/2013/4/1/292

Pushed to l2-mtd.git, thanks!
NamJae Jeon - May 13, 2013, 7:10 a.m.
2013/5/13, Artem Bityutskiy <dedekind1@gmail.com>:
> On Sat, 2013-04-13 at 22:38 +0900, Namjae Jeon wrote:
>> From: Namjae Jeon <namjae.jeon@samsung.com>
>>
>> It is better to use blk_queue_max_discard_sectors helper
>> function to set max_discard_sectors as it checks
>> max_discard_sectors upper limit UINT_MAX >> 9
>>
>> similar issue was reported for mmc in below link
>> https://lkml.org/lkml/2013/4/1/292
>
> Pushed to l2-mtd.git, thanks!
>
Hi. Artem.
Please revert this patch and ignore it.
Because this issue was already fixed by the below patch.
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=871dd9286e25330c8a581e5dacfa8b1dfe1dd641

Sorry for interrupt.
Thanks.
> --
> Best Regards,
> Artem Bityutskiy
>
>

Patch

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 5ad39bb..cf35f99 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -417,7 +417,7 @@  int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
 
 	if (tr->discard) {
 		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, new->rq);
-		new->rq->limits.max_discard_sectors = UINT_MAX;
+		blk_queue_max_discard_sectors(new->rq, UINT_MAX >> 9);
 	}
 
 	gd->queue = new->rq;