From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 311AAC4332F for ; Wed, 9 Feb 2022 09:07:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229688AbiBIJGy (ORCPT ); Wed, 9 Feb 2022 04:06:54 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:37852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229819AbiBIJGx (ORCPT ); Wed, 9 Feb 2022 04:06:53 -0500 Received: from out1.migadu.com (out1.migadu.com [IPv6:2001:41d0:2:863f::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D8CCE039C48; Wed, 9 Feb 2022 01:06:49 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1644397546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rlSA805MDoryKB/tu0n68xmri81ZVnikvMPprm9yUto=; b=Grb1TyxI/KSzMSO/uCDZoh1l3iFPdrVJPrDJEsRzecMlpmti4wOxBBtSYTxEsxlaOwuclW vbVdsJUJaIL2bX8s7BQmCfaaP5KyF2jqIgvgeK54HvEkM9+vQ1BbgwmUWSQfuFqyE7XlPY nizP91gfFOyMZS4rqEQk+ZfFthatGN4= From: Guoqing Jiang Subject: Re: [PATCH 3/7] rnbd: drop WRITE_SAME support To: Christoph Hellwig , axboe@kernel.dk, martin.petersen@oracle.com, philipp.reisner@linbit.com, lars.ellenberg@linbit.com, target-devel@vger.kernel.org, haris.iqbal@ionos.com, jinpu.wang@ionos.com, manoj@linux.ibm.com, mrochs@linux.ibm.com, ukrishn@linux.ibm.com Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, drbd-dev@lists.linbit.com, dm-devel@redhat.com References: <20220209082828.2629273-1-hch@lst.de> <20220209082828.2629273-4-hch@lst.de> Message-ID: <4f1565b2-0f83-0cfa-58bd-86d5dee48e51@linux.dev> Date: Wed, 9 Feb 2022 17:05:36 +0800 MIME-Version: 1.0 In-Reply-To: <20220209082828.2629273-4-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 2/9/22 4:28 PM, Christoph Hellwig wrote: > REQ_OP_WRITE_SAME was only ever submitted by the legacy Linux zeroing > code, which has switched to use REQ_OP_WRITE_ZEROES long before rnbd was > even merged. > > Signed-off-by: Christoph Hellwig > --- > drivers/block/rnbd/rnbd-clt.c | 7 ++----- > drivers/block/rnbd/rnbd-clt.h | 1 - > drivers/block/rnbd/rnbd-proto.h | 6 ------ > drivers/block/rnbd/rnbd-srv.c | 3 +-- > 4 files changed, 3 insertions(+), 14 deletions(-) > > diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c > index c08971de369fc..dc192d2738854 100644 > --- a/drivers/block/rnbd/rnbd-clt.c > +++ b/drivers/block/rnbd/rnbd-clt.c > @@ -82,7 +82,6 @@ static int rnbd_clt_set_dev_attr(struct rnbd_clt_dev *dev, > dev->nsectors = le64_to_cpu(rsp->nsectors); > dev->logical_block_size = le16_to_cpu(rsp->logical_block_size); > dev->physical_block_size = le16_to_cpu(rsp->physical_block_size); > - dev->max_write_same_sectors = le32_to_cpu(rsp->max_write_same_sectors); > dev->max_discard_sectors = le32_to_cpu(rsp->max_discard_sectors); > dev->discard_granularity = le32_to_cpu(rsp->discard_granularity); > dev->discard_alignment = le32_to_cpu(rsp->discard_alignment); > @@ -1359,8 +1358,6 @@ static void setup_request_queue(struct rnbd_clt_dev *dev) > blk_queue_logical_block_size(dev->queue, dev->logical_block_size); > blk_queue_physical_block_size(dev->queue, dev->physical_block_size); > blk_queue_max_hw_sectors(dev->queue, dev->max_hw_sectors); > - blk_queue_max_write_same_sectors(dev->queue, > - dev->max_write_same_sectors); > > /* > * we don't support discards to "discontiguous" segments > @@ -1610,10 +1607,10 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname, > } > > rnbd_clt_info(dev, > - "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_write_same_sectors: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, rotational: %d, wc: %d, fua: %d)\n", > + "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, rotational: %d, wc: %d, fua: %d)\n", > dev->gd->disk_name, dev->nsectors, > dev->logical_block_size, dev->physical_block_size, > - dev->max_write_same_sectors, dev->max_discard_sectors, > + dev->max_discard_sectors, > dev->discard_granularity, dev->discard_alignment, > dev->secure_discard, dev->max_segments, > dev->max_hw_sectors, dev->rotational, dev->wc, dev->fua); > diff --git a/drivers/block/rnbd/rnbd-clt.h b/drivers/block/rnbd/rnbd-clt.h > index 0c2cae7f39b9f..6946ba23d62e5 100644 > --- a/drivers/block/rnbd/rnbd-clt.h > +++ b/drivers/block/rnbd/rnbd-clt.h > @@ -122,7 +122,6 @@ struct rnbd_clt_dev { > bool wc; > bool fua; > u32 max_hw_sectors; > - u32 max_write_same_sectors; > u32 max_discard_sectors; > u32 discard_granularity; > u32 discard_alignment; I am planning to remove more members inside struct rnbd_clt_dev. > diff --git a/drivers/block/rnbd/rnbd-proto.h b/drivers/block/rnbd/rnbd-proto.h > index de5d5a8df81d7..3eb8b34bd1886 100644 > --- a/drivers/block/rnbd/rnbd-proto.h > +++ b/drivers/block/rnbd/rnbd-proto.h > @@ -249,9 +249,6 @@ static inline u32 rnbd_to_bio_flags(u32 rnbd_opf) > case RNBD_OP_SECURE_ERASE: > bio_opf = REQ_OP_SECURE_ERASE; > break; > - case RNBD_OP_WRITE_SAME: > - bio_opf = REQ_OP_WRITE_SAME; > - break; > default: > WARN(1, "Unknown RNBD type: %d (flags %d)\n", > rnbd_op(rnbd_opf), rnbd_opf); > @@ -284,9 +281,6 @@ static inline u32 rq_to_rnbd_flags(struct request *rq) > case REQ_OP_SECURE_ERASE: > rnbd_opf = RNBD_OP_SECURE_ERASE; > break; > - case REQ_OP_WRITE_SAME: > - rnbd_opf = RNBD_OP_WRITE_SAME; > - break; > case REQ_OP_FLUSH: > rnbd_opf = RNBD_OP_FLUSH; > break; > diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c > index 132e950685d59..0e6b5687f8321 100644 > --- a/drivers/block/rnbd/rnbd-srv.c > +++ b/drivers/block/rnbd/rnbd-srv.c > @@ -548,8 +548,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp, > cpu_to_le16(rnbd_dev_get_max_segs(rnbd_dev)); > rsp->max_hw_sectors = > cpu_to_le32(rnbd_dev_get_max_hw_sects(rnbd_dev)); > - rsp->max_write_same_sectors = > - cpu_to_le32(bdev_write_same(rnbd_dev->bdev)); > + rsp->max_write_same_sectors = 0; IIUC, I think we can delete max_write_same_sectors from rsp as well given the earlier change in setup_request_queue and rnbd_clt_set_dev_attr. Thanks, Guoqing