From patchwork Thu Oct 25 21:10:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10656547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 299E014DE for ; Thu, 25 Oct 2018 21:11:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F8642C648 for ; Thu, 25 Oct 2018 21:11:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1392B2C650; Thu, 25 Oct 2018 21:11:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0D4F2C648 for ; Thu, 25 Oct 2018 21:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727150AbeJZFpc (ORCPT ); Fri, 26 Oct 2018 01:45:32 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:33599 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727475AbeJZFpc (ORCPT ); Fri, 26 Oct 2018 01:45:32 -0400 Received: by mail-it1-f194.google.com with SMTP id h6-v6so3042824ith.0 for ; Thu, 25 Oct 2018 14:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wc6ZgNZEp67y2oRDtYvPR8YsWAWbMr6xmcqd1wHolgA=; b=wuE7TNRGwEQ5QTk2JxYaF07vsc+NCC8iquEXSn0bGO6780EtA7WEVeHCTdyKvESJF7 1X5y+Aw48sh4iRWK6F1hER6fb1uZDD3WsWEFYiHkvlzWUOtOevnMXi5cO670F5inQaKD 3HUxa0RZjsG2KvyNhr6Z95H3v/NxoRYNczNOV3hbsrWP91xSeL6XB38O9yxxCR2Eo0/M r3UeO7McYxkmjEUuEQ9BPnISWOKE0no8EsLqOAXtjWaRByQIcWm5n0akfxTsKk/x/ujg WQ0KaU6SIYleSX5M/glXJXYxlGUY1b2zNoo997G8Ud7ENOZDEx2pf3LLr/BTVsZd1mxt UQ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Wc6ZgNZEp67y2oRDtYvPR8YsWAWbMr6xmcqd1wHolgA=; b=HzX0xpFflL6AX+pr3Nz2qXpKrHoF12VWNjeTjwxl8nOVe1nFxPhXu5DsGIZCZkjP90 yKhNFHxkhEb09u/xVr6pUExDyCEdrknJHzzBfb8xGm6dlrFdlr45pJr7mgUm2RYoVxVj 7PPHFMzusq/Yv7rWFOutaWvg3xCHF9Q/2iaCYzbz06MMeaHweFYgMTjDJPkhIhpqlwda 1Jhd/MjSZPAI4H/pHPYaIubJRTvKM4Uz2wNPjo44I1tcHEtu6EhOKtEGmvAEbU6n+S0/ XjdXdVlFz/4UHvPXSgEcTiG24f1Nr9xx1Ly2dK97A0TwRqSkr4QeLnRsxZRyOfEW/oFj Ni4g== X-Gm-Message-State: AGRZ1gJnZka7qJ6dzMN4iaFDCtLALLpraBctHu1Ah5jaeSZ1/3MGL1xL lu+7eevLg7NGjQZJ1ega8ZASgHqezYVlOw== X-Google-Smtp-Source: AJdET5eDj3sX8Et7sA5n2Rr3IP8O/AyodUDBWM8Wz/JL1hw97mT1P/Y/c1Ic8V/TDuJ4KzpCMutayw== X-Received: by 2002:a24:3a4f:: with SMTP id m76-v6mr2224746itm.122.1540501873617; Thu, 25 Oct 2018 14:11:13 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id e65-v6sm3446375ioa.76.2018.10.25.14.11.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 14:11:12 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 15/28] blk-wbt: kill check for legacy queue type Date: Thu, 25 Oct 2018 15:10:26 -0600 Message-Id: <20181025211039.11559-16-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025211039.11559-1-axboe@kernel.dk> References: <20181025211039.11559-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Everything is blk-mq at this point, so it doesn't make any sense to have this option available as it does nothing. Signed-off-by: Jens Axboe Reviewed-by: Hannes Reinecke --- block/Kconfig | 6 ------ block/blk-wbt.c | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/block/Kconfig b/block/Kconfig index f7045aa47edb..8044452a4fd3 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -155,12 +155,6 @@ config BLK_CGROUP_IOLATENCY Note, this is an experimental interface and could be changed someday. -config BLK_WBT_SQ - bool "Single queue writeback throttling" - depends on BLK_WBT - ---help--- - Enable writeback throttling by default on legacy single queue devices - config BLK_WBT_MQ bool "Multiqueue writeback throttling" default y diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 8ac93fcbaa2e..49fac89a981c 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -709,8 +709,7 @@ void wbt_enable_default(struct request_queue *q) if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags)) return; - if ((q->mq_ops && IS_ENABLED(CONFIG_BLK_WBT_MQ)) || - (q->request_fn && IS_ENABLED(CONFIG_BLK_WBT_SQ))) + if (IS_ENABLED(CONFIG_BLK_WBT_MQ)) wbt_init(q); } EXPORT_SYMBOL_GPL(wbt_enable_default);