From patchwork Fri May 28 18:44:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12287419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98981C2B9F7 for ; Fri, 28 May 2021 18:54:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 703A2613DD for ; Fri, 28 May 2021 18:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229549AbhE1Sz7 (ORCPT ); Fri, 28 May 2021 14:55:59 -0400 Received: from condef-04.nifty.com ([202.248.20.69]:62239 "EHLO condef-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbhE1Sz6 (ORCPT ); Fri, 28 May 2021 14:55:58 -0400 Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-04.nifty.com with ESMTP id 14SIjnJS023301 for ; Sat, 29 May 2021 03:45:49 +0900 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-12.nifty.com with ESMTP id 14SIibCl014551; Sat, 29 May 2021 03:44:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 14SIibCl014551 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1622227478; bh=+BwCCEELL5xHbm5thPyHyFbhX9hUgqXt5F2QplIm71k=; h=From:To:Cc:Subject:Date:From; b=F+m+kCph/3n5rG/eNeqyyi6rPNza8RGZt6x6gsnxoRbRGKn3dyLDvgs8fGvxMlg5i ngdlK7v6o3xjqT4JTBGwTgNr2LS6DHAlB8bsmoCOrpV8OcMQ51R16f9ef3FUv1+GLg smeGPKLRLNqJb36XI1zWVonbec0QGcf+pLpBN2tv7Mm+/vNipTq4uSwUVyoNyZbZqw fwgW8WBxh7hQN6A6lKFeUbw6o9y2Xoe8DJNbTa07nBnKwvL5RDU90sC882zNQyKdW4 1DQIOFwj79Yv18CrzuUBomVoOGbYlpkJZbm7xkuTyOUZAr0ar31zxtv59fxMEIGQbz ESk550cJ81gRQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] block: remove redundant =y from BLK_CGROUP dependency Date: Sat, 29 May 2021 03:44:32 +0900 Message-Id: <20210528184435.252924-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 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 a2297edfdde8..cb56f837a4e5 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -93,7 +93,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 @@ -135,7 +135,7 @@ config BLK_WBT 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 @@ -146,7 +146,7 @@ config BLK_CGROUP_IOLATENCY 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 Fri May 28 18:44:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12287421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50E94C2B9F7 for ; Fri, 28 May 2021 18:54:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B976610FC for ; Fri, 28 May 2021 18:54:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbhE1S4Q (ORCPT ); Fri, 28 May 2021 14:56:16 -0400 Received: from condef-06.nifty.com ([202.248.20.71]:49702 "EHLO condef-06.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbhE1S4Q (ORCPT ); Fri, 28 May 2021 14:56:16 -0400 Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-06.nifty.com with ESMTP id 14SIjp4h028366 for ; Sat, 29 May 2021 03:45:51 +0900 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-12.nifty.com with ESMTP id 14SIibCm014551; Sat, 29 May 2021 03:44:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 14SIibCm014551 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1622227479; bh=ul+iPhomc5/a+3uLEWyWeoxx4HhhQyXAG63XvmcCJ6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bMT/dT44wxADJT6ZvM0HAxA8Dqhc7dWDZTJkOE8pRODeYkQSGVal3i/Dj+wZI/ZTR cM/dREPsf13ucKUA7+Tj0YA43cojfBUNxOHoWbvctyj2zRFYUfvejqjjZ+QglskhWd xrv3EoeUPPaJBIVLQP6/t1Lht/rCYV/l3V6YuVr1j5qEcQyzz91wK2Z+OFCROBm3Lg A7RXwh83RYzF4KzNCuI2rXxS+sNe5wrUL0+2PO6NUQFQI5IK6c2ej6sQlzUVAHMHPn 3oZ9XPW2hYGPOTe8zK9mbcZl0Bm0ptpw2TGwfqyV5oabGHBkxgm8NKqER32GWL8Alx 1bbOG8HmzBQiQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] block: simplify Kconfig files Date: Sat, 29 May 2021 03:44:33 +0900 Message-Id: <20210528184435.252924-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210528184435.252924-1-masahiroy@kernel.org> References: <20210528184435.252924-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. 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 cb56f837a4e5..932596dbe4b4 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -208,29 +208,25 @@ 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 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 Fri May 28 18:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12287417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5F2FC2B9F7 for ; Fri, 28 May 2021 18:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3524613DD for ; Fri, 28 May 2021 18:54:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbhE1Szk (ORCPT ); Fri, 28 May 2021 14:55:40 -0400 Received: from condef-10.nifty.com ([202.248.20.75]:53429 "EHLO condef-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbhE1Szj (ORCPT ); Fri, 28 May 2021 14:55:39 -0400 X-Greylist: delayed 353 seconds by postgrey-1.27 at vger.kernel.org; Fri, 28 May 2021 14:55:39 EDT Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-10.nifty.com with ESMTP id 14SIjopH017734 for ; Sat, 29 May 2021 03:45:50 +0900 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-12.nifty.com with ESMTP id 14SIibCn014551; Sat, 29 May 2021 03:44:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 14SIibCn014551 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1622227479; bh=jaxdsqU7j4qXYB8W7T2mX99WHAg3Osh1zu5S6gjlbZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K8qcGC9CNy/bvxlAYsRJhlT2YZ0iCsi9TmrPkuf4zib+OULyrJA8cL22Be5xc1sI4 paBTPZjpzqcNAyjaEy5kGZRpwqq0SS3gWWfiV0wrVjShqJXSDLrTA+wVkFz/H1i/TI 8ZKF9qls0wKW1iVUfbVf5pDv+tZdgZLjwTnD7qVWMbCy4kb3BhEwLPD2QcRfcTyYzn 3IXIUoU/zoagHz82n8+pEg/oB9JcwW4L0/e2x6gw83UBJUAPWM7G2xvyUFBIhKjiIp YQQUOVKboKcoWu+j6j6mnO8uGJmWBORYtz8Rq+Ucz2VqGWnvG1HP61Ej38qqzZrjzw 4XqNd03lzOdiQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] block: move menu "Partition type" to block/partitions/Kconfig Date: Sat, 29 May 2021 03:44:34 +0900 Message-Id: <20210528184435.252924-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210528184435.252924-1-masahiroy@kernel.org> References: <20210528184435.252924-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 932596dbe4b4..412a6e11d0cc 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -202,12 +202,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 6e2a649669e5..edc2d0779814 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 @@ -268,3 +270,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 Fri May 28 18:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12287423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1380C2B9F7 for ; Fri, 28 May 2021 18:55:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEE0C613DD for ; Fri, 28 May 2021 18:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229493AbhE1S5K (ORCPT ); Fri, 28 May 2021 14:57:10 -0400 Received: from condef-02.nifty.com ([202.248.20.67]:21179 "EHLO condef-02.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbhE1S5K (ORCPT ); Fri, 28 May 2021 14:57:10 -0400 Received: from conuserg-12.nifty.com ([10.126.8.75])by condef-02.nifty.com with ESMTP id 14SIjpQH018216 for ; Sat, 29 May 2021 03:45:51 +0900 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-12.nifty.com with ESMTP id 14SIibCo014551; Sat, 29 May 2021 03:44:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 14SIibCo014551 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1622227480; bh=ldEXN72R4ZQPqoN770mx5epfuTtmbUuSqubynOtJnH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jx3HmzBTmRuFXHwp2jTaBcC6mdAbK2SjbLdSEgG4jzFDVPH4iDPS/5F8jeEUVXMnx /nH5QBsXiR6E5egGiEx1kaW86fLnKPAJjEcGLbUEAxH5aAqbW5HrUoWicu0pTfh5i5 drRCv1nS3H8jq7SyAM8n/bZABJOxTPSgPWwodypKHyt7Mc1KZXpya7QG79fjycr89i OwzQ/xQMYQt7VboM0zEtKQpzaNvsN/ow/YJZk+lNSW77h1cIDCph0IV4xZF71LIbIA ZCIKqCNhhZGIjBJSYYZMrksAH5+JrhQlIcoyUiX4IiBlr9HLpDL16YY49eMGZ4EtbC o7LX1tPTphmQQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: Jens Axboe , linux-block@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] block: move CONFIG_BLOCK guard to top Makefile Date: Sat, 29 May 2021 03:44:35 +0900 Message-Id: <20210528184435.252924-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210528184435.252924-1-masahiroy@kernel.org> References: <20210528184435.252924-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 88cb5b59109c..055dcf5a2704 100644 --- a/Makefile +++ b/Makefile @@ -1095,7 +1095,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 8d841f5f986f..99f0757a3aa5 100644 --- a/block/Makefile +++ b/block/Makefile @@ -3,7 +3,7 @@ # Makefile for the kernel block layer # -obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \ +obj-y := 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 \