From patchwork Fri May 21 03:01:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 12271745 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CC87C433B4 for ; Fri, 21 May 2021 03:01:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CBA96108C for ; Fri, 21 May 2021 03:01:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232046AbhEUDCx (ORCPT ); Thu, 20 May 2021 23:02:53 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:25389 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234712AbhEUDCx (ORCPT ); Thu, 20 May 2021 23:02:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1621566091; x=1653102091; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=shPpSeP296J2qygw6NO0KVC+guYs/L89/b5ZZys6J5g=; b=DShdwlIQqzX/TBDL9PBD1+bBW2a0we+t+cSr9vtLzHZ4sIiNKZBah2ep TyLHw//DVm1QyC4qTGkkcEBoNIY/8SOee530UfTHB0MKcVZTK7cdmd3BM z3splmG3EsuhsmTnyTGFfm/XlWnlKQ40gAh54na1pv1cETUQq/acsqK3u DLg2wDJPhKHbNTUxiwietWU/Qiis5HI2RFewq7EStlrjiADN9isiHoqGG KtZAbErBaDyKCOIoWg2oIYFqJ3Xr+ue6TnT1SL/2E6xjcIgICSA79xa9+ Z8S3urFSiZJR42EIodK7YEs1SGAPj03tIBY6Quoi2gwqKZWxApax7I6mL w==; IronPort-SDR: Si3QHv7ILCzM7iIxDXzGlbW4Yt4oJd5dX+w3pI02BU64Uy58Cd1yuPwWJsiZWc/xElhpzCrsbH cwbWBmajj9/FAS9TIuyx1JclPqiGmL3Ljnd1WgJ7GwPcQjr/hqnnEMG56ekOkUZBCZIofYmsal ZRpfPp9YiQxrp5cBJXhZLhrTioc5ceLAuXiiHOdM7joV79K6sXHjZ1KnknEZzkXD/OEJrW84Lq dYOrdyE/t73jsEEyF6pCm7ihwFw8ShRDRhZlfuC8M8F/yPQLxmP0ZgD1HY1f5Ws4v3CI65Nw15 GSA= X-IronPort-AV: E=Sophos;i="5.82,313,1613404800"; d="scan'208";a="168943860" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 21 May 2021 11:01:30 +0800 IronPort-SDR: pXRWFodA1KIXe4Oh51/I+0uMet1O95WbzlB/XLdGlNugVJ3J7iwbuZI0Csby57v3Pv0braTDKl 7CkpLyGz1T/lR4dlsQU96HCGyr5CDqDynBa8eGDW5zuKOVfUHBJZXNrR4ACTXdqXXdlnMN20pS IugFjb/piujAJTuUKOvweFwbroZN1r73Hsrt2L6dZlbmqeZZGqeOTy8BlXYbDTjIDB/N+/HMEB zABdE9pZq03HLnjtNjd4l+sKCbFhkprEcPkoYbWx8RCy7Q+nf8IXZ6UKCVqCtaTDxYdK+rxGYV zxjnWC4cu3yTqdPax3ZGly2v Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2021 19:41:07 -0700 IronPort-SDR: XTzp68aMOYTDkar2IQ8AuQcI3JQX77oPn7SA8j/h+8A/9jF7cuJS1owUIgiHJBx6rOTuqHiRK4 7mbOvkzUZov5f5P9QhcAmIIa5E+LK+B/9c5SpWJOACEfliqcT03VDrKY1DhAPQWyD+DyyB4IzU I5VRTuvaCWBsXYcfmZTcGK0aWHTCNxq7QSjxqSv4g9qoUtjrAjIVBV4B0jg8NdiA0bafjs0yzs DGKA7wCKnOobWrXlrB80PE7YEYtiXVHbG7YrrlEv8JfiFJ5fd/zFjecEWOe2XILUrhce3FpKpq fa4= WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 20 May 2021 20:01:30 -0700 From: Damien Le Moal To: dm-devel@redhat.com, Mike Snitzer , linux-block@vger.kernel.org, Jens Axboe Subject: [PATCH v3 07/11] dm: Introduce dm_report_zones() Date: Fri, 21 May 2021 12:01:15 +0900 Message-Id: <20210521030119.1209035-8-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521030119.1209035-1-damien.lemoal@wdc.com> References: <20210521030119.1209035-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org To simplify the implementation of the report_zones operation of a zoned target, introduce the function dm_report_zones() to set a target mapping start sector in struct dm_report_zones_args and call blkdev_report_zones(). This new function is exported and the report zones callback function dm_report_zones_cb() is not. dm-linear, dm-flakey and dm-crypt are modified to use dm_report_zones(). Signed-off-by: Damien Le Moal Reviewed-by: Johannes Thumshirn Reviewed-by: Hannes Reinecke --- drivers/md/dm-crypt.c | 7 +++---- drivers/md/dm-flakey.c | 7 +++---- drivers/md/dm-linear.c | 7 +++---- drivers/md/dm-zone.c | 23 ++++++++++++++++++++--- include/linux/device-mapper.h | 3 ++- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index b0ab080f2567..f410ceee51d7 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -3138,11 +3138,10 @@ static int crypt_report_zones(struct dm_target *ti, struct dm_report_zones_args *args, unsigned int nr_zones) { struct crypt_config *cc = ti->private; - sector_t sector = cc->start + dm_target_offset(ti, args->next_sector); - args->start = cc->start; - return blkdev_report_zones(cc->dev->bdev, sector, nr_zones, - dm_report_zones_cb, args); + return dm_report_zones(cc->dev->bdev, cc->start, + cc->start + dm_target_offset(ti, args->next_sector), + args, nr_zones); } #else #define crypt_report_zones NULL diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index b7fee9936f05..5877220c01ed 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c @@ -463,11 +463,10 @@ static int flakey_report_zones(struct dm_target *ti, struct dm_report_zones_args *args, unsigned int nr_zones) { struct flakey_c *fc = ti->private; - sector_t sector = flakey_map_sector(ti, args->next_sector); - args->start = fc->start; - return blkdev_report_zones(fc->dev->bdev, sector, nr_zones, - dm_report_zones_cb, args); + return dm_report_zones(fc->dev->bdev, fc->start, + flakey_map_sector(ti, args->next_sector), + args, nr_zones); } #else #define flakey_report_zones NULL diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index 92db0f5e7f28..c91f1e2e2f65 100644 --- a/drivers/md/dm-linear.c +++ b/drivers/md/dm-linear.c @@ -140,11 +140,10 @@ static int linear_report_zones(struct dm_target *ti, struct dm_report_zones_args *args, unsigned int nr_zones) { struct linear_c *lc = ti->private; - sector_t sector = linear_map_sector(ti, args->next_sector); - args->start = lc->start; - return blkdev_report_zones(lc->dev->bdev, sector, nr_zones, - dm_report_zones_cb, args); + return dm_report_zones(lc->dev->bdev, lc->start, + linear_map_sector(ti, args->next_sector), + args, nr_zones); } #else #define linear_report_zones NULL diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c index 3243c42b7951..b42474043249 100644 --- a/drivers/md/dm-zone.c +++ b/drivers/md/dm-zone.c @@ -56,7 +56,8 @@ int dm_blk_report_zones(struct gendisk *disk, sector_t sector, return ret; } -int dm_report_zones_cb(struct blk_zone *zone, unsigned int idx, void *data) +static int dm_report_zones_cb(struct blk_zone *zone, unsigned int idx, + void *data) { struct dm_report_zones_args *args = data; sector_t sector_diff = args->tgt->begin - args->start; @@ -84,7 +85,24 @@ int dm_report_zones_cb(struct blk_zone *zone, unsigned int idx, void *data) args->next_sector = zone->start + zone->len; return args->orig_cb(zone, args->zone_idx++, args->orig_data); } -EXPORT_SYMBOL_GPL(dm_report_zones_cb); + +/* + * Helper for drivers of zoned targets to implement struct target_type + * report_zones operation. + */ +int dm_report_zones(struct block_device *bdev, sector_t start, sector_t sector, + struct dm_report_zones_args *args, unsigned int nr_zones) +{ + /* + * Set the target mapping start sector first so that + * dm_report_zones_cb() can correctly remap zone information. + */ + args->start = start; + + return blkdev_report_zones(bdev, sector, nr_zones, + dm_report_zones_cb, args); +} +EXPORT_SYMBOL_GPL(dm_report_zones); void dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q) { @@ -99,4 +117,3 @@ void dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q) WARN_ON_ONCE(queue_is_mq(q)); q->nr_zones = blkdev_nr_zones(t->md->disk); } - diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index ff700fb6ce1d..caea0a079d2d 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -478,7 +478,8 @@ struct dm_report_zones_args { /* must be filled by ->report_zones before calling dm_report_zones_cb */ sector_t start; }; -int dm_report_zones_cb(struct blk_zone *zone, unsigned int idx, void *data); +int dm_report_zones(struct block_device *bdev, sector_t start, sector_t sector, + struct dm_report_zones_args *args, unsigned int nr_zones); #endif /* CONFIG_BLK_DEV_ZONED */ /*