From patchwork Mon Sep 9 20:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13797552 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E0C1ECE588 for ; Mon, 9 Sep 2024 20:26:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7496D6B00C9; Mon, 9 Sep 2024 16:26:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F9ED6B00CD; Mon, 9 Sep 2024 16:26:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C0D96B00CF; Mon, 9 Sep 2024 16:26:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3CE016B00C9 for ; Mon, 9 Sep 2024 16:26:35 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D992E12020A for ; Mon, 9 Sep 2024 20:26:34 +0000 (UTC) X-FDA: 82546332708.08.0704EAC Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id 5B3E740004 for ; Mon, 9 Sep 2024 20:26:33 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Tg7XM1id; spf=pass (imf11.hostedemail.com: domain of arnd@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725913566; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=cHcJfey5WDIJSwWj5K9fY+05qItmnH6e9QBve7rzfyg=; b=trJp0x6OxAgNuHz+8sDXeHX7FyQVLRTktZB+fT0aMVqicxOltPkmkzhxFUwN6Zpd6h/2KH QEZ5ECMgeeuY6raC3NCxSZN7GdXxl7Gs2xxCxoBwL3V2vvFu8Z/5ig7W8Lbqhzp7d2gOud GkXS8oC39lTBIl5Rfg6maSGA287ewn4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Tg7XM1id; spf=pass (imf11.hostedemail.com: domain of arnd@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=arnd@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725913566; a=rsa-sha256; cv=none; b=e2TSzfqy7YPKPk7Jmalb3h/xWEJwSNWc0hkDeEPKn79NbnyP7W65G6FiSZxE2MIovm3fFq 44S7aK5Y2P3rN7NTa84dGzBkjahGSHe3mxoaFK4B6JHZkp0SRTDu3zTPWZ4N8ksZiUMxE2 NxBdt/375k9KsMwym9/tVHuTS8KXS+M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id C1813A437E6; Mon, 9 Sep 2024 20:26:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E471C4CEC5; Mon, 9 Sep 2024 20:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725913591; bh=V3rJ93Zwx3fhKglzbBXQ0xPAsxMtRNfyG24KXb6eLfc=; h=From:To:Cc:Subject:Date:From; b=Tg7XM1idXNVxN/0TtIWXWZyoRa5V3qVQMI9dW2dwiveiHI4WFmlUhakSf84iWGPr9 bWaLNvZxvuKssaRZgzNym12+ID0PLsIBmyVQoLJcNWJM2iq3RvulEMsxLhNDbFwsJk UrNLKFe8r/PYPxU1gf0p6aT9f1J7tVi0IHiqKu0MemvJACtmpHV4ZJW+b0fPP2QBAR RCFNl7dSLwGL7Bj7f0m7XV1FFIU7X2H2O0aiRwhc4dNZn7x6Yp6GU4rKD9LbbwTjKU NBYubRvknIhP2dJdGgqXLwGkbayPlfIEH44fWb5tcXQTA/Lr0vU2M9qxo1XvIdMaF9 oshgjWiHUgrEA== From: Arnd Bergmann To: Andrew Morton , Yosry Ahmed , Johannes Weiner , Nhat Pham , Chris Down Cc: Arnd Bergmann , David Hildenbrand , "Mike Rapoport (Microsoft)" , Peter Xu , "Matthew Wilcox (Oracle)" , Kees Cook , Vlastimil Babka , Chengming Zhou , Anshuman Khandual , Vitaly Wool , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: z3fold: deprecated ZSWAP_ZPOOL_DEFAULT_Z3FOLD as well Date: Mon, 9 Sep 2024 20:26:16 +0000 Message-Id: <20240909202625.1054880-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 9cdfeq3ahhoqodtkgy7kc9wajdc3gc1j X-Rspamd-Queue-Id: 5B3E740004 X-Rspamd-Server: rspam11 X-HE-Tag: 1725913593-770033 X-HE-Meta: U2FsdGVkX18yscuWkmXeyBJwoA3u6KH1L85ubOshoo0Flfoc/mkbmCariHCFjSHOPHTo4rj9tX7ExtAsv8RClV/4vM2Unt+ZLN7kDvP3zz3OLIkBF7zwBFBiD/jZTcILbz3L9DyOzCPWPHHdW5qHXHL1qQqCuTKidZEeOtolhw5yAqDDhOMabCoUdQPz9LOqlNVBQlkoPJ+TG3QertFv4Hhg0bev5+VHL8HTf1rhHPCDUrXryez68HUK/iej77l+QMtYrjrm7fyFDyNRl51mlB1TaAuTsGIzTeBeJtkL0TFAd1QajrJMdKR2n9NUtRAK/8RX1rqkCDscyJhiuPr+exu0C5CwNAYOZCeOvsmpyFzpyfhM6t2VZcFs5dx3CT7h0RLFko8lvhvJ7givQBCACJSHhlEatz03je2bSZaHRG9V3+DttRLIz1yz8PnhRrVuTAaWONldQ4gURNI/HJqy+sRxiO/YS26/kQzQLoKEyTM54izOwn5NbHp/0p+lEMU/XFUCyzo3YQ3CDtDw05avJGi7NSqhHKJQPc35Fie6lSgKQceZ+Fo7qPXeEQGPxalHzxd5HSdcx1RV8/kbnMN+eLexAGNmCQIW68o9M/gXDV2UJac4bmlHPPnAERPHbXD0oAXTAyCUImZ5MOyobgJYBBSd0adADtSpGQ5PBOYQIQyeOf6j+cplDECM5QV5ycQUZpneKhq3TwPRAZXRJ14GlyoTVWI1R09fbm2/Xrp2HQEciJ2qRgisMz+EKMJyyME6bkkU0BSM9ofr8onu/XnLW0AFiySdv9ZzucmyzdvUUzMitu5FwoX5rL5xAON7xUUg48XqbXDH53mQ2nKL4+VAiyLqwsFRXLV93waYkXcef+anN6GbXJ/ztClmcHg83DtvMEUQhDQtvtj+WJVtjKfO6tmqpUZFiKLn53a2yYgzh20vipXk5Y5tQOgpUEz7lgrMeA0zha5dEYMbKqTdAd1 uhzweIIX qybZ1M3hZ3sWSSLOrxmGRNT38uulbJmoPtaDkuAaN6twb0Ud0AZgICuejYeeucnLqg5C/4pz6Ik/JXc8VYFeMinjpulGBfD2Xkb1d3FGz6sT0ebMuRY2uVhFyTQKVSt9QIRnTsgOvsebWjk+A87zOdbyPLcyjaNV7gIpVGk8wq28klTvv8hBvM/K9Folf24Xhk55uZK4RHuSI8Cod6YAhbuOHEEOu9UsDBz/+eO+7/vlDyb9MLiuoMPsVChbdoMJa8ToO X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Arnd Bergmann Randconfig builds that use ZSWAP_ZPOOL_DEFAULT_Z3FOLD now cause a harmless warning: WARNING: unmet direct dependencies detected for Z3FOLD Depends on [n]: Z3FOLD_DEPRECATED [=n] Selected by [y]: - ZSWAP_ZPOOL_DEFAULT_Z3FOLD [=y] && ZSWAP [=y] Avoid the warning by selecting Z3FOLD_DEPRECATED instead, but rename this symbol to ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED in the process so it no longer automatically gets used with old defconfigs while still allowing users to select it manually. Fixes: c68c1bed014d ("mm: z3fold: deprecate CONFIG_Z3FOLD") Signed-off-by: Arnd Bergmann --- mm/Kconfig | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index 7c9930bf8a9d..09aebca1cae3 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -146,12 +146,15 @@ config ZSWAP_ZPOOL_DEFAULT_ZBUD help Use the zbud allocator as the default allocator. -config ZSWAP_ZPOOL_DEFAULT_Z3FOLD - bool "z3fold" - select Z3FOLD +config ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED + bool "z3foldi (DEPRECATED)" + select Z3FOLD_DEPRECATED help Use the z3fold allocator as the default allocator. + Deprecated and scheduled for removal in a few cycles, + see CONFIG_Z3FOLD_DEPRECATED. + config ZSWAP_ZPOOL_DEFAULT_ZSMALLOC bool "zsmalloc" select ZSMALLOC @@ -163,7 +166,7 @@ config ZSWAP_ZPOOL_DEFAULT string depends on ZSWAP default "zbud" if ZSWAP_ZPOOL_DEFAULT_ZBUD - default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD + default "z3fold" if ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED default "zsmalloc" if ZSWAP_ZPOOL_DEFAULT_ZSMALLOC default ""