*** adding and exposing SANITIZE capability to the user space via a unique IOCTL ***
Subsystems (5)
v7 cover *** adding and exposing SANITIZE capability to the user space via a unique IOCTL ***
*** adding and exposing SANITIZE capability to the user space via a unique IOCTL ***
Yaniv Gardi (2):
block: ioctl support for sanitize in eMMC 4.5
mmc: card: Adding support for sanitize in eMMC 4.5
block/blk-core.c | 15 +++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++ block/blk-merge.c | 4 ++ block/elevator.c | 2 +- block/ioctl.c | 9 +++++ drivers/mmc/card/block.c | 72 ++++++++++++++++++++++++++++++++------------ drivers/mmc/card/queue.c | 10 +++++- include/linux/blk_types.h | 5 ++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + include/linux/mmc/host.h | 1 + kernel/trace/blktrace.c | 2 + 12 files changed, 149 insertions(+), 26 deletions(-)
Signature · 4 lines
1.7.6 -- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
PATCH RESEND v7 1/2 block: ioctl support for sanitize in eMMC 4.5
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5.
The sanitize ioctl support helps performing this operation via user application.
--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)
block/blk-core.c +12 -3
@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),
@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */
@@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {
@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) ||
block/blk-lib.c +51 -0
57 lines not on this page · raw message
block/blk-merge.c +4 -0
@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!rq_mergeable (rq))return false; +/* don't merge file system requests and sanitize requests */ +if ((req->cmd_flags &REQ_SANITIZE ) != (next->cmd_flags &REQ_SANITIZE )) +return false; +/* don't merge file system requests and discard requests */ if ((bio->bi_rw &REQ_DISCARD ) != (rq->bio->bi_rw &REQ_DISCARD ))return false;
block/elevator.c +1 -1
@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)if (rq->cmd_flags &REQ_SOFTBARRIER ) {/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type ==REQ_TYPE_FS || - (rq->cmd_flags &REQ_DISCARD )) { + (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }
block/ioctl.c +9 -0
@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,return blkdev_issue_discard (bdev, start, len,GFP_KERNEL , flags); } +static int blk_ioctl_sanitize (struct block_device *bdev) +{ +return blkdev_issue_sanitize (bdev,GFP_KERNEL ); +} +static int put_ushort (unsigned long arg,unsigned short val) {return put_user (val, (unsigned short __user *)arg);
@@ -234,6 +239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,set_device_ro (bdev, n);return 0 ; +case BLKSANITIZE : + ret =blk_ioctl_sanitize (bdev); +break ; +case BLKDISCARD :case BLKSECDISCARD : {uint64_t range[2 ];
include/linux/blk_types.h +4 -1
@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE,/* merge of different types, fail separately */ + __REQ_SANITIZE,/* sanitize */ __REQ_NR_BITS, /* stops here */ };
@@ -171,13 +172,15 @@ enum rq_flag_bits {#define REQ_META (1 << __REQ_META)#define REQ_PRIO (1 << __REQ_PRIO)#define REQ_DISCARD (1 << __REQ_DISCARD) +#define REQ_SANITIZE (1 << __REQ_SANITIZE)#define REQ_NOIDLE (1 << __REQ_NOIDLE)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)#define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ - REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \ + REQ_SANITIZE)#define REQ_CLONE_MASK REQ_COMMON_MASK#define REQ_RAHEAD (1 << __REQ_RAHEAD)
include/linux/blkdev.h +3 -0
@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \
@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)#define blk_queue_stackable (q) \ test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) +#define blk_queue_sanitize (q) test_bit(QUEUE_FLAG_SANITIZE, &(q)->queue_flags)#define blk_queue_secdiscard (q) (blk_queue_discard(q) && \ test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))
@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,extern int blkdev_issue_flush (struct block_device *,gfp_t ,sector_t *);extern int blkdev_issue_discard (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask,unsigned long flags); +extern int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask);extern int blkdev_issue_zeroout (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask); static inline int sb_issue_discard(struct super_block *sb, sector_t block,
include/linux/fs.h +1 -0
@@ -333,6 +333,7 @@ struct inodes_stat_t {#define BLKDISCARDZEROES _IO(0x12,124)#define BLKSECDISCARD _IO(0x12,125)#define BLKROTATIONAL _IO(0x12,126) +#define BLKSANITIZE _IO(0x12, 127)#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */
kernel/trace/blktrace.c +2 -0
@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else
Signature · 4 lines
1.7.6 -- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
Re: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
Looks good to me.
Quoted 285 lines · Yaniv Gardi
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5.
The sanitize ioctl support helps performing this operation via user application.Signed-off-by Yaniv Gardi <[email protected]>--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)block/blk-core.c +12
-3@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */ @@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) ||block/blk-lib.c +51
-0@@ -115,6 +115,57 @@ int blkdev_issue_discard(struct block_device *bdev,sector_t sector,EXPORT_SYMBOL (blkdev_issue_discard );/** +* blkdev_issue_sanitize - queue a sanitize request +* @bdev: blockdev to issue sanitize for +* @gfp_mask: memory allocation flags (for bio_alloc) +* +* Description: +* Issue a sanitize request for the specified block device +*/ +int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask) +{ +DECLARE_COMPLETION_ONSTACK (wait); +struct request_queue *q =bdev_get_queue (bdev); +int type =REQ_WRITE |REQ_SANITIZE ; +struct bio_batch bb; +struct bio *bio; +int ret =0 ; + +if (!q) +return -ENXIO ; + +if (!blk_queue_sanitize (q)) { +pr_err ("%s - card doesn't support sanitize" , __func__); +return -EOPNOTSUPP ; + } + + bio =bio_alloc (gfp_mask,1 ); +if (!bio) +return -ENOMEM ; + +atomic_set (&bb.done,1 ); + bb.flags =1 <<BIO_UPTODATE ; + bb.wait = &wait; + + bio->bi_end_io = bio_batch_end_io; + bio->bi_bdev = bdev; + bio->bi_private = &bb; + +atomic_inc (&bb.done); +submit_bio (type, bio); + +/* Wait for bios in-flight */ +if (!atomic_dec_and_test (&bb.done)) +wait_for_completion (&wait); + +if (!test_bit (BIO_UPTODATE , &bb.flags)) + ret = -EIO ; + +return ret; +} +EXPORT_SYMBOL (blkdev_issue_sanitize); + +/** * blkdev_issue_zeroout - generate number of zero filed write bios * @bdev: blockdev to issue * @sector: start sector
block/blk-merge.c +4
-0@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!rq_mergeable (rq))return false; +/* don't merge file system requests and sanitize requests */ +if ((req->cmd_flags &REQ_SANITIZE ) != (next->cmd_flags &REQ_SANITIZE )) +return false; +/* don't merge file system requests and discard requests */ if ((bio->bi_rw &REQ_DISCARD ) != (rq->bio->bi_rw &REQ_DISCARD ))block/blk-merge.c +0
-0return false;block/elevator.c +1
-1@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where) if (rq->cmd_flags & REQ_SOFTBARRIER) {/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type ==REQ_TYPE_FS || - (rq->cmd_flags &REQ_DISCARD )) { + (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq;block/elevator.c +0
-0}block/ioctl.c +5
-0@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start, return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags); } +static int blk_ioctl_sanitize (struct block_device *bdev) +{ +return blkdev_issue_sanitize (bdev,GFP_KERNEL ); +} +static int put_ushort (unsigned long arg,unsigned short val) {block/ioctl.c +4
-0return put_user (val, (unsigned short __user *)arg);@@ -234,6 +239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,set_device_ro (bdev, n);return 0 ; +case BLKSANITIZE : + ret =blk_ioctl_sanitize (bdev); +break ; +case BLKDISCARD :case BLKSECDISCARD : {block/ioctl.c +0
-0uint64_t range[2 ];include/linux/blk_types.h +4
-1@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE,/* merge of different types, fail separately */ + __REQ_SANITIZE,/* sanitize */ __REQ_NR_BITS, /* stops here */ };@@ -171,13 +172,15 @@ enum rq_flag_bits {#define REQ_META (1 << __REQ_META)#define REQ_PRIO (1 << __REQ_PRIO)#define REQ_DISCARD (1 << __REQ_DISCARD) +#define REQ_SANITIZE (1 << __REQ_SANITIZE)#define REQ_NOIDLE (1 << __REQ_NOIDLE)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)#define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ - REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \ + REQ_SANITIZE)#define REQ_CLONE_MASK REQ_COMMON_MASK#define REQ_RAHEAD (1 << __REQ_RAHEAD)include/linux/blkdev.h +2
-0@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)#define blk_queue_stackable (q) \ test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) +#define blk_queue_sanitize (q) test_bit(QUEUE_FLAG_SANITIZE, &(q)->queue_flags)#define
blk_queue_secdiscard(q)(blk_queue_discard(q)&& \include/linux/blkdev.h +1
-0test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt, extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *); extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); +extern int blkdev_issue_sanitize(struct block_device *bdev, gfp_t gfp_mask);extern int blkdev_issue_zeroout(struct
block_device*bdev,sector_t
sector,
sector_tnr_sects,gfp_tgfp_mask);
static inline int sb_issue_discard(structsuper_block*sb,sector_t
block,include/linux/fs.h +1
-0@@ -333,6 +333,7 @@ struct inodes_stat_t {#define BLKDISCARDZEROES _IO(0x12,124)#define BLKSECDISCARD _IO(0x12,125)#define BLKROTATIONAL _IO(0x12,126) +#define BLKSANITIZE _IO(0x12, 127)#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */ kernel/trace/blktrace.c +2
-1@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else --1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
Signature · 2 lines
Sent by consultant of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
Re: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
Hi Jens,
Can you approve this patch?
Thanks,
Yaniv
Quoted 305 lines
Looks good to me.
Reviewed-by Maya Erez <[email protected]>Quoted 284 lines · Yaniv Gardi
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5.
The sanitize ioctl support helps performing this operation via user application.Signed-off-by Yaniv Gardi <[email protected]>--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)block/blk-core.c +12
-3@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */ @@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) ||block/blk-lib.c +51
-0@@ -115,6 +115,57 @@ int blkdev_issue_discard(struct block_device *bdev,sector_t sector,EXPORT_SYMBOL (blkdev_issue_discard );/** +* blkdev_issue_sanitize - queue a sanitize request +* @bdev: blockdev to issue sanitize for +* @gfp_mask: memory allocation flags (for bio_alloc) +* +* Description: +* Issue a sanitize request for the specified block device +*/ +int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask) +{ +DECLARE_COMPLETION_ONSTACK (wait); +struct request_queue *q =bdev_get_queue (bdev); +int type =REQ_WRITE |REQ_SANITIZE ; +struct bio_batch bb; +struct bio *bio; +int ret =0 ; + +if (!q) +return -ENXIO ; + +if (!blk_queue_sanitize (q)) { +pr_err ("%s - card doesn't support sanitize" , __func__); +return -EOPNOTSUPP ; + } + + bio =bio_alloc (gfp_mask,1 ); +if (!bio) +return -ENOMEM ; + +atomic_set (&bb.done,1 ); + bb.flags =1 <<BIO_UPTODATE ; + bb.wait = &wait; + + bio->bi_end_io = bio_batch_end_io; + bio->bi_bdev = bdev; + bio->bi_private = &bb; + +atomic_inc (&bb.done); +submit_bio (type, bio); + +/* Wait for bios in-flight */ +if (!atomic_dec_and_test (&bb.done)) +wait_for_completion (&wait); + +if (!test_bit (BIO_UPTODATE , &bb.flags)) + ret = -EIO ; + +return ret; +} +EXPORT_SYMBOL (blkdev_issue_sanitize); + +/** * blkdev_issue_zeroout - generate number of zero filed write bios * @bdev: blockdev to issue * @sector: start sector
block/blk-merge.c +4
-0@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!rq_mergeable (rq))return false; +/* don't merge file system requests and sanitize requests */ +if ((req->cmd_flags &REQ_SANITIZE ) != (next->cmd_flags &REQ_SANITIZE )) +return false; +/* don't merge file system requests and discard requests */ block/blk-merge.c +0
-0if ((bio->bi_rw &REQ_DISCARD ) != (rq->bio->bi_rw &REQ_DISCARD ))return false;block/elevator.c +0
-0@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q,struct
request *rq, int where)block/elevator.c +1
-1if (rq->cmd_flags &REQ_SOFTBARRIER ) {/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type ==REQ_TYPE_FS || - (rq->cmd_flags &REQ_DISCARD )) { + (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }block/ioctl.c +5
-0@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start, return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags); } +static int blk_ioctl_sanitize (struct block_device *bdev) +{ +return blkdev_issue_sanitize (bdev,GFP_KERNEL ); +} +static int put_ushort (unsigned long arg,unsigned short val) {block/ioctl.c +4
-0return put_user (val, (unsigned short __user *)arg);@@ -234,6 +239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,set_device_ro (bdev, n);return 0 ; +case BLKSANITIZE : + ret =blk_ioctl_sanitize (bdev); +break ; +case BLKDISCARD :case BLKSECDISCARD : {block/ioctl.c +0
-0uint64_t range[2 ];include/linux/blk_types.h +4
-1@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE,/* merge of different types, fail separately */ + __REQ_SANITIZE,/* sanitize */ __REQ_NR_BITS, /* stops here */ };@@ -171,13 +172,15 @@ enum rq_flag_bits {#define REQ_META (1 << __REQ_META)#define REQ_PRIO (1 << __REQ_PRIO)#define REQ_DISCARD (1 << __REQ_DISCARD) +#define REQ_SANITIZE (1 << __REQ_SANITIZE)#define REQ_NOIDLE (1 << __REQ_NOIDLE)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)#define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ - REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \ + REQ_SANITIZE)#define REQ_CLONE_MASK REQ_COMMON_MASK#define REQ_RAHEAD (1 << __REQ_RAHEAD)include/linux/blkdev.h +2
-0@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)#define blk_queue_stackable (q) \ test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) +#define blk_queue_sanitize (q) test_bit(QUEUE_FLAG_SANITIZE,&(q)->queue_flags)
#defineblk_queue_secdiscard(q)(blk_queue_discard(q)&& \include/linux/blkdev.h +1
-0test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt, extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *); extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); +extern int blkdev_issue_sanitize(struct block_device *bdev, gfp_t
gfp_mask);
extern int blkdev_issue_zeroout(structblock_device*bdev,sector_t
sector,
sector_tnr_sects,gfp_tgfp_mask);
static inline int sb_issue_discard(structsuper_block*sb,sector_t
block,include/linux/fs.h +1
-0@@ -333,6 +333,7 @@ struct inodes_stat_t {#define BLKDISCARDZEROES _IO(0x12,124)#define BLKSECDISCARD _IO(0x12,125)#define BLKROTATIONAL _IO(0x12,126) +#define BLKSANITIZE _IO(0x12, 127)#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */ kernel/trace/blktrace.c +2
-1@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else --Quoted 6 lines
1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum--
Sent by consultant of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
Yaniv Gardi Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
Re: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
In reply to Yaniv GardiQuoted 257 lines · Yaniv Gardi
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5.
The sanitize ioctl support helps performing this operation via user application.Signed-off-by Yaniv Gardi <[email protected]>--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)block/blk-core.c +12
-3@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */ @@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) ||block/blk-lib.c +51
-0@@ -115,6 +115,57 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,EXPORT_SYMBOL (blkdev_issue_discard);/** +* blkdev_issue_sanitize - queue a sanitize request +* @bdev: blockdev to issue sanitize for +* @gfp_mask: memory allocation flags (for bio_alloc) +* +* Description: +* Issue a sanitize request for the specified block device +*/ +int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask) +{ +DECLARE_COMPLETION_ONSTACK (wait); +struct request_queue *q =bdev_get_queue (bdev); +int type =REQ_WRITE |REQ_SANITIZE ; +struct bio_batch bb; +struct bio *bio; +int ret =0 ; + +if (!q) +return -ENXIO ; + +if (!blk_queue_sanitize (q)) { +pr_err ("%s - card doesn't support sanitize" , __func__); +return -EOPNOTSUPP ; + } + + bio =bio_alloc (gfp_mask,1 ); +if (!bio) +return -ENOMEM ; + +atomic_set (&bb.done,1 ); + bb.flags =1 <<BIO_UPTODATE ; + bb.wait = &wait; + + bio->bi_end_io = bio_batch_end_io; + bio->bi_bdev = bdev; + bio->bi_private = &bb; + +atomic_inc (&bb.done); +submit_bio (type, bio); + +/* Wait for bios in-flight */ +if (!atomic_dec_and_test (&bb.done)) +wait_for_completion (&wait); + +if (!test_bit (BIO_UPTODATE , &bb.flags)) + ret = -EIO ; + +return ret; +} +EXPORT_SYMBOL (blkdev_issue_sanitize); + +/** * blkdev_issue_zeroout - generate number of zero filed write bios * @bdev: blockdev to issue * @sector: start sector block/blk-merge.c +4
-0@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!rq_mergeable (rq))return false; +/* don't merge file system requests and sanitize requests */ +if ((req->cmd_flags &REQ_SANITIZE ) != (next->cmd_flags &REQ_SANITIZE )) +return false; +/* don't merge file system requests and discard requests */ if ((bio->bi_rw &REQ_DISCARD ) != (rq->bio->bi_rw &REQ_DISCARD ))return false;block/elevator.c +1
-1@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)if (rq->cmd_flags &REQ_SOFTBARRIER ) {/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type ==REQ_TYPE_FS || - (rq->cmd_flags &REQ_DISCARD )) { + (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }block/ioctl.c +9
-0@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,return blkdev_issue_discard (bdev, start, len,GFP_KERNEL , flags); } +static int blk_ioctl_sanitize (struct block_device *bdev) +{ +return blkdev_issue_sanitize (bdev,GFP_KERNEL ); +} +static int put_ushort (unsigned long arg,unsigned short val) {return put_user (val, (unsigned short __user *)arg);@@ -234,6 +239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,set_device_ro (bdev, n);return 0 ; +case BLKSANITIZE : + ret =blk_ioctl_sanitize (bdev); +break ; +case BLKDISCARD :case BLKSECDISCARD : {uint64_t range[2 ];include/linux/blk_types.h +4
-1@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE,/* merge of different types, fail separately */ + __REQ_SANITIZE,/* sanitize */ __REQ_NR_BITS, /* stops here */ };@@ -171,13 +172,15 @@ enum rq_flag_bits {#define REQ_META (1 << __REQ_META)#define REQ_PRIO (1 << __REQ_PRIO)#define REQ_DISCARD (1 << __REQ_DISCARD) +#define REQ_SANITIZE (1 << __REQ_SANITIZE)#define REQ_NOIDLE (1 << __REQ_NOIDLE)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)#define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ - REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \ + REQ_SANITIZE)#define REQ_CLONE_MASK REQ_COMMON_MASK#define REQ_RAHEAD (1 << __REQ_RAHEAD)include/linux/blkdev.h +3
-0@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)#define blk_queue_stackable (q) \ test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) +#define blk_queue_sanitize (q) test_bit(QUEUE_FLAG_SANITIZE, &(q)->queue_flags)#define blk_queue_secdiscard (q) (blk_queue_discard(q) && \ test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,extern int blkdev_issue_flush (struct block_device *,gfp_t ,sector_t *);extern int blkdev_issue_discard (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask,unsigned long flags); +extern int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask);extern int blkdev_issue_zeroout (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask); static inline int sb_issue_discard(struct super_block *sb, sector_t block,include/linux/fs.h +1
-0@@ -333,6 +333,7 @@ struct inodes_stat_t {#define BLKDISCARDZEROES _IO(0x12,124)#define BLKSECDISCARD _IO(0x12,125)#define BLKROTATIONAL _IO(0x12,126) +#define BLKSANITIZE _IO(0x12, 127)#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */ kernel/trace/blktrace.c +0
-0
kernel/trace/blktrace.c void blk_fill_rwbs(char *rwbs, u32 rw, int bytes)
Quoted 9 lines
kernel/trace/blktrace.c +2
-1@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else --
there is a conflict in the macro definition of include/linux/mmc/host.h for
#define MMC_CAP2_SANITIZE (1 << 10) /* Support Sanitize */
kindly change it to
#define MMC_CAP2_SANITIZE (1 << 12) /* Support Sanitize */
as 10th bit is already in use for other purpose
Quoted 8 lines
1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum --
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
In reply to Yaniv GardiQuoted 133 lines · Yaniv Gardi
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5.
The sanitize ioctl support helps performing this operation via user application.Signed-off-by Yaniv Gardi <[email protected]>--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)block/blk-core.c +12
-3@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */ @@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) ||block/blk-lib.c +51
-0@@ -115,6 +115,57 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,EXPORT_SYMBOL (blkdev_issue_discard);/** +* blkdev_issue_sanitize - queue a sanitize request +* @bdev: blockdev to issue sanitize for +* @gfp_mask: memory allocation flags (for bio_alloc) +* +* Description: +* Issue a sanitize request for the specified block device +*/ +int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask) +{ +DECLARE_COMPLETION_ONSTACK (wait); +struct request_queue *q =bdev_get_queue (bdev); +int type =REQ_WRITE |REQ_SANITIZE ; +struct bio_batch bb; +struct bio *bio; +int ret =0 ; + +if (!q) +return -ENXIO ; + +if (!blk_queue_sanitize (q)) { +pr_err ("%s - card doesn't support sanitize" , __func__); +return -EOPNOTSUPP ; + } + + bio =bio_alloc (gfp_mask,1 ); +if (!bio) +return -ENOMEM ; + +atomic_set (&bb.done,1 ); + bb.flags =1 <<BIO_UPTODATE ; + bb.wait = &wait; + + bio->bi_end_io = bio_batch_end_io; + bio->bi_bdev = bdev; + bio->bi_private = &bb; + +atomic_inc (&bb.done); +submit_bio (type, bio); + +/* Wait for bios in-flight */ +if (!atomic_dec_and_test (&bb.done)) +wait_for_completion (&wait); + +if (!test_bit (BIO_UPTODATE , &bb.flags)) + ret = -EIO ; + +return ret; +} +EXPORT_SYMBOL (blkdev_issue_sanitize); + +/** * blkdev_issue_zeroout - generate number of zero filed write bios * @bdev: blockdev to issue * @sector: start sector block/blk-merge.c +0
-0
block/blk-merge.c bool blk_rq_merge_ok(struct request *rq, struct bio *bio) · line 481
Quoted 5 lines
block/blk-merge.c +2
-0@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!rq_mergeable (rq))return false; +/* don't merge file system requests and sanitize requests */ +if ((req->cmd_flags &REQ_SANITIZE ) != (next->cmd_flags &REQ_SANITIZE ))
this will not compile. gives compile error. Either change the function parameter to req or change in the above condition as rq
Quoted 136 lines
block/blk-merge.c +2
-0+return false; +/* don't merge file system requests and discard requests */ if ((bio->bi_rw &REQ_DISCARD ) != (rq->bio->bi_rw &REQ_DISCARD ))return false;block/elevator.c +1
-1@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)if (rq->cmd_flags &REQ_SOFTBARRIER ) {/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type ==REQ_TYPE_FS || - (rq->cmd_flags &REQ_DISCARD )) { + (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }block/ioctl.c +9
-0@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,return blkdev_issue_discard (bdev, start, len,GFP_KERNEL , flags); } +static int blk_ioctl_sanitize (struct block_device *bdev) +{ +return blkdev_issue_sanitize (bdev,GFP_KERNEL ); +} +static int put_ushort (unsigned long arg,unsigned short val) {return put_user (val, (unsigned short __user *)arg);@@ -234,6 +239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,set_device_ro (bdev, n);return 0 ; +case BLKSANITIZE : + ret =blk_ioctl_sanitize (bdev); +break ; +case BLKDISCARD :case BLKSECDISCARD : {uint64_t range[2 ];include/linux/blk_types.h +4
-1@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE,/* merge of different types, fail separately */ + __REQ_SANITIZE,/* sanitize */ __REQ_NR_BITS, /* stops here */ };@@ -171,13 +172,15 @@ enum rq_flag_bits {#define REQ_META (1 << __REQ_META)#define REQ_PRIO (1 << __REQ_PRIO)#define REQ_DISCARD (1 << __REQ_DISCARD) +#define REQ_SANITIZE (1 << __REQ_SANITIZE)#define REQ_NOIDLE (1 << __REQ_NOIDLE)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)#define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ - REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \ + REQ_SANITIZE)#define REQ_CLONE_MASK REQ_COMMON_MASK#define REQ_RAHEAD (1 << __REQ_RAHEAD)include/linux/blkdev.h +3
-0@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)#define blk_queue_stackable (q) \ test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) +#define blk_queue_sanitize (q) test_bit(QUEUE_FLAG_SANITIZE, &(q)->queue_flags)#define blk_queue_secdiscard (q) (blk_queue_discard(q) && \ test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,extern int blkdev_issue_flush (struct block_device *,gfp_t ,sector_t *);extern int blkdev_issue_discard (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask,unsigned long flags); +extern int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask);extern int blkdev_issue_zeroout (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask); static inline int sb_issue_discard(struct super_block *sb, sector_t block,include/linux/fs.h +1
-0@@ -333,6 +333,7 @@ struct inodes_stat_t {#define BLKDISCARDZEROES _IO(0x12,124)#define BLKSECDISCARD _IO(0x12,125)#define BLKROTATIONAL _IO(0x12,126) +#define BLKSANITIZE _IO(0x12, 127)#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */ kernel/trace/blktrace.c +2
-1@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else --1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum --
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
In reply to Yaniv GardiQuoted 133 lines · Yaniv Gardi
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5.
The sanitize ioctl support helps performing this operation via user application.Signed-off-by Yaniv Gardi <[email protected]>--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)block/blk-core.c +12
-3@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */ @@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) ||block/blk-lib.c +51
-0@@ -115,6 +115,57 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,EXPORT_SYMBOL (blkdev_issue_discard);/** +* blkdev_issue_sanitize - queue a sanitize request +* @bdev: blockdev to issue sanitize for +* @gfp_mask: memory allocation flags (for bio_alloc) +* +* Description: +* Issue a sanitize request for the specified block device +*/ +int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask) +{ +DECLARE_COMPLETION_ONSTACK (wait); +struct request_queue *q =bdev_get_queue (bdev); +int type =REQ_WRITE |REQ_SANITIZE ; +struct bio_batch bb; +struct bio *bio; +int ret =0 ; + +if (!q) +return -ENXIO ; + +if (!blk_queue_sanitize (q)) { +pr_err ("%s - card doesn't support sanitize" , __func__); +return -EOPNOTSUPP ; + } + + bio =bio_alloc (gfp_mask,1 ); +if (!bio) +return -ENOMEM ; + +atomic_set (&bb.done,1 ); + bb.flags =1 <<BIO_UPTODATE ; + bb.wait = &wait; + + bio->bi_end_io = bio_batch_end_io; + bio->bi_bdev = bdev; + bio->bi_private = &bb; + +atomic_inc (&bb.done); +submit_bio (type, bio); + +/* Wait for bios in-flight */ +if (!atomic_dec_and_test (&bb.done)) +wait_for_completion (&wait); + +if (!test_bit (BIO_UPTODATE , &bb.flags)) + ret = -EIO ; + +return ret; +} +EXPORT_SYMBOL (blkdev_issue_sanitize); + +/** * blkdev_issue_zeroout - generate number of zero filed write bios * @bdev: blockdev to issue * @sector: start sector block/blk-merge.c +0
-0
block/blk-merge.c bool blk_rq_merge_ok(struct request *rq, struct bio *bio) · line 482
Quoted 6 lines
block/blk-merge.c +3
-0@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!rq_mergeable (rq))return false; +/* don't merge file system requests and sanitize requests */ +if ((req->cmd_flags &REQ_SANITIZE ) != (next->cmd_flags &REQ_SANITIZE )) +return false;
also the next data structure is not available in this function.
Quoted 135 lines
block/blk-merge.c +1
-0+/* don't merge file system requests and discard requests */ if ((bio->bi_rw &REQ_DISCARD ) != (rq->bio->bi_rw &REQ_DISCARD ))return false;block/elevator.c +1
-1@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)if (rq->cmd_flags &REQ_SOFTBARRIER ) {/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type ==REQ_TYPE_FS || - (rq->cmd_flags &REQ_DISCARD )) { + (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))) { q->end_sector =rq_end_sector (rq); q->boundary_rq = rq; }block/ioctl.c +9
-0@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,return blkdev_issue_discard (bdev, start, len,GFP_KERNEL , flags); } +static int blk_ioctl_sanitize (struct block_device *bdev) +{ +return blkdev_issue_sanitize (bdev,GFP_KERNEL ); +} +static int put_ushort (unsigned long arg,unsigned short val) {return put_user (val, (unsigned short __user *)arg);@@ -234,6 +239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,set_device_ro (bdev, n);return 0 ; +case BLKSANITIZE : + ret =blk_ioctl_sanitize (bdev); +break ; +case BLKDISCARD :case BLKSECDISCARD : {uint64_t range[2 ];include/linux/blk_types.h +4
-1@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE,/* merge of different types, fail separately */ + __REQ_SANITIZE,/* sanitize */ __REQ_NR_BITS, /* stops here */ };@@ -171,13 +172,15 @@ enum rq_flag_bits {#define REQ_META (1 << __REQ_META)#define REQ_PRIO (1 << __REQ_PRIO)#define REQ_DISCARD (1 << __REQ_DISCARD) +#define REQ_SANITIZE (1 << __REQ_SANITIZE)#define REQ_NOIDLE (1 << __REQ_NOIDLE)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)#define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ - REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \ + REQ_SANITIZE)#define REQ_CLONE_MASK REQ_COMMON_MASK#define REQ_RAHEAD (1 << __REQ_RAHEAD)include/linux/blkdev.h +3
-0@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)#define blk_queue_stackable (q) \ test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags) +#define blk_queue_sanitize (q) test_bit(QUEUE_FLAG_SANITIZE, &(q)->queue_flags)#define blk_queue_secdiscard (q) (blk_queue_discard(q) && \ test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,extern int blkdev_issue_flush (struct block_device *,gfp_t ,sector_t *);extern int blkdev_issue_discard (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask,unsigned long flags); +extern int blkdev_issue_sanitize (struct block_device *bdev,gfp_t gfp_mask);extern int blkdev_issue_zeroout (struct block_device *bdev,sector_t sector,sector_t nr_sects,gfp_t gfp_mask); static inline int sb_issue_discard(struct super_block *sb, sector_t block,include/linux/fs.h +1
-0@@ -333,6 +333,7 @@ struct inodes_stat_t {#define BLKDISCARDZEROES _IO(0x12,124)#define BLKSECDISCARD _IO(0x12,125)#define BLKROTATIONAL _IO(0x12,126) +#define BLKSANITIZE _IO(0x12, 127)#define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */ kernel/trace/blktrace.c +2
-1@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else --1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum --
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
In reply to Yaniv GardiHi Jens,
The sanitize feature is a mandatory feature for eMMC4.5. This feature requires changes in the block and MMC layers to allow the ability to trigger the sanitize request.
Chris Ball agreed to merge the MMC changes of this patch but due to the dependency on the block layer it is on hold for more than 6 months. Our previous requests to you to merge the block layer patches were not replied.
If you see any issues that prevents this patch from being merged into the block layer please let us know.
Otherwise, we would like to push this patch ASAP.
Thanks,
Maya
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Yaniv Gardi
Sent: Thursday, June 28, 2012 11:33 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; open list
Subject: [PATCH RESEND v7 1/2] block: ioctl support for sanitize in eMMC 4.5
Adding a new ioctl to support sanitize operation in eMMC cards version 4.5. The sanitize ioctl support helps performing this operation via user application.
--- block/blk-core.c | 15 ++++++++++-- block/blk-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 4 +++ block/elevator.c | 2 +- block/ioctl.c | 9 ++++++++ include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 3 ++ include/linux/fs.h | 1 + kernel/trace/blktrace.c | 2 + 9 files changed, 87 insertions(+), 5 deletions(-)
block/blk-core.c index 3c923a7..4a56102b renamed from block/blk-core.c +0 -0
100644
block/blk-core.c +12 -3
@@ -1641,7 +1641,7 @@ generic_make_request_checks(struct bio *bio) goto end_io; } -if (unlikely (!(bio->bi_rw &REQ_DISCARD ) && +if (unlikely (!(bio->bi_rw & (REQ_DISCARD |REQ_SANITIZE )) && nr_sectors >queue_max_hw_sectors (q))) { printk(KERN_ERR "bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b),
@@ -1689,6 +1689,14 @@ generic_make_request_checks(struct bio *bio) goto end_io; } +if ((bio->bi_rw &REQ_SANITIZE ) && + (!blk_queue_sanitize (q))) { +pr_info ("%s - got a SANITIZE request but the queue " +"doesn't support sanitize requests" , __func__); + err = -EOPNOTSUPP ; + goto end_io; + } +if (blk_throtl_bio (q, bio))return false;/* throttled, will be resubmitted later */
@@ -1794,7 +1802,8 @@ void submit_bio(int rw, struct bio *bio)* If it's a regular read/write or a barrier with data attached, * go through the normal accounting stuff before submission. */ -if (bio_has_data (bio) && !(rw &REQ_DISCARD )) { +if (bio_has_data (bio) && + (!(rw & (REQ_DISCARD |REQ_SANITIZE )))) {if (rw &WRITE ) {count_vm_events (PGPGOUT , count); }else {
@@ -1840,7 +1849,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->cmd_flags &REQ_DISCARD ) +if (rq->cmd_flags & (REQ_DISCARD |REQ_SANITIZE ))return 0 ; if (blk_rq_sectors(rq) > queue_max_sectors(q) || diff --git
a/block/blk-lib.c b/block/blk-lib.c index 2b461b4..280d63e 100644
block/blk-lib.c +0 -0
@@ -115,6 +115,57 @@ int blkdev_issue_discard(struct block_device *bdev,
sector_t sector, EXPORT_SYMBOL(blkdev_issue_discard);
/**
+ * blkdev_issue_sanitize - queue a sanitize request
+ * @bdev: blockdev to issue sanitize for
+ * @gfp_mask: memory allocation flags (for bio_alloc)
+ *
+ * Description:
+ * Issue a sanitize request for the specified block device
+ */
+int blkdev_issue_sanitize(struct block_device *bdev, gfp_t gfp_mask) {
+ DECLARE_COMPLETION_ONSTACK(wait);
+ struct request_queue *q = bdev_get_queue(bdev);
+ int type = REQ_WRITE | REQ_SANITIZE;
+ struct bio_batch bb;
+ struct bio *bio;
+ int ret = 0;
+
+ if (!q)
+ return -ENXIO;
+
+ if (!blk_queue_sanitize(q)) {
+ pr_err("%s - card doesn't support sanitize", __func__);
+ return -EOPNOTSUPP;
+ }
+
+ bio = bio_alloc(gfp_mask, 1);
+ if (!bio)
+ return -ENOMEM;
+
+ atomic_set(&bb.done, 1);
+ bb.flags = 1 << BIO_UPTODATE;
+ bb.wait = &wait;
+
+ bio->bi_end_io = bio_batch_end_io;
+ bio->bi_bdev = bdev;
+ bio->bi_private = &bb;
+
+ atomic_inc(&bb.done);
+ submit_bio(type, bio);
+
+ /* Wait for bios in-flight */
+ if (!atomic_dec_and_test(&bb.done))
+ wait_for_completion(&wait);
+
+ if (!test_bit(BIO_UPTODATE, &bb.flags))
+ ret = -EIO;
+
+ return ret;
+}
+EXPORT_SYMBOL(blkdev_issue_sanitize);
+
+/**
* blkdev_issue_zeroout - generate number of zero filed write bios
* @bdev: blockdev to issue
* @sector: start sector
block/blk-merge.c index 160035f..7e24772 renamed from block/blk-merge.c +0 -0
100644
block/blk-merge.c +0 -0
@@ -477,6 +477,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio
*bio)
if (!rq_mergeable(rq))
return false;
+ /* don't merge file system requests and sanitize requests */
+ if ((req->cmd_flags & REQ_SANITIZE) != (next->cmd_flags &REQ_SANITIZE))
+ return false;
+
/* don't merge file system requests and discard requests */ if ((bio->bi_rw & REQ_DISCARD) != (rq->bio->bi_rw & REQ_DISCARD))
return false;
block/elevator.c index 6a55d41..91f1de1 renamed from block/elevator.c +0 -0
100644
block/elevator.c +0 -0
@@ -563,7 +563,7 @@ void __elv_add_request(struct request_queue *q, struct
request *rq, int where)
if (rq->cmd_flags & REQ_SOFTBARRIER) {
/* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type == REQ_TYPE_FS ||
- (rq->cmd_flags & REQ_DISCARD)) {
+ (rq->cmd_flags & (REQ_DISCARD | REQ_SANITIZE))) {
q->end_sector = rq_end_sector(rq); q->boundary_rq = rq;
}
block/ioctl.c +0 -0
@@ -132,6 +132,11 @@ static int blk_ioctl_discard(struct block_device *bdev,
uint64_t start,
return blkdev_issue_discard(bdev, start, len, GFP_KERNEL, flags); }
+static int blk_ioctl_sanitize(struct block_device *bdev) {
+ return blkdev_issue_sanitize(bdev, GFP_KERNEL); }
+
static int put_ushort(unsigned long arg, unsigned short val) {
return put_user(val, (unsigned short __user *)arg); @@ -234,6
+239,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
set_device_ro(bdev, n);
return 0;
+ case BLKSANITIZE:
+ ret = blk_ioctl_sanitize(bdev);
+ break;
+
case BLKDISCARD:
case BLKSECDISCARD: {
uint64_t range[2];
include/linux/blk_types.h index renamed from include/linux/blk_types.h +0 -0
0edb65d..e58e0db 100644
include/linux/blk_types.h +0 -0
@@ -160,6 +160,7 @@ enum rq_flag_bits { __REQ_FLUSH_SEQ,/* request for flush sequence */ __REQ_IO_STAT,/* account I/O stat */ __REQ_MIXED_MERGE, /* merge of different types, fail separately
*/
+ __REQ_SANITIZE, /* sanitize */
__REQ_NR_BITS, /* stops here */
};
@@ -171,13 +172,15 @@ enum rq_flag_bits {
#define REQ_META (1 << __REQ_META)
#define REQ_PRIO (1 << __REQ_PRIO)
#define REQ_DISCARD (1 << __REQ_DISCARD)
+#define REQ_SANITIZE (1 << __REQ_SANITIZE)
#define REQ_NOIDLE (1 << __REQ_NOIDLE)
#define REQ_FAILFAST_MASK \
(REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)
#define REQ_COMMON_MASK \
(REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \
- REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE) + REQ_DISCARD | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | REQ_SECURE | \
+ REQ_SANITIZE)
#define REQ_CLONE_MASK REQ_COMMON_MASK
#define REQ_RAHEAD (1 << __REQ_RAHEAD)
include/linux/blkdev.h index renamed from include/linux/blkdev.h +0 -0
ba43f40..1db6c91 100644
include/linux/blkdev.h +1 -0
@@ -438,6 +438,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 16/* Contributes to random pool */ #define QUEUE_FLAG_SECDISCARD 17/* supports SECDISCARD */ #define QUEUE_FLAG_SAME_FORCE 18/* force complete on same CPU */ +#define QUEUE_FLAG_SANITIZE 19/* supports SANITIZE */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \
@@ -518,6 +519,7 @@ static inline void queue_flag_clear(unsigned int flag,
struct request_queue *q)
#define blk_queue_stackable(q) \
test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)
#define blk_queue_discard(q) test_bit(QUEUE_FLAG_DISCARD,
&(q)->queue_flags)
+#define blk_queue_sanitize(q) test_bit(QUEUE_FLAG_SANITIZE,
&(q)->queue_flags)
#define blk_queue_secdiscard(q) (blk_queue_discard(q) && \
test_bit(QUEUE_FLAG_SECDISCARD, &(q)->queue_flags))
@@ -971,6 +973,7 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt, extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *); extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);
+extern int blkdev_issue_sanitize(struct block_device *bdev, gfp_t +gfp_mask);
extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
sector_t nr_sects, gfp_t gfp_mask);
static inline int sb_issue_discard(struct super_block *sb, sector_t block,
include/linux/fs.h index b0a6d44..167c450 renamed from include/linux/fs.h +0 -0
100644
include/linux/fs.h +0 -0
@@ -333,6 +333,7 @@ struct inodes_stat_t { #define BLKDISCARDZEROES
_IO(0x12,124) #define BLKSECDISCARD _IO(0x12,125) #define BLKROTATIONAL _IO(0x12,126)
+#define BLKSANITIZE _IO(0x12, 127)
#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */
#define FIBMAP _IO(0x00,1) /* bmap access */
kernel/trace/blktrace.c index renamed from kernel/trace/blktrace.c +0 -0
c0bd030..06f7940 100644
kernel/trace/blktrace.c +2 -0
@@ -1788,6 +1788,8 @@ void blk_fill_rwbs(char *rwbs, u32 rw, int bytes) rwbs[i++] ='W' ; else if (rw & REQ_DISCARD) rwbs[i++] ='D' ; + else if (rw & REQ_SANITIZE) + rwbs[i++] ='Z' ; else if (bytes) rwbs[i++] ='R' ; else
--
1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum --
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
--
Maya Erez
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
PATCH RESEND v7 2/2 mmc: card: Adding support for sanitize in eMMC 4.5
In reply to Yaniv GardiThis feature delete the unmap memory region of the eMMC card, by writing to a specific register in the EXT_CSD unmap region is the memory region that were previously deleted (by erase, trim or discard operation)
--- drivers/mmc/card/block.c | 72 +++++++++++++++++++++++++++++++++------------- drivers/mmc/card/queue.c | 10 ++++++- include/linux/mmc/host.h | 1 + 3 files changed, 62 insertions(+), 21 deletions(-)
drivers/mmc/card/block.c +52 -20
@@ -874,10 +874,10 @@ static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, {struct mmc_blk_data *md = mq->data;struct mmc_card *card = md->queue.card; -unsigned int from, nr, arg, trim_arg, erase_arg; +unsigned int from, nr, arg;int err =0 , type =MMC_BLK_SECDISCARD ; -if (!(mmc_can_secure_erase_trim (card) ||mmc_can_sanitize (card))) { +if (!(mmc_can_secure_erase_trim (card))) { err = -EOPNOTSUPP ; goto out; }
@@ -885,23 +885,10 @@ static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, from =blk_rq_pos (req); nr =blk_rq_sectors (req); -/* The sanitize operation is supported at v4.5 only */ -if (mmc_can_sanitize (card)) { - erase_arg =MMC_ERASE_ARG ; - trim_arg =MMC_TRIM_ARG ; - }else { - erase_arg =MMC_SECURE_ERASE_ARG ; - trim_arg =MMC_SECURE_TRIM1_ARG ; - } - -if (mmc_erase_group_aligned (card, from, nr)) - arg = erase_arg; -else if (mmc_can_trim (card)) - arg = trim_arg; -else { - err = -EINVAL ; - goto out; - } +if (mmc_can_trim (card) && !mmc_erase_group_aligned (card, from, nr)) + arg =MMC_SECURE_TRIM1_ARG ; +else + arg =MMC_SECURE_ERASE_ARG ; retry:if (card->quirks &MMC_QUIRK_INAND_CMD38 ) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@@ -953,6 +940,46 @@ out:return err ?0 :1 ; } +static int mmc_blk_issue_sanitize_rq (struct mmc_queue *mq, +struct request *req) +{ +struct mmc_blk_data *md = mq->data; +struct mmc_card *card = md->queue.card; +int err =0 ; + +BUG_ON (!card); +BUG_ON (!card->host); + +if (!(mmc_can_sanitize (card) && + (card->host->caps2 &MMC_CAP2_SANITIZE ))) { +pr_warning ("%s: %s - SANITIZE is not supported\n" , +mmc_hostname (card->host), __func__); + err = -EOPNOTSUPP ; + goto out; + } + +pr_debug ("%s: %s - SANITIZE IN PROGRESS...\n" , +mmc_hostname (card->host), __func__); + + err =mmc_switch (card,EXT_CSD_CMD_SET_NORMAL , +EXT_CSD_SANITIZE_START ,1 ,0 ); + +if (err) +pr_err ("%s: %s - mmc_switch() with " +"EXT_CSD_SANITIZE_START failed. err=%d\n" , +mmc_hostname (card->host), __func__, err); + +pr_debug ("%s: %s - SANITIZE COMPLETED\n" ,mmc_hostname (card->host), + __func__); + +out: +spin_lock_irq (&md->lock); +__blk_end_request (req, err,blk_rq_bytes (req)); +spin_unlock_irq (&md->lock); + +return err ?0 :1 ; +} +static int mmc_blk_issue_flush (struct mmc_queue *mq,struct request *req) {struct mmc_blk_data *md = mq->data;
@@ -1437,7 +1464,12 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) goto out; } -if (req && req->cmd_flags &REQ_DISCARD ) { +if (req && req->cmd_flags &REQ_SANITIZE ) { +/* complete ongoing async transfer before issuing sanitize */ +if (card->host && card->host->areq) +mmc_blk_issue_rw_rq (mq,NULL ); + ret =mmc_blk_issue_sanitize_rq (mq, req); + }else if (req && req->cmd_flags &REQ_DISCARD ) {/* complete ongoing async transfer before issuing discard */ if (card->host->areq)mmc_blk_issue_rw_rq (mq,NULL );
drivers/mmc/card/queue.c +9 -1
@@ -145,10 +145,15 @@ static void mmc_queue_setup_discard(struct request_queue *q,/* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) q->limits.discard_granularity =0 ; -if (mmc_can_secure_erase_trim (card) ||mmc_can_sanitize (card)) +if (mmc_can_secure_erase_trim (card))queue_flag_set_unlocked (QUEUE_FLAG_SECDISCARD , q); } +static void mmc_queue_setup_sanitize (struct request_queue *q) +{ +queue_flag_set_unlocked (QUEUE_FLAG_SANITIZE , q); +} +/** * mmc_init_queue - initialise a queue structure. * @mq: mmc queue
@@ -184,6 +189,9 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,if (mmc_can_erase (card))mmc_queue_setup_discard (mq->queue, card); +if ((mmc_can_sanitize (card) && (host->caps2 &MMC_CAP2_SANITIZE ))) +mmc_queue_setup_sanitize (mq->queue); +#ifdef CONFIG_MMC_BLOCK_BOUNCE if (host->max_segs ==1 ) {unsigned int bouncesz;
include/linux/mmc/host.h +1 -0
@@ -238,6 +238,7 @@ struct mmc_host {#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)/* Use the broken voltage */ #define MMC_CAP2_DETECT_ON_ERR (1 << 8)/* On I/O err check card removal */ #define MMC_CAP2_HC_ERASE_SZ (1 << 9)/* High-capacity erase size */ +#define MMC_CAP2_SANITIZE (1 << 10)/* Support Sanitize */ mmc_pm_flag_t pm_caps;/* supported pm features */ unsigned int power_notify_type;
Signature · 4 lines
1.7.6 -- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
Looks good to me.
Quoted 179 lines · Yaniv Gardi
This feature delete the unmap memory region of the eMMC card, by writing to a specific register in the
EXT_CSDunmap region is the memory region that were previously deleted (by erase, trim or discard operation)Signed-off-by Yaniv Gardi <[email protected]>--- drivers/mmc/card/block.c | 72 +++++++++++++++++++++++++++++++++------------- drivers/mmc/card/queue.c | 10 ++++++- include/linux/mmc/host.h | 1 + 3 files changed, 62 insertions(+), 21 deletions(-)drivers/mmc/card/block.c +2
-2@@ -874,10 +874,10 @@ static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, {struct mmc_blk_data *md = mq->data;struct mmc_card *card = md->queue.card; -unsigned int from, nr, arg, trim_arg, erase_arg; +unsigned int from, nr, arg;int err =0 , type =MMC_BLK_SECDISCARD ; -if (!(mmc_can_secure_erase_trim (card) ||mmc_can_sanitize (card))) { +if (!(mmc_can_secure_erase_trim (card))) { err = -EOPNOTSUPP ; goto out;drivers/mmc/card/block.c +4
-17}@@ -885,23 +885,10 @@ static int mmc_blk_issue_secdiscard_rq(structmmc_queue *mq, from =blk_rq_pos (req); nr =blk_rq_sectors (req); -/* The sanitize operation is supported at v4.5 only */ -if (mmc_can_sanitize (card)) { - erase_arg =MMC_ERASE_ARG ; - trim_arg =MMC_TRIM_ARG ; - }else { - erase_arg =MMC_SECURE_ERASE_ARG ; - trim_arg =MMC_SECURE_TRIM1_ARG ; - } - -if (mmc_erase_group_aligned (card, from, nr)) - arg = erase_arg; -else if (mmc_can_trim (card)) - arg = trim_arg; -else { - err = -EINVAL ; - goto out; - } +if (mmc_can_trim (card) && !mmc_erase_group_aligned (card, from, nr)) + arg =MMC_SECURE_TRIM1_ARG ; +else + arg =MMC_SECURE_ERASE_ARG ; retry:if (card->quirks &MMC_QUIRK_INAND_CMD38 ) {drivers/mmc/card/block.c +46
-1err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,@@ -953,6 +940,46 @@ out:return err ?0 :1 ; } +static int mmc_blk_issue_sanitize_rq (struct mmc_queue *mq, +struct request *req) +{ +struct mmc_blk_data *md = mq->data; +struct mmc_card *card = md->queue.card; +int err =0 ; + +BUG_ON (!card); +BUG_ON (!card->host); + +if (!(mmc_can_sanitize (card) && + (card->host->caps2 &MMC_CAP2_SANITIZE ))) { +pr_warning ("%s: %s - SANITIZE is not supported\n" , +mmc_hostname (card->host), __func__); + err = -EOPNOTSUPP ; + goto out; + } + +pr_debug ("%s: %s - SANITIZE IN PROGRESS...\n" , +mmc_hostname (card->host), __func__); + + err =mmc_switch (card,EXT_CSD_CMD_SET_NORMAL , +EXT_CSD_SANITIZE_START ,1 ,0 ); + +if (err) +pr_err ("%s: %s - mmc_switch() with " +"EXT_CSD_SANITIZE_START failed. err=%d\n" , +mmc_hostname (card->host), __func__, err); + +pr_debug ("%s: %s - SANITIZE COMPLETED\n" ,mmc_hostname (card->host), + __func__); + +out: +spin_lock_irq (&md->lock); +__blk_end_request (req, err,blk_rq_bytes (req)); +spin_unlock_irq (&md->lock); + +return err ?0 :1 ; +} +static int mmc_blk_issue_flush (struct mmc_queue *mq,struct request *req) {struct mmc_blk_data *md = mq->data;@@ -1437,7 +1464,12 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) goto out; } -if (req && req->cmd_flags &REQ_DISCARD ) { +if (req && req->cmd_flags &REQ_SANITIZE ) { +/* complete ongoing async transfer before issuing sanitize */ +if (card->host && card->host->areq) +mmc_blk_issue_rw_rq (mq,NULL ); + ret =mmc_blk_issue_sanitize_rq (mq, req); + }else if (req && req->cmd_flags &REQ_DISCARD ) {/* complete ongoing async transfer before issuing discard */ if (card->host->areq)drivers/mmc/card/block.c +0
-0mmc_blk_issue_rw_rq (mq,NULL );drivers/mmc/card/queue.c +6
-1@@ -145,10 +145,15 @@ static void mmc_queue_setup_discard(struct request_queue *q,/* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) q->limits.discard_granularity = 0; -if (mmc_can_secure_erase_trim (card) ||mmc_can_sanitize (card)) +if (mmc_can_secure_erase_trim (card))queue_flag_set_unlocked (QUEUE_FLAG_SECDISCARD , q); } +static void mmc_queue_setup_sanitize (struct request_queue *q) +{ +queue_flag_set_unlocked (QUEUE_FLAG_SANITIZE , q); +} +/** * mmc_init_queue - initialise a queue structure. * @mq: mmc queue
drivers/mmc/card/queue.c +3
-0@@ -184,6 +189,9 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, if (mmc_can_erase(card)) mmc_queue_setup_discard(mq->queue, card); +if ((mmc_can_sanitize (card) && (host->caps2 &MMC_CAP2_SANITIZE ))) +mmc_queue_setup_sanitize (mq->queue); +#ifdef CONFIG_MMC_BLOCK_BOUNCE if (host->max_segs ==1 ) {drivers/mmc/card/queue.c +0
-0unsigned int bouncesz;include/linux/mmc/host.h +1
-0@@ -238,6 +238,7 @@ struct mmc_host {#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)/* Use the broken voltage */ #define MMC_CAP2_DETECT_ON_ERR (1 << 8)/* On I/O err check card removal */ #define MMC_CAP2_HC_ERASE_SZ (1 << 9)/* High-capacity erase size */ +#define MMC_CAP2_SANITIZE (1 << 10)/* Support Sanitize */ mmc_pm_flag_t pm_caps;/* supported pm features */ unsigned int
power_notify_type;
--
1.7.6
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum --
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Sent by consultant of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
Hi Chris,
Can you push this patch to mmc-next?
Thanks,
Yaniv
Quoted 197 lines
Looks good to me.
Reviewed-by Maya Erez <[email protected]>Quoted 173 lines · Yaniv Gardi
This feature delete the unmap memory region of the eMMC card, by writing to a specific register in the
EXT_CSDunmap region is the memory region that were previously deleted (by erase, trim or discard operation)Signed-off-by Yaniv Gardi <[email protected]>--- drivers/mmc/card/block.c | 72 +++++++++++++++++++++++++++++++++------------- drivers/mmc/card/queue.c | 10 ++++++- include/linux/mmc/host.h | 1 + 3 files changed, 62 insertions(+), 21 deletions(-)drivers/mmc/card/block.c +2
-2@@ -874,10 +874,10 @@ static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, {struct mmc_blk_data *md = mq->data;struct mmc_card *card = md->queue.card; -unsigned int from, nr, arg, trim_arg, erase_arg; +unsigned int from, nr, arg;int err =0 , type =MMC_BLK_SECDISCARD ; -if (!(mmc_can_secure_erase_trim (card) ||mmc_can_sanitize (card))) { +if (!(mmc_can_secure_erase_trim (card))) { err = -EOPNOTSUPP ; goto out;drivers/mmc/card/block.c +4
-17}@@ -885,23 +885,10 @@ static int mmc_blk_issue_secdiscard_rq(structmmc_queue *mq, from =blk_rq_pos (req); nr =blk_rq_sectors (req); -/* The sanitize operation is supported at v4.5 only */ -if (mmc_can_sanitize (card)) { - erase_arg =MMC_ERASE_ARG ; - trim_arg =MMC_TRIM_ARG ; - }else { - erase_arg =MMC_SECURE_ERASE_ARG ; - trim_arg =MMC_SECURE_TRIM1_ARG ; - } - -if (mmc_erase_group_aligned (card, from, nr)) - arg = erase_arg; -else if (mmc_can_trim (card)) - arg = trim_arg; -else { - err = -EINVAL ; - goto out; - } +if (mmc_can_trim (card) && !mmc_erase_group_aligned (card, from, nr)) + arg =MMC_SECURE_TRIM1_ARG ; +else + arg =MMC_SECURE_ERASE_ARG ; retry:if (card->quirks &MMC_QUIRK_INAND_CMD38 ) {drivers/mmc/card/block.c +40
-0err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,@@ -953,6 +940,46 @@ out:return err ?0 :1 ; } +static int mmc_blk_issue_sanitize_rq (struct mmc_queue *mq, +struct request *req) +{ +struct mmc_blk_data *md = mq->data; +struct mmc_card *card = md->queue.card; +int err =0 ; + +BUG_ON (!card); +BUG_ON (!card->host); + +if (!(mmc_can_sanitize (card) && + (card->host->caps2 &MMC_CAP2_SANITIZE ))) { +pr_warning ("%s: %s - SANITIZE is not supported\n" , +mmc_hostname (card->host), __func__); + err = -EOPNOTSUPP ; + goto out; + } + +pr_debug ("%s: %s - SANITIZE IN PROGRESS...\n" , +mmc_hostname (card->host), __func__); + + err =mmc_switch (card,EXT_CSD_CMD_SET_NORMAL , +EXT_CSD_SANITIZE_START ,1 ,0 ); + +if (err) +pr_err ("%s: %s - mmc_switch() with " +"EXT_CSD_SANITIZE_START failed. err=%d\n" , +mmc_hostname (card->host), __func__, err); + +pr_debug ("%s: %s - SANITIZE COMPLETED\n" ,mmc_hostname (card->host), + __func__); + +out: +spin_lock_irq (&md->lock); +__blk_end_request (req, err,blk_rq_bytes (req)); +spin_unlock_irq (&md->lock); + +return err ?0 :1 ; +} +static int mmc_blk_issue_flush (struct mmc_queue *mq,struct request *req) {drivers/mmc/card/block.c +6
-1struct mmc_blk_data *md = mq->data;@@ -1437,7 +1464,12 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) goto out; } -if (req && req->cmd_flags &REQ_DISCARD ) { +if (req && req->cmd_flags &REQ_SANITIZE ) { +/* complete ongoing async transfer before issuing sanitize */ +if (card->host && card->host->areq) +mmc_blk_issue_rw_rq (mq,NULL ); + ret =mmc_blk_issue_sanitize_rq (mq, req); + }else if (req && req->cmd_flags &REQ_DISCARD ) {/* complete ongoing async transfer before issuing discard */ if (card->host->areq)drivers/mmc/card/block.c +0
-0mmc_blk_issue_rw_rq (mq,NULL );drivers/mmc/card/queue.c +6
-1@@ -145,10 +145,15 @@ static void mmc_queue_setup_discard(struct request_queue *q,/* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) q->limits.discard_granularity = 0; -if (mmc_can_secure_erase_trim (card) ||mmc_can_sanitize (card)) +if (mmc_can_secure_erase_trim (card))queue_flag_set_unlocked (QUEUE_FLAG_SECDISCARD , q); } +static void mmc_queue_setup_sanitize (struct request_queue *q) +{ +queue_flag_set_unlocked (QUEUE_FLAG_SANITIZE , q); +} +/** * mmc_init_queue - initialise a queue structure. * @mq: mmc queue
drivers/mmc/card/queue.c +3
-0@@ -184,6 +189,9 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, if (mmc_can_erase(card)) mmc_queue_setup_discard(mq->queue, card); +if ((mmc_can_sanitize (card) && (host->caps2 &MMC_CAP2_SANITIZE ))) +mmc_queue_setup_sanitize (mq->queue); +#ifdef CONFIG_MMC_BLOCK_BOUNCE if (host->max_segs ==1 ) {drivers/mmc/card/queue.c +0
-0unsigned int bouncesz;include/linux/mmc/host.h +0
-0@@ -238,6 +238,7 @@ struct mmc_host {#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)/* Use the broken voltage */ #define MMC_CAP2_DETECT_ON_ERR (1 << 8)/* On I/O err check card removal
*/
#defineMMC_CAP2_HC_ERASE_SZ(1 << 9) /* High-capacity erase size */include/linux/mmc/host.h +1
-1+#define MMC_CAP2_SANITIZE (1 << 10)/* Support Sanitize */ mmc_pm_flag_t pm_caps;/* supported pm features */ unsigned int power_notify_type; --1.7.6
Quoted 9 lines
--
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
Sent by consultant of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
Yaniv Gardi Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum
Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
In reply to Yaniv GardiHi Yaniv,
Quoted 6 lines · Yaniv Gardi
This feature delete the unmap memory region of the eMMC card, by writing to a specific register in the
EXT_CSDunmap region is the memory region that were previously deleted (by erase, trim or discard operation)Signed-off-by Yaniv Gardi <[email protected]>
Did you reply to Chuanxiao's review comments yet? He said:
"So to implement your scenario, how about only add mmc_blk_issue_sanitize_rq() for REQ_SANITIZE but not touch mmc_blk_issue_secdiscard_rq()? With your changes in mmc_blk_issue_secdiscard_rq(), eMMC4.5 device will be failed to operate secure trim/erase for REQ_SECURE request."
at: http://thread.gmane.org/gmane.linux.kernel.mmc/14822/focus=14880
Thanks,
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
Quoted 18 lines · Chris Ball
Hi Yaniv,
Quoted 6 lines · Yaniv Gardi
This feature delete the unmap memory region of the eMMC card, by writing to a specific register in the
EXT_CSDunmap region is the memory region that were previously deleted (by erase, trim or discard operation)Signed-off-by Yaniv Gardi <[email protected]>Did you reply to Chuanxiao's review comments yet? He said:
"So to implement your scenario, how about only add
mmc_blk_issue_sanitize_rq()forREQ_SANITIZEbut not touchmmc_blk_issue_secdiscard_rq()? With your changes inmmc_blk_issue_secdiscard_rq(), eMMC4.5 device will be failed to operate secure trim/erase forREQ_SECURErequest."
Quoted 9 lines
at: http://thread.gmane.org/gmane.linux.kernel.mmc/14822/focus=14880
Thanks,
- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child
Secure trim and secure erase were removed from eMMC4.5. Please refer to annex B at B.6 section in eMMC4.5 spec.
Therefore, failure upon trying to do secure trim/erase is the expected behavior for eMMC4.5 devices.
Thanks,
Maya
Signature · 2 lines
Sent by consultant of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
RE: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
Hi Chris,
Are there any additional open issues to discuss regarding the sanitize capability ?
If not, we would like to see this patch pushed into mmc-next.
Thanks,
Yaniv
= > -----Original Message-----
= > From: [email protected] [mailto:linux-mmc-
= > [email protected]] On Behalf Of [email protected]
= > Sent: Thursday, July 19, 2012 2:25 PM
= > To: Chris Ball
= > Cc: Yaniv Gardi; [email protected]; [email protected]; = > [email protected]; open list
= > Subject: Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for = > sanitize in eMMC 4.5
= >
= > On Wed, July 18, 2012 11:46 pm, Chris Ball wrote:
= > > Hi Yaniv,
= > >
= > > On Thu, Jun 28 2012, Yaniv Gardi wrote:
= > >> This feature delete the unmap memory region of the eMMC card, by = > >> writing to a specific register in the EXT_CSD unmap region is the = > >> memory region that were previously deleted (by erase, trim or discard = > >> operation)
= > >>
= > >> Signed-off-by: Yaniv Gardi <[email protected]>
= > >
= > > Did you reply to Chuanxiao's review comments yet? He said:
= > >
= > > "So to implement your scenario, how about only add
= > > mmc_blk_issue_sanitize_rq() for REQ_SANITIZE but not touch = > > mmc_blk_issue_secdiscard_rq()? With your changes in
= > > mmc_blk_issue_secdiscard_rq(), eMMC4.5 device will be failed to = > > operate secure trim/erase for REQ_SECURE request."
= > >
= > > at:
= > http://thread.gmane.org/gmane.linux.kernel.mmc/14822/focus=14880
= > >
= > > Thanks,
= > >
= > > - Chris.
= > > --
= > > Chris Ball <[email protected]> <http://printf.net/>
= > > One Laptop Per Child
= > >
= >
= > Secure trim and secure erase were removed from eMMC4.5. Please refer = > to annex B at B.6 section in eMMC4.5 spec.
= > Therefore, failure upon trying to do secure trim/erase is the expected = > behavior for eMMC4.5 devices.
= >
= > Thanks,
= > Maya
= > --
= > Sent by consultant of Qualcomm Innovation Center, Inc.
= > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum = >
= > --
= > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the
= > body of a message to [email protected] More majordomo info = > at http://vger.kernel.org/majordomo-info.html
Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
Hi Yaniv,
Quoted 3 lines · Yaniv Gardi
Are there any additional open issues to discuss regarding the sanitize capability ?
If not, we would like to see this patch pushed into mmc-next.
I think you've responded to all of the open issues, thanks -- I'm adding everyone who made a review comment to the CC list for this mail, so that they can check whether v7 addresses their concerns, and consider asking more questions or providing a Reviewed-by.
How are you doing with getting the block layer patches merged? I'd like to get both layers into linux-next around the same time, if we can.
I wonder if there's any way to test whether sanitize has had an effect. It would be good to know whether it actually does anything on a specific eMMC, although I'm sure it's difficult to tell.
Thanks!
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
RE: [PATCH RESEND v7 2/2] mmc: card: Adding support for sanitize in eMMC 4.5
+ Jens Axboe
Hi Jens,
Can you please review the v8 patch and refer to it? As seen below, everything is all set to push the change in the mmc layer, But it's better to push the feature to both modules
Hi Chris,
I just uploaded a v8, which has small fix in the block layer. It has no changes at all, in the mmc layer.
Hope we soon have a reply from Jens regarding when the sanitize patch can be pushed in to linux-next in the block layer.
Thanks,
Yaniv
= > -----Original Message-----
= > From: [email protected] [mailto:linux-mmc-
= > [email protected]] On Behalf Of Chris Ball
= > Sent: Tuesday, July 24, 2012 9:56 AM
= > To: Yaniv Gardi
= > Cc: [email protected]; [email protected]; 'open = > list'; [email protected]; Girish K S; S, Venkatraman; Dong, Chuanxiao;
= > Stephen Boyd; Jaehoon Chung; Kyungmin Park
= > Subject: Re: [PATCH RESEND v7 2/2] mmc: card: Adding support for = > sanitize in eMMC 4.5
= >
= > Hi Yaniv,
= >
= > On Tue, Jul 24 2012, Yaniv Gardi wrote:
= > > Are there any additional open issues to discuss regarding the sanitize = > > capability ?
= > > If not, we would like to see this patch pushed into mmc-next. = >
= > I think you've responded to all of the open issues, thanks -- I'm adding = > everyone who made a review comment to the CC list for this mail, so that = > they can check whether v7 addresses their concerns, and consider asking = > more questions or providing a Reviewed-by.
= >
= > How are you doing with getting the block layer patches merged? I'd like to
= > get both layers into linux-next around the same time, if we can. = >
= > I wonder if there's any way to test whether sanitize has had an effect. = > It would be good to know whether it actually does anything on a specific = > eMMC, although I'm sure it's difficult to tell.
= >
= > Thanks!
= >
= > - Chris.
= > --
= > Chris Ball <[email protected]> <http://printf.net/>
= > One Laptop Per Child
= > --
= > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the
= > body of a message to [email protected] More majordomo info = > at http://vger.kernel.org/majordomo-info.html