From patchwork Mon Sep 27 13:59:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12520031 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66AE5C433EF for ; Mon, 27 Sep 2021 14:10:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48EB160F46 for ; Mon, 27 Sep 2021 14:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234691AbhI0OMW (ORCPT ); Mon, 27 Sep 2021 10:12:22 -0400 Received: from condef-05.nifty.com ([202.248.20.70]:26212 "EHLO condef-05.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234679AbhI0OMV (ORCPT ); Mon, 27 Sep 2021 10:12:21 -0400 Received: from conuserg-10.nifty.com ([10.126.8.73])by condef-05.nifty.com with ESMTP id 18RE16O3002858 for ; Mon, 27 Sep 2021 23:01:07 +0900 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RE07Fw028280; Mon, 27 Sep 2021 23:00:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RE07Fw028280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632751208; bh=sbbtG/svmz0yZkoEwS+QEl6uI6SK2Ial4jl+8NYu1LA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vos8ho8ZBYtl4tDKRjKVnFLlrG4eMcLWMlsRfyevV5CUeJGM4sc+REIi4jOtphLAy ZcXhWzgOeax02PeC1EECnKCnLOz61DrKiV6luPpEShHZ/r2zGBzN9kn9SsGPLA2HJ1 YJMkAGLscMy0dl1VAO4Xj2n47sWCtEH4M3nD9LlFMGs5zW0S8MORr18v4rWltNauKh K5WcwaRSs8RUL6imNoZ95bRYaWIeFZDFw7KJNciRs6AsZRtyqUV/ONDmLk+GTGySaV tSktkQ7I1hZHf6fGrpFDITqJD6wuQMxEHSq5UzJeRcX2U/lDSjclMTDnimXwk4rjoS 87d+8U0hErX2g== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [RESEND PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency Date: Mon, 27 Sep 2021 22:59:57 +0900 Message-Id: <20210927140000.866249-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927140000.866249-1-masahiroy@kernel.org> References: <20210927140000.866249-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org CONFIG_BLK_CGROUP is a boolean option, that is, its value is 'y' or 'n'. The comparison to 'y' is redundant. Signed-off-by: Masahiro Yamada --- block/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/Kconfig b/block/Kconfig index 8e28ae7718bd..1d83504749e7 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -73,7 +73,7 @@ config BLK_DEV_ZONED config BLK_DEV_THROTTLING bool "Block layer bio throttling support" - depends on BLK_CGROUP=y + depends on BLK_CGROUP select BLK_CGROUP_RWSTAT help Block layer bio throttling support. It can be used to limit @@ -112,7 +112,7 @@ config BLK_WBT_MQ config BLK_CGROUP_IOLATENCY bool "Enable support for latency based cgroup IO protection" - depends on BLK_CGROUP=y + depends on BLK_CGROUP help Enabling this option enables the .latency interface for IO throttling. The IO controller will attempt to maintain average IO latencies below @@ -132,7 +132,7 @@ config BLK_CGROUP_FC_APPID config BLK_CGROUP_IOCOST bool "Enable support for cost model based cgroup IO controller" - depends on BLK_CGROUP=y + depends on BLK_CGROUP select BLK_RQ_IO_DATA_LEN select BLK_RQ_ALLOC_TIME help From patchwork Mon Sep 27 13:59:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12520033 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4D07C433EF for ; Mon, 27 Sep 2021 14:10:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4DA16108E for ; Mon, 27 Sep 2021 14:10:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234739AbhI0OMd (ORCPT ); Mon, 27 Sep 2021 10:12:33 -0400 Received: from condef-08.nifty.com ([202.248.20.73]:34220 "EHLO condef-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234741AbhI0OMc (ORCPT ); Mon, 27 Sep 2021 10:12:32 -0400 Received: from conuserg-10.nifty.com ([10.126.8.73])by condef-08.nifty.com with ESMTP id 18RE18L6028468 for ; Mon, 27 Sep 2021 23:01:08 +0900 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RE07Fx028280; Mon, 27 Sep 2021 23:00:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RE07Fx028280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632751209; bh=KxbFoC0Lpctbe3+9vWMEemrZDfcQA9Rb6dRZ6EUnmN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w2uoKVUTSU6/9ZgiEyItEKglzN9eATvYKW++xnVmz7Ez2/OrrcovgQgaPv/BcXCgC 1Z8FS6Q3PqP16lOq1SC/UfNCn8O+/SnighzVhNhpI/xvq+wldKLGpgimwqt5AHPshh M0ET1ejypJExn+qmHWdyJu+PpRVmc48SZ8GWLzHnjTabfbbMLVYfe2+kyNAiUtB9yy YbGirCrO9prEl5ZnVtJRAOMwbp2JMwfqVa5IhQsr6k1GqtXCFWneB8IQr7PPl1G47z O6v6LhEiWb2egUvdSeEjXp468iPh2/CoCE285fHrz2b+WcN5IJAbtSS4iulaUkehrx z3m9vi7irYnbg== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [RESEND PATCH 2/4] block: simplify Kconfig files Date: Mon, 27 Sep 2021 22:59:58 +0900 Message-Id: <20210927140000.866249-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927140000.866249-1-masahiroy@kernel.org> References: <20210927140000.866249-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Everything under block/ depends on BLOCK. BLOCK_HOLDER_DEPRECATED is selected from drivers/md/Kconfig, which is entirely dependent on BLOCK. Extend the 'if BLOCK' ... 'endif' so it covers the whole block/Kconfig. Also, clean up the definition of BLOCK_COMPAT and BLK_MQ_PCI because COMPAT and PCI are boolean. Signed-off-by: Masahiro Yamada --- block/Kconfig | 18 +++++++----------- block/Kconfig.iosched | 4 ---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/block/Kconfig b/block/Kconfig index 1d83504749e7..c4d35829ea4f 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -196,33 +196,29 @@ source "block/partitions/Kconfig" endmenu -endif # BLOCK - config BLOCK_COMPAT - bool - depends on BLOCK && COMPAT - default y + def_bool COMPAT config BLK_MQ_PCI - bool - depends on BLOCK && PCI - default y + def_bool PCI config BLK_MQ_VIRTIO bool - depends on BLOCK && VIRTIO + depends on VIRTIO default y config BLK_MQ_RDMA bool - depends on BLOCK && INFINIBAND + depends on INFINIBAND default y config BLK_PM - def_bool BLOCK && PM + def_bool PM # do not use in new code config BLOCK_HOLDER_DEPRECATED bool source "block/Kconfig.iosched" + +endif # BLOCK diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index 2f2158e05a91..885fee86dfca 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -if BLOCK - menu "IO Schedulers" config MQ_IOSCHED_DEADLINE @@ -45,5 +43,3 @@ config BFQ_CGROUP_DEBUG files in a cgroup which can be useful for debugging. endmenu - -endif From patchwork Mon Sep 27 13:59:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12520029 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3BD7C433F5 for ; Mon, 27 Sep 2021 14:10:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9419660F46 for ; Mon, 27 Sep 2021 14:10:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234677AbhI0OMB (ORCPT ); Mon, 27 Sep 2021 10:12:01 -0400 Received: from condef-08.nifty.com ([202.248.20.73]:33484 "EHLO condef-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234706AbhI0OL6 (ORCPT ); Mon, 27 Sep 2021 10:11:58 -0400 Received: from conuserg-10.nifty.com ([10.126.8.73])by condef-08.nifty.com with ESMTP id 18RE19HL028538 for ; Mon, 27 Sep 2021 23:01:09 +0900 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RE07G0028280; Mon, 27 Sep 2021 23:00:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RE07G0028280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632751209; bh=A+BkteJsqOiCj+z6B2881OBPKBaV4HPokeV46N2OmSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JYMm4/RAQMnWOXdwLovsdIOhLVi5M69GwZTmkJz53e4GW6EOr7SgVYUIREEMBS/Ay XhZtUYOgn2xhAT1TAbm/4oZnqMzLJHCsqsGuZe0tIP0ptUtt/MGoJH2cvRm3nAdu5f a08eA18AULPjYz6YI4UxTlBJqHnyWQXLm29LTKigkx5+18FYbbui4Qe2koVJaqauiY rT23mK9CWQLKUVFVkEmX4AyxH/FKSTz2V644EVVn4dG7xAqjwXQWTZoK2sRrVYzADk WjfI41HxkYdCPpTv7QmigxGvM975r13OpE502YQ8ygg2dD/tnyUivbGNC2unKzrktE 0uzgoVTQM4tog== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [RESEND PATCH 3/4] block: move menu "Partition type" to block/partitions/Kconfig Date: Mon, 27 Sep 2021 22:59:59 +0900 Message-Id: <20210927140000.866249-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927140000.866249-1-masahiroy@kernel.org> References: <20210927140000.866249-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Move the menu to the relevant place. Signed-off-by: Masahiro Yamada --- block/Kconfig | 4 ---- block/partitions/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/Kconfig b/block/Kconfig index c4d35829ea4f..c6ce41a5e5b2 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -190,12 +190,8 @@ config BLK_INLINE_ENCRYPTION_FALLBACK by falling back to the kernel crypto API when inline encryption hardware is not present. -menu "Partition Types" - source "block/partitions/Kconfig" -endmenu - config BLOCK_COMPAT def_bool COMPAT diff --git a/block/partitions/Kconfig b/block/partitions/Kconfig index 278593b8e4e9..7aff4eb81c60 100644 --- a/block/partitions/Kconfig +++ b/block/partitions/Kconfig @@ -2,6 +2,8 @@ # # Partition configuration # +menu "Partition Types" + config PARTITION_ADVANCED bool "Advanced partition selection" help @@ -267,3 +269,5 @@ config CMDLINE_PARTITION help Say Y here if you want to read the partition table from bootargs. The format for the command line is just like mtdparts. + +endmenu From patchwork Mon Sep 27 14:00:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12520027 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 701CCC433F5 for ; Mon, 27 Sep 2021 14:09:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D74E60F94 for ; Mon, 27 Sep 2021 14:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234583AbhI0OLU (ORCPT ); Mon, 27 Sep 2021 10:11:20 -0400 Received: from condef-04.nifty.com ([202.248.20.69]:56192 "EHLO condef-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234717AbhI0OLT (ORCPT ); Mon, 27 Sep 2021 10:11:19 -0400 Received: from conuserg-10.nifty.com ([10.126.8.73])by condef-04.nifty.com with ESMTP id 18RE1AYs023449 for ; Mon, 27 Sep 2021 23:01:10 +0900 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 18RE07G1028280; Mon, 27 Sep 2021 23:00:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 18RE07G1028280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1632751210; bh=zWeVVrMdOBNr2TwWOoBOYkVjaBDcD5y8SZG9+hIZpO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OzPo6CiE3OUAdAvhYYiY7Rre3j3t1NjOWn0YHQzpTbEHsHAJKBfB3NfvyzdNhmqD3 XumuBqkAg1/V0VxZTtyq1AFcbR59mJKHgww3OvrbPs8WrRRzYvKQYTwm5GR+j11qCE bRc7PRbcLOLj04JGs+Y+ci8VV/KVK1rUjn66B+dZDGOnmbnqSLhXSgC3SgQL0DTKoh RFHwDXwMYmAIc7cKnpc7wZGj4O+E1vQOKnkQLrcR/+P/w1AN378apItyEV9dbG5k1P OVqHXn3d4xiTe+QmXDhdjMjCbdskm6oseCF4v8fa8bG0UCId9U320xg75U4BV88jt6 TaV6jwLHLeOoQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [RESEND PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile Date: Mon, 27 Sep 2021 23:00:00 +0900 Message-Id: <20210927140000.866249-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927140000.866249-1-masahiroy@kernel.org> References: <20210927140000.866249-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Every object under block/ depends on CONFIG_BLOCK. Move the guard to the top Makefile since there is no point to descend into block/ if CONFIG_BLOCK=n. Signed-off-by: Masahiro Yamada --- Makefile | 3 ++- block/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 60923c2f41d5..0bcaa9e30fdf 100644 --- a/Makefile +++ b/Makefile @@ -1115,7 +1115,8 @@ export MODORDER := $(extmod_prefix)modules.order export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps ifeq ($(KBUILD_EXTMOD),) -core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ +core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ +core-$(CONFIG_BLOCK) += block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ diff --git a/block/Makefile b/block/Makefile index 41aa1ba69c90..74df168729ec 100644 --- a/block/Makefile +++ b/block/Makefile @@ -3,7 +3,7 @@ # Makefile for the kernel block layer # -obj-$(CONFIG_BLOCK) := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \ +obj-y := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \ blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ blk-exec.o blk-merge.o blk-timeout.o \ blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \