From mboxrd@z Thu Jan 1 00:00:00 1970 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 B2D32C3DA41 for ; Thu, 11 Jul 2024 11:51:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 326A26B008C; Thu, 11 Jul 2024 07:51:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D5356B0092; Thu, 11 Jul 2024 07:51:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19DA36B009E; Thu, 11 Jul 2024 07:51:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EDF2D6B008C for ; Thu, 11 Jul 2024 07:51:40 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AC22D160561 for ; Thu, 11 Jul 2024 11:51:40 +0000 (UTC) X-FDA: 82327307160.08.91A592A Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf12.hostedemail.com (Postfix) with ESMTP id C2CA940017 for ; Thu, 11 Jul 2024 11:51:38 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=chAfkoW8; spf=pass (imf12.hostedemail.com: domain of seakeel@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=seakeel@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720698682; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=aJJrseQEfg3j3LJ1tOzOpDcKnIMoClUQKxX10P83OEY=; b=eGqLXr8mxW8Gl3qqUurDx/p7B8BIwEj4XxmEHfSTst8y3CYuDYqU677gj1MYP4dduyxW8C u9ETdXqUIwgJUviQyd2lpP5WhrOOTzJKEMKD60n2k7WxRjpo977eDQnpCiSO6hhVPWzQeb AKvb+cnI8qJMOO0mByCu/1oNDcwbQw4= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=chAfkoW8; spf=pass (imf12.hostedemail.com: domain of seakeel@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=seakeel@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720698682; a=rsa-sha256; cv=none; b=d/FMcnom1crg775ap7UDMNq1K3CQywTxrmllbINW6UweKkGn+/aZEhGSpznidWal/3IClg OABPnfyS6RYhPW93HDOEp/Mm8zY0CQk1Ey5eAHwy+XkBQ5WUETN+PFoFPQlpunul9b39hD QUamw6xYGFogKZBiaab0xEB2TqTYkuk= Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2c961b5f215so611064a91.0 for ; Thu, 11 Jul 2024 04:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720698698; x=1721303498; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=aJJrseQEfg3j3LJ1tOzOpDcKnIMoClUQKxX10P83OEY=; b=chAfkoW8siJ99lVttMTz/rppwQw6hXCiN8a+McjavVdNkBlX0yZO+XMQWa3ns83bUV ti+G1B5GlRcezmiGbIOOtFMaM6TtBFK7dkLh6VJlaxRXX9nzOOYVXRuJxrABzj3HmX2g xHq1Al05RR8XfTYve2aRy92YZ9LYy7QychODlozqLhCl4OzWKEeHcwbGqu0JOqn+gWBB l9bCfFco6J4Hyf4kgXpE86dbsOQ/29haKaUZUtSr95RYPD6VjUHZzKtCEfKcrtgZBDm5 u0Td/egyKdW3vRLBbKsP9k2vtd6/ytdU3xS8k1jukAB9mWkKTDo4TekXW0PzYJQnDlkl rtsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720698698; x=1721303498; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aJJrseQEfg3j3LJ1tOzOpDcKnIMoClUQKxX10P83OEY=; b=rZXzDV2xmsUYIwFdtO+3toISkcruW6r3zubFYEt/T5jADv3PTdB73d7798JiIp7R9M 1yv42uvrE5GwlNC+IuFxzGTwPbU3a3T7fLrgzBAFJdVd7fBTVEYxKImPjV7U0Zft5xu2 Wr792IRxDgOSUdsdkkTHKB34RcOYa0UY7Hj7+7c2ZrQEcNyi8H/gBgIE4CGYxJNXqH1X LsAnCPuITZQol1bdMKa8HBWNtCltoY27LU/mD4sn0iO1uupYw9c0fl0Z8bB1LTPi2qQ/ yTm1W1I9czmdqrTGwI14hco8jBC7gGwscmYfCtfUuQOWLVClWOWupyyny44ZugIFnv8a CXJA== X-Forwarded-Encrypted: i=1; AJvYcCWhF+t1irFidW1Xz8WKq5KygsKk9FMqSvS551JTn/kYvS5B33eefqEXvxmSAy/0d3C5+/nHP11zOK5uWbz7oTydC+M= X-Gm-Message-State: AOJu0YyNt3p3M/py0cH78gkJGOX5/Ds/0ElJVM5UuP3eP6ljsPLHwAAe 26zmmfXv7wVkDe9f8Sa5Wtm1I2NLTWif0VKdEfZYUsluLkySUWZy X-Google-Smtp-Source: AGHT+IEHNNn4a8XKmxXct+hWuMn/VO2hl+aQXm6B1er+w5jDgCHCa7OkH5FnK4dd5BvS+GN1rLzMNA== X-Received: by 2002:a17:90a:7e0e:b0:2c9:7e9c:9637 with SMTP id 98e67ed59e1d1-2ca35c2a6dcmr6426513a91.13.1720698697629; Thu, 11 Jul 2024 04:51:37 -0700 (PDT) Received: from [192.168.255.10] ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ca34e854ddsm5505815a91.25.2024.07.11.04.51.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 11 Jul 2024 04:51:37 -0700 (PDT) Message-ID: Date: Thu, 11 Jul 2024 19:51:33 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 1/2] mm/memcg: alignment memcg_data define condition To: Vlastimil Babka , alexs@kernel.org, Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Randy Dunlap , Yoann Congal , Masahiro Yamada , Petr Mladek , Suren Baghdasaryan References: <20240710054336.190410-1-alexs@kernel.org> <42afbce8-7746-438f-ba3a-c997a2c702e5@suse.cz> Content-Language: en-US From: Alex Shi In-Reply-To: <42afbce8-7746-438f-ba3a-c997a2c702e5@suse.cz> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: C2CA940017 X-Stat-Signature: uiwwcdjezw67ox5mjp6k8adj6uspaeyo X-HE-Tag: 1720698698-171879 X-HE-Meta: U2FsdGVkX19V9ubvFXrIu9Bp4TLvx5v2pGjrqgnzWNnNecf6LMEC8imYo4rXgX4A50U2A7pd60i24PzWuWmNK30pb9Sh9T8nzG63lPHKVIaPo548HfRdbQUNID3Fgx2K3a2UrTzgjcK87wNBjDsXlD4VH9YM5y1+R3jiu6mxbnqwkY608+iLplZS1ODB6TNmJODp+vUdRFteoBy5M+9MDwJkr8BxBxzq/Of/ZAXxMq5GITiYmV+G6U1dQhCGanNeCXER/efb+A+ALXzV37g/PZ/VQN23znY3O5hGpa1crFOkx8g/vfgjGHK88jQXeUe2Sdlt6lK+jYHmdFEUs+88Nb04qC04oZct9oOvgOle+uCWycDKBFNMXDXrrp/j7Ts3xV1cBt1qov9OblpORS8rtafN9QPU+UWgx2r4AtqXXicLJXf4P/ilsMWV0ZpWNvFaA8UxS5A4cJyW+5DIWWy776XDLiSSlb+Cx09cA21erZ8kefhI7WvbTNC/SaKz0IlxdolqGqixM+WbNNfpkwPhoFGw9IcnYYJwitJ9y3KWNZ2kZ6k7rO0hnvNAMfTnX9Say0MjuEt1oko4o/nYqkkHS8X0R4J8dKNsLqRiFuFYnWl38yorgAW6E8YpRc+YEjT4QMPXPGDTcxdZBIIf/BO49VG8KekDWZy79un4c+ssRAbkkBVEV410HgXPyIMhXNK9xcql7U7YcOFbTPQM9SWN54elvyVp19ZJxteDXq3UaY0bHBhqT4XswbWW13lo9mj+ydYoBl9hZrhxrYvRxLfPidX5ka8d2TEcGvrcagDmBR34wd2Nhg3eUDeRxVS4U0u47ne/eSL88oFdUSn/CupZ7T+BHYFDkoyFnByiqH/G3cJ4fd23v1nOccT0a/BgEWtnSA+tnVpL2MTLUW4cv5PWyXzHIgtiVEQ4H49USjxy86JKd+rrkOoBCB3CGUP8tCVD9OQ7R6x9CtnJfCVx/V/ N4CZwhwH WFMMGqAH2mtWgV8nMgAZCIT5KwBfcU+n6e6mfjeqnF0FQNGNeDZ350WMsJxHsBSYhFN47M7Ig87C43XQmPo0ui/+XzEPkShPTnzJjidZgIuRpS1NikaxB8swMjUtTqddSIlWHPw1Mf4kKnq+Eetbw5/zosJO2naTGkOYRFaZ+Y6pCVgv8TbJ5dksUs4Itu72eiRp6ZCyiiuddfcGtamP6pJ6VJGhFLOmOMTJxRDgm+zkQLBl5hLgxD1G388B9eDFF+glefhuILjKIpt9aRIcsoX8w5Pp+F46JrvAbAjAGjlxIoJbcD388H11SO382TA+VvXN1j0Yrps4rYKHi9a/6HlJKGAbiZmsdKUYU48Efsnnn8QQtKF+c0+cXLf6O8AiCKNB2nAfUzqlmRTPkRO1VUSLdoS7BCBYWsV+b1U0l4AwdzlC2PIs/n/rZhxOUFcLhd5RAY2U5c9kfUZcjB/kB0VCY/dv+8TdKddLsgzdU95le4jPGd9V5BhTrT+M8dgQ7KmHX9sksoIfN634uSe5NUXjMXbtcLlY2n1nm2EzPcahYw9wZZVUhkf5vZICQBPaDD7RtmA/Loxjyey1S855TsIrxhK70XfOm86C/EQ/AdnbTJ05RQZvaGA4tc3P4sBkGZOAHJnGlz2cKsuRoOjHWFg/nlzU5NuacUoBL9PwJn7SUtTKHZSO/7pkV19Xq9F/2qygC 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: On 7/11/24 4:13 PM, Vlastimil Babka wrote: > On 7/10/24 7:43 AM, alexs@kernel.org wrote: >> 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. And selected SLAB_OBJ_EXT for MEMCG, just for >> SLAB_MATCH(memcg_data, obj_exts), even no other relationship between them. >> >> Above action make memcg_data exposed and include SLAB_OBJ_EXT for >> !MEMCG. That's incorrect in logcial and pay on code size. >> >> 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. And decouple the SLAB_OBJ_EXT from >> MEMCG in next patch. >> >> Signed-off-by: Alex Shi (Tencent) >> Cc: Randy Dunlap >> Cc: Yoann Congal >> Cc: Masahiro Yamada >> Cc: Petr Mladek >> Cc: Suren Baghdasaryan >> Cc: Vlastimil Babka >> --- >> v1->v3: take Vlastimil's suggestion and move SLAB_OBJ_EXT/MEMCG decouple >> to 2nd patch. >> --- >> include/linux/mm_types.h | 8 ++++++-- >> mm/slab.h | 4 ++++ >> 2 files changed, 10 insertions(+), 2 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; >> >> -#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 >> >> /* >> @@ -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..8ffdd4f315f8 100644 >> --- a/mm/slab.h >> +++ b/mm/slab.h >> @@ -98,7 +98,11 @@ 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); >> +#else >> +SLAB_MATCH(_unused_slab_obj_ext, obj_exts); >> +#endif >> #endif > > Why not also #ifdef / #elif like above, instead of this nesting? Uh, it works too if MEMCG/SLAB_OBJ_EXT decoupled. but right, it could be written with #ifdef/#elif. Thanks Alex > >> #undef SLAB_MATCH >> static_assert(sizeof(struct slab) <= sizeof(struct page)); >