From patchwork Thu Jan 16 09:56:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13941559 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7CD8C02180 for ; Thu, 16 Jan 2025 10:05:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 47C5E10E927; Thu, 16 Jan 2025 10:05:54 +0000 (UTC) X-Greylist: delayed 486 seconds by postgrey-1.36 at gabe; Thu, 16 Jan 2025 10:05:53 UTC Received: from riemann.telenet-ops.be (riemann.telenet-ops.be [195.130.137.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 18A8310E927 for ; Thu, 16 Jan 2025 10:05:53 +0000 (UTC) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by riemann.telenet-ops.be (Postfix) with ESMTPS id 4YYdZt01l7z4x4FK for ; Thu, 16 Jan 2025 10:57:42 +0100 (CET) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:dc22:1d0d:62b2:39be]) by albert.telenet-ops.be with cmsmtp id 1lwg2E00D038l1s06lwg1x; Thu, 16 Jan 2025 10:56:41 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.97) (envelope-from ) id 1tYMc5-0000000D3YR-0Gpj; Thu, 16 Jan 2025 10:56:38 +0100 Received: from geert by rox.of.borg with local (Exim 4.97) (envelope-from ) id 1tYMcA-00000004hpF-1JRC; Thu, 16 Jan 2025 10:56:38 +0100 From: Geert Uytterhoeven To: Maxime Ripard , Maarten Lankhorst , Friedrich Vock , Tejun Heo , Jason Gunthorpe , Leon Romanovsky Cc: dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH next] cgroup/rdma: Drop bogus PAGE_COUNTER select Date: Thu, 16 Jan 2025 10:56:35 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When adding the Device memory controller (DMEM), "select PAGE_COUNTER" was added to CGROUP_RDMA, presumably instead of CGROUP_DMEM. While commit e33b51499a0a6bca ("cgroup/dmem: Select PAGE_COUNTER") added the missing select to CGROUP_DMEM, the bogus select is still there. Remove it. Fixes: b168ed458ddecc17 ("kernel/cgroup: Add "dmem" memory accounting cgroup") Closes: https://lore.kernel.org/CAMuHMdUmPfahsnZwx2iB5yfh8rjjW25LNcnYujNBgcKotUXBNg@mail.gmail.com Signed-off-by: Geert Uytterhoeven --- Broken commit is in drm/drm-next Partial fix is in drm-misc/for-linux-next init/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index 61f50cafa8151ed2..bd7630e75207e8dc 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1128,7 +1128,6 @@ config CGROUP_PIDS config CGROUP_RDMA bool "RDMA controller" - select PAGE_COUNTER help Provides enforcement of RDMA resources defined by IB stack. It is fairly easy for consumers to exhaust RDMA resources, which