Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7afafc8a authored by Adrian Hunter's avatar Adrian Hunter Committed by Jens Axboe
Browse files

block: Fix secure erase 



Commit 288dab8a ("block: add a separate operation type for secure
erase") split REQ_OP_SECURE_ERASE from REQ_OP_DISCARD without considering
all the places REQ_OP_DISCARD was being used to mean either. Fix those.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Fixes: 288dab8a ("block: add a separate operation type for secure erase")
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f6b6a28e

block/bio.c

+11 −10
Original line number Diff line number Diff line
@@ -667,18 +667,19 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, 
	bio->bi_iter.bi_sector	= bio_src->bi_iter.bi_sector;

	bio->bi_iter.bi_size	= bio_src->bi_iter.bi_size;



	if (bio_op(bio) == REQ_OP_DISCARD)

		goto integrity_clone;



	if (bio_op(bio) == REQ_OP_WRITE_SAME) {

	switch (bio_op(bio)) {

	case REQ_OP_DISCARD:

	case REQ_OP_SECURE_ERASE:

		break;

	case REQ_OP_WRITE_SAME:

		bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0];

		goto integrity_clone;

	}



		break;

	default:

		bio_for_each_segment(bv, bio_src, iter)

			bio->bi_io_vec[bio->bi_vcnt++] = bv;

		break;

	}



integrity_clone:

	if (bio_integrity(bio_src)) {

		int ret;
@@ -1788,7 +1789,7 @@ struct bio *bio_split(struct bio *bio, int sectors, 
	 * Discards need a mutable bio_vec to accommodate the payload

	 * required by the DSM TRIM and UNMAP commands.

	 */

	if (bio_op(bio) == REQ_OP_DISCARD)

	if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE)

		split = bio_clone_bioset(bio, gfp, bs);

	else

		split = bio_clone_fast(bio, gfp, bs);

block/blk-merge.c

+19 −14
Original line number Diff line number Diff line
@@ -172,12 +172,18 @@ void blk_queue_split(struct request_queue *q, struct bio **bio, 
	struct bio *split, *res;

	unsigned nsegs;



	if (bio_op(*bio) == REQ_OP_DISCARD)

	switch (bio_op(*bio)) {

	case REQ_OP_DISCARD:

	case REQ_OP_SECURE_ERASE:

		split = blk_bio_discard_split(q, *bio, bs, &nsegs);

	else if (bio_op(*bio) == REQ_OP_WRITE_SAME)

		break;

	case REQ_OP_WRITE_SAME:

		split = blk_bio_write_same_split(q, *bio, bs, &nsegs);

	else

		break;

	default:

		split = blk_bio_segment_split(q, *bio, q->bio_split, &nsegs);

		break;

	}



	/* physical segments can be figured out during splitting */

	res = split ? split : *bio;
@@ -213,7 +219,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, 
	 * This should probably be returning 0, but blk_add_request_payload()

	 * (Christoph!!!!)

	 */

	if (bio_op(bio) == REQ_OP_DISCARD)

	if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE)

		return 1;



	if (bio_op(bio) == REQ_OP_WRITE_SAME)
@@ -385,7 +391,9 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio, 
	nsegs = 0;

	cluster = blk_queue_cluster(q);



	if (bio_op(bio) == REQ_OP_DISCARD) {

	switch (bio_op(bio)) {

	case REQ_OP_DISCARD:

	case REQ_OP_SECURE_ERASE:

		/*

		 * This is a hack - drivers should be neither modifying the

		 * biovec, nor relying on bi_vcnt - but because of
@@ -393,19 +401,16 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio, 
		 * a payload we need to set up here (thank you Christoph) and

		 * bi_vcnt is really the only way of telling if we need to.

		 */



		if (bio->bi_vcnt)

			goto single_segment;



		if (!bio->bi_vcnt)

			return 0;

	}



	if (bio_op(bio) == REQ_OP_WRITE_SAME) {

single_segment:

		/* Fall through */

	case REQ_OP_WRITE_SAME:

		*sg = sglist;

		bvec = bio_iovec(bio);

		sg_set_page(*sg, bvec.bv_page, bvec.bv_len, bvec.bv_offset);

		return 1;

	default:

		break;

	}



	for_each_bio(bio)

block/elevator.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq) 
	list_for_each_prev(entry, &q->queue_head) {

		struct request *pos = list_entry_rq(entry);



		if ((req_op(rq) == REQ_OP_DISCARD) != (req_op(pos) == REQ_OP_DISCARD))

		if (req_op(rq) != req_op(pos))

			break;

		if (rq_data_dir(rq) != rq_data_dir(pos))

			break;

drivers/mmc/card/block.c

+1 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,7 @@ static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, struct request *req) 
			break;



		if (req_op(next) == REQ_OP_DISCARD ||

		    req_op(next) == REQ_OP_SECURE_ERASE ||

		    req_op(next) == REQ_OP_FLUSH)

			break;

drivers/mmc/card/queue.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static int mmc_prep_request(struct request_queue *q, struct request *req) 
	/*

	 * We only like normal block requests and discards.

	 */

	if (req->cmd_type != REQ_TYPE_FS && req_op(req) != REQ_OP_DISCARD) {

	if (req->cmd_type != REQ_TYPE_FS && req_op(req) != REQ_OP_DISCARD &&

	    req_op(req) != REQ_OP_SECURE_ERASE) {

		blk_dump_rq_flags(req, "MMC bad request");

		return BLKPREP_KILL;

	}