From patchwork Mon Nov 29 23:01:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 12646047 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 2E4B3C4332F for ; Mon, 29 Nov 2021 23:02:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237016AbhK2XGN (ORCPT ); Mon, 29 Nov 2021 18:06:13 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:35470 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237243AbhK2XFd (ORCPT ); Mon, 29 Nov 2021 18:05:33 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 680AFB811FF; Mon, 29 Nov 2021 23:02:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 168CFC53FCB; Mon, 29 Nov 2021 23:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638226933; bh=TsQO+VKLXXeDMXVewIYmjbp69FG3TjSq0I96OnyDosE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I44J4yyyLs/KOvb80gIL8xy4x3mlAW6o5+ZGNoOOS7qi1iE5tefOTRV2xwBysZ4Ab jCmP1NkJWdFqPP0xn8Q0fcqLQzmmztevCFpRRtsdngDAHtfgdnYNHWmice3kh2kyds OZ8AGhTT9nC4O+Y7xxcWve7N68aoj5oeN/N0EcJkQ3rOZCWTx/vMfCHUPUReu6N2fd FZOk7yVjR7uuJ3qMcU5BuIGD5bLFKS6JljmAL991pWjaHEBBdlFL9zqQcEr5aKtWl2 3tDz5i6rCHiLOpempB3lxw6DrmvxWG20gtcEWY95pJkN5gXDQ5YVI6D2/H46EisOSd 6Yv3RKzL1tVbw== From: Nathan Chancellor To: Andrew Morton , Chris Mason , Josef Bacik , David Sterba , Luis Chamberlain Cc: Nick Desaulniers , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Nathan Chancellor Subject: [PATCH 1/3] arch/Kconfig: Split PAGE_SIZE_LESS_THAN_256KB from PAGE_SIZE_LESS_THAN_64KB Date: Mon, 29 Nov 2021 16:01:39 -0700 Message-Id: <20211129230141.228085-2-nathan@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211129230141.228085-1-nathan@kernel.org> References: <20211129230141.228085-1-nathan@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org btrfs requires a page size smaller than 256kB. To use that dependency in other places, introduce CONFIG_PAGE_SIZE_LESS_THAN_256KB and reuse that dependency in CONFIG_PAGE_SIZE_LESS_THAN_64KB. Signed-off-by: Nathan Chancellor --- arch/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/Kconfig b/arch/Kconfig index d3c4ab249e9c..c1936e154e66 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -998,6 +998,10 @@ config PAGE_SIZE_LESS_THAN_64KB depends on !PAGE_SIZE_64KB depends on !PARISC_PAGE_SIZE_64KB depends on !PPC_64K_PAGES + depends on PAGE_SIZE_LESS_THAN_256KB + +config PAGE_SIZE_LESS_THAN_256KB + def_bool y depends on !PPC_256K_PAGES depends on !PAGE_SIZE_256KB From patchwork Mon Nov 29 23:01:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 12646093 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 114A8C433FE for ; Mon, 29 Nov 2021 23:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233453AbhK2XRa (ORCPT ); Mon, 29 Nov 2021 18:17:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231620AbhK2XRP (ORCPT ); Mon, 29 Nov 2021 18:17:15 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B768C061758; Mon, 29 Nov 2021 15:02:20 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id A7893CE13DF; Mon, 29 Nov 2021 23:02:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5C16C53FAD; Mon, 29 Nov 2021 23:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638226936; bh=WaUWXxNKGrqJexnmsIfPnE6pHCB4zCYmP3pB5o5fl4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RnO0pin373qkyR601VSZts28ERAF6PB1mETGFiRk2t/ljAes7cDjSmd4sUBCJvGCm 5jOFzGlduN9ZAz7BMSGZQ2p4m2X8W8vUIPlaEEQ4/Q4iowBS1+/PYkbjR7qahlTcb8 00eUCrljdvyaG7szImq/EvZ+8F/EETU6zdZF73WYTxj3ccHLLv4XXvuf0bGbmJeuY9 xZtJNH/KBEDXDqL6joqvFfHiyFmjso95jlTgEM1p6+QtBNLnR7fIVpmz3V9NE8onSn exesyViGwmybqVtqCFbqzAwsVvBXkMxlNUP0Uwiq2UekBxQR1S9F2LPXZ3HnWM3G6w NlDg321vildsg== From: Nathan Chancellor To: Andrew Morton , Chris Mason , Josef Bacik , David Sterba , Luis Chamberlain Cc: Nick Desaulniers , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Nathan Chancellor Subject: [PATCH 2/3] btrfs: Use generic Kconfig option for 256kB page size limit Date: Mon, 29 Nov 2021 16:01:40 -0700 Message-Id: <20211129230141.228085-3-nathan@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211129230141.228085-1-nathan@kernel.org> References: <20211129230141.228085-1-nathan@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Use the newly introduced CONFIG_PAGE_SIZE_LESS_THAN_256KB to describe the dependency introduced by commit b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K"). Signed-off-by: Nathan Chancellor Acked-by: David Sterba --- fs/btrfs/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index 520a0f6a7d9e..183e5c4aed34 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig @@ -18,8 +18,7 @@ config BTRFS_FS select RAID6_PQ select XOR_BLOCKS select SRCU - depends on !PPC_256K_PAGES # powerpc - depends on !PAGE_SIZE_256KB # hexagon + depends on PAGE_SIZE_LESS_THAN_256KB help Btrfs is a general purpose copy-on-write filesystem with extents, From patchwork Mon Nov 29 23:01:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 12646095 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 7436AC433EF for ; Mon, 29 Nov 2021 23:14:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233578AbhK2XRb (ORCPT ); Mon, 29 Nov 2021 18:17:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230284AbhK2XRP (ORCPT ); Mon, 29 Nov 2021 18:17:15 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C32F7C06175A; Mon, 29 Nov 2021 15:02:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 1BDA6CE167C; Mon, 29 Nov 2021 23:02:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C408C53FC7; Mon, 29 Nov 2021 23:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638226940; bh=1i2gZ5NGBOA7KsIRxdWJ7aD3gL4YbJYucMh+Om0IHO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BmgvC2cJiYl9hg0+DWzrUeegL1v3t/0Ldjou6S6SPHApfqANoPUv82DGNm2PvdjxC FOMooKapEe85SHUpBBmfjVnOLqNRyUOb7yVD/jzS9pQgChawpzSYzuR2QWOCHbYpls dSkfzbUqp6Ue8NZReOpR6ks/s/+j4KbJ6PSJTxpEKygYa2272ixlWyeRNFlRtGwEOL LTpOsd6dIzH+Fpw+8LdQHGQWdQBD0mtJXOJa/+copBW9sMcrNbUwMM7ivbIOPHBI5l GGzASoGXWhfibOgzK25omCP/MHXOw+HrdIiB8gBA4/BTSlrxZ0qhDgN08RhTRhfd4a XRTe7QQwuyDAA== From: Nathan Chancellor To: Andrew Morton , Chris Mason , Josef Bacik , David Sterba , Luis Chamberlain Cc: Nick Desaulniers , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Nathan Chancellor , kernel test robot Subject: [PATCH 3/3] lib/Kconfig.debug: Make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB Date: Mon, 29 Nov 2021 16:01:41 -0700 Message-Id: <20211129230141.228085-4-nathan@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211129230141.228085-1-nathan@kernel.org> References: <20211129230141.228085-1-nathan@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K") disabled btrfs for configurations that used a 256kB page size. However, it did not fully solve the problem because CONFIG_TEST_KMOD selects CONFIG_BTRFS, which does not account for the dependency. This results in a Kconfig warning and the failed BUILD_BUG_ON error returning. WARNING: unmet direct dependencies detected for BTRFS_FS Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y] Selected by [m]: - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y] To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of CONFIG_TEST_KMOD so there is no more invalid configuration or build errors. Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K") Reported-by: kernel test robot Signed-off-by: Nathan Chancellor --- lib/Kconfig.debug | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 5c12bde10996..a32f6bb4642c 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2486,6 +2486,7 @@ config TEST_KMOD depends on m depends on NETDEVICES && NET_CORE && INET # for TUN depends on BLOCK + depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS select TEST_LKM select XFS_FS select TUN