Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp155786rwr; Wed, 19 Apr 2023 04:59:00 -0700 (PDT) X-Google-Smtp-Source: AKy350Zi71qrk+uje316RlFCzHxxvM29IpkFVRj2OP6M6uCFr8ENUJNptkjGwU6933Qm0K2L8ETP X-Received: by 2002:a17:903:50f:b0:1a2:8871:b408 with SMTP id jn15-20020a170903050f00b001a28871b408mr4700535plb.36.1681905540638; Wed, 19 Apr 2023 04:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681905540; cv=none; d=google.com; s=arc-20160816; b=OF2mFe+ZH4CSJQTPcPsM1f6lvqk05ahSOi86Q4Q7tZnNoSh0+Is/Cs02sqM/5nuTYw pygkgcJy1eHhYUMBc/Nff+YYTFMIaIeplmKL+Oj8xnmc/5zP9Baw8CwdfTmEU6+YpYi0 cKsmuSogCZ1tnjakE4FU/4y5PYnB361I96M2QTe9E0xwYCLfqW2Z7jhCRlStBU8jI1Ej y31sFR27C/HmP65mgABo1fXf7hBY5kDQoleSwQoJ4LdDuVfIdSmmtDho/mP3klt8FqIp focLu2Laz4u3NMag9eWC0ViBCLOZLT8seFVb8R77MQMpTRxBwIItqTunPIb++a+DgDxG IBUg== 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=LRiLMxf1Jtl4CWqtNs+ryHUB2RCNKjjIL4t4lTMZCiI=; b=uyiHZ/6bN6YsjzwCVnC2U8k1hMhQcaX89C+KxTeMxzS51RIo6BbsgwW1dUv+J4porl YYhxkh+3yuGDdo6VDXxPKKV/LM5LN4SJYrZ+eKR7D2L1GPBhGs0ZL8Is3gYuUieV8okW jU2uKiMEWGR7OHWDUwI46zBV5sAr1N6QkvM1hOreMHBrZHpW+8ucFm43BkRu2edL6QUI fXOMu/cpDRBTrsQNIYOz5mId+StnDcesDXMncSDLDfZv1U8NjgTjbIH0J0rJW7Qk4m0/ M3SU1AOpa4yjYVBjsips46oXygxtNi2grXBTKrRXQbTBGnGRMXD9IfwpDLNq85IVZYlV fUAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=KZoJL6DF; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a17090311cc00b001a217a73d56si17093342plh.161.2023.04.19.04.58.47; Wed, 19 Apr 2023 04:59: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=KZoJL6DF; 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 S233079AbjDSLyj (ORCPT + 99 others); Wed, 19 Apr 2023 07:54:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233034AbjDSLy3 (ORCPT ); Wed, 19 Apr 2023 07:54:29 -0400 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20F4FBBBC for ; Wed, 19 Apr 2023 04:54:26 -0700 (PDT) Received: from epcas5p4.samsung.com (unknown [182.195.41.42]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20230419115424epoutp04534c55ee7ddaf22acbd9cee19473ca23~XU_1OR-RL1730617306epoutp04l for ; Wed, 19 Apr 2023 11:54:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20230419115424epoutp04534c55ee7ddaf22acbd9cee19473ca23~XU_1OR-RL1730617306epoutp04l DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1681905264; bh=LRiLMxf1Jtl4CWqtNs+ryHUB2RCNKjjIL4t4lTMZCiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KZoJL6DFB/ISYvL6ObnvIicPPT6e13RUwk/2X7yvwn70hCPdEn9h3TPjrY9n3jp9t pI7MyOsHqAYM4VRfGls6bxzdzinBdR687ybY8yYCopmaS0gXHwM1idnFyCt7SNX+Pa 7LWdEeOuGyFONmm6vsMhn3eL6RlSOyKYrZYSWOSA= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas5p3.samsung.com (KnoxPortal) with ESMTP id 20230419115423epcas5p3d11042d1fddaa2d996a66cf0e54c249c~XU_0omp3r1237612376epcas5p3k; Wed, 19 Apr 2023 11:54:23 +0000 (GMT) Received: from epsmges5p3new.samsung.com (unknown [182.195.38.176]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4Q1fMx6y6nz4x9Pp; Wed, 19 Apr 2023 11:54:21 +0000 (GMT) Received: from epcas5p4.samsung.com ( [182.195.41.42]) by epsmges5p3new.samsung.com (Symantec Messaging Gateway) with SMTP id 08.04.09987.D66DF346; Wed, 19 Apr 2023 20:54:21 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas5p4.samsung.com (KnoxPortal) with ESMTPA id 20230419114656epcas5p404001300c41f5bbd02362edd45d3ff45~XU4Tyt2ZZ2617926179epcas5p4l; Wed, 19 Apr 2023 11:46:56 +0000 (GMT) Received: from epsmgms1p2.samsung.com (unknown [182.195.42.42]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230419114656epsmtrp1771dce5179207bae5b16d284e5fb97f7~XU4Tw9-Ct1675116751epsmtrp1k; Wed, 19 Apr 2023 11:46:56 +0000 (GMT) X-AuditID: b6c32a4b-a67fd70000002703-02-643fd66d3513 Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p2.samsung.com (Symantec Messaging Gateway) with SMTP id 84.83.08609.0B4DF346; Wed, 19 Apr 2023 20:46:56 +0900 (KST) Received: from green245.sa.corp.samsungelectronics.net (unknown [107.99.41.245]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230419114652epsmtip18947edad37a475338f9d05db3d5bb2ea~XU4QiJJVw2332323323epsmtip1Y; Wed, 19 Apr 2023 11:46:52 +0000 (GMT) From: Nitesh Shetty To: Jens Axboe , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Keith Busch , Christoph Hellwig , Sagi Grimberg , James Smart , Chaitanya Kulkarni , Alexander Viro , Christian Brauner Cc: bvanassche@acm.org, hare@suse.de, ming.lei@redhat.com, dlemoal@kernel.org, anuj20.g@samsung.com, joshi.k@samsung.com, nitheshshetty@gmail.com, gost.dev@samsung.com, Nitesh Shetty , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v10 1/9] block: Introduce queue limits for copy-offload support Date: Wed, 19 Apr 2023 17:13:06 +0530 Message-Id: <20230419114320.13674-2-nj.shetty@samsung.com> X-Mailer: git-send-email 2.35.1.500.gb896f729e2 In-Reply-To: <20230419114320.13674-1-nj.shetty@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA02Te0xTVxzHPfeW28JSd3mYHTFutYsoEKCFUg7Iy4nkbswM45gLumFDb4BQ 2qYtVHAZINMoKmWiPAoDHRsqgsTyCK/iVgZSHiHCxMGCuAUYIBSEiQPHHKVl87/P75vv7/we Jz8W7pDNdGYlSFW0QiqScAk7RkO7q5tH0lCImFc1LUQ13Z04Op27hqPboxoCPW1fBCh/YQVH T+6FIL2p2AYN/9CEodZvL2Po1u0ODLVcf4ahjldzBLpsGAJo4qEWQ/oRd9SqNzLQYHMJgcoq JpjIkJeFocbxTIAaXpbh6M7TeQbqGtmB+tfu24RCavDnCEo71kdQTdpRJtX/+C6DGuxLpnSV 5wmq9rt0qmU4g6AuZZkIar7tIUHl1FUCqrbnFLWke5vSjc9hkVujEwPjaZGYVnBoaaxMnCCN C+JGHIk5EOMr5PE9+P7Ij8uRipLoIG7Yh5Ee4QmS9Q1wOSkiSfK6FClSKrlewYEKWbKK5sTL lKogLi0XS+QCuadSlKRMlsZ5SmlVAJ/H8/ZdN55IjJ/46VeG/J+PTtaXVuAZoOJANrBlQVIA n+fX49nAjuVAtgCoHx0AlmARwNVvjNZgCcCxmSmwmbLU1840swPZDOCFB4cspjMYXLqywsgG LBZBusOeVyyz7kSexeGzifMMc4CTAxj8u24eN5scycOwoc3W/BCD3A2NNQWEWWaTATBjOcqM kPSCmjF7s8OW3AdvtOXhZmaT9tBYNM4wM06+A7PqizcmgGS5LbyZW8uw9BkGB3pnCQs7wpn7 dUwLO8NpzVkrq+GtKzcJS/JXAGofaa1DhsAz3ZqNNnHSFdY0e1nknfBq9x3MUngrvPRyHLPo bNhYusnvwqqaa9a62+HQi0wrU3B68px1oTkAlk/Wg1zA0b42kPa1gbT/l74G8EqwnZYrk+Jo pa/cR0qr//vkWFmSDmwchVtEI/j9yYKnAWAsYACQhXOd2L0HA8QObLEoNY1WyGIUyRJaaQC+ 6/v+GnfeFitbvyqpKoYv8OcJhEKhwN9HyOe+xd4TZIx1IONEKjqRpuW0YjMPY9k6Z2Dw6AfK kh9HBabqmi7183S7LaH95YHfF3+ZMulC37u4u2P5xbaIzjdXo0rpczfozvo3/prtGz0SXlVm Uh89wEyJKNDuUv8yQ7435bJXvwZ+a36/5zCxay5NsSMq3hCWp15w9z75mfiYX93+Tx+stf4J jfoLTQEDRe681WN1A49Cy3p8gneash+f9ujlVEe7cw6mmSQ2nNmoVJAuLtyrcLIp92jV9KiH 0cyprkJdoUZRsPJJjumLHPXixauex8NEATBwdSIzt9bbMdq0Zc/8xw37F6qv77OJ8Z4qHqGV xbp+/9T8xM95kj+KvGFwSfjxQp591PLdaD9XlxPhkkOTmcVz6VyGMl7Ed8MVStG/Hza31Z0E AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA02Ra0hTYRjHfc85Ox7NyWlJvWUqzRY1m3aj3tQy6cIhCUsoKCIdenCWznGm 3aXVsGh2sUyjKdnVy4pmM0Pz2tR0mRg5i1xzRq6bNS1NE1NrWtC33/P8/n+eDw+FCx4Tc6gE eQrLyaWJQtKdeFgv9JWUmMPilliHeUj/9AmOTmSO4eiO9TyJeuu/A5TTP4Kj7towVO3I5aHX dRUYqrpxEUPFdxoxVHn9G4YaJ76S6KLxJUD2Di2GqjsDUFW1iUDtj/JIlF9gd0XGLDWGynuO A/RwNB9H93r7CNTc6Y3axpp46yDTbo5gtLZWkqnQWl2Ztq77BNPemsoYdKdJpvTWMabytYpk zqodJNNX00Ey5x7oAFPacoQZMPgyhp6v2FbPXe6hcWxiwn6WC1ob4y6zN1gIxXjkwbKrBbgK FKzXADcK0ivgQGu9qwa4UwK6HMCRTzZySsyGBWMN+BTPgMXjH/6G1BgczqjANICiSDoAtkxQ zr0XnYnDFzYV6RxwuhuDbR8Gec72DDoSvnpTN8kELYIm/WXSWebTwVA1tN2JkA6C523TnQk3 OgQW1mRN3hX8SZwxjgMn8+np0HSlh3AyTvtBdVkunglo7X9K+5+6BjAdmM0qlEnxScqlimVy 9kCgUpqkTJXHB8YmJxnA5JfF4nJQpesPNAKMAkYAKVzoxX+2MThOwI+THjrMcsnRXGoiqzQC b4oQzuI/15iiBXS8NIXdx7IKlvtnMcptjgorlK2MGlpw05DReGrfyFDtoCn7TLYPx48Q+Rbp FV2l8/sWea7p59I0tVhT5ar6cEP0xiJC/z71pLalWeKxYq5IXWpefYURF4fHmshtsm0u8nCX wCBevuhA1x6/vjYrlxjT+EuUvGPTPL8NrWHbbSHv4lfvWVJnjtmc4xvuKbj74MimZDJz56jZ Mo260PDj7JvcUQ9Xo49lt9U/5ZKj5Pno59Cbu0oaFt7o/NLxSHnwWhr3rgjlJfhdL7y6ZRYf s3j07n6L63GtS9RPWZZ/pdRut0j2fmTrlqdHHDKI02PW6BzdRGTUzMhQk6TM3y645cgb7824 3Xy0mxhYLDk9USsklDLpUjHOKaW/AY/X4BpUAwAA X-CMS-MailID: 20230419114656epcas5p404001300c41f5bbd02362edd45d3ff45 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: REQ_APPROVE CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230419114656epcas5p404001300c41f5bbd02362edd45d3ff45 References: <20230419114320.13674-1-nj.shetty@samsung.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 Add device limits as sysfs entries, - copy_offload (RW) - copy_max_bytes (RW) - copy_max_bytes_hw (RO) Above limits help to split the copy payload in block layer. copy_offload: used for setting copy offload(1) or emulation(0). copy_max_bytes: maximum total length of copy in single payload. copy_max_bytes_hw: Reflects the device supported maximum limit. Reviewed-by: Hannes Reinecke Signed-off-by: Nitesh Shetty Signed-off-by: Kanchan Joshi Signed-off-by: Anuj Gupta --- Documentation/ABI/stable/sysfs-block | 33 ++++++++++++++ block/blk-settings.c | 24 +++++++++++ block/blk-sysfs.c | 64 ++++++++++++++++++++++++++++ include/linux/blkdev.h | 12 ++++++ include/uapi/linux/fs.h | 3 ++ 5 files changed, 136 insertions(+) diff --git a/Documentation/ABI/stable/sysfs-block b/Documentation/ABI/stable/sysfs-block index c57e5b7cb532..e4d31132f77c 100644 --- a/Documentation/ABI/stable/sysfs-block +++ b/Documentation/ABI/stable/sysfs-block @@ -155,6 +155,39 @@ Description: last zone of the device which may be smaller. +What: /sys/block//queue/copy_offload +Date: April 2023 +Contact: linux-block@vger.kernel.org +Description: + [RW] When read, this file shows whether offloading copy to a + device is enabled (1) or disabled (0). Writing '0' to this + file will disable offloading copies for this device. + Writing any '1' value will enable this feature. If the device + does not support offloading, then writing 1, will result in + error. + + +What: /sys/block//queue/copy_max_bytes +Date: April 2023 +Contact: linux-block@vger.kernel.org +Description: + [RW] This is the maximum number of bytes, that the block layer + will allow for copy request. This will be smaller or equal to + the maximum size allowed by the hardware, indicated by + 'copy_max_bytes_hw'. Attempt to set value higher than + 'copy_max_bytes_hw' will truncate this to 'copy_max_bytes_hw'. + + +What: /sys/block//queue/copy_max_bytes_hw +Date: April 2023 +Contact: linux-block@vger.kernel.org +Description: + [RO] This is the maximum number of bytes, that the hardware + will allow in a single data copy request. + A value of 0 means that the device does not support + copy offload. + + What: /sys/block//queue/crypto/ Date: February 2022 Contact: linux-block@vger.kernel.org diff --git a/block/blk-settings.c b/block/blk-settings.c index 896b4654ab00..23aff2d4dcba 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -59,6 +59,8 @@ void blk_set_default_limits(struct queue_limits *lim) lim->zoned = BLK_ZONED_NONE; lim->zone_write_granularity = 0; lim->dma_alignment = 511; + lim->max_copy_sectors_hw = 0; + lim->max_copy_sectors = 0; } /** @@ -82,6 +84,8 @@ void blk_set_stacking_limits(struct queue_limits *lim) lim->max_dev_sectors = UINT_MAX; lim->max_write_zeroes_sectors = UINT_MAX; lim->max_zone_append_sectors = UINT_MAX; + lim->max_copy_sectors_hw = ULONG_MAX; + lim->max_copy_sectors = ULONG_MAX; } EXPORT_SYMBOL(blk_set_stacking_limits); @@ -183,6 +187,22 @@ void blk_queue_max_discard_sectors(struct request_queue *q, } EXPORT_SYMBOL(blk_queue_max_discard_sectors); +/** + * blk_queue_max_copy_sectors_hw - set max sectors for a single copy payload + * @q: the request queue for the device + * @max_copy_sectors: maximum number of sectors to copy + **/ +void blk_queue_max_copy_sectors_hw(struct request_queue *q, + unsigned int max_copy_sectors) +{ + if (max_copy_sectors > (COPY_MAX_BYTES >> SECTOR_SHIFT)) + max_copy_sectors = COPY_MAX_BYTES >> SECTOR_SHIFT; + + q->limits.max_copy_sectors_hw = max_copy_sectors; + q->limits.max_copy_sectors = max_copy_sectors; +} +EXPORT_SYMBOL_GPL(blk_queue_max_copy_sectors_hw); + /** * blk_queue_max_secure_erase_sectors - set max sectors for a secure erase * @q: the request queue for the device @@ -578,6 +598,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->max_segment_size = min_not_zero(t->max_segment_size, b->max_segment_size); + t->max_copy_sectors = min(t->max_copy_sectors, b->max_copy_sectors); + t->max_copy_sectors_hw = min(t->max_copy_sectors_hw, + b->max_copy_sectors_hw); + t->misaligned |= b->misaligned; alignment = queue_limit_alignment_offset(b, start); diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index a64208583853..826ab29beba3 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -212,6 +212,63 @@ static ssize_t queue_discard_zeroes_data_show(struct request_queue *q, char *pag return queue_var_show(0, page); } +static ssize_t queue_copy_offload_show(struct request_queue *q, char *page) +{ + return queue_var_show(blk_queue_copy(q), page); +} + +static ssize_t queue_copy_offload_store(struct request_queue *q, + const char *page, size_t count) +{ + s64 copy_offload; + ssize_t ret = queue_var_store64(©_offload, page); + + if (ret < 0) + return ret; + + if (copy_offload && !q->limits.max_copy_sectors_hw) + return -EINVAL; + + if (copy_offload) + blk_queue_flag_set(QUEUE_FLAG_COPY, q); + else + blk_queue_flag_clear(QUEUE_FLAG_COPY, q); + + return count; +} + +static ssize_t queue_copy_max_hw_show(struct request_queue *q, char *page) +{ + return sprintf(page, "%llu\n", (unsigned long long) + q->limits.max_copy_sectors_hw << SECTOR_SHIFT); +} + +static ssize_t queue_copy_max_show(struct request_queue *q, char *page) +{ + return sprintf(page, "%llu\n", (unsigned long long) + q->limits.max_copy_sectors << SECTOR_SHIFT); +} + +static ssize_t queue_copy_max_store(struct request_queue *q, + const char *page, size_t count) +{ + s64 max_copy; + ssize_t ret = queue_var_store64(&max_copy, page); + + if (ret < 0) + return ret; + + if (max_copy & (queue_logical_block_size(q) - 1)) + return -EINVAL; + + max_copy >>= SECTOR_SHIFT; + if (max_copy > q->limits.max_copy_sectors_hw) + max_copy = q->limits.max_copy_sectors_hw; + + q->limits.max_copy_sectors = max_copy; + return count; +} + static ssize_t queue_write_same_max_show(struct request_queue *q, char *page) { return queue_var_show(0, page); @@ -590,6 +647,10 @@ QUEUE_RO_ENTRY(queue_nr_zones, "nr_zones"); QUEUE_RO_ENTRY(queue_max_open_zones, "max_open_zones"); QUEUE_RO_ENTRY(queue_max_active_zones, "max_active_zones"); +QUEUE_RW_ENTRY(queue_copy_offload, "copy_offload"); +QUEUE_RO_ENTRY(queue_copy_max_hw, "copy_max_bytes_hw"); +QUEUE_RW_ENTRY(queue_copy_max, "copy_max_bytes"); + QUEUE_RW_ENTRY(queue_nomerges, "nomerges"); QUEUE_RW_ENTRY(queue_rq_affinity, "rq_affinity"); QUEUE_RW_ENTRY(queue_poll, "io_poll"); @@ -637,6 +698,9 @@ static struct attribute *queue_attrs[] = { &queue_discard_max_entry.attr, &queue_discard_max_hw_entry.attr, &queue_discard_zeroes_data_entry.attr, + &queue_copy_offload_entry.attr, + &queue_copy_max_hw_entry.attr, + &queue_copy_max_entry.attr, &queue_write_same_max_entry.attr, &queue_write_zeroes_max_entry.attr, &queue_zone_append_max_entry.attr, diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e3242e67a8e3..200338f2ec2e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -298,6 +298,9 @@ struct queue_limits { unsigned int discard_alignment; unsigned int zone_write_granularity; + unsigned long max_copy_sectors_hw; + unsigned long max_copy_sectors; + unsigned short max_segments; unsigned short max_integrity_segments; unsigned short max_discard_segments; @@ -564,6 +567,7 @@ struct request_queue { #define QUEUE_FLAG_NOWAIT 29 /* device supports NOWAIT */ #define QUEUE_FLAG_SQ_SCHED 30 /* single queue style io dispatch */ #define QUEUE_FLAG_SKIP_TAGSET_QUIESCE 31 /* quiesce_tagset skip the queue*/ +#define QUEUE_FLAG_COPY 32 /* supports copy offload */ #define QUEUE_FLAG_MQ_DEFAULT ((1UL << QUEUE_FLAG_IO_STAT) | \ (1UL << QUEUE_FLAG_SAME_COMP) | \ @@ -584,6 +588,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q); test_bit(QUEUE_FLAG_STABLE_WRITES, &(q)->queue_flags) #define blk_queue_io_stat(q) test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags) #define blk_queue_add_random(q) test_bit(QUEUE_FLAG_ADD_RANDOM, &(q)->queue_flags) +#define blk_queue_copy(q) test_bit(QUEUE_FLAG_COPY, &(q)->queue_flags) #define blk_queue_zone_resetall(q) \ test_bit(QUEUE_FLAG_ZONE_RESETALL, &(q)->queue_flags) #define blk_queue_dax(q) test_bit(QUEUE_FLAG_DAX, &(q)->queue_flags) @@ -902,6 +907,8 @@ extern void blk_queue_chunk_sectors(struct request_queue *, unsigned int); extern void blk_queue_max_segments(struct request_queue *, unsigned short); extern void blk_queue_max_discard_segments(struct request_queue *, unsigned short); +extern void blk_queue_max_copy_sectors_hw(struct request_queue *q, + unsigned int max_copy_sectors); void blk_queue_max_secure_erase_sectors(struct request_queue *q, unsigned int max_sectors); extern void blk_queue_max_segment_size(struct request_queue *, unsigned int); @@ -1221,6 +1228,11 @@ static inline unsigned int bdev_discard_granularity(struct block_device *bdev) return bdev_get_queue(bdev)->limits.discard_granularity; } +static inline unsigned int bdev_max_copy_sectors(struct block_device *bdev) +{ + return bdev_get_queue(bdev)->limits.max_copy_sectors; +} + static inline unsigned int bdev_max_secure_erase_sectors(struct block_device *bdev) { diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index b7b56871029c..8879567791fa 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -64,6 +64,9 @@ struct fstrim_range { __u64 minlen; }; +/* maximum total copy length */ +#define COPY_MAX_BYTES (1 << 27) + /* extent-same (dedupe) ioctls; these MUST match the btrfs ioctl definitions */ #define FILE_DEDUPE_RANGE_SAME 0 #define FILE_DEDUPE_RANGE_DIFFERS 1 -- 2.35.1.500.gb896f729e2