From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD9EC3527D for ; Sat, 9 Apr 2022 04:52:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BD8B6B0078; Sat, 9 Apr 2022 00:52:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96D0E8D0010; Sat, 9 Apr 2022 00:52:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80D668D0008; Sat, 9 Apr 2022 00:52:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0025.hostedemail.com [216.40.44.25]) by kanga.kvack.org (Postfix) with ESMTP id 732866B0078 for ; Sat, 9 Apr 2022 00:52:39 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 272CB18403C06 for ; Sat, 9 Apr 2022 04:52:39 +0000 (UTC) X-FDA: 79336120038.24.565909F Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf11.hostedemail.com (Postfix) with ESMTP id A465240007 for ; Sat, 9 Apr 2022 04:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=E3X6NUmqO/cjQfN4n5BXTr2WVRZ6M72tRrIVLi6Q30s=; b=dN2x6OP9dlhch8rjrCpbttgJ+F OwrM1Snw47PT56UEGvwWgmxti7upHZEyxHbuDWKBwjT+qk70bTnmVOcRcIKP2BWXYOIq+BAjXxHHe NQXXgoARAJttZjNcyWmTrXnknP5HljsTCYMmiCBUXQl+h4dinmh8pbEF37uFvR0D+0QpZFSn/PaRY NSTLgCA0OvIqKYxzVVU6UDEv7jhkaezdiXPBLaeQFxHd9DXawuHALHp6V9clakI1pWSfvOTxU5LQp +j45Q42EoThMPTplAKmVMPL7bzMmY7HHOy4nRM2NbLnTPx74TitfWJSadkZ53oYbmgiqqKIbWLW/I c326Jvkw==; Received: from 213-147-167-116.nat.highway.webapn.at ([213.147.167.116] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nd351-0021Yb-Ag; Sat, 09 Apr 2022 04:52:11 +0000 From: Christoph Hellwig To: Jens Axboe Cc: dm-devel@redhat.com, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-um@lists.infradead.org, linux-block@vger.kernel.org, drbd-dev@lists.linbit.com, nbd@other.debian.org, ceph-devel@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, linux-nvme@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, jfs-discussion@lists.sourceforge.net, linux-nilfs@vger.kernel.org, ntfs3@lists.linux.dev, ocfs2-devel@oss.oracle.com, linux-mm@kvack.org, "Martin K . Petersen" , =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , Coly Li , David Sterba Subject: [PATCH 23/27] block: add a bdev_max_discard_sectors helper Date: Sat, 9 Apr 2022 06:50:39 +0200 Message-Id: <20220409045043.23593-24-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220409045043.23593-1-hch@lst.de> References: <20220409045043.23593-1-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A465240007 X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=dN2x6OP9; dmarc=none; spf=none (imf11.hostedemail.com: domain of BATV+43fc5532e856fea764d1+6803+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+43fc5532e856fea764d1+6803+infradead.org+hch@bombadil.srs.infradead.org X-Stat-Signature: zgc38oyugx74o1mhouq6rndom8ywzrh3 X-HE-Tag: 1649479958-225236 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add a helper to query the number of sectors support per each discard bio based on the block device and use this helper to stop various places from poking into the request_queue to see if discard is supported and if so ho= w much. This mirrors what is done e.g. for write zeroes as well. Signed-off-by: Christoph Hellwig Reviewed-by: Martin K. Petersen Acked-by: Christoph B=C3=B6hmwalder [d= rbd] Acked-by: Coly Li [bcache] Acked-by: David Sterba [btrfs] --- drivers/block/drbd/drbd_nl.c | 8 +++++--- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/rnbd/rnbd-srv-dev.h | 3 +-- drivers/md/dm-io.c | 2 +- drivers/target/target_core_device.c | 7 +++---- fs/f2fs/segment.c | 6 ++---- include/linux/blkdev.h | 5 +++++ 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 40bb0b356a6d6..d4dacc329ac2e 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1439,7 +1439,8 @@ static bool write_ordering_changed(struct disk_conf= *a, struct disk_conf *b) static void sanitize_disk_conf(struct drbd_device *device, struct disk_c= onf *disk_conf, struct drbd_backing_dev *nbc) { - struct request_queue * const q =3D nbc->backing_bdev->bd_disk->queue; + struct block_device *bdev =3D nbc->backing_bdev; + struct request_queue *q =3D bdev->bd_disk->queue; =20 if (disk_conf->al_extents < DRBD_AL_EXTENTS_MIN) disk_conf->al_extents =3D DRBD_AL_EXTENTS_MIN; @@ -1455,6 +1456,7 @@ static void sanitize_disk_conf(struct drbd_device *= device, struct disk_conf *dis =20 if (disk_conf->rs_discard_granularity) { int orig_value =3D disk_conf->rs_discard_granularity; + sector_t discard_size =3D bdev_max_discard_sectors(bdev) << 9; int remainder; =20 if (q->limits.discard_granularity > disk_conf->rs_discard_granularity) @@ -1463,8 +1465,8 @@ static void sanitize_disk_conf(struct drbd_device *= device, struct disk_conf *dis remainder =3D disk_conf->rs_discard_granularity % q->limits.discard_gr= anularity; disk_conf->rs_discard_granularity +=3D remainder; =20 - if (disk_conf->rs_discard_granularity > q->limits.max_discard_sectors = << 9) - disk_conf->rs_discard_granularity =3D q->limits.max_discard_sectors <= < 9; + if (disk_conf->rs_discard_granularity > discard_size) + disk_conf->rs_discard_granularity =3D discard_size; =20 if (disk_conf->rs_discard_granularity !=3D orig_value) drbd_info(device, "rs_discard_granularity changed to %d\n", diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd= _receiver.c index 08da922f81d1d..0b4c7de463989 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1524,7 +1524,7 @@ int drbd_issue_discard_or_zero_out(struct drbd_devi= ce *device, sector_t start, u granularity =3D max(q->limits.discard_granularity >> 9, 1U); alignment =3D (bdev_discard_alignment(bdev) >> 9) % granularity; =20 - max_discard_sectors =3D min(q->limits.max_discard_sectors, (1U << 22)); + max_discard_sectors =3D min(bdev_max_discard_sectors(bdev), (1U << 22))= ; max_discard_sectors -=3D max_discard_sectors % granularity; if (unlikely(!max_discard_sectors)) goto zero_out; diff --git a/drivers/block/rnbd/rnbd-srv-dev.h b/drivers/block/rnbd/rnbd-= srv-dev.h index 2c3df02b5e8ec..f82fbb4bbda8e 100644 --- a/drivers/block/rnbd/rnbd-srv-dev.h +++ b/drivers/block/rnbd/rnbd-srv-dev.h @@ -52,8 +52,7 @@ static inline int rnbd_dev_get_max_discard_sects(const = struct rnbd_dev *dev) if (!blk_queue_discard(bdev_get_queue(dev->bdev))) return 0; =20 - return blk_queue_get_max_sectors(bdev_get_queue(dev->bdev), - REQ_OP_DISCARD); + return bdev_max_discard_sectors(dev->bdev); } =20 static inline int rnbd_dev_get_discard_granularity(const struct rnbd_dev= *dev) diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index 5762366333a27..e4b95eaeec8c7 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c @@ -311,7 +311,7 @@ static void do_region(int op, int op_flags, unsigned = region, * Reject unsupported discard and write same requests. */ if (op =3D=3D REQ_OP_DISCARD) - special_cmd_max_sectors =3D q->limits.max_discard_sectors; + special_cmd_max_sectors =3D bdev_max_discard_sectors(where->bdev); else if (op =3D=3D REQ_OP_WRITE_ZEROES) special_cmd_max_sectors =3D q->limits.max_write_zeroes_sectors; if ((op =3D=3D REQ_OP_DISCARD || op =3D=3D REQ_OP_WRITE_ZEROES) && diff --git a/drivers/target/target_core_device.c b/drivers/target/target_= core_device.c index 16e775bcf4a7c..c3e25bac90d59 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -829,9 +829,8 @@ struct se_device *target_alloc_device(struct se_hba *= hba, const char *name) } =20 /* - * Check if the underlying struct block_device request_queue supports - * the QUEUE_FLAG_DISCARD bit for UNMAP/WRITE_SAME in SCSI + TRIM - * in ATA and we need to set TPE=3D1 + * Check if the underlying struct block_device supports discard and if y= es + * configure the UNMAP parameters. */ bool target_configure_unmap_from_queue(struct se_dev_attrib *attrib, struct block_device *bdev) @@ -843,7 +842,7 @@ bool target_configure_unmap_from_queue(struct se_dev_= attrib *attrib, return false; =20 attrib->max_unmap_lba_count =3D - q->limits.max_discard_sectors >> (ilog2(block_size) - 9); + bdev_max_discard_sectors(bdev) >> (ilog2(block_size) - 9); /* * Currently hardcoded to 1 in Linux/SCSI code.. */ diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 22dfeb9915290..71f09adbcba86 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1196,9 +1196,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info= *sbi, unsigned int *issued) { struct block_device *bdev =3D dc->bdev; - struct request_queue *q =3D bdev_get_queue(bdev); unsigned int max_discard_blocks =3D - SECTOR_TO_BLOCK(q->limits.max_discard_sectors); + SECTOR_TO_BLOCK(bdev_max_discard_sectors(bdev)); struct discard_cmd_control *dcc =3D SM_I(sbi)->dcc_info; struct list_head *wait_list =3D (dpolicy->type =3D=3D DPOLICY_FSTRIM) ? &(dcc->fstrim_list) : &(dcc->wait_list); @@ -1375,9 +1374,8 @@ static void __update_discard_tree_range(struct f2fs= _sb_info *sbi, struct discard_cmd *dc; struct discard_info di =3D {0}; struct rb_node **insert_p =3D NULL, *insert_parent =3D NULL; - struct request_queue *q =3D bdev_get_queue(bdev); unsigned int max_discard_blocks =3D - SECTOR_TO_BLOCK(q->limits.max_discard_sectors); + SECTOR_TO_BLOCK(bdev_max_discard_sectors(bdev)); block_t end =3D lstart + len; =20 dc =3D (struct discard_cmd *)f2fs_lookup_rb_tree_ret(&dcc->root, diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 34b1cfd067421..ce16247d3afab 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1254,6 +1254,11 @@ bdev_zone_write_granularity(struct block_device *b= dev) int bdev_alignment_offset(struct block_device *bdev); unsigned int bdev_discard_alignment(struct block_device *bdev); =20 +static inline unsigned int bdev_max_discard_sectors(struct block_device = *bdev) +{ + return bdev_get_queue(bdev)->limits.max_discard_sectors; +} + static inline unsigned int bdev_write_zeroes_sectors(struct block_device= *bdev) { struct request_queue *q =3D bdev_get_queue(bdev); --=20 2.30.2