From patchwork Fri Aug 11 10:52:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitesh Shetty X-Patchwork-Id: 134438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1031387vqi; Fri, 11 Aug 2023 04:56:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4WDYDzceKOc6WmfAARAnbFMtv/a54H2bAuDsiDAK9j7nURNcweLDVHxdzkxLe7a1NsMkA X-Received: by 2002:a05:6a20:3d0a:b0:13f:13cb:bc50 with SMTP id y10-20020a056a203d0a00b0013f13cbbc50mr2567935pzi.25.1691754960415; Fri, 11 Aug 2023 04:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691754960; cv=none; d=google.com; s=arc-20160816; b=AEbf5HWqr2sZrWVWlLeadqiAIc6xJo3IS/s7qe5Mj/bustn797NlIl0O3jl7lSazo1 mK96uRIWX3QYPEcFjmzEUPEhWGAgA9TKyC9zV3NcPJxDpfyIZhfTlaVNa93rvVhg9e30 X2i27VWb8CCxBwdP/6iofNA7FSoyq5Yy/8ueNr8j6l2KHxA/yVEuVGcyqfiLhKqfvzSZ 7rLKkJSqxFY1cJKmlqhctwREnpbukP3B6haC5Uqc1ElRcpWEVYzyK+mRYmoMBzSwYC+G VHmMkQrjM/edh+zb/qYJ6Q73p3LcYzAyild5u1ajCikLfpFnfwGS7iK+6d6fsbVximBq lwIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:dlp-filter:cms-type :content-transfer-encoding:mime-version:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=vUp+fASOS8MODdHhtCYgPpbmUzBhPuTl/SXHUKbP9I0=; fh=9zkdczoFVidWnv4llOc/GxVXO+UkEUyfBlN7w8/1iXg=; b=V+OQouZ3MZ8bMAg1Hhi8zMOX5QWonqpAz4lbCHNMWAyrk3uUGBJYEu4rJZNIFBa4vz pOjKNE9JsYkzvRbH5sq+bD0AClkezmutdnRUtb25Y6JrrlUCl86cZ8L6i0TXYiIf/H5n NVM1247tRaVV6DGG3jDOXpWEIycFHkvmp8t4jZJkO3WpC3s7RuPHRKTfrlniuV5lbsSG L40NtoLor8AjIcAD/3mR3theKzhtRZHoRnkqNzSTZHeo9+syOL0AuZcnbHrgjdi+c0va eEKZ0SJmPW4zddYjEAmvYA+lwhefq39mc8QMZWuDaM4TlzP56Lkwo/z0lXG+f3HR5uNe hQvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=kt9M69ZC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ca21-20020a056a00419500b006874b10adebsi3326456pfb.181.2023.08.11.04.55.46; Fri, 11 Aug 2023 04:56:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=kt9M69ZC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236568AbjHKLV2 (ORCPT + 99 others); Fri, 11 Aug 2023 07:21:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236488AbjHKLU7 (ORCPT ); Fri, 11 Aug 2023 07:20:59 -0400 Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9317330DA for ; Fri, 11 Aug 2023 04:20:53 -0700 (PDT) Received: from epcas5p1.samsung.com (unknown [182.195.41.39]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20230811112051epoutp0279c9b201f582b36b6c7d4800b3309715~6UEFcJpSc0105201052epoutp02N for ; Fri, 11 Aug 2023 11:20:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20230811112051epoutp0279c9b201f582b36b6c7d4800b3309715~6UEFcJpSc0105201052epoutp02N DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1691752851; bh=vUp+fASOS8MODdHhtCYgPpbmUzBhPuTl/SXHUKbP9I0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kt9M69ZCujoPS46N1Yo6biWnnfSuGi7i8+UirNEgdDiKdsgi8a4wKuoi2GgCMo2kp KjeiKBKqnFAi4cde3yixpfmqs0WGdCl273hfkqWF43VanMGSxR3xCGpH2mokqrQUnS SFINV4fmjmQQqugeFLGzyozl2dcZqSqERrtM+ZgU= Received: from epsnrtp4.localdomain (unknown [182.195.42.165]) by epcas5p2.samsung.com (KnoxPortal) with ESMTP id 20230811112050epcas5p2866916af63009e0aaa3e3a0185ad31e3~6UEEn1OXr0511305113epcas5p25; Fri, 11 Aug 2023 11:20:50 +0000 (GMT) Received: from epsmges5p1new.samsung.com (unknown [182.195.38.183]) by epsnrtp4.localdomain (Postfix) with ESMTP id 4RMhDd4MKqz4x9Pv; Fri, 11 Aug 2023 11:20:49 +0000 (GMT) Received: from epcas5p2.samsung.com ( [182.195.41.40]) by epsmges5p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 69.7D.55522.19916D46; Fri, 11 Aug 2023 20:20:49 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p3.samsung.com (KnoxPortal) with ESMTPA id 20230811105830epcas5p37a477e5e7b006613549647bebdf4d028~6TwkO0CPt2989329893epcas5p3F; Fri, 11 Aug 2023 10:58:30 +0000 (GMT) Received: from epsmgmcp1.samsung.com (unknown [182.195.42.82]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230811105830epsmtrp2da1a8fadbde3e617e6438c330a5bbfa1~6TwkN0yzv2549525495epsmtrp2c; Fri, 11 Aug 2023 10:58:30 +0000 (GMT) X-AuditID: b6c32a49-419ff7000000d8e2-1d-64d619914d89 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgmcp1.samsung.com (Symantec Messaging Gateway) with SMTP id 65.23.64355.65416D46; Fri, 11 Aug 2023 19:58:30 +0900 (KST) Received: from green245.sa.corp.samsungelectronics.net (unknown [107.99.41.245]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230811105824epsmtip2d8dc512097dbe28fc313202aa2f0faf2~6Twe3QMcV1482514825epsmtip2R; Fri, 11 Aug 2023 10:58:24 +0000 (GMT) From: Nitesh Shetty To: Jens Axboe , Jonathan Corbet , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Keith Busch , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , Alexander Viro , Christian Brauner Cc: martin.petersen@oracle.com, mcgrof@kernel.org, dlemoal@kernel.org, gost.dev@samsung.com, Nitesh Shetty , Damien Le Moal , Anuj Gupta , Vincent Fu , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v14 11/11] null_blk: add support for copy offload Date: Fri, 11 Aug 2023 16:22:54 +0530 Message-Id: <20230811105300.15889-12-nj.shetty@samsung.com> X-Mailer: git-send-email 2.35.1.500.gb896f729e2 In-Reply-To: <20230811105300.15889-1-nj.shetty@samsung.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA01TbUxTVxjOufdyKSzVK2J2YEObbiZDxkcV8AACmxh3nbCQEbLJftQ7egUC tE1bFCfRAiII8i1LrHwGIoIbxQ5UigUGDuRrzDJgsFTYaAeOCCLZ2CTAKBen/57nOe/7Pnne k5eHO1y2debFSVWsQsokCEl74k6X63vuhU6jEq/V0reRtq8bR2kFqzi6Zcon0VzXc4DMHZkA rQwO4WiqPRgZ5q/boPGOFgzV3foBQ0WdowBZRjQYMky4oapLNQS6b+gl0LC+lEQVNyy2qLZn DUO/FFgAurNSgaOGuQUCPZx4C03nZAE0tNpj8wGkhx7fJujhwSRaV3+ZpL+ruUC3jqtJujqv 2IbOTZ8n6ZaMSRt60TJB0AttIySd11QP6CXdblpnfoqF86PiD8WyjIRVCFhptEwSJ40JFB6P EIeIfXy9RO4iP3RQKJAyiWyg8EhouPvRuISN+ELBaSYhaUMKZ5RKoWfQIYUsScUKYmVKVaCQ lUsS5N5yDyWTqEySxnhIWZW/yMtrv89G4cn42LaGGUz+8KPkxX9nbNUgIyAb2PEg5Q0f1S9j 2cCe50C1Atid227DkecA/lo2/4qMF/2DZwPeZssD/aec3gLgelYjwZEMDM4MlAFrEUm5wf51 nlV3pNQ4bGytBlaCU6U4tPxdTlrNd1IfwmaLibBigtoLv39xcRPzqQBoSGsDnJsnzJ/cYZXt NuQFnZHkSnbA3mvmzXKc2gPTm6/j1vmQKraDD5b0OBfuCEyr7Cc4vBP+2dNky2FnuDRvIDl8 BtZdvUlyzRcB1IxpAPcQDDP68jcj45Qr1Oo9OdkFlvQ1YJzxNpi7YsY4nQ/vlb/E78BvtJVb 853g6HLqFqZh0WzB1krzAFyoniQKgEDzWiDNa4E0r6wrAV4PnFi5MjGGVfrIRVL2zP/fHC1L 1IHNm9h37B4wTT3z6AQYD3QCyMOFjvzACKPEgS9hzn7FKmRiRVICq+wEPhsLL8Sdd0XLNo5K qhKLvP28vH19fb39DviKhG/y5zLKJA5UDKNi41lWzipe9mE8O2c1FvL4sxN6Y45Ya7l7bpda TjWemvO4krx+YHvUsZww49kgQVW33tWsetowm7n2ZVXSj1G9I37Ka1dHO8j7nX7tq46SMXvF TJkpzD4lJHLtfDjx6PCJvTcZqW7wgkzvf6P89rMmrUvr9GwpQ0Umn473l1zSuppMY18Mv5Fa 5LbbRZAZOhVm20lKQltUrc1GcfaLJSLl836/kuX5FM/J2p8NhHTK0LV9oCZglFH3PdnWGox+ q5mu3JNZ2JR3cm3q3Y9jS2rfr3I4OHQkJqKu4ZTZrPg99bzg24qvjws/iRctBiXuByXjheee zI1G3h0w/hW1okgvvmL6yecP50GBLCvmcEGLkFDGMqJ9uELJ/Ac8yfAfnAQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsWy7bCSvG6YyLUUg45ZXBbrTx1jtmia8JfZ YvXdfjaL14c/MVo8OdDOaPH77Hlmiwf77S32vpvNanHzwE4mi5WrjzJZTDp0jdHi6dVZTBZ7 b2lbLGxbwmKxZ+9JFovLu+awWcxf9pTdYvnxf0wWNyY8ZbTY9ns+s8W61+9ZLE7ckrZ43N3B aHH+73FWBwmP8/c2snhcPlvqsWlVJ5vH5iX1HrtvNrB5LO6bzOrR2/yOzWNn631Wj49Pb7F4 vN93lc2jb8sqRo/Pm+Q8Nj15yxTAG8Vlk5Kak1mWWqRvl8CVsW/dc6aCE+4VH38+Z29gbLXu YuTgkBAwkTiyK6iLkYtDSGA7o8TDG31sXYycQHFJiWV/jzBD2MISK/89Z4coamaS+LnxDDtI M5uAtsTp/xwgcRGBLmaJzp3vWEAamAVWMUssuWcDYgsLOEpsfXoXLM4ioCpx8FcLmM0rYC2x t2kfI8QR+hL99wVBwpxA4febLoHdICRgJfFh2UFGiHJBiZMzn0CNl5do3jqbeQKjwCwkqVlI UgsYmVYxiqYWFOem5yYXGOoVJ+YWl+al6yXn525iBMeuVtAOxmXr/+odYmTiYDzEKMHBrCTC axt8KUWINyWxsiq1KD++qDQntfgQozQHi5I4r3JOZ4qQQHpiSWp2ampBahFMlomDU6qBSaTg 457zFrF3Tux6zFz9SD7Ifv2V2x/7Nj9fU9ZkL+FRzZxxavnD1z0R8p9k99WFGpXbbnF7tNt3 +4MN0XwnHp37yfzfInX7m62LFLpSdh5N2XtCsy1aek8BT29E3Y25mnusbtQe1T7E6G735+P/ lsyce6Kb1wRp6/F9/HmnqE/ezPx2wav4lQ3/1kfKMGyyyktOVJ0Qfv16uUTKqjqeoNKpNu6i qZJl7beuJqeIf7qsq7R13s2VPReSRbLSGaa7vHFbGr9NZ8KOCxWbqx5yLij6W63ZoXS1VirL 3/5DPWeuqenMGauqtq97frG2aMUnp13P5xW+lhLV523U6mHr+7br87eLZ5adnnJlyZ7Ne5RY ijMSDbWYi4oTAbrrnr9MAwAA X-CMS-MailID: 20230811105830epcas5p37a477e5e7b006613549647bebdf4d028 X-Msg-Generator: CA X-Sendblock-Type: REQ_APPROVE CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230811105830epcas5p37a477e5e7b006613549647bebdf4d028 References: <20230811105300.15889-1-nj.shetty@samsung.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773933649370156606 X-GMAIL-MSGID: 1773933649370156606 Implementation is based on existing read and write infrastructure. copy_max_bytes: A new configfs and module parameter is introduced, which can be used to set hardware/driver supported maximum copy limit. Only request based queue mode will support for copy offload. Added tracefs support to copy IO tracing. Suggested-by: Damien Le Moal Signed-off-by: Anuj Gupta Signed-off-by: Nitesh Shetty Signed-off-by: Vincent Fu --- Documentation/block/null_blk.rst | 5 ++ drivers/block/null_blk/main.c | 99 ++++++++++++++++++++++++++++++- drivers/block/null_blk/null_blk.h | 1 + drivers/block/null_blk/trace.h | 23 +++++++ 4 files changed, 125 insertions(+), 3 deletions(-) diff --git a/Documentation/block/null_blk.rst b/Documentation/block/null_blk.rst index 4dd78f24d10a..6153e02fcf13 100644 --- a/Documentation/block/null_blk.rst +++ b/Documentation/block/null_blk.rst @@ -149,3 +149,8 @@ zone_size=[MB]: Default: 256 zone_nr_conv=[nr_conv]: Default: 0 The number of conventional zones to create when block device is zoned. If zone_nr_conv >= nr_zones, it will be reduced to nr_zones - 1. + +copy_max_bytes=[size in bytes]: Default: COPY_MAX_BYTES + A module and configfs parameter which can be used to set hardware/driver + supported maximum copy offload limit. + COPY_MAX_BYTES(=128MB at present) is defined in fs.h diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index 864013019d6b..afc14aa20305 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -11,6 +11,8 @@ #include #include "null_blk.h" +#include "trace.h" + #undef pr_fmt #define pr_fmt(fmt) "null_blk: " fmt @@ -157,6 +159,10 @@ static int g_max_sectors; module_param_named(max_sectors, g_max_sectors, int, 0444); MODULE_PARM_DESC(max_sectors, "Maximum size of a command (in 512B sectors)"); +static unsigned long g_copy_max_bytes = COPY_MAX_BYTES; +module_param_named(copy_max_bytes, g_copy_max_bytes, ulong, 0444); +MODULE_PARM_DESC(copy_max_bytes, "Maximum size of a copy command (in bytes)"); + static unsigned int nr_devices = 1; module_param(nr_devices, uint, 0444); MODULE_PARM_DESC(nr_devices, "Number of devices to register"); @@ -409,6 +415,7 @@ NULLB_DEVICE_ATTR(home_node, uint, NULL); NULLB_DEVICE_ATTR(queue_mode, uint, NULL); NULLB_DEVICE_ATTR(blocksize, uint, NULL); NULLB_DEVICE_ATTR(max_sectors, uint, NULL); +NULLB_DEVICE_ATTR(copy_max_bytes, uint, NULL); NULLB_DEVICE_ATTR(irqmode, uint, NULL); NULLB_DEVICE_ATTR(hw_queue_depth, uint, NULL); NULLB_DEVICE_ATTR(index, uint, NULL); @@ -550,6 +557,7 @@ static struct configfs_attribute *nullb_device_attrs[] = { &nullb_device_attr_queue_mode, &nullb_device_attr_blocksize, &nullb_device_attr_max_sectors, + &nullb_device_attr_copy_max_bytes, &nullb_device_attr_irqmode, &nullb_device_attr_hw_queue_depth, &nullb_device_attr_index, @@ -656,7 +664,8 @@ static ssize_t memb_group_features_show(struct config_item *item, char *page) "poll_queues,power,queue_mode,shared_tag_bitmap,size," "submit_queues,use_per_node_hctx,virt_boundary,zoned," "zone_capacity,zone_max_active,zone_max_open," - "zone_nr_conv,zone_offline,zone_readonly,zone_size\n"); + "zone_nr_conv,zone_offline,zone_readonly,zone_size," + "copy_max_bytes\n"); } CONFIGFS_ATTR_RO(memb_group_, features); @@ -722,6 +731,7 @@ static struct nullb_device *null_alloc_dev(void) dev->queue_mode = g_queue_mode; dev->blocksize = g_bs; dev->max_sectors = g_max_sectors; + dev->copy_max_bytes = g_copy_max_bytes; dev->irqmode = g_irqmode; dev->hw_queue_depth = g_hw_queue_depth; dev->blocking = g_blocking; @@ -1271,6 +1281,81 @@ static int null_transfer(struct nullb *nullb, struct page *page, return err; } +static inline int nullb_setup_copy(struct nullb *nullb, struct request *req, + bool is_fua) +{ + sector_t sector_in, sector_out; + loff_t offset_in, offset_out; + void *in, *out; + ssize_t chunk, rem = 0; + struct bio *bio; + struct nullb_page *t_page_in, *t_page_out; + u16 seg = 1; + int status = -EIO; + + if (blk_rq_nr_phys_segments(req) != COPY_MAX_SEGMENTS) + return status; + + /* + * First bio contains information about source and last bio contains + * information about destination. + */ + __rq_for_each_bio(bio, req) { + if (seg == blk_rq_nr_phys_segments(req)) { + sector_out = bio->bi_iter.bi_sector; + if (rem != bio->bi_iter.bi_size) + return status; + } else { + sector_in = bio->bi_iter.bi_sector; + rem = bio->bi_iter.bi_size; + } + seg++; + } + + trace_nullb_copy_op(req, sector_out << SECTOR_SHIFT, + sector_in << SECTOR_SHIFT, rem); + + spin_lock_irq(&nullb->lock); + while (rem > 0) { + chunk = min_t(size_t, nullb->dev->blocksize, rem); + offset_in = (sector_in & SECTOR_MASK) << SECTOR_SHIFT; + offset_out = (sector_out & SECTOR_MASK) << SECTOR_SHIFT; + + if (null_cache_active(nullb) && !is_fua) + null_make_cache_space(nullb, PAGE_SIZE); + + t_page_in = null_lookup_page(nullb, sector_in, false, + !null_cache_active(nullb)); + if (!t_page_in) + goto err; + t_page_out = null_insert_page(nullb, sector_out, + !null_cache_active(nullb) || + is_fua); + if (!t_page_out) + goto err; + + in = kmap_local_page(t_page_in->page); + out = kmap_local_page(t_page_out->page); + + memcpy(out + offset_out, in + offset_in, chunk); + kunmap_local(out); + kunmap_local(in); + __set_bit(sector_out & SECTOR_MASK, t_page_out->bitmap); + + if (is_fua) + null_free_sector(nullb, sector_out, true); + + rem -= chunk; + sector_in += chunk >> SECTOR_SHIFT; + sector_out += chunk >> SECTOR_SHIFT; + } + + status = 0; +err: + spin_unlock_irq(&nullb->lock); + return status; +} + static int null_handle_rq(struct nullb_cmd *cmd) { struct request *rq = cmd->rq; @@ -1280,13 +1365,16 @@ static int null_handle_rq(struct nullb_cmd *cmd) sector_t sector = blk_rq_pos(rq); struct req_iterator iter; struct bio_vec bvec; + bool fua = rq->cmd_flags & REQ_FUA; + + if (op_is_copy(req_op(rq))) + return nullb_setup_copy(nullb, rq, fua); spin_lock_irq(&nullb->lock); rq_for_each_segment(bvec, rq, iter) { len = bvec.bv_len; err = null_transfer(nullb, bvec.bv_page, len, bvec.bv_offset, - op_is_write(req_op(rq)), sector, - rq->cmd_flags & REQ_FUA); + op_is_write(req_op(rq)), sector, fua); if (err) { spin_unlock_irq(&nullb->lock); return err; @@ -2042,6 +2130,9 @@ static int null_validate_conf(struct nullb_device *dev) return -EINVAL; } + if (dev->queue_mode == NULL_Q_BIO) + dev->copy_max_bytes = 0; + return 0; } @@ -2161,6 +2252,8 @@ static int null_add_dev(struct nullb_device *dev) dev->max_sectors = queue_max_hw_sectors(nullb->q); dev->max_sectors = min(dev->max_sectors, BLK_DEF_MAX_SECTORS); blk_queue_max_hw_sectors(nullb->q, dev->max_sectors); + blk_queue_max_copy_hw_sectors(nullb->q, + dev->copy_max_bytes >> SECTOR_SHIFT); if (dev->virt_boundary) blk_queue_virt_boundary(nullb->q, PAGE_SIZE - 1); diff --git a/drivers/block/null_blk/null_blk.h b/drivers/block/null_blk/null_blk.h index 929f659dd255..e82e53a2e2df 100644 --- a/drivers/block/null_blk/null_blk.h +++ b/drivers/block/null_blk/null_blk.h @@ -107,6 +107,7 @@ struct nullb_device { unsigned int queue_mode; /* block interface */ unsigned int blocksize; /* block size */ unsigned int max_sectors; /* Max sectors per command */ + unsigned long copy_max_bytes; /* Max copy offload length in bytes */ unsigned int irqmode; /* IRQ completion handler */ unsigned int hw_queue_depth; /* queue depth */ unsigned int index; /* index of the disk, only valid with a disk */ diff --git a/drivers/block/null_blk/trace.h b/drivers/block/null_blk/trace.h index 6b2b370e786f..431c33e11a49 100644 --- a/drivers/block/null_blk/trace.h +++ b/drivers/block/null_blk/trace.h @@ -68,6 +68,29 @@ TRACE_EVENT(nullb_report_zones, __print_disk_name(__entry->disk), __entry->nr_zones) ); +TRACE_EVENT(nullb_copy_op, + TP_PROTO(struct request *req, + sector_t dst, sector_t src, size_t len), + TP_ARGS(req, dst, src, len), + TP_STRUCT__entry( + __array(char, disk, DISK_NAME_LEN) + __field(enum req_op, op) + __field(sector_t, dst) + __field(sector_t, src) + __field(size_t, len) + ), + TP_fast_assign( + __entry->op = req_op(req); + __assign_disk_name(__entry->disk, req->q->disk); + __entry->dst = dst; + __entry->src = src; + __entry->len = len; + ), + TP_printk("%s req=%-15s: dst=%llu, src=%llu, len=%lu", + __print_disk_name(__entry->disk), + blk_op_str(__entry->op), + __entry->dst, __entry->src, __entry->len) +); #endif /* _TRACE_NULLB_H */ #undef TRACE_INCLUDE_PATH