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 1F78EC19F32 for ; Wed, 5 Mar 2025 18:49:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78F6528001E; Wed, 5 Mar 2025 13:49:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 71570280019; Wed, 5 Mar 2025 13:49:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5430B28001D; Wed, 5 Mar 2025 13:49:04 -0500 (EST) 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 24CE1280019 for ; Wed, 5 Mar 2025 13:49:04 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D0EF4B0D21 for ; Wed, 5 Mar 2025 10:30:02 +0000 (UTC) X-FDA: 83187127044.28.9B6057C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 11D348000D for ; Wed, 5 Mar 2025 10:29:59 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fZh3vfUL; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741170600; 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=DwfrVJB2IPkMjhKdEJbWHuXqPqDoaFm43Z3NiVADH/M=; b=4nqOMraBrvz+kFN8Nh5+1X0GHUmM8Uty9Nti/ABa8vVoCkeZs6H6RToEWncAkhHt9ug6LK 538HVXFB9CRTA10i0sj8cpVPF/cx/CwtjnS0thmtmTIafGfvgA7uSpsajtQlhnP3XBSD0I lnkQerTFelFE7xdqvzvf5tUWrORQqoo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741170600; a=rsa-sha256; cv=none; b=fijZQnBOMIEH38czosLyRUVZr2K3ubmBKhDirUJIo8IyZ0OR0JMOQr6HRpkYT0EL/BUJCp LcKYGXd24v7rUQ9Tw+fIghLu7qkBYRa4ZwCs6aJ8MCi9zv8ABhFq0bDzraFasCXvGYtt5d jj97Ib8VSk4IWbovVHq1y8c+v4trsPQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fZh3vfUL; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741170599; h=from:from: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:autocrypt:autocrypt; bh=DwfrVJB2IPkMjhKdEJbWHuXqPqDoaFm43Z3NiVADH/M=; b=fZh3vfULo/RqEKU58tfpvrrgZ4/Kf3F2OYBxl/+gN+g8EmimaELkfazC5U77+8785WDzG1 TUtSQeKkk+jU9ARIarFPqkKFerURRW2Xe5o+GcbhHeVNPd45qu1lbcOU8jAM2Wm9tT3zp1 VF6rdwqDVfMId4MH11sXzOuk2yNbYg8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-05RqrLURP6qH3BqTGuBylw-1; Wed, 05 Mar 2025 05:29:58 -0500 X-MC-Unique: 05RqrLURP6qH3BqTGuBylw-1 X-Mimecast-MFC-AGG-ID: 05RqrLURP6qH3BqTGuBylw_1741170597 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-390fd681712so1816816f8f.3 for ; Wed, 05 Mar 2025 02:29:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741170597; x=1741775397; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from: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=DwfrVJB2IPkMjhKdEJbWHuXqPqDoaFm43Z3NiVADH/M=; b=WnTtq3PeQJ9ZQsedKJ7L5YzwbJ/jgIS38PgzQMgKXCzK434cZ9dLJYoV/3xmKhCstm EOkBtb8PbekK9RkIAGx5fCnuiVv6vT+6KEDT4ZBLU9Xe50Cs5VWTA5sXOrUvc1aP5dd7 jaimYQ3APlLTAOlLUMsju83vsyTZ7cxfgbusAMQI6nZxhXmVy5DU5Drw1EBegRBRRqLi /o9XDK/gFYydySnEsKk0fxdF0/2jezqKHGs1RwLsMGKfGKY9Sy/bdxZikD1TVZTJ0YQN 0aC4ceVpSdLzi6VMFhyPVd9cT5a5Y7SJoQZjXp2NOIAWR3ZLkUnbyfgTIRV10kfQG5pz 9eJg== X-Forwarded-Encrypted: i=1; AJvYcCUCP+bsRuFX7HJocVO+b8mdIUnKieSWudy0fnm0IoPpBi1CDkCdj8DZYllK7gI1cXO5wmwW2cqVXg==@kvack.org X-Gm-Message-State: AOJu0YzSQnDSTq6c/aOCbtBOP5YSCA+15fggahSRKFs6gdRhkbxQ8mUg Pp5h9s5V3GcvJIrKfxYZ2yqd7MUOi/F+6U4eZFRobLcwr2IguO2s3b/KUdT4ZTgCq7KBIV3NkXu v3qdI8W0A8talvvZQDglN2oruE/rKcDPPehSqnMsloSBCsbqN X-Gm-Gg: ASbGncv+A8aoU5s0TXXDrp2fKvqPyNzjV+dFSfeMVXpZZ5vDkTiKW3dvH4qX0962vdu k5i6G+93JPo47PvR/U79NRMSjkvW9P3QDbjZyxGaeIO2RDa6xKXm0ayclmhGEFN6LEyLacrUYmA sxm9nSXirFWFK7lzgGl5vbUaRFp4uagYzVbjhRChQQ6fUpjZiiBrZcDq7lfEPZy6ryG63dGtc6r zNoOvJqiSlSxKT/DM8SZPeqnhVXxa3exKw2vstkSdwETZEENrPfQlwz9RPt4baIIIOo+ABQST9s /hrV5j0xDv6i1PxCz/8V4JN42oiavO8nJQBHrYlOtNrizMU81A== X-Received: by 2002:a5d:6c62:0:b0:38f:503a:d93f with SMTP id ffacd0b85a97d-3911f7b349cmr1849709f8f.40.1741170596793; Wed, 05 Mar 2025 02:29:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWt7nqNGJWcxZ3sniy7h3PrfZcFzKDyC306gbJ7KAAn7ebAdfJmPYIrJ3yzoj/ABCPOc+44w== X-Received: by 2002:a5d:6c62:0:b0:38f:503a:d93f with SMTP id ffacd0b85a97d-3911f7b349cmr1849668f8f.40.1741170596371; Wed, 05 Mar 2025 02:29:56 -0800 (PST) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47a6a9fsm20821992f8f.36.2025.03.05.02.29.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Mar 2025 02:29:55 -0800 (PST) Message-ID: Date: Wed, 5 Mar 2025 11:29:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 03/20] mm: let _folio_nr_pages overlay memcg_data in first tail page To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?UTF-8?Q?Michal_Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , "Kirill A. Shutemov" , Stephen Rothwell References: <20250303163014.1128035-1-david@redhat.com> <20250303163014.1128035-4-david@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250303163014.1128035-4-david@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _eJXr4eyOX3MG_NnlRs2UbVj3cXsH_zSw71wbBrsl20_1741170597 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Stat-Signature: jk9uxosdq7gw1wyyjceeponbobuquyja X-Rspamd-Queue-Id: 11D348000D X-Rspam-User: X-HE-Tag: 1741170599-772788 X-HE-Meta: U2FsdGVkX193cZ/ckLCg4GgYw4qxGV6byRkwAc/rhFREEoKueXs11rIsWS3l0TQBpVGXAT/hrCMIMtZhTwRf9ZL7CfwQ1SyRErBU10xMLY4LWz2G4BPlsgBN6MubN8QYMb3dv66popp2uVBPiuMB6cPb7CKk/2IbQ9dtGRKRqsMNvnw27XCVLhFWlD5KK5dO3eb5Yrx1xfY49Rbv2gQiHJ3NLovpTsgUYMOVl1SWALJq+kKreEVwbHklnaa/QlAw7DaMUax1hjb1uD/qDiqjj9mqZ4jTQyDrZcQrkNFR7K/6e46RFyva/aHe+oE4GTYG7d2xiI1rl7L30IYM3/L+9SPxsk4nNX81ovb5yFlLN/8hL5TTWRLNRsjAHrM13q1mvkcEO0t8ipdKU5hhK8uW5Ahn9DGsngu6zDdyuO5Yn7vWPQvYAs24tOke++bWJCdYs3Sz33E5/YgdPGx4EY34PUBUIdM+/EyT0BMaDQO2/IuuAv4K8iDMn3EoFfuhDrhPW08uzgjkRHWYAIQbzXlHAoeCzCu/30bLS7dqvjrIOCwuVLYUWFl7PyLN8A/1hRIp8794SS7dJRZXHRaA5gxxTqZAHHT33XuyOQFoivoxMCr8dR5gtJC8uJc662BOBbtcyWihAA3W/lLmIk8q9nZgZ+kLA7INxhX2Ef9YblpHuTRjO0Nw1idtoLQS6nB7MUss0zSo6xdMT9wHGp1v0pOZjCS2W98E41hrY6zVbNWgILClUhgg2vVxDHnM1PVRQ4YGnlQtiAqy/330/oHg9DvQyJ/Vbp7UHHqQMS6Iu6ooB/9Qk1LcHpJLv4CLEfUHxDKV8Pkb2mbFdiDgqiHaCNghxKcKnmAZUuV496UJxZDX775ifvfmswV3R5/WwO0tJnW5uGeL1kn12DoDjN8vCMAvpKfSp5ZJ8xEJUEcIry1CdrZytZXAnZxWEDQtkOtwrxiyNwSHcUvrWx8QPCTmoJw 2QkXMRfB DaIEgu1OvnTMpTa93pLyHoO3C93Es7HRDEemfLBHZSRgaEO23BkzuQBOYWAGZAYejHngUFo7wrCJTAd7mZ0DEr9y1uE614eyKQ+LwraMMZFnJ3v2cJqxEzp0G8acXJ4KVbZWz0UHvQdRYlw/Oki4+vbixymBKUm3LKODUhjSqedF0owTBfnqf2MZqKZ0IdVVjD8Np4kcCjNb5jxoxmyECMmyhPkFzX6bM+HNm/IHI7c1IRCvDESA56JQjysrYXZpRCOtM8w9O9ClDyKba2Hh6S0cKCJbzZL7F0WtV6nxdGFlvhf9CoIMGXWvp8ZTqfDEtl8Nk/EmOEk8R/gDLjaZupeu5ex6DSOsHuCY86SjPAm2PFSj7rcPJaICbSevZTBtJifkYCV2R+Q+fV4iuwSPpU9Bo7d9LBpdPvxa2O3sVTt6EKO79hGuOWXH3Uqdv+wksp3G7YUz/6kmEkfVY6luo471yz8CwXZ0IYYuYWqVIzImzICE7smJxetEuiHrV/4oSmAF6rqwpXh1THUc= 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 03.03.25 17:29, David Hildenbrand wrote: > Let's free up some more of the "unconditionally available on 64BIT" > space in order-1 folios by letting _folio_nr_pages overlay memcg_data in > the first tail page (second folio page). Consequently, we have the > optimization now whenever we have CONFIG_MEMCG, independent of 64BIT. > > We have to make sure that page->memcg on tail pages does not return > "surprises". page_memcg_check() already properly refuses PageTail(). > Let's do that earlier in print_page_owner_memcg() to avoid printing > wrong "Slab cache page" information. No other code should touch that > field on tail pages of compound pages. > > Reset the "_nr_pages" to 0 when splitting folios, or when freeing them > back to the buddy (to avoid false page->memcg_data "bad page" reports). > > Note that in __split_huge_page(), folio_nr_pages() would stop working > already as soon as we start messing with the subpages. > > Most kernel configs should have at least CONFIG_MEMCG enabled, even if > disabled at runtime. 64byte "struct memmap" is what we usually have > on 64BIT. > > While at it, rename "_folio_nr_pages" to "_nr_pages". > > Hopefully memdescs / dynamically allocating "strut folio" in the future > will further clean this up, e.g., making _nr_pages available in all > configs and maybe even in small folios. Doing that should be fairly easy > on top of this change. > > Reviewed-by: Kirill A. Shutemov > Signed-off-by: David Hildenbrand > --- > include/linux/mm.h | 4 ++-- > include/linux/mm_types.h | 30 ++++++++++++++++++++++-------- > mm/huge_memory.c | 16 +++++++++++++--- > mm/internal.h | 4 ++-- > mm/page_alloc.c | 6 +++++- > mm/page_owner.c | 2 +- > 6 files changed, 45 insertions(+), 17 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index a743321dc1a5d..694704217df8a 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -1199,10 +1199,10 @@ static inline unsigned int folio_large_order(const struct folio *folio) > return folio->_flags_1 & 0xff; > } > > -#ifdef CONFIG_64BIT > +#ifdef NR_PAGES_IN_LARGE_FOLIO > static inline long folio_large_nr_pages(const struct folio *folio) > { > - return folio->_folio_nr_pages; > + return folio->_nr_pages; > } > #else > static inline long folio_large_nr_pages(const struct folio *folio) > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > index 689b2a7461892..e81be20bbabc6 100644 > --- a/include/linux/mm_types.h > +++ b/include/linux/mm_types.h > @@ -287,6 +287,11 @@ typedef struct { > unsigned long val; > } swp_entry_t; > > +#if defined(CONFIG_MEMCG) || defined(CONFIG_SLAB_OBJ_EXT) > +/* We have some extra room after the refcount in tail pages. */ > +#define NR_PAGES_IN_LARGE_FOLIO > +#endif > + > /** > * struct folio - Represents a contiguous set of bytes. > * @flags: Identical to the page flags. > @@ -312,7 +317,7 @@ typedef struct { > * @_large_mapcount: Do not use directly, call folio_mapcount(). > * @_nr_pages_mapped: Do not use outside of rmap and debug code. > * @_pincount: Do not use directly, call folio_maybe_dma_pinned(). > - * @_folio_nr_pages: Do not use directly, call folio_nr_pages(). > + * @_nr_pages: Do not use directly, call folio_nr_pages(). > * @_hugetlb_subpool: Do not use directly, use accessor in hugetlb.h. > * @_hugetlb_cgroup: Do not use directly, use accessor in hugetlb_cgroup.h. > * @_hugetlb_cgroup_rsvd: Do not use directly, use accessor in hugetlb_cgroup.h. > @@ -377,13 +382,20 @@ struct folio { > unsigned long _flags_1; > unsigned long _head_1; > /* public: */ > - atomic_t _large_mapcount; > - atomic_t _entire_mapcount; > - atomic_t _nr_pages_mapped; > - atomic_t _pincount; > -#ifdef CONFIG_64BIT > - unsigned int _folio_nr_pages; > -#endif > + union { > + struct { > + atomic_t _large_mapcount; > + atomic_t _entire_mapcount; > + atomic_t _nr_pages_mapped; > + atomic_t _pincount; > + }; > + unsigned long _usable_1[4]; > + }; > + atomic_t _mapcount_1; > + atomic_t _refcount_1; > +#ifdef NR_PAGES_IN_LARGE_FOLIO > + unsigned int _nr_pages; > +#endif /* NR_PAGES_IN_LARGE_FOLIO */ > /* private: the union with struct page is transitional */ @Andrew The following on top to make htmldoc happy. There will be two conflicts to be resolved in two patches because of the added "/* private: " under "_pincount". It's fairly straight forward to resolve (just keep "/* private:" below any changes), but let me know if I should resend a v4 instead for this. From 9d9ff38c2ea14f1b4dab29f099ec0f6be683f3fe Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Wed, 5 Mar 2025 11:14:52 +0100 Subject: [PATCH] fixup: mm: let _folio_nr_pages overlay memcg_data in first tail page Make "make htmldoc" happy by marking non-private placeholder entries private. Signed-off-by: David Hildenbrand --- include/linux/mm_types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index e81be20bbabc..6062c12c3871 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -381,18 +381,20 @@ struct folio { struct { unsigned long _flags_1; unsigned long _head_1; - /* public: */ union { struct { + /* public: */ atomic_t _large_mapcount; atomic_t _entire_mapcount; atomic_t _nr_pages_mapped; atomic_t _pincount; + /* private: the union with struct page is transitional */ }; unsigned long _usable_1[4]; }; atomic_t _mapcount_1; atomic_t _refcount_1; + /* public: */ #ifdef NR_PAGES_IN_LARGE_FOLIO unsigned int _nr_pages; #endif /* NR_PAGES_IN_LARGE_FOLIO */ -- 2.48.1 -- Cheers, David / dhildenb