Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp554511rwb; Wed, 9 Nov 2022 06:06:44 -0800 (PST) X-Google-Smtp-Source: AMsMyM7wtKXLOMY5jymyVhG8LZ4FryZWyLNeUi+J3qlxk/mJMN4K2tymX6+iDQBo2KRvgXYBtrmE X-Received: by 2002:a05:6a00:1504:b0:56d:1ee8:973e with SMTP id q4-20020a056a00150400b0056d1ee8973emr38875386pfu.30.1668002803910; Wed, 09 Nov 2022 06:06:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668002803; cv=none; d=google.com; s=arc-20160816; b=PfQjM696DJht9k59TKX6r3lqnuVcqtiqfhddymeXjM850jEpMM3iaPxlW9feoQYSfJ 0pzHSD8LuMIICJOQgHQPw6ZD6IFincm47HbUuZWkttWuKtWKm01A0z62E8SgqQfdNSNK yxlD7DL6k59mc71Hatiei2GbcGMQy1zGWCqGnGgfN0g2FnJeSe+OFzx81L2N9N6MA69/ uwPY5w+3PEh7jMVm8DtoGL8QUIrWk+1D/Sv+XlpmCFJqewQy5e07/4wacu+t3wiJn2NY XlRQnkOds0A0xw7AeglZMGQk7OztJ1HJWqWmLpntPPm5lglT2PjQPuC/6vtzw6BHureM aVRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fMFIifcDEWp2tuYJ6xczHhtO2meaPJaEEnuy7NTfdVA=; b=s5DbCykz5zhvh08JfLaisYMDFuqgblcL2tgw6RCfnSZxbRxNSe1HjU+WkN0PHDXVs3 C3sBcHmfotbxxhz13WMFRqnyKJTFYjDSoj0RoWps8eNqNa7oImyBVi1Jsz+OIG1caj2Z imHD0+v0445PAt21zm44hdTwGij+t+hgEHp6Mk6aaMRnC8DFZ5KeDjZz/bm9jihWf75v prMxuV4Cfvb7pEx279JMSBq4jL1cPsG9GnEmWrbdeyziAzsssZ49CcZVLJw3mcfLw424 wbhYXOBRHUfwF++2WiF0gswXrLAj5vQth7PA+PfTD8AUx0GZzbTSBDqCqo8H/PRbKXSY 8BIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=6kEX59yO; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k4-20020a170902c40400b00186a8c18856si21795463plk.451.2022.11.09.06.06.30; Wed, 09 Nov 2022 06:06:43 -0800 (PST) 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=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=6kEX59yO; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230194AbiKINfR (ORCPT + 93 others); Wed, 9 Nov 2022 08:35:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbiKINfL (ORCPT ); Wed, 9 Nov 2022 08:35:11 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB2642B605 for ; Wed, 9 Nov 2022 05:35:09 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id a67so27223788edf.12 for ; Wed, 09 Nov 2022 05:35:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fMFIifcDEWp2tuYJ6xczHhtO2meaPJaEEnuy7NTfdVA=; b=6kEX59yOiWAA2z//lcDmb/ZWXfyTfEGiA7WYWTIEjzQJKuUX13VM+dNzv/hxsTZ+pC lk5yde0+fVgTDH8fbD8AG0mPOG1iA74UPHFMuiDIIQ8a4bEJf+KCTobE5zSuxlPUaHtH DzK3gsDExUAAzzRyDvN7BNwaKspgSNvPVAoS8WUyzp2EtiWV09ftAj5IrcYi1GfqtdF4 XRVOYeOanOl5krqDGBZN0dmyNKJCCgMLrO4qBWb6KZzLNhD71qyMlvugp4RrYKqDidUU fUNkIuJomMJo0c685105vF+bt1yqwNgAb+eUH/KBZGvWC5mbHB7APfBYiXC6H6eg5WbX vesA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fMFIifcDEWp2tuYJ6xczHhtO2meaPJaEEnuy7NTfdVA=; b=ccnwleUCXUCcFQO38h2OM5go/x4NBJXxM+ySirT8UZqfHXLto/D1SjDbz2jKTfKWwR DIYLD2/EZNexkLBtkWLKd2niP31EBfstGPTjOJoP+VjSSRcmovH27wGDMH1pZ/9s+epu qlfT7ELsTHlgqrVY9sRTTHta0LWUGaoFRugkf2fuYFAGpHxvoN9+2FS61EiEHAhUiZjs qQ1XAv8vHKlVmkoP8aqfa9tDxLp4WwumwMW45lV80LDTWwW92G7UoECdfEoV3IRvjUPb FV7ux1Ra4DZZaJ/4jwAHN4WTwdRsWKkAXCpgoDI2m5DFg9ailGxCapLGGk18NPyshWQF JmVg== X-Gm-Message-State: ACrzQf1t+YtoANKvRH1+ruQkJ+bMpvjaRArIwbC3f+vuhEge0vA2JE5Q SkfzzaI9HgiS0/OcJYnrqSkn5w== X-Received: by 2002:aa7:d744:0:b0:45c:e353:e891 with SMTP id a4-20020aa7d744000000b0045ce353e891mr61337607eds.36.1668000908425; Wed, 09 Nov 2022 05:35:08 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id lx8-20020a170906af0800b00782fbb7f5f7sm5867463ejb.113.2022.11.09.05.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 05:35:08 -0800 (PST) From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , Joel Colledge Subject: [PATCH 1/3] drbd: use blk_queue_max_discard_sectors helper Date: Wed, 9 Nov 2022 14:34:51 +0100 Message-Id: <20221109133453.51652-2-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221109133453.51652-1-christoph.boehmwalder@linbit.com> References: <20221109133453.51652-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 We currently only set q->limits.max_discard_sectors, but that is not enough. Another field, max_hw_discard_sectors, was introduced in commit 0034af036554 ("block: make /sys/block//queue/discard_max_bytes writeable"). The difference is that max_discard_sectors can be changed from user space via sysfs, while max_hw_discard_sectors is the "hardware" upper limit. So use this helper, which sets both. This is also a fixup for commit 998e9cbcd615 ("drbd: cleanup decide_on_discard_support"): if discards are not supported, that does not necessarily mean we also want to disable write_zeroes. Fixes: 998e9cbcd615 ("drbd: cleanup decide_on_discard_support") Reviewed-by: Joel Colledge Signed-off-by: Christoph Böhmwalder --- drivers/block/drbd/drbd_nl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 864c98e74875..249eba7d21c2 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1210,6 +1210,7 @@ static void decide_on_discard_support(struct drbd_device *device, struct drbd_connection *connection = first_peer_device(device)->connection; struct request_queue *q = device->rq_queue; + unsigned int max_discard_sectors; if (bdev && !bdev_max_discard_sectors(bdev->backing_bdev)) goto not_supported; @@ -1230,15 +1231,14 @@ static void decide_on_discard_support(struct drbd_device *device, * topology on all peers. */ blk_queue_discard_granularity(q, 512); - q->limits.max_discard_sectors = drbd_max_discard_sectors(connection); - q->limits.max_write_zeroes_sectors = - drbd_max_discard_sectors(connection); + max_discard_sectors = drbd_max_discard_sectors(connection); + blk_queue_max_discard_sectors(q, max_discard_sectors); + blk_queue_max_write_zeroes_sectors(q, max_discard_sectors); return; not_supported: blk_queue_discard_granularity(q, 0); - q->limits.max_discard_sectors = 0; - q->limits.max_write_zeroes_sectors = 0; + blk_queue_max_discard_sectors(q, 0); } static void fixup_write_zeroes(struct drbd_device *device, struct request_queue *q) -- 2.38.1