From nobody Wed Dec 17 12:08:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 180F6C6FD18 for ; Thu, 20 Apr 2023 00:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232623AbjDTAtJ (ORCPT ); Wed, 19 Apr 2023 20:49:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232395AbjDTAtA (ORCPT ); Wed, 19 Apr 2023 20:49:00 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABCAF3AAA for ; Wed, 19 Apr 2023 17:48:57 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1a677dffb37so5344145ad.2 for ; Wed, 19 Apr 2023 17:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1681951737; x=1684543737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G8Jg49/KQsZt4WzBpHKtXWTZpexlXZcV39964TwtkKY=; b=Q4O+/LqSIe1dsLzJhrazbt5goLnGi1zJWJbTolX3hoDJhRdiYIt8oP3uueEYErY/Me zQFFkE4rPiCEQLA8DNT5eqI7xXNcKG9o07MjxHnnVHAWwiIa2Rlq84+FMrIzrcymDMj0 zmTM8yrT7jralZt9fyBveGGYaxRpJ9r5tkzj0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681951737; x=1684543737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G8Jg49/KQsZt4WzBpHKtXWTZpexlXZcV39964TwtkKY=; b=eInOhfbcyD3L5tEEPLz+Ek5ZldT05zYOiAJMZNDWDw4hfVtUNHxmud2ztnWDB4vLWg ooD60PJf8D5SAUVxsd3q4tUc0bSjBDbfOydbc3+0DAImmLFWOyykJXW+LVVrUS0kjT3x was1QTXiCnMhcQnhUmiH4dtVG7ilqQf0NvTrzVPLIs4GyQVMqqmM/LNm58Wx6k5CxRWB RzgbpmwpEAsqy5u9OwZqyjRVLuWUk8RB67J4y2j4fEqnRYuiB42TM+wQiX/JPUyO/aD1 v+DJpaDCnJ0GMJMYuITMff8D5vZob7mJ3rYX6d4YZqhr0GC+InSBsnOCareoaWN3OPh7 qTbg== X-Gm-Message-State: AAQBX9eZ1JaPrCAcf0+dXEHowp+8lBGRJZ8Gk6WA7U+yay274UbEQLoO iRQHxyWR4TvmLOq0/upY98lvjQ== X-Google-Smtp-Source: AKy350Zv7+C4nbn5BKw2snuixQns/eVqKDeE09iyFz2LG4XBGopEf6DRHNtYzyNhmmireBFKIpsriQ== X-Received: by 2002:a17:902:ea0f:b0:19c:b11b:ffca with SMTP id s15-20020a170902ea0f00b0019cb11bffcamr8862265plg.23.1681951736959; Wed, 19 Apr 2023 17:48:56 -0700 (PDT) Received: from sarthakkukreti-glaptop.corp.google.com ([2620:15c:9d:200:5113:a333:10ce:e2d]) by smtp.gmail.com with ESMTPSA id io18-20020a17090312d200b001a65575c13asm74323plb.48.2023.04.19.17.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 17:48:56 -0700 (PDT) From: Sarthak Kukreti To: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Jens Axboe , "Michael S. Tsirkin" , Jason Wang , Stefan Hajnoczi , Alasdair Kergon , Mike Snitzer , Christoph Hellwig , Brian Foster , Theodore Ts'o , Andreas Dilger , Bart Van Assche , Daniil Lunev , "Darrick J. Wong" Subject: [PATCH v5 1/5] block: Don't invalidate pagecache for invalid falloc modes Date: Wed, 19 Apr 2023 17:48:46 -0700 Message-ID: <20230420004850.297045-2-sarthakkukreti@chromium.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230420004850.297045-1-sarthakkukreti@chromium.org> References: <20230414000219.92640-1-sarthakkukreti@chromium.org> <20230420004850.297045-1-sarthakkukreti@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Only call truncate_bdev_range() if the fallocate mode is supported. This fixes a bug where data in the pagecache could be invalidated if the fallocate() was called on the block device with an invalid mode. Fixes: 25f4c41415e5 ("block: implement (some of) fallocate for block device= s") Signed-off-by: Sarthak Kukreti --- block/fops.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/block/fops.c b/block/fops.c index d2e6be4e3d1c..2fd7e8b9ab48 100644 --- a/block/fops.c +++ b/block/fops.c @@ -648,25 +648,27 @@ static long blkdev_fallocate(struct file *file, int m= ode, loff_t start, =20 filemap_invalidate_lock(inode->i_mapping); =20 - /* Invalidate the page cache, including dirty pages. */ - error =3D truncate_bdev_range(bdev, file->f_mode, start, end); - if (error) - goto fail; - + /* + * Invalidate the page cache, including dirty pages, for valid + * de-allocate mode calls to fallocate(). + */ switch (mode) { case FALLOC_FL_ZERO_RANGE: case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE: - error =3D blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, + error =3D truncate_bdev_range(bdev, file->f_mode, start, end) || + blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOUNMAP); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE: - error =3D blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, + error =3D truncate_bdev_range(bdev, file->f_mode, start, end) || + blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: - error =3D blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, + error =3D truncate_bdev_range(bdev, file->f_mode, start, end) || + blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, len >> SECTOR_SHIFT, GFP_KERNEL); break; default: --=20 2.40.0.634.g4ca3ef3211-goog From nobody Wed Dec 17 12:08:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9E5DC6FD18 for ; Thu, 20 Apr 2023 00:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232867AbjDTAtX (ORCPT ); Wed, 19 Apr 2023 20:49:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232555AbjDTAtC (ORCPT ); Wed, 19 Apr 2023 20:49:02 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE6975FC2 for ; Wed, 19 Apr 2023 17:48:59 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1a677dffb37so5344325ad.2 for ; Wed, 19 Apr 2023 17:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1681951739; x=1684543739; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ge5ae5s/zTUTW+xFevsGXCZgK4RSj4PVy8hKUSBMXvk=; b=UzDM2iyCH2CKC3wFPV0YG581woZ6SIZbhdfTRI0EoojcriW0jD+F8+vr1t1zXHPiWg U8GlwnfpoTHg9NaR02soE7YFxOCKceR88sDHohf6YrPdlZKNhnQL0U5lYlI35sNlujXo QvMV9j1uWUileMKQ2YVBWgpgiUR9ZNd3RKg1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681951739; x=1684543739; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ge5ae5s/zTUTW+xFevsGXCZgK4RSj4PVy8hKUSBMXvk=; b=TbhRWK3ReGSzMAvEazyhdyWVppSvyJ4FgZKPjgR4sHmoTbCMtqPGBd82jpBvQKVcdh dy99nHfjP6AL5J3pWDZCSwmf9LbJ9O61eBD2QzatpJPwDaJzyIuXJ4OzQL1yUinPIY/d Y9Su77P6URAhvMHt1Ntqc41zqH+RK4IfpBihfDRtnY1Cdv/dHKDUx5duYurhb0vLGtvU 3vw9Tjir9EsKpgn4RIeFUxbmMRJGeBu4vlGUKQuLOUFyMPZ9HYIdTwn7kg+yCqS3n52p vznKcG5EIr1X6LTlumw5ciupR5LXOn7hBSOGfVthtyToLfXEpdzc9qR3bxgxOxxlen1O EQvg== X-Gm-Message-State: AAQBX9dVpni2VKqsJs5jP23vS99X+uWFStDPsJSycrd1xdC9rezkyFvl jHHRld8zrSPtCoz2Pv3v88BXjQ== X-Google-Smtp-Source: AKy350YsalSiiDa6/ioe6KuTBiAb4Q6GnbfFX32GTviM8SeqtoQmN3fRUIe6kYLYTzuEAHw7Yl/C1g== X-Received: by 2002:a17:902:eb8d:b0:19c:f476:4793 with SMTP id q13-20020a170902eb8d00b0019cf4764793mr6312520plg.51.1681951739281; Wed, 19 Apr 2023 17:48:59 -0700 (PDT) Received: from sarthakkukreti-glaptop.corp.google.com ([2620:15c:9d:200:5113:a333:10ce:e2d]) by smtp.gmail.com with ESMTPSA id io18-20020a17090312d200b001a65575c13asm74323plb.48.2023.04.19.17.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 17:48:58 -0700 (PDT) From: Sarthak Kukreti To: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Jens Axboe , "Michael S. Tsirkin" , Jason Wang , Stefan Hajnoczi , Alasdair Kergon , Mike Snitzer , Christoph Hellwig , Brian Foster , Theodore Ts'o , Andreas Dilger , Bart Van Assche , Daniil Lunev , "Darrick J. Wong" Subject: [PATCH v5 2/5] block: Introduce provisioning primitives Date: Wed, 19 Apr 2023 17:48:47 -0700 Message-ID: <20230420004850.297045-3-sarthakkukreti@chromium.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230420004850.297045-1-sarthakkukreti@chromium.org> References: <20230414000219.92640-1-sarthakkukreti@chromium.org> <20230420004850.297045-1-sarthakkukreti@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Introduce block request REQ_OP_PROVISION. The intent of this request is to request underlying storage to preallocate disk space for the given block range. Block devices that support this capability will export a provision limit within their request queues. This patch also adds the capability to call fallocate() in mode 0 on block devices, which will send REQ_OP_PROVISION to the block device for the specified range, Signed-off-by: Sarthak Kukreti --- block/blk-core.c | 5 ++++ block/blk-lib.c | 53 +++++++++++++++++++++++++++++++++++++++ block/blk-merge.c | 18 +++++++++++++ block/blk-settings.c | 19 ++++++++++++++ block/blk-sysfs.c | 9 +++++++ block/bounce.c | 1 + block/fops.c | 10 +++++++- include/linux/bio.h | 6 +++-- include/linux/blk_types.h | 5 +++- include/linux/blkdev.h | 16 ++++++++++++ 10 files changed, 138 insertions(+), 4 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 42926e6cb83c..4a2342ba3a8b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -123,6 +123,7 @@ static const char *const blk_op_name[] =3D { REQ_OP_NAME(WRITE_ZEROES), REQ_OP_NAME(DRV_IN), REQ_OP_NAME(DRV_OUT), + REQ_OP_NAME(PROVISION) }; #undef REQ_OP_NAME =20 @@ -798,6 +799,10 @@ void submit_bio_noacct(struct bio *bio) if (!q->limits.max_write_zeroes_sectors) goto not_supported; break; + case REQ_OP_PROVISION: + if (!q->limits.max_provision_sectors) + goto not_supported; + break; default: break; } diff --git a/block/blk-lib.c b/block/blk-lib.c index e59c3069e835..647b6451660b 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -343,3 +343,56 @@ int blkdev_issue_secure_erase(struct block_device *bde= v, sector_t sector, return ret; } EXPORT_SYMBOL(blkdev_issue_secure_erase); + +/** + * blkdev_issue_provision - provision a block range + * @bdev: blockdev to write + * @sector: start sector + * @nr_sects: number of sectors to provision + * @gfp_mask: memory allocation flags (for bio_alloc) + * + * Description: + * Issues a provision request to the block device for the range of sector= s. + * For thinly provisioned block devices, this acts as a signal for the + * underlying storage pool to allocate space for this block range. + */ +int blkdev_issue_provision(struct block_device *bdev, sector_t sector, + sector_t nr_sects, gfp_t gfp) +{ + sector_t bs_mask =3D (bdev_logical_block_size(bdev) >> 9) - 1; + unsigned int max_sectors =3D bdev_max_provision_sectors(bdev); + struct bio *bio =3D NULL; + struct blk_plug plug; + int ret =3D 0; + + if (max_sectors =3D=3D 0) + return -EOPNOTSUPP; + if ((sector | nr_sects) & bs_mask) + return -EINVAL; + if (bdev_read_only(bdev)) + return -EPERM; + + blk_start_plug(&plug); + for (;;) { + unsigned int req_sects =3D min_t(sector_t, nr_sects, max_sectors); + + bio =3D blk_next_bio(bio, bdev, 0, REQ_OP_PROVISION, gfp); + bio->bi_iter.bi_sector =3D sector; + bio->bi_iter.bi_size =3D req_sects << SECTOR_SHIFT; + + sector +=3D req_sects; + nr_sects -=3D req_sects; + if (!nr_sects) { + ret =3D submit_bio_wait(bio); + if (ret =3D=3D -EOPNOTSUPP) + ret =3D 0; + bio_put(bio); + break; + } + cond_resched(); + } + blk_finish_plug(&plug); + + return ret; +} +EXPORT_SYMBOL(blkdev_issue_provision); diff --git a/block/blk-merge.c b/block/blk-merge.c index 6460abdb2426..a3ffebb97a1d 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -158,6 +158,21 @@ static struct bio *bio_split_write_zeroes(struct bio *= bio, return bio_split(bio, lim->max_write_zeroes_sectors, GFP_NOIO, bs); } =20 +static struct bio *bio_split_provision(struct bio *bio, + const struct queue_limits *lim, + unsigned int *nsegs, struct bio_set *bs) +{ + *nsegs =3D 0; + + if (!lim->max_provision_sectors) + return NULL; + + if (bio_sectors(bio) <=3D lim->max_provision_sectors) + return NULL; + + return bio_split(bio, lim->max_provision_sectors, GFP_NOIO, bs); +} + /* * Return the maximum number of sectors from the start of a bio that may be * submitted as a single request to a block device. If enough sectors rema= in, @@ -366,6 +381,9 @@ struct bio *__bio_split_to_limits(struct bio *bio, case REQ_OP_WRITE_ZEROES: split =3D bio_split_write_zeroes(bio, lim, nr_segs, bs); break; + case REQ_OP_PROVISION: + split =3D bio_split_provision(bio, lim, nr_segs, bs); + break; default: split =3D bio_split_rw(bio, lim, nr_segs, bs, get_max_io_size(bio, lim) << SECTOR_SHIFT); diff --git a/block/blk-settings.c b/block/blk-settings.c index 896b4654ab00..d303e6614c36 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -59,6 +59,7 @@ void blk_set_default_limits(struct queue_limits *lim) lim->zoned =3D BLK_ZONED_NONE; lim->zone_write_granularity =3D 0; lim->dma_alignment =3D 511; + lim->max_provision_sectors =3D 0; } =20 /** @@ -82,6 +83,7 @@ void blk_set_stacking_limits(struct queue_limits *lim) lim->max_dev_sectors =3D UINT_MAX; lim->max_write_zeroes_sectors =3D UINT_MAX; lim->max_zone_append_sectors =3D UINT_MAX; + lim->max_provision_sectors =3D UINT_MAX; } EXPORT_SYMBOL(blk_set_stacking_limits); =20 @@ -208,6 +210,20 @@ void blk_queue_max_write_zeroes_sectors(struct request= _queue *q, } EXPORT_SYMBOL(blk_queue_max_write_zeroes_sectors); =20 +/** + * blk_queue_max_provision_sectors - set max sectors for a single provision + * + * @q: the request queue for the device + * @max_provision_sectors: maximum number of sectors to provision per comm= and + **/ + +void blk_queue_max_provision_sectors(struct request_queue *q, + unsigned int max_provision_sectors) +{ + q->limits.max_provision_sectors =3D max_provision_sectors; +} +EXPORT_SYMBOL(blk_queue_max_provision_sectors); + /** * blk_queue_max_zone_append_sectors - set max sectors for a single zone a= ppend * @q: the request queue for the device @@ -578,6 +594,9 @@ int blk_stack_limits(struct queue_limits *t, struct que= ue_limits *b, t->max_segment_size =3D min_not_zero(t->max_segment_size, b->max_segment_size); =20 + t->max_provision_sectors =3D min_not_zero(t->max_provision_sectors, + b->max_provision_sectors); + t->misaligned |=3D b->misaligned; =20 alignment =3D queue_limit_alignment_offset(b, start); diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index f1fce1c7fa44..0a3165211c66 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -213,6 +213,13 @@ static ssize_t queue_discard_zeroes_data_show(struct r= equest_queue *q, char *pag return queue_var_show(0, page); } =20 +static ssize_t queue_provision_max_show(struct request_queue *q, + char *page) +{ + return sprintf(page, "%llu\n", + (unsigned long long)q->limits.max_provision_sectors << 9); +} + static ssize_t queue_write_same_max_show(struct request_queue *q, char *pa= ge) { return queue_var_show(0, page); @@ -604,6 +611,7 @@ QUEUE_RO_ENTRY(queue_discard_max_hw, "discard_max_hw_by= tes"); QUEUE_RW_ENTRY(queue_discard_max, "discard_max_bytes"); QUEUE_RO_ENTRY(queue_discard_zeroes_data, "discard_zeroes_data"); =20 +QUEUE_RO_ENTRY(queue_provision_max, "provision_max_bytes"); QUEUE_RO_ENTRY(queue_write_same_max, "write_same_max_bytes"); QUEUE_RO_ENTRY(queue_write_zeroes_max, "write_zeroes_max_bytes"); QUEUE_RO_ENTRY(queue_zone_append_max, "zone_append_max_bytes"); @@ -661,6 +669,7 @@ static struct attribute *queue_attrs[] =3D { &queue_discard_max_entry.attr, &queue_discard_max_hw_entry.attr, &queue_discard_zeroes_data_entry.attr, + &queue_provision_max_entry.attr, &queue_write_same_max_entry.attr, &queue_write_zeroes_max_entry.attr, &queue_zone_append_max_entry.attr, diff --git a/block/bounce.c b/block/bounce.c index 7cfcb242f9a1..ab9d8723ae64 100644 --- a/block/bounce.c +++ b/block/bounce.c @@ -176,6 +176,7 @@ static struct bio *bounce_clone_bio(struct bio *bio_src) case REQ_OP_DISCARD: case REQ_OP_SECURE_ERASE: case REQ_OP_WRITE_ZEROES: + case REQ_OP_PROVISION: break; default: bio_for_each_segment(bv, bio_src, iter) diff --git a/block/fops.c b/block/fops.c index 2fd7e8b9ab48..16420c5fe4a2 100644 --- a/block/fops.c +++ b/block/fops.c @@ -613,7 +613,8 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, str= uct iov_iter *to) =20 #define BLKDEV_FALLOC_FL_SUPPORTED \ (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ - FALLOC_FL_ZERO_RANGE | FALLOC_FL_NO_HIDE_STALE) + FALLOC_FL_ZERO_RANGE | FALLOC_FL_NO_HIDE_STALE | \ + FALLOC_FL_UNSHARE_RANGE) =20 static long blkdev_fallocate(struct file *file, int mode, loff_t start, loff_t len) @@ -653,6 +654,13 @@ static long blkdev_fallocate(struct file *file, int mo= de, loff_t start, * de-allocate mode calls to fallocate(). */ switch (mode) { + case 0: + case FALLOC_FL_UNSHARE_RANGE: + case FALLOC_FL_KEEP_SIZE: + case FALLOC_FL_UNSHARE_RANGE | FALLOC_FL_KEEP_SIZE: + error =3D blkdev_issue_provision(bdev, start >> SECTOR_SHIFT, + len >> SECTOR_SHIFT, GFP_KERNEL); + break; case FALLOC_FL_ZERO_RANGE: case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE: error =3D truncate_bdev_range(bdev, file->f_mode, start, end) || diff --git a/include/linux/bio.h b/include/linux/bio.h index d766be7152e1..9820b3b039f2 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -57,7 +57,8 @@ static inline bool bio_has_data(struct bio *bio) bio->bi_iter.bi_size && bio_op(bio) !=3D REQ_OP_DISCARD && bio_op(bio) !=3D REQ_OP_SECURE_ERASE && - bio_op(bio) !=3D REQ_OP_WRITE_ZEROES) + bio_op(bio) !=3D REQ_OP_WRITE_ZEROES && + bio_op(bio) !=3D REQ_OP_PROVISION) return true; =20 return false; @@ -67,7 +68,8 @@ static inline bool bio_no_advance_iter(const struct bio *= bio) { return bio_op(bio) =3D=3D REQ_OP_DISCARD || bio_op(bio) =3D=3D REQ_OP_SECURE_ERASE || - bio_op(bio) =3D=3D REQ_OP_WRITE_ZEROES; + bio_op(bio) =3D=3D REQ_OP_WRITE_ZEROES || + bio_op(bio) =3D=3D REQ_OP_PROVISION; } =20 static inline void *bio_data(struct bio *bio) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 99be590f952f..27bdf88f541c 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -385,7 +385,10 @@ enum req_op { REQ_OP_DRV_IN =3D (__force blk_opf_t)34, REQ_OP_DRV_OUT =3D (__force blk_opf_t)35, =20 - REQ_OP_LAST =3D (__force blk_opf_t)36, + /* request device to provision block */ + REQ_OP_PROVISION =3D (__force blk_opf_t)37, + + REQ_OP_LAST =3D (__force blk_opf_t)38, }; =20 enum req_flag_bits { diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 941304f17492..239e2f418b6e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -303,6 +303,7 @@ struct queue_limits { unsigned int discard_granularity; unsigned int discard_alignment; unsigned int zone_write_granularity; + unsigned int max_provision_sectors; =20 unsigned short max_segments; unsigned short max_integrity_segments; @@ -921,6 +922,8 @@ extern void blk_queue_max_discard_sectors(struct reques= t_queue *q, unsigned int max_discard_sectors); extern void blk_queue_max_write_zeroes_sectors(struct request_queue *q, unsigned int max_write_same_sectors); +extern void blk_queue_max_provision_sectors(struct request_queue *q, + unsigned int max_provision_sectors); extern void blk_queue_logical_block_size(struct request_queue *, unsigned = int); extern void blk_queue_max_zone_append_sectors(struct request_queue *q, unsigned int max_zone_append_sectors); @@ -1060,6 +1063,9 @@ int __blkdev_issue_discard(struct block_device *bdev,= sector_t sector, int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector, sector_t nr_sects, gfp_t gfp); =20 +extern int blkdev_issue_provision(struct block_device *bdev, sector_t sect= or, + sector_t nr_sects, gfp_t gfp_mask); + #define BLKDEV_ZERO_NOUNMAP (1 << 0) /* do not free blocks */ #define BLKDEV_ZERO_NOFALLBACK (1 << 1) /* don't write explicit zeroes */ =20 @@ -1139,6 +1145,11 @@ static inline unsigned short queue_max_discard_segme= nts(const struct request_que return q->limits.max_discard_segments; } =20 +static inline unsigned short queue_max_provision_sectors(const struct requ= est_queue *q) +{ + return q->limits.max_provision_sectors; +} + static inline unsigned int queue_max_segment_size(const struct request_que= ue *q) { return q->limits.max_segment_size; @@ -1281,6 +1292,11 @@ static inline bool bdev_nowait(struct block_device *= bdev) return test_bit(QUEUE_FLAG_NOWAIT, &bdev_get_queue(bdev)->queue_flags); } =20 +static inline unsigned int bdev_max_provision_sectors(struct block_device = *bdev) +{ + return bdev_get_queue(bdev)->limits.max_provision_sectors; +} + static inline enum blk_zoned_model bdev_zoned_model(struct block_device *b= dev) { return blk_queue_zoned_model(bdev_get_queue(bdev)); --=20 2.40.0.634.g4ca3ef3211-goog From nobody Wed Dec 17 12:08:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D8D6C77B7C for ; Thu, 20 Apr 2023 00:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232644AbjDTAt0 (ORCPT ); Wed, 19 Apr 2023 20:49:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232626AbjDTAtM (ORCPT ); Wed, 19 Apr 2023 20:49:12 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBE875B9D for ; Wed, 19 Apr 2023 17:49:01 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-63b5c830d5eso413655b3a.2 for ; Wed, 19 Apr 2023 17:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1681951741; x=1684543741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zjwbO5gtYbaRUbN/ugVIqmiHFy9zDkcoTLH4vTn0XJc=; b=T2zNd0XBTykW6IeKnIFXyyfeKxzdpcSGUeVnPNWBk73UVCnQxlhpe6qMPvQwVeQHla IShd3rVs7X7lKhmtbNVFYm/LRCo4EU7W9tijbPTFt+CKs18dJEduRvP78AYQG6ObAEfv K8Q1aju9K1S2CKcdGz3aPhTiL2+G3+tycCzEM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681951741; x=1684543741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zjwbO5gtYbaRUbN/ugVIqmiHFy9zDkcoTLH4vTn0XJc=; b=YxyRD28MQUSVnU8MohguQ0Y1T19AQXPDOaI0fF7ffclzAyEu/7FGLhwWzeH1eH20ZU sAam4Myz81OMy2z9P8f7hcXNi3nyKv5Ag/CPKCphimGNHmM+wj4bhxkMOrtzdDPKa1na P3egtFGywgUTzgFWxye0xM/USQuGzjIQRWjX3XFWjiFT69btYLds32yxnqTRou/Rxpr9 r/lN35L82b/w+lk0AN+b21pwWl7260LTzUTaZil3wAz5RIPkl57FN9xo4Zz61Du0Dt/2 AEMAQZPoVVeIv90IxRbYPcEVKhMZCV7iHfQeTi2KHnV52d+7bh9becbSoRj6+iuPGXhI vNRw== X-Gm-Message-State: AAQBX9d5xRQWkWV8hWJHnMznH6Z4QWTygEtgLqTNyM24JuU/GNdiSAR0 KpkQHxi0DtwJUtCMJrqfNMzW8A== X-Google-Smtp-Source: AKy350aTu+24MA6fP+teG2H2ec7jgiDiJlGEX7f6TRAlrgrcZ86YWzTd8XgC5OcIPcxJB7p+2zgMBQ== X-Received: by 2002:a17:903:2409:b0:19e:839e:49d8 with SMTP id e9-20020a170903240900b0019e839e49d8mr6616678plo.59.1681951741346; Wed, 19 Apr 2023 17:49:01 -0700 (PDT) Received: from sarthakkukreti-glaptop.corp.google.com ([2620:15c:9d:200:5113:a333:10ce:e2d]) by smtp.gmail.com with ESMTPSA id io18-20020a17090312d200b001a65575c13asm74323plb.48.2023.04.19.17.48.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 17:49:00 -0700 (PDT) From: Sarthak Kukreti To: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Jens Axboe , "Michael S. Tsirkin" , Jason Wang , Stefan Hajnoczi , Alasdair Kergon , Mike Snitzer , Christoph Hellwig , Brian Foster , Theodore Ts'o , Andreas Dilger , Bart Van Assche , Daniil Lunev , "Darrick J. Wong" Subject: [PATCH v5 3/5] dm: Add block provisioning support Date: Wed, 19 Apr 2023 17:48:48 -0700 Message-ID: <20230420004850.297045-4-sarthakkukreti@chromium.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230420004850.297045-1-sarthakkukreti@chromium.org> References: <20230414000219.92640-1-sarthakkukreti@chromium.org> <20230420004850.297045-1-sarthakkukreti@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add block provisioning support for device-mapper targets. dm-crypt, dm-snap and dm-linear will, by default, passthrough REQ_OP_PROVISION requests to the underlying device, if supported. Signed-off-by: Sarthak Kukreti --- drivers/md/dm-crypt.c | 5 ++++- drivers/md/dm-linear.c | 2 ++ drivers/md/dm-snap.c | 8 ++++++++ drivers/md/dm-table.c | 23 +++++++++++++++++++++++ drivers/md/dm.c | 6 ++++++ include/linux/device-mapper.h | 17 +++++++++++++++++ 6 files changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 8b47b913ee83..aa8072d6d7bf 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -3336,6 +3336,9 @@ static int crypt_ctr(struct dm_target *ti, unsigned i= nt argc, char **argv) cc->tag_pool_max_sectors <<=3D cc->sector_shift; } =20 + ti->num_provision_bios =3D 1; + ti->provision_supported =3D true; + ret =3D -ENOMEM; cc->io_queue =3D alloc_workqueue("kcryptd_io/%s", WQ_MEM_RECLAIM, 1, devn= ame); if (!cc->io_queue) { @@ -3390,7 +3393,7 @@ static int crypt_map(struct dm_target *ti, struct bio= *bio) * - for REQ_OP_DISCARD caller must use flush if IO ordering matters */ if (unlikely(bio->bi_opf & REQ_PREFLUSH || - bio_op(bio) =3D=3D REQ_OP_DISCARD)) { + bio_op(bio) =3D=3D REQ_OP_DISCARD || bio_op(bio) =3D=3D REQ_OP_PROVIS= ION)) { bio_set_dev(bio, cc->dev->bdev); if (bio_sectors(bio)) bio->bi_iter.bi_sector =3D cc->start + diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index f4448d520ee9..66e50f5b0665 100644 --- a/drivers/md/dm-linear.c +++ b/drivers/md/dm-linear.c @@ -62,6 +62,8 @@ static int linear_ctr(struct dm_target *ti, unsigned int = argc, char **argv) ti->num_discard_bios =3D 1; ti->num_secure_erase_bios =3D 1; ti->num_write_zeroes_bios =3D 1; + ti->num_provision_bios =3D 1; + ti->provision_supported =3D true; ti->private =3D lc; return 0; =20 diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 9c49f53760d0..07927bb1e711 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -1358,6 +1358,8 @@ static int snapshot_ctr(struct dm_target *ti, unsigne= d int argc, char **argv) if (s->discard_zeroes_cow) ti->num_discard_bios =3D (s->discard_passdown_origin ? 2 : 1); ti->per_io_data_size =3D sizeof(struct dm_snap_tracked_chunk); + ti->num_provision_bios =3D 1; + ti->provision_supported =3D true; =20 /* Add snapshot to the list of snapshots for this origin */ /* Exceptions aren't triggered till snapshot_resume() is called */ @@ -2003,6 +2005,11 @@ static int snapshot_map(struct dm_target *ti, struct= bio *bio) /* If the block is already remapped - use that, else remap it */ e =3D dm_lookup_exception(&s->complete, chunk); if (e) { + if (unlikely(bio_op(bio) =3D=3D REQ_OP_PROVISION)) { + bio_endio(bio); + r =3D DM_MAPIO_SUBMITTED; + goto out_unlock; + } remap_exception(s, e, bio, chunk); if (unlikely(bio_op(bio) =3D=3D REQ_OP_DISCARD) && io_overlaps_chunk(s, bio)) { @@ -2413,6 +2420,7 @@ static void snapshot_io_hints(struct dm_target *ti, s= truct queue_limits *limits) /* All discards are split on chunk_size boundary */ limits->discard_granularity =3D snap->store->chunk_size; limits->max_discard_sectors =3D snap->store->chunk_size; + limits->max_provision_sectors =3D snap->store->chunk_size; =20 up_read(&_origins_lock); } diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 119db5e01080..9301f050529f 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1854,6 +1854,26 @@ static bool dm_table_supports_write_zeroes(struct dm= _table *t) return true; } =20 +static int device_provision_capable(struct dm_target *ti, struct dm_dev *d= ev, + sector_t start, sector_t len, void *data) +{ + return !bdev_max_provision_sectors(dev->bdev); +} + +static bool dm_table_supports_provision(struct dm_table *t) +{ + for (unsigned int i =3D 0; i < t->num_targets; i++) { + struct dm_target *ti =3D dm_table_get_target(t, i); + + if (ti->provision_supported || + (ti->type->iterate_devices && + ti->type->iterate_devices(ti, device_provision_capable, NULL))) + return true; + } + + return false; +} + static int device_not_nowait_capable(struct dm_target *ti, struct dm_dev *= dev, sector_t start, sector_t len, void *data) { @@ -1987,6 +2007,9 @@ int dm_table_set_restrictions(struct dm_table *t, str= uct request_queue *q, if (!dm_table_supports_write_zeroes(t)) q->limits.max_write_zeroes_sectors =3D 0; =20 + if (!dm_table_supports_provision(t)) + q->limits.max_provision_sectors =3D 0; + dm_table_verify_integrity(t); =20 /* diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 3b694ba3a106..9b94121b8d38 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1609,6 +1609,7 @@ static bool is_abnormal_io(struct bio *bio) case REQ_OP_DISCARD: case REQ_OP_SECURE_ERASE: case REQ_OP_WRITE_ZEROES: + case REQ_OP_PROVISION: return true; default: break; @@ -1641,6 +1642,11 @@ static blk_status_t __process_abnormal_io(struct clo= ne_info *ci, if (ti->max_write_zeroes_granularity) max_granularity =3D limits->max_write_zeroes_sectors; break; + case REQ_OP_PROVISION: + num_bios =3D ti->num_provision_bios; + if (ti->max_provision_granularity) + max_granularity =3D limits->max_provision_sectors; + break; default: break; } diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index a52d2b9a6846..9981378457d2 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -334,6 +334,12 @@ struct dm_target { */ unsigned int num_write_zeroes_bios; =20 + /* + * The number of PROVISION bios that will be submitted to the target. + * The bio number can be accessed with dm_bio_get_target_bio_nr. + */ + unsigned int num_provision_bios; + /* * The minimum number of extra bytes allocated in each io for the * target to use. @@ -358,6 +364,11 @@ struct dm_target { */ bool discards_supported:1; =20 + /* Set if this target needs to receive provision requests regardless of + * whether or not its underlying devices have support. + */ + bool provision_supported:1; + /* * Set if this target requires that discards be split on * 'max_discard_sectors' boundaries. @@ -376,6 +387,12 @@ struct dm_target { */ bool max_write_zeroes_granularity:1; =20 + /* + * Set if this target requires that provisions be split on + * 'max_provision_sectors' boundaries. + */ + bool max_provision_granularity:1; + /* * Set if we need to limit the number of in-flight bios when swapping. */ --=20 2.40.0.634.g4ca3ef3211-goog From nobody Wed Dec 17 12:08:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55EDBC77B73 for ; Thu, 20 Apr 2023 00:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232931AbjDTAta (ORCPT ); Wed, 19 Apr 2023 20:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232245AbjDTAtM (ORCPT ); Wed, 19 Apr 2023 20:49:12 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 079CE618C for ; Wed, 19 Apr 2023 17:49:04 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1a6862e47b1so6577055ad.0 for ; Wed, 19 Apr 2023 17:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1681951743; x=1684543743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TaRkZLFdq6iB8YT++07ypsMh1Ei2+nMtmkI0wjjAr+E=; b=DHUsnLMP1v5oaeRmmnbbE/U5NIHkwVR0EwfOtvZnueT49CaqN63WVYqu5wmp79o157 Y0zhKRO/cyJPB+h5YWITKVZ+HRmjeUNqrqufqdRhcgy1FKy3nxQvrphJaXWi/Cp9z76K S51qv8kZYwCk+6X3jVxJ13oE5RwoREq36V8bk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681951743; x=1684543743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TaRkZLFdq6iB8YT++07ypsMh1Ei2+nMtmkI0wjjAr+E=; b=Hl9icQGEU6ztzhJdW8MPKOgrj0w+/kaN1FFpuHxq/pZ3S70Mquj+sjM/jqyK7Yj9BP 3h07oOdur0W05qAhp8NLrMCEZwHpwkP4TvjdBvmn/QsmfhcqODnB+nbmjlJyWec7ijUp nicbZHhwM7kicxY6soCHLM84mBwCEtSmRoBU1x/rI5QIUwYC1O2oOr97pWLgh6E5XYQT aL/k/uwxCyQtNgTXchY+S+Tm2Z3pKaRsAk+e6Gb/Bcy9YHsHX0i7uVZ6qazk/jmQNeIT sAzgdDTRxAVf3zVwqZBv856gpPU4pYXlh9ahvfJK4E3IL/BhTTcwQF66nmQ9hiZSn9NP RYDw== X-Gm-Message-State: AAQBX9dloBi9+8nYsbVwI745q66EDaXxVD4tO4sUyrMeTzKyEX+VaXhB JSRmKocNAa59kw821ZzxV7gu+Q== X-Google-Smtp-Source: AKy350ZTS0kWGW+doA+M2fMNYTglwoDWa1lLyikxdZz12Cp/X0+QqkuEAwvn5bRsdiFf0rVsYOAFlw== X-Received: by 2002:a17:903:2905:b0:19a:b869:f2f8 with SMTP id lh5-20020a170903290500b0019ab869f2f8mr6266808plb.21.1681951743472; Wed, 19 Apr 2023 17:49:03 -0700 (PDT) Received: from sarthakkukreti-glaptop.corp.google.com ([2620:15c:9d:200:5113:a333:10ce:e2d]) by smtp.gmail.com with ESMTPSA id io18-20020a17090312d200b001a65575c13asm74323plb.48.2023.04.19.17.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 17:49:03 -0700 (PDT) From: Sarthak Kukreti To: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Jens Axboe , "Michael S. Tsirkin" , Jason Wang , Stefan Hajnoczi , Alasdair Kergon , Mike Snitzer , Christoph Hellwig , Brian Foster , Theodore Ts'o , Andreas Dilger , Bart Van Assche , Daniil Lunev , "Darrick J. Wong" Subject: [PATCH v5 4/5] dm-thin: Add REQ_OP_PROVISION support Date: Wed, 19 Apr 2023 17:48:49 -0700 Message-ID: <20230420004850.297045-5-sarthakkukreti@chromium.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230420004850.297045-1-sarthakkukreti@chromium.org> References: <20230414000219.92640-1-sarthakkukreti@chromium.org> <20230420004850.297045-1-sarthakkukreti@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" dm-thinpool uses the provision request to provision blocks for a dm-thin device. dm-thinpool currently does not pass through REQ_OP_PROVISION to underlying devices. For shared blocks, provision requests will break sharing and copy the contents of the entire block. Additionally, if 'skip_block_zeroing' is not set, dm-thin will opt to zero out the entire range as a part of provisioning. Signed-off-by: Sarthak Kukreti --- drivers/md/dm-thin.c | 73 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index 2b13c949bd72..58d633f5c928 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -274,6 +274,7 @@ struct pool { =20 process_bio_fn process_bio; process_bio_fn process_discard; + process_bio_fn process_provision; =20 process_cell_fn process_cell; process_cell_fn process_discard_cell; @@ -913,7 +914,8 @@ static void __inc_remap_and_issue_cell(void *context, struct bio *bio; =20 while ((bio =3D bio_list_pop(&cell->bios))) { - if (op_is_flush(bio->bi_opf) || bio_op(bio) =3D=3D REQ_OP_DISCARD) + if (op_is_flush(bio->bi_opf) || bio_op(bio) =3D=3D REQ_OP_DISCARD || + bio_op(bio) =3D=3D REQ_OP_PROVISION) bio_list_add(&info->defer_bios, bio); else { inc_all_io_entry(info->tc->pool, bio); @@ -1245,8 +1247,8 @@ static int io_overlaps_block(struct pool *pool, struc= t bio *bio) =20 static int io_overwrites_block(struct pool *pool, struct bio *bio) { - return (bio_data_dir(bio) =3D=3D WRITE) && - io_overlaps_block(pool, bio); + return (bio_data_dir(bio) =3D=3D WRITE) && io_overlaps_block(pool, bio) && + bio_op(bio) !=3D REQ_OP_PROVISION; } =20 static void save_and_set_endio(struct bio *bio, bio_end_io_t **save, @@ -1891,7 +1893,8 @@ static void process_shared_bio(struct thin_c *tc, str= uct bio *bio, =20 if (bio_data_dir(bio) =3D=3D WRITE && bio->bi_iter.bi_size) { break_sharing(tc, bio, block, &key, lookup_result, data_cell); - cell_defer_no_holder(tc, virt_cell); + if (bio_op(bio) !=3D REQ_OP_PROVISION) + cell_defer_no_holder(tc, virt_cell); } else { struct dm_thin_endio_hook *h =3D dm_per_bio_data(bio, sizeof(struct dm_t= hin_endio_hook)); =20 @@ -1953,6 +1956,51 @@ static void provision_block(struct thin_c *tc, struc= t bio *bio, dm_block_t block } } =20 +static void process_provision_bio(struct thin_c *tc, struct bio *bio) +{ + int r; + struct pool *pool =3D tc->pool; + dm_block_t block =3D get_bio_block(tc, bio); + struct dm_bio_prison_cell *cell; + struct dm_cell_key key; + struct dm_thin_lookup_result lookup_result; + + /* + * If cell is already occupied, then the block is already + * being provisioned so we have nothing further to do here. + */ + build_virtual_key(tc->td, block, &key); + if (bio_detain(pool, &key, bio, &cell)) + return; + + if (tc->requeue_mode) { + cell_requeue(pool, cell); + return; + } + + r =3D dm_thin_find_block(tc->td, block, 1, &lookup_result); + switch (r) { + case 0: + if (lookup_result.shared) { + process_shared_bio(tc, bio, block, &lookup_result, cell); + } else { + bio_endio(bio); + cell_defer_no_holder(tc, cell); + } + break; + case -ENODATA: + provision_block(tc, bio, block, cell); + break; + + default: + DMERR_LIMIT("%s: dm_thin_find_block() failed: error =3D %d", + __func__, r); + cell_defer_no_holder(tc, cell); + bio_io_error(bio); + break; + } +} + static void process_cell(struct thin_c *tc, struct dm_bio_prison_cell *cel= l) { int r; @@ -2228,6 +2276,8 @@ static void process_thin_deferred_bios(struct thin_c = *tc) =20 if (bio_op(bio) =3D=3D REQ_OP_DISCARD) pool->process_discard(tc, bio); + else if (bio_op(bio) =3D=3D REQ_OP_PROVISION) + pool->process_provision(tc, bio); else pool->process_bio(tc, bio); =20 @@ -2579,6 +2629,7 @@ static void set_pool_mode(struct pool *pool, enum poo= l_mode new_mode) dm_pool_metadata_read_only(pool->pmd); pool->process_bio =3D process_bio_fail; pool->process_discard =3D process_bio_fail; + pool->process_provision =3D process_bio_fail; pool->process_cell =3D process_cell_fail; pool->process_discard_cell =3D process_cell_fail; pool->process_prepared_mapping =3D process_prepared_mapping_fail; @@ -2592,6 +2643,7 @@ static void set_pool_mode(struct pool *pool, enum poo= l_mode new_mode) dm_pool_metadata_read_only(pool->pmd); pool->process_bio =3D process_bio_read_only; pool->process_discard =3D process_bio_success; + pool->process_provision =3D process_bio_fail; pool->process_cell =3D process_cell_read_only; pool->process_discard_cell =3D process_cell_success; pool->process_prepared_mapping =3D process_prepared_mapping_fail; @@ -2612,6 +2664,7 @@ static void set_pool_mode(struct pool *pool, enum poo= l_mode new_mode) pool->out_of_data_space =3D true; pool->process_bio =3D process_bio_read_only; pool->process_discard =3D process_discard_bio; + pool->process_provision =3D process_bio_fail; pool->process_cell =3D process_cell_read_only; pool->process_prepared_mapping =3D process_prepared_mapping; set_discard_callbacks(pool); @@ -2628,6 +2681,7 @@ static void set_pool_mode(struct pool *pool, enum poo= l_mode new_mode) dm_pool_metadata_read_write(pool->pmd); pool->process_bio =3D process_bio; pool->process_discard =3D process_discard_bio; + pool->process_provision =3D process_provision_bio; pool->process_cell =3D process_cell; pool->process_prepared_mapping =3D process_prepared_mapping; set_discard_callbacks(pool); @@ -2749,7 +2803,8 @@ static int thin_bio_map(struct dm_target *ti, struct = bio *bio) return DM_MAPIO_SUBMITTED; } =20 - if (op_is_flush(bio->bi_opf) || bio_op(bio) =3D=3D REQ_OP_DISCARD) { + if (op_is_flush(bio->bi_opf) || bio_op(bio) =3D=3D REQ_OP_DISCARD || + bio_op(bio) =3D=3D REQ_OP_PROVISION) { thin_defer_bio_with_throttle(tc, bio); return DM_MAPIO_SUBMITTED; } @@ -3396,6 +3451,9 @@ static int pool_ctr(struct dm_target *ti, unsigned in= t argc, char **argv) pt->adjusted_pf =3D pt->requested_pf =3D pf; ti->num_flush_bios =3D 1; ti->limit_swap_bios =3D true; + ti->num_provision_bios =3D 1; + ti->provision_supported =3D true; + ti->max_provision_granularity =3D true; =20 /* * Only need to enable discards if the pool should pass @@ -4288,6 +4346,9 @@ static int thin_ctr(struct dm_target *ti, unsigned in= t argc, char **argv) ti->max_discard_granularity =3D true; } =20 + ti->num_provision_bios =3D 1; + ti->provision_supported =3D true; + mutex_unlock(&dm_thin_pool_table.mutex); =20 spin_lock_irq(&tc->pool->lock); @@ -4502,6 +4563,8 @@ static void thin_io_hints(struct dm_target *ti, struc= t queue_limits *limits) =20 limits->discard_granularity =3D pool->sectors_per_block << SECTOR_SHIFT; limits->max_discard_sectors =3D pool->sectors_per_block * BIO_PRISON_MAX_= RANGE; + + limits->max_provision_sectors =3D pool->sectors_per_block; } =20 static struct target_type thin_target =3D { --=20 2.40.0.634.g4ca3ef3211-goog From nobody Wed Dec 17 12:08:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E21EFC77B73 for ; Thu, 20 Apr 2023 00:49:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233076AbjDTAti (ORCPT ); Wed, 19 Apr 2023 20:49:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232503AbjDTAtU (ORCPT ); Wed, 19 Apr 2023 20:49:20 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5354465AA for ; Wed, 19 Apr 2023 17:49:08 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1a814fe0ddeso6178495ad.2 for ; Wed, 19 Apr 2023 17:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1681951747; x=1684543747; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DJ+yGPB/3GoY7peOyZ+CblNlWIiKQ+IujQrkD9HaThI=; b=AsGCK3PzHl4ubqG8b7iSl3UlUgSVpLYZQgbDseTH2tZlTDUqkO4l23lNAdsx0+zFBl XwpiVdhhEvmYimfYnxFgH/cAs2UjaXqmDCjBdZnGaXZudoEwPrhFzpNgc+BLEZDu89Yb NSm8rBdMG1jTuscW2lrhVq9EyU8Ei5cNDuVdo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681951747; x=1684543747; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DJ+yGPB/3GoY7peOyZ+CblNlWIiKQ+IujQrkD9HaThI=; b=Uw4HHWrpFMQ4KnIUSpZktjcQuSqPpOFutqWX0sQmt4e3cyZU0ncdnytn+RHf1zCT6g grD7VoH3yWESckGLYZLg2V4cSITfA7khmAjeCqvKplW++oNxli4IxKiRbuxcmEbeGnZ3 0GIHwGMGAHIkafXLCxmBC6uIpTed1HBdaOUlf59DAWpB0prJis2h/iOPQC1FzTn1GFUj GigwjZqgETThOPGKKz4E+xI0SqlCUfOPXI7/qw9jIE5Ix6S4lZq/w9m8rNqcmOwoWX46 Lgh6pCX9M9PSBK6dC3RzNocvP5drZxNzxgIjluFFvkI/u50UjCOf3gFSs2voDZQeRafW ueZw== X-Gm-Message-State: AAQBX9fmTrYUOo7vr8jkYFJ6Ra3JnE4SOm1IFygs5YCvtHxEUP4MG49B JXpPPZ+6mhTPmEY/Wopxb2c77w== X-Google-Smtp-Source: AKy350aGYAY9EuWC+snwEDPRTdaLAmDmSJ1/7+Wp2Iq2qareE0BBMHYD3hQa0gQtEfvf6Zqtorcqng== X-Received: by 2002:a17:902:d482:b0:1a6:9d98:e720 with SMTP id c2-20020a170902d48200b001a69d98e720mr8237297plg.3.1681951747164; Wed, 19 Apr 2023 17:49:07 -0700 (PDT) Received: from sarthakkukreti-glaptop.corp.google.com ([2620:15c:9d:200:5113:a333:10ce:e2d]) by smtp.gmail.com with ESMTPSA id io18-20020a17090312d200b001a65575c13asm74323plb.48.2023.04.19.17.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 17:49:06 -0700 (PDT) From: Sarthak Kukreti To: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Jens Axboe , "Michael S. Tsirkin" , Jason Wang , Stefan Hajnoczi , Alasdair Kergon , Mike Snitzer , Christoph Hellwig , Brian Foster , Theodore Ts'o , Andreas Dilger , Bart Van Assche , Daniil Lunev , "Darrick J. Wong" Subject: [PATCH v5 5/5] loop: Add support for provision requests Date: Wed, 19 Apr 2023 17:48:50 -0700 Message-ID: <20230420004850.297045-6-sarthakkukreti@chromium.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog In-Reply-To: <20230420004850.297045-1-sarthakkukreti@chromium.org> References: <20230414000219.92640-1-sarthakkukreti@chromium.org> <20230420004850.297045-1-sarthakkukreti@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for provision requests to loopback devices. Loop devices will configure provision support based on whether the underlying block device/file can support the provision request and upon receiving a provision bio, will map it to the backing device/storage. For loop devices over files, a REQ_OP_PROVISION request will translate to an fallocate mode 0 call on the backing file. Signed-off-by: Sarthak Kukreti --- drivers/block/loop.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index bc31bb7072a2..13c4b4f8b9c1 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -327,6 +327,24 @@ static int lo_fallocate(struct loop_device *lo, struct= request *rq, loff_t pos, return ret; } =20 +static int lo_req_provision(struct loop_device *lo, struct request *rq, lo= ff_t pos) +{ + struct file *file =3D lo->lo_backing_file; + struct request_queue *q =3D lo->lo_queue; + int ret; + + if (!q->limits.max_provision_sectors) { + ret =3D -EOPNOTSUPP; + goto out; + } + + ret =3D file->f_op->fallocate(file, 0, pos, blk_rq_bytes(rq)); + if (unlikely(ret && ret !=3D -EINVAL && ret !=3D -EOPNOTSUPP)) + ret =3D -EIO; + out: + return ret; +} + static int lo_req_flush(struct loop_device *lo, struct request *rq) { int ret =3D vfs_fsync(lo->lo_backing_file, 0); @@ -488,6 +506,8 @@ static int do_req_filebacked(struct loop_device *lo, st= ruct request *rq) FALLOC_FL_PUNCH_HOLE); case REQ_OP_DISCARD: return lo_fallocate(lo, rq, pos, FALLOC_FL_PUNCH_HOLE); + case REQ_OP_PROVISION: + return lo_req_provision(lo, rq, pos); case REQ_OP_WRITE: if (cmd->use_aio) return lo_rw_aio(lo, cmd, pos, ITER_SOURCE); @@ -754,6 +774,25 @@ static void loop_sysfs_exit(struct loop_device *lo) &loop_attribute_group); } =20 +static void loop_config_provision(struct loop_device *lo) +{ + struct file *file =3D lo->lo_backing_file; + struct inode *inode =3D file->f_mapping->host; + + /* + * If the backing device is a block device, mirror its provisioning + * capability. + */ + if (S_ISBLK(inode->i_mode)) { + blk_queue_max_provision_sectors(lo->lo_queue, + bdev_max_provision_sectors(I_BDEV(inode))); + } else if (file->f_op->fallocate) { + blk_queue_max_provision_sectors(lo->lo_queue, UINT_MAX >> 9); + } else { + blk_queue_max_provision_sectors(lo->lo_queue, 0); + } +} + static void loop_config_discard(struct loop_device *lo) { struct file *file =3D lo->lo_backing_file; @@ -1092,6 +1131,7 @@ static int loop_configure(struct loop_device *lo, fmo= de_t mode, blk_queue_io_min(lo->lo_queue, bsize); =20 loop_config_discard(lo); + loop_config_provision(lo); loop_update_rotational(lo); loop_update_dio(lo); loop_sysfs_init(lo); @@ -1304,6 +1344,7 @@ loop_set_status(struct loop_device *lo, const struct = loop_info64 *info) } =20 loop_config_discard(lo); + loop_config_provision(lo); =20 /* update dio if lo_offset or transfer is changed */ __loop_update_dio(lo, lo->use_dio); @@ -1830,6 +1871,7 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ct= x *hctx, case REQ_OP_FLUSH: case REQ_OP_DISCARD: case REQ_OP_WRITE_ZEROES: + case REQ_OP_PROVISION: cmd->use_aio =3D false; break; default: --=20 2.40.0.634.g4ca3ef3211-goog