From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D2DC260583; Tue, 12 Aug 2025 19:14:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026049; cv=none; b=U9XMDA7JwrbI7F/HaUXfzR10Eo+ULzwxCoP5V27BASfUG8ITbyN4dixI23uUV8XcLVXLEFnU/CIECvQPoZJFTHsl8wNP3SuouvItSao7O6DWu9ETppvpzYqLAYuJr/bx60yaj6HuwxvXMaQyIM4kt/2vgAvI1MxC+okOaksaVwk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026049; c=relaxed/simple; bh=MVLgCui+cUsXIzCUY9WWcoq9g5SHjc+5IRhLbUPIZ/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jU5aaGWn4m4bRiE9Nd8MjhktKO+zBqU80YBblm8szc6M4Kk+BI20F4s3v7h0PRpIDkSqVlbMPKx4kBMM9SAuk3Nf1Vd8nYgzUcdsXvHP+Db0tLYhuTvEtK1VJ33beFUbEZUXR9qQmM2rl4DGBIxguTZF6PmTv3k4k3soSRX/IP4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kFtzQbf9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kFtzQbf9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80AD1C4CEF0; Tue, 12 Aug 2025 19:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026049; bh=MVLgCui+cUsXIzCUY9WWcoq9g5SHjc+5IRhLbUPIZ/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kFtzQbf9CoyHUREt3NcAAmwM5tDZYC1PlHDzG5DbxwUJB5xbAimpBUpD05NfgXIpx NqJLmRrIsWM1Qgy5HcuflrOybWaa6CYIxzogEwrxgENf9TRiR/i8WwsEJQDKgynKs5 GorslH/oOC0UpHTp289U7mlc/MB5e5X03npsIgJU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Matthew Wilcox (Oracle)" , Roman Gushchin , Harry Yoo , Vlastimil Babka , Sasha Levin Subject: [PATCH 6.15 188/480] memcg_slabinfo: Fix use of PG_slab Date: Tue, 12 Aug 2025 19:46:36 +0200 Message-ID: <20250812174405.261211901@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthew Wilcox (Oracle) [ Upstream commit 7f770e94d7936e8e35d4b4d5fa4618301b03ea33 ] Check PGTY_slab instead of PG_slab. Fixes: 4ffca5a96678 (mm: support only one page_type per page) Signed-off-by: Matthew Wilcox (Oracle) Tested-by: Roman Gushchin Reviewed-by: Roman Gushchin Reviewed-by: Harry Yoo Link: https://patch.msgid.link/20250611155916.2579160-11-willy@infradead.org Signed-off-by: Vlastimil Babka Signed-off-by: Sasha Levin --- tools/cgroup/memcg_slabinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cgroup/memcg_slabinfo.py b/tools/cgroup/memcg_slabinfo.py index 270c28a0d098..6bf4bde77903 100644 --- a/tools/cgroup/memcg_slabinfo.py +++ b/tools/cgroup/memcg_slabinfo.py @@ -146,11 +146,11 @@ def detect_kernel_config(): def for_each_slab(prog): - PGSlab = ~prog.constant('PG_slab') + slabtype = prog.constant('PGTY_slab') for page in for_each_page(prog): try: - if page.page_type.value_() == PGSlab: + if (page.page_type.value_() >> 24) == slabtype: yield cast('struct slab *', page) except FaultError: pass -- 2.39.5