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 CFCF9C433EF for ; Tue, 22 Feb 2022 07:46:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229549AbiBVHq6 (ORCPT ); Tue, 22 Feb 2022 02:46:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbiBVHq4 (ORCPT ); Tue, 22 Feb 2022 02:46:56 -0500 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40EE5120E80; Mon, 21 Feb 2022 23:38:38 -0800 (PST) Received: by verein.lst.de (Postfix, from userid 2407) id 0947C67373; Tue, 22 Feb 2022 08:38:33 +0100 (CET) Date: Tue, 22 Feb 2022 08:38:33 +0100 From: Christoph Hellwig To: "Martin K. Petersen" Cc: Christoph Hellwig , axboe@kernel.dk, 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, linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, drbd-dev@lists.linbit.com, dm-devel@redhat.com Subject: Re: [PATCH 7/7] block: remove REQ_OP_WRITE_SAME support Message-ID: <20220222073833.GA4979@lst.de> References: <20220209082828.2629273-1-hch@lst.de> <20220209082828.2629273-8-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org On Sat, Feb 19, 2022 at 08:44:18PM -0500, Martin K. Petersen wrote: > > -static ssize_t queue_write_same_max_show(struct request_queue *q, char *page) > > -{ > > - return sprintf(page, "%llu\n", > > - (unsigned long long)q->limits.max_write_same_sectors << 9); > > -} > > - > > This tripped one of my test scripts. We should probably return 0 here > like we did for discard_zeroes_data and leave the sysfs entry in place. The maybe fold this in? --- >From eae8e9b8cff5ee8522b00430a4aabd01ebc7c55a Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 22 Feb 2022 08:35:59 +0100 Subject: block: restore the write_same_max sysfs attribute Some userspace breaks if this attribute is gone. Restore it and always return 0. Signed-off-by: Christoph Hellwig --- block/blk-sysfs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 4a5bb47bee3ce..431fdd036f65a 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -212,6 +212,11 @@ static ssize_t queue_discard_zeroes_data_show(struct request_queue *q, char *pag return queue_var_show(0, page); } +static ssize_t queue_write_same_max_show(struct request_queue *q, char *page) +{ + return sprintf(page, "%llu\n", 0ULL); +} + static ssize_t queue_write_zeroes_max_show(struct request_queue *q, char *page) { return sprintf(page, "%llu\n", @@ -581,6 +586,7 @@ QUEUE_RO_ENTRY(queue_discard_max_hw, "discard_max_hw_bytes"); QUEUE_RW_ENTRY(queue_discard_max, "discard_max_bytes"); QUEUE_RO_ENTRY(queue_discard_zeroes_data, "discard_zeroes_data"); +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"); QUEUE_RO_ENTRY(queue_zone_write_granularity, "zone_write_granularity"); @@ -636,6 +642,7 @@ static struct attribute *queue_attrs[] = { &queue_discard_max_entry.attr, &queue_discard_max_hw_entry.attr, &queue_discard_zeroes_data_entry.attr, + &queue_write_same_max_entry.attr, &queue_write_zeroes_max_entry.attr, &queue_zone_append_max_entry.attr, &queue_zone_write_granularity_entry.attr, -- 2.30.2