Skip to contentSkip to conversation

block: avoid the unnecessary blk_bio_discard_split()

RFC Superseded Tom Yan 3 participants 5 messages Dec 6, 2020 – Dec 12, 2020

Subsystems (3)
lore
Share & tools
lore

Tom Yan

author
#0 lore raw

RFC 1/1 block: avoid the unnecessary blk_bio_discard_split()

It doesn't seem necessary to have the redundant layer of splitting. The request size will even be more consistent / aligned to the cap.

---
 block/blk-lib.c   | 5 ++++-
 block/blk-merge.c | 2 +-
 block/blk.h       | 8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
block/blk-lib.c +4 -1
index e90614fd8d6a..f606184a9050 100644
@@ -85,9 +85,12 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 		 *   is split in device drive, the split ones are very probably
 		 *   to be aligned to discard_granularity of the device's queue.
 		 */
-		if (granularity_aligned_lba == sector_mapped)
+		if (granularity_aligned_lba == sector_mapped) {
 			req_sects = min_t(sector_t, nr_sects,
 					  bio_aligned_discard_max_sectors(q));
+			if (!req_sects)
+				return -EOPNOTSUPP;
+		}
 		else
 			req_sects = min_t(sector_t, nr_sects,
 					  granularity_aligned_lba - sector_mapped);
block/blk-merge.c +1 -1
index bcf5e4580603..2439216585d9 100644
@@ -59,6 +59,7 @@ static inline bool req_gap_front_merge(struct request *req, struct bio *bio)
 	return bio_will_gap(req->q, NULL, bio, req->bio);
 }
 
+/* deprecated */
 static struct bio *blk_bio_discard_split(struct request_queue *q,
 					 struct bio *bio,
 					 struct bio_set *bs,
@@ -303,7 +304,6 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs)
 	switch (bio_op(*bio)) {
 	case REQ_OP_DISCARD:
 	case REQ_OP_SECURE_ERASE:
-		split = blk_bio_discard_split(q, *bio, &q->bio_split, nr_segs);
 		break;
 	case REQ_OP_WRITE_ZEROES:
 		split = blk_bio_write_zeroes_split(q, *bio, &q->bio_split,
block/blk.h +6 -2
index dfab98465db9..e7e31a8c4930 100644
@@ -281,8 +281,12 @@ static inline unsigned int bio_allowed_max_sectors(struct request_queue *q)
 static inline unsigned int bio_aligned_discard_max_sectors(
 					struct request_queue *q)
 {
-	return round_down(UINT_MAX, q->limits.discard_granularity) >>
-			SECTOR_SHIFT;
+	unsigned int discard_max_sectors, granularity;
+	discard_max_sectors = min(q->limits.max_discard_sectors,
+				  bio_allowed_max_sectors(q));
+	/* Zero-sector (unknown) and one-sector granularities are the same.  */
+	granularity = max(q->limits.discard_granularity >> SECTOR_SHIFT, 1U)
+	return round_down(max, granularity);
 }
 
 /*
Signature · 1 line
2.29.2
#1 lore raw

Hello!

Quoted 16 lines · Tom Yan

It doesn't seem necessary to have the redundant layer of splitting. The request size will even be more consistent / aligned to the cap.

---
  block/blk-lib.c   | 5 ++++-
  block/blk-merge.c | 2 +-
  block/blk.h       | 8 ++++++--
  3 files changed, 11 insertions(+), 4 deletions(-)
block/blk-lib.c +0 -0
index e90614fd8d6a..f606184a9050 100644
@@ -85,9 +85,12 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
  		 *   is split in device drive, the split ones are very probably

block/blk-lib.c int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, · line 94

Quoted 10 lines
block/blk-lib.c +4 -1
  		 *   to be aligned to discard_granularity of the device's queue.
  		 */
-		if (granularity_aligned_lba == sector_mapped)
+		if (granularity_aligned_lba == sector_mapped) {
  			req_sects = min_t(sector_t, nr_sects,
  					  bio_aligned_discard_max_sectors(q));
+			if (!req_sects)
+				return -EOPNOTSUPP;
+		}
  		else

Needs to be } else { according to the CodingStyle doc...

block/blk-lib.c int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, · line 96

Quoted 2 lines
block/blk-lib.c +0 -0
  			req_sects = min_t(sector_t, nr_sects,
  					  granularity_aligned_lba - sector_mapped);

[...]

MBR, Sergei

author
#2 lore raw

RFC v2 1/1 block: avoid the unnecessary blk_bio_discard_split()

It doesn't seem necessary to have the redundant layer of splitting. The request size will even be more consistent / aligned to the cap.

---
 block/blk-lib.c   | 7 +++++--
 block/blk-merge.c | 2 +-
 block/blk.h       | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)
block/blk-lib.c +5 -2
index e90614fd8d6a..3b75c1c4ba17 100644
@@ -85,12 +85,15 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 		 *   is split in device drive, the split ones are very probably
 		 *   to be aligned to discard_granularity of the device's queue.
 		 */
-		if (granularity_aligned_lba == sector_mapped)
+		if (granularity_aligned_lba == sector_mapped) {
 			req_sects = min_t(sector_t, nr_sects,
 					  bio_aligned_discard_max_sectors(q));
-		else
+			if (!req_sects)
+				return -EOPNOTSUPP;
+		} else {
 			req_sects = min_t(sector_t, nr_sects,
 					  granularity_aligned_lba - sector_mapped);
+		}
 
 		WARN_ON_ONCE((req_sects << 9) > UINT_MAX);
 
block/blk-merge.c +1 -1
index 97b7c2821565..f4e030fe6399 100644
@@ -59,6 +59,7 @@ static inline bool req_gap_front_merge(struct request *req, struct bio *bio)
 	return bio_will_gap(req->q, NULL, bio, req->bio);
 }
 
+/* deprecated */
 static struct bio *blk_bio_discard_split(struct request_queue *q,
 					 struct bio *bio,
 					 struct bio_set *bs,
@@ -303,7 +304,6 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs)
 	switch (bio_op(*bio)) {
 	case REQ_OP_DISCARD:
 	case REQ_OP_SECURE_ERASE:
-		split = blk_bio_discard_split(q, *bio, &q->bio_split, nr_segs);
 		break;
 	case REQ_OP_WRITE_ZEROES:
 		split = blk_bio_write_zeroes_split(q, *bio, &q->bio_split,
block/blk.h +6 -2
index dfab98465db9..e7e31a8c4930 100644
@@ -281,8 +281,12 @@ static inline unsigned int bio_allowed_max_sectors(struct request_queue *q)
 static inline unsigned int bio_aligned_discard_max_sectors(
 					struct request_queue *q)
 {
-	return round_down(UINT_MAX, q->limits.discard_granularity) >>
-			SECTOR_SHIFT;
+	unsigned int discard_max_sectors, granularity;
+	discard_max_sectors = min(q->limits.max_discard_sectors,
+				  bio_allowed_max_sectors(q));
+	/* Zero-sector (unknown) and one-sector granularities are the same.  */
+	granularity = max(q->limits.discard_granularity >> SECTOR_SHIFT, 1U)
+	return round_down(max, granularity);
 }
 
 /*
Signature · 1 line
2.29.2
author
#3 lore raw

RFC v3 1/1 block: avoid the unnecessary blk_bio_discard_split()

It doesn't seem necessary to have the redundant layer of splitting. The request size will even be more consistent / aligned to the cap.

---
 block/blk-lib.c   | 11 +++++++++--
 block/blk-merge.c |  2 +-
 block/blk.h       |  8 ++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)
block/blk-lib.c +9 -2
index e90614fd8d6a..cbf55c9f0d6f 100644
@@ -85,12 +85,19 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 		 *   is split in device drive, the split ones are very probably
 		 *   to be aligned to discard_granularity of the device's queue.
 		 */
-		if (granularity_aligned_lba == sector_mapped)
+		if (granularity_aligned_lba == sector_mapped) {
 			req_sects = min_t(sector_t, nr_sects,
 					  bio_aligned_discard_max_sectors(q));
-		else
+			if (!req_sects)
+				return -EOPNOTSUPP;
+		} else {
 			req_sects = min_t(sector_t, nr_sects,
 					  granularity_aligned_lba - sector_mapped);
+		}
+
+		/* Zero-sector (unknown) and one-sector granularities are the same.  */
+		granularity = max(q->limits.discard_granularity >> SECTOR_SHIFT, 1U);
+		req_sects = round_down(req_sects, granularity);
 
 		WARN_ON_ONCE((req_sects << 9) > UINT_MAX);
 
block/blk-merge.c +1 -1
index 97b7c2821565..f4e030fe6399 100644
@@ -59,6 +59,7 @@ static inline bool req_gap_front_merge(struct request *req, struct bio *bio)
 	return bio_will_gap(req->q, NULL, bio, req->bio);
 }
 
+/* deprecated */
 static struct bio *blk_bio_discard_split(struct request_queue *q,
 					 struct bio *bio,
 					 struct bio_set *bs,
@@ -303,7 +304,6 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs)
 	switch (bio_op(*bio)) {
 	case REQ_OP_DISCARD:
 	case REQ_OP_SECURE_ERASE:
-		split = blk_bio_discard_split(q, *bio, &q->bio_split, nr_segs);
 		break;
 	case REQ_OP_WRITE_ZEROES:
 		split = blk_bio_write_zeroes_split(q, *bio, &q->bio_split,
block/blk.h +6 -2
index dfab98465db9..508371fafdf3 100644
@@ -281,8 +281,12 @@ static inline unsigned int bio_allowed_max_sectors(struct request_queue *q)
 static inline unsigned int bio_aligned_discard_max_sectors(
 					struct request_queue *q)
 {
-	return round_down(UINT_MAX, q->limits.discard_granularity) >>
-			SECTOR_SHIFT;
+	unsigned int discard_max_sectors, granularity;
+	discard_max_sectors = min(q->limits.max_discard_sectors,
+				  bio_allowed_max_sectors(q));
+	/* Zero-sector (unknown) and one-sector granularities are the same.  */
+	granularity = max(q->limits.discard_granularity >> SECTOR_SHIFT, 1U);
+	return round_down(discard_max_sectors, granularity);
 }
 
 /*
Signature · 1 line
2.29.2
#4 lore raw
Quoted 4 lines · Tom Yan

It doesn't seem necessary to have the redundant layer of splitting. The request size will even be more consistent / aligned to the cap.

Can you please explain why the change log is missing ?