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 5BCABC3DA47 for ; Thu, 11 Jul 2024 08:13:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D59A36B0092; Thu, 11 Jul 2024 04:13:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE2DA6B0095; Thu, 11 Jul 2024 04:13:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0E9A6B0096; Thu, 11 Jul 2024 04:13:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 8A1816B0092 for ; Thu, 11 Jul 2024 04:13:13 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0B169A2216 for ; Thu, 11 Jul 2024 08:13:13 +0000 (UTC) X-FDA: 82326756666.24.49F17AF Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf11.hostedemail.com (Postfix) with ESMTP id AA91440029 for ; Thu, 11 Jul 2024 08:13:10 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=kvnlSRMP; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=rC6RTVVe; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=kvnlSRMP; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=rC6RTVVe; spf=pass (imf11.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720685558; 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=iXv7ArpG3e8N4OhGTgyHxbykD3wgp31n59XMlfWeuSw=; b=qX6ZKM3v1csVGet4ab7hnNpWtWT6GeGX1LfQvE+RV6n98+azaqoAY3+opnfdJ1CtFSmeiM Hqdv+4hAWrxyfnnnYHFQo7GUGT3OoG9Mj3nauEav3c0mYU9y6QDJnGASPt9COux0tgi038 gnRe4imMGvJnV4Mhyl0vzArIbeqgJ3w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720685558; a=rsa-sha256; cv=none; b=pQ+EIeHJjP9eRd2FN4UOUZPniwRfQL+WjZo1OM8D/77fUdzmzh6vDChPxYCKkNsGQzrh8r Q24xsasMX0S+P7Xs8KrDATRQjdQ3Ml6ZJ6J3vlTYi4cOuLQIeZH1tzabooLLEeHhmpzk2M IvR+lB4GEd1dUC5PYztXINSF2zSsofU= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=kvnlSRMP; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=rC6RTVVe; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=kvnlSRMP; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=rC6RTVVe; spf=pass (imf11.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2C2052191C; Thu, 11 Jul 2024 08:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1720685589; h=from:from:reply-to: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:autocrypt:autocrypt; bh=iXv7ArpG3e8N4OhGTgyHxbykD3wgp31n59XMlfWeuSw=; b=kvnlSRMPMh3rHHVP8q9jJbWJbQzel3IyMGmIgXBL5sTOxtjCDYgdESKylma8IvJo6S/lKy 6GzjlrMtcCCezcni5w3tEAU+XriDWJNT0foMSxfdkQvrkAcz/IsyyHaTXtaAFMEWF9C9th L4m7hT2cdzFTTinkniKwaVVM1Mzxd4E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1720685589; h=from:from:reply-to: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:autocrypt:autocrypt; bh=iXv7ArpG3e8N4OhGTgyHxbykD3wgp31n59XMlfWeuSw=; b=rC6RTVVe4IeWhNpgRYcCvKuXzzfiBLKrRtbM91yGZCk97MbmT4aKo813oolL4Jxu71Ulwx PdtGhfRflL13kSAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1720685589; h=from:from:reply-to: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:autocrypt:autocrypt; bh=iXv7ArpG3e8N4OhGTgyHxbykD3wgp31n59XMlfWeuSw=; b=kvnlSRMPMh3rHHVP8q9jJbWJbQzel3IyMGmIgXBL5sTOxtjCDYgdESKylma8IvJo6S/lKy 6GzjlrMtcCCezcni5w3tEAU+XriDWJNT0foMSxfdkQvrkAcz/IsyyHaTXtaAFMEWF9C9th L4m7hT2cdzFTTinkniKwaVVM1Mzxd4E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1720685589; h=from:from:reply-to: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:autocrypt:autocrypt; bh=iXv7ArpG3e8N4OhGTgyHxbykD3wgp31n59XMlfWeuSw=; b=rC6RTVVe4IeWhNpgRYcCvKuXzzfiBLKrRtbM91yGZCk97MbmT4aKo813oolL4Jxu71Ulwx PdtGhfRflL13kSAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0F027136AF; Thu, 11 Jul 2024 08:13:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sHFQAxWUj2ZsHgAAD6G6ig (envelope-from ); Thu, 11 Jul 2024 08:13:09 +0000 Message-ID: <42afbce8-7746-438f-ba3a-c997a2c702e5@suse.cz> Date: Thu, 11 Jul 2024 10:13:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 1/2] mm/memcg: alignment memcg_data define condition Content-Language: en-US To: 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> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: <20240710054336.190410-1-alexs@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: AA91440029 X-Stat-Signature: kj6m5hqae6mygs7usnitz5rsxiin74t1 X-HE-Tag: 1720685590-915558 X-HE-Meta: U2FsdGVkX19kRhMkke/6Lf8vVsAbemzhT3qYFTOiocsol4cmYYlRZCH0cs1JUR7F8gWAKEIf594URrY+9YOZnFAttEB+N3MQ4tvvfx6QOi46jsxy73pxTMB5SbMNDXe5Q3o8I/4VlLSi4a0Y8yxXJMEHBLVF/ovJuiXGKptReDFQXCntIRx0LodUnJ6219UJQF5A/FUwMpWOEH7vnOTJrn6Vc9TH8ofOmKdIq9ex09gSnkJXo+b0ImzzZGkPyJPHr4QVTF2DxEpzjrv9ujyZW8IVGTYvUJN5OdYWzgdfZ9ezOYEDarjR8UZartV7eVLabhz10d/30BXJpjcnoDB9hRG4ir8UpPUY73+HBUjM1OOk2autC0PF/qO7jVcIeJnEqqGeOVKiLaVg0A7qFYuugCqBEGQbp5qSSgEUSHaloSmIcUI+ptoj5LdMidezLjPA6KD2JBCP1Fw0ztzKjc3uKlYqHQI8n1HgpGzZcu07bcul2AVfhXRMQft/dB8YM2uL9N5d3RMrKCZ3cHKpo8L6bmHXZSxZgadXzl1WSCs9m8jLd7FhmvJGSWHFq4RGMYQUrLC9NSL5vXjKLjcu65n1ADNE0BAxm0X860ICvsSx9GY/L5ShBNlNyFS9Hh+sZmsLq3SZWHRqCRZsTgiI5Nj+ig+0xbsNGi8LfqIG7mUgr8ZERzEabrXoN/IapZGHXI2Ft6az9SGjvqSd4wgkEJFnIDnA57qLCpqSU3dzDb71/F8KoNZ1P4m09C/EaHpJO8Tct1OqNWsbzo1XZW/Y8QwKys/WHELFR54u5bPr6Zj5x+ybgS+ymnjRWQVQblPaoZGXjH8Mv1GLrgzjZTJA5Xjqxsa28o+pjuvcPKJC7Ptl3nPVMPEC9ynDAU2QwVONy8xY4Mji8llGGwrsJFcaHE6WxaL7reULP+fGF/YqZsbO6XL4fbti60UtCZrvn3zDf60HdIKtcki9+PjtXhhb0qe UpJQ474T 0G/mNJ0h8jxaZGwWaXQ9UTj4qOenaG8fzCtKX50kCQC8hyOQtsS4iWwXNT2qXUNpMbK15cT9Gw59eqeO3qRkJ9TbRezzAwJ79lKrhOEjfkGyLYULBE/f9SsNTu4kTRW807AhxDVLvx3b4iYn3ZpzVSoohDl7SIdo0J9503c2CbkqOAbvzmbVoxiP48g2dY7nef+4ZOsWBcFtgai6vgh04cypBU/nnDQvJly6RQZchKAAva3A2AZHTL1eAXwrYoZ/Li2kjduBLA6xby5hSGZwcgU21qqHIk3Mo8LO9dopf2++aOPcuytRfUvas2RFcavj8VpCRzfhIs4wEsJhsBW7kg4roL18kpbWuCz0Y+Cs40xqvcwrujD4hkuSC5Gn+bdi0GFca/TNoiKQ6eOEtMP2/O7bUf+AqSy/ceN5Gf2LYZbNBQENmLm9SdMPE22UEFokJh4I/fMOaboMjnfTcXz25vd9u68GqvlfCTVZiqlRohv44sOkd/O+qtSNU1eAJVmoKKASUjb+sYzGZJqukh0tH3pM2UzrIMLhSCSGfl0NRPmlyRcuOfpGSxN7E8IES824y4JbkL4rbUGCc2bg= 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/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? > #undef SLAB_MATCH > static_assert(sizeof(struct slab) <= sizeof(struct page));