From nobody Wed Dec 17 08:52:57 2025 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 0D4484A3D for ; Fri, 12 Jul 2024 04:09:56 +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=1720757397; cv=none; b=A3K2n/toWmb3OfKYpeFjmT5plqip5sVpHI6enzYY4kBlwOdKu10Ox1cMpen+zXslvMi77kTNFOY8VeGh0q3NCUGsfBJUBA+QFbC/aAMJNhZWRsNkKYO3nYHWQNU1OqBTCv+k4oj62pmA/hUpzo+yTWIwECgqoTQdMAQ6zIu1f2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720757397; c=relaxed/simple; bh=ov6vsRh9oCOwll/9cGyKD8KumYOAD2zGCgg8X1M2O9k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=av9rX+3Yhhb6EaazOVv3Q4dc+hp1PSwlJhWmbmQsr9oLhQk0iLoE02V6oju8j48dAf0OTKPmuaTs/gIYEZzjhmdgqDann1ouv+t1vAR/rXVYnTk8IqzTVtr9kY9KLUI1XuBo6nvmO50QPSUSFITZnc+8e5lQBic7/gPns70UfmA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RGpKl+mN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RGpKl+mN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7934EC3277B; Fri, 12 Jul 2024 04:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720757396; bh=ov6vsRh9oCOwll/9cGyKD8KumYOAD2zGCgg8X1M2O9k=; h=From:To:Cc:Subject:Date:From; b=RGpKl+mNRyRNs7qHLHnIBJebTVTWWLWFP0MvfLyFk3ntzIhWbCxHm/5d+psTOPajs /JYdSITaEXSoFznvapGjaXjTr3kgoNrnxRgtIZjhJo3DhRsRmXFKPX7beBtEeMrzvt aCCItTn4A/+065eqCuHfqjrV5k0dg3wcCdynkwm6ICkgr7x9M68EYRrLsyJvXusQ5v vwNxnyZD4nPOVpvS2KXoHE5qQHkTOb5uwGDPZ/NnE8cOwzfc1vI3sdINfK4PEObuEi Q3i1lFIlE32KzrwaFKpFY8j3e7AXq9GNcH4p139w2ZOds9quPLOhDqcT0R5L6NJvXA X1DJaVCSxdikQ== From: alexs@kernel.org To: Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: "Alex Shi (Tencent)" , Randy Dunlap , Yoann Congal , Masahiro Yamada , Petr Mladek , Suren Baghdasaryan Subject: [PATCH v3] mm/memcg: alignment memcg_data define condition Date: Fri, 12 Jul 2024 12:14:35 +0800 Message-ID: <20240712041435.301314-1-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Alex Shi (Tencent)" commit 21c690a349ba ("mm: introduce slabobj_ext to support slab object extensions") changed the folio/page->memcg_data define condition from MEMCG to SLAB_OBJ_EXT. This action make memcg_data exposed while !MEMCG. As Vlastimil Babka suggested, let's add _unused_slab_obj_ext for SLAB_MATCH for slab.obj_exts while !MEMCG. That could resolve the match issue, clean up the feature logical. Signed-off-by: Alex Shi (Tencent) Cc: Randy Dunlap Cc: Yoann Congal Cc: Masahiro Yamada Cc: Petr Mladek Cc: Suren Baghdasaryan Cc: Vlastimil Babka --- include/linux/mm_types.h | 8 ++++++-- mm/slab.h | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index ef09c4eef6d3..4ac3abc673d3 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -180,8 +180,10 @@ struct page { /* Usage count. *DO NOT USE DIRECTLY*. See page_ref.h */ atomic_t _refcount; =20 -#ifdef CONFIG_SLAB_OBJ_EXT +#ifdef CONFIG_MEMCG unsigned long memcg_data; +#elif defined(CONFIG_SLAB_OBJ_EXT) + unsigned long _unused_slab_obj_ext; #endif =20 /* @@ -343,8 +345,10 @@ struct folio { }; atomic_t _mapcount; atomic_t _refcount; -#ifdef CONFIG_SLAB_OBJ_EXT +#ifdef CONFIG_MEMCG unsigned long memcg_data; +#elif defined(CONFIG_SLAB_OBJ_EXT) + unsigned long _unused_slab_obj_ext; #endif #if defined(WANT_PAGE_VIRTUAL) void *virtual; diff --git a/mm/slab.h b/mm/slab.h index 3586e6183224..3aae11dde532 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -97,8 +97,10 @@ struct slab { SLAB_MATCH(flags, __page_flags); SLAB_MATCH(compound_head, slab_cache); /* Ensure bit 0 is clear */ SLAB_MATCH(_refcount, __page_refcount); -#ifdef CONFIG_SLAB_OBJ_EXT +#ifdef CONFIG_MEMCG SLAB_MATCH(memcg_data, obj_exts); +#elif defined(CONFIG_SLAB_OBJ_EXT) +SLAB_MATCH(_unused_slab_obj_ext, obj_exts); #endif #undef SLAB_MATCH static_assert(sizeof(struct slab) <=3D sizeof(struct page)); --=20 2.43.0