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 D3527D31769 for ; Tue, 5 Nov 2024 17:35:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61F016B0088; Tue, 5 Nov 2024 12:35:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CE5D6B0089; Tue, 5 Nov 2024 12:35:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44BF76B008A; Tue, 5 Nov 2024 12:35:07 -0500 (EST) 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 237DE6B0088 for ; Tue, 5 Nov 2024 12:35:07 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CE3BFC167D for ; Tue, 5 Nov 2024 17:35:06 +0000 (UTC) X-FDA: 82752740532.07.64B32E9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 417FD40022 for ; Tue, 5 Nov 2024 17:34:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=efT2tFFg; spf=pass (imf01.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=1730828020; 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=1mUnNkdhUU0vKrW5HhuOr6BbhCUcWOAVXK2JluGYHBw=; b=b0QZy4hjZcf6PuoMqB8pyaxIKp6P36u9RDDyh/+3oIvCOb8Wq82Y3u+b9pvoOlz1FQnjEk NQMPWrJFFElYn4j/uJdjKsqpo4DkmfDxM7GfD9QDQnlTuN4Lt4NfzX2/EaF92n2Td0kuOC mz3qI2X/wGpBKMC+fpngOLOJzZHysrs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730828020; a=rsa-sha256; cv=none; b=DXbKaVRMe5YgD0f2XbL/I5ZQF5sOREjfmtaA/aw6Y96v4nZx8Aj1H7kBGuyUvtqOx8VxFW B9XQt8y0TlAtaT1YtiH59qkTG4O7AEobbqTy5eiG9DCNoaeR15c+C0WG0eJDHE0W4azcvb 3Dp1jTcVEICQuxJA2g02VzxYJHoIMkc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=efT2tFFg; spf=pass (imf01.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=1730828103; 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=1mUnNkdhUU0vKrW5HhuOr6BbhCUcWOAVXK2JluGYHBw=; b=efT2tFFgXHMVvzbNGd3G8EJB7h0rRsj1wUgTjs4eLduTXY+m3ecKgANzXHWPra0mjtGoVw rmM5BoyOaCXKC7BPpkOfYZyyPK0igGZOo1E/L8njNThs4D8FOsaBV9uCMb5y8CyWQS6Ntw KYRlb0iG+/LRNiup4FNhQp/JTp5oaIw= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-92-9ZR0onlhMDGO0B-jOVwPWg-1; Tue, 05 Nov 2024 12:35:01 -0500 X-MC-Unique: 9ZR0onlhMDGO0B-jOVwPWg-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-37d3e8dccc9so3174537f8f.1 for ; Tue, 05 Nov 2024 09:35:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730828100; x=1731432900; 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=1mUnNkdhUU0vKrW5HhuOr6BbhCUcWOAVXK2JluGYHBw=; b=bMuM+pKY/eltAk3mUlr98KoW01sOITtLfma32YSTRmsncEAe7qS3gBZ/vTnkUy1W0r VBQw3NwEACtAXJRfk3H/7as4WDBFb/wxvuNy4y41eF4AG3Ux4V7J5BTtY5FzSSKrUz9d 5QA1wAxaVivGNfcLvNwXZ68DDiqnv3Gad5ZUU+KoDOYE/dxOFgKHOPdiDjVJlVXf4Zk+ fozrVLNnm7pOv6cdcGQd1sKdLp/EKID06prG7OHuDhlHAp5fPQNlPfXfxk44Tnu8ptiA fSwDn0UzLNNqNxynbHI8BYygRbMm/9t7czWqM80ihOsDujTQeS3S0cCpaomvzcwGQtIF GygQ== X-Forwarded-Encrypted: i=1; AJvYcCWL/25wkH7Va8XmQgvdqTS63+U6X1GV66Sg8Sa/XjFJXzbPPEILyVMmjTloLo+6G6Zb7WvsqVFEiQ==@kvack.org X-Gm-Message-State: AOJu0YxA7oFSD+rPkfy3H6BV3AS0j+EKxT47hxyMAPsFknxRsC6ubQBt uSp8dDtl9vlUM0udqzymkroS2DV3fki1Iq2rdEDp4wULIef1QbHBogqo+F2t046hC/euVm3ibYu xHa1ng4fjFURoF3EyRbqCWfk+xhLSYrn8hZ9Lnxjn39bKYjyv X-Received: by 2002:a5d:59a4:0:b0:37e:f8a1:596e with SMTP id ffacd0b85a97d-381be7ad255mr18796237f8f.11.1730828100533; Tue, 05 Nov 2024 09:35:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEb67RXG7gg4reG9aH+APrEu5DU88SXNov5UkfGKKI1PQMJ8lrhhXBBktuE4+XOvNor+097fw== X-Received: by 2002:a5d:59a4:0:b0:37e:f8a1:596e with SMTP id ffacd0b85a97d-381be7ad255mr18796216f8f.11.1730828100155; Tue, 05 Nov 2024 09:35:00 -0800 (PST) Received: from ?IPV6:2003:cb:c73b:db00:b0d7:66ca:e3e9:6528? (p200300cbc73bdb00b0d766cae3e96528.dip0.t-ipconnect.de. [2003:cb:c73b:db00:b0d7:66ca:e3e9:6528]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4327d698405sm200578605e9.41.2024.11.05.09.34.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Nov 2024 09:34:59 -0800 (PST) Message-ID: Date: Tue, 5 Nov 2024 18:34:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] mm: Simplify split_page_memcg() To: "Matthew Wilcox (Oracle)" , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt Cc: Muchun Song , cgroups@vger.kernel.org, linux-mm@kvack.org References: <20241104210602.374975-1-willy@infradead.org> <20241104210602.374975-3-willy@infradead.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20241104210602.374975-3-willy@infradead.org> X-Mimecast-Spam-Score: 0 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: rspam10 X-Stat-Signature: qnzi9ftj4ych9yk7z6sbk6i9suzzptt8 X-Rspamd-Queue-Id: 417FD40022 X-Rspam-User: X-HE-Tag: 1730828078-581827 X-HE-Meta: U2FsdGVkX19jJctAg0TcX3FQzcBTRTexzc6VsUIf0MbVwHA2+938B53Wiw/PXO4PS3nRzgeClGNiYbwfg2nasPP+zduk1FU3ifp28AH4EV9D8BZbVSlQYH9eUKYD6jTqarUIZfBpowGLRsXG2oI8N16rq8V2vXdsc+sojWaSkUxM8+g/iXK0WKs0OizjWBeZazH2jWnzDJXK6rXb9cfS7XAT9o2vF74smCkeTRwxtargUxMY1qiNQc/LC4a1QtobsOByJS9b3LjvnonUPCmUTAs9mYB+iiuiuAYe/fA75SNzEJqI3ExDTUv1S6dvvKlRdQjRhqG/okUoFQ3tMS1OiMsVX9MvAe0O9xHt1yUuujGLVPRObS0vt0Rxazqu7AOBDYmEqBNejZgsXQB+OQtnUfo5JoquajmdBZ6NqJotJRg8N73yC7T2xNEZ7AHuCDgWU6A/zV0xGY8iaOhJx3K6LKWZM2/KMrYD/CxzrBXmwq8kz7JHPkmGw9m+nbHTNmzO86hC21dJytEGA6vuWdVpNp8bRzciloIrE7LGzF7OKcxMZbY+iPc+PndESOdEULpqiEtmsmlDPurluVLgBQ0hp0Fh8qCoMN0X+Psd7nbUiCrGjGBFgXLB56fL76/kxz7bcwBQ/JorkJxdaTM4IjyPFLhiCPkhBFue6x9075a1tk0HZfVmUlCZy/TDo+dfLQA+rnb45wUbltIX9jYTydfmMy8+SgiA3UZW5ZH6L4zmTA9em2wi/t6WtI+xywUTF83YGC8shEougkpi/oUuoyKru0rniBYmEglZEGYGfVP5+v0aT21WbX+qC0gNceyIwWD84j0YqrgSxEIAyHSknJxnqbup//C9FS69sbI9AMYJ/qVNMaPGZSQu3Nt2VgJT6UlZr8uLALmCr4xoXV6d4ALBqMzXbfiLAtp4OOHzhELOk1objFeG3b4vkjQQ4hocrcFQPW5yGvyPVWYdrAA0HZB PlQwaEbl a+vqeHksfktThz6kIrBL0e1ye9fYOcS0THn/yDpg3Q+s/cVBO0aoi+1u77mgKkuRDOUO4KMSJlgPoDNzJ38YJ+AcR8RvB4aMCIl6f+mDugzvSnTwz+HlneUvoHh6GB/itXpjyeA2DoGj8jkB6hyH8lvYGZKZWMg2mIHpFqMzUvxNhUsBFfrD/VC7e2xAy4+MVa1CCg/FAKVrG9oCTL2tfd4YR53yRLWFFrRT4DVl1NfA+zOuAIsg7EPz+b0iLJ5jGHj7FFi25HFuLkxdBUi4JbaZTINxlf3aTqTJiGtwDZ9YwLpQZtKULXPWAzqcbloiql8dIod3oE0udm6omT6/E+pM820u7hRv8CuFHnLmSxD3aV9HdKYSVfbOf7ERMG/SZjIhHS7C5/+GWGoTmpiwR+nwHHwTTuQnSx6zoDSrXbtHCJ7JBBe3qUzJnPhMjXzVsXvpwjhgPNbm2Gyj1YYhMlbe3xlIn+N+qPJMXoAdh5IUHIfEmbtFw4OqKE6Pdz2yx6ESl 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 04.11.24 22:05, Matthew Wilcox (Oracle) wrote: > The last argument to split_page_memcg() is now always 0, so remove it, > effectively reverting commit b8791381d7ed. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > include/linux/memcontrol.h | 4 ++-- > mm/memcontrol.c | 26 ++++++++++++++------------ > mm/page_alloc.c | 4 ++-- > 3 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 5502aa8e138e..a787080f814f 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1044,7 +1044,7 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, > rcu_read_unlock(); > } > > -void split_page_memcg(struct page *head, int old_order, int new_order); > +void split_page_memcg(struct page *first, int order); > > #else /* CONFIG_MEMCG */ > > @@ -1463,7 +1463,7 @@ void count_memcg_event_mm(struct mm_struct *mm, enum vm_event_item idx) > { > } > > -static inline void split_page_memcg(struct page *head, int old_order, int new_order) > +static inline void split_page_memcg(struct page *first, int order) > { > } > #endif /* CONFIG_MEMCG */ > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5e44d6e7591e..506439a5dcfe 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3034,25 +3034,27 @@ void __memcg_slab_free_hook(struct kmem_cache *s, struct slab *slab, > } > > /* > - * Because folio_memcg(head) is not set on tails, set it now. > + * The memcg data is only set on the first page, now transfer it to all the > + * other pages. > */ > -void split_page_memcg(struct page *head, int old_order, int new_order) > +void split_page_memcg(struct page *first, int order) > { > - struct folio *folio = page_folio(head); > + unsigned long memcg_data = first->memcg_data; > + struct obj_cgroup *objcg; > int i; > - unsigned int old_nr = 1 << old_order; > - unsigned int new_nr = 1 << new_order; > + unsigned int nr = 1 << order; > > - if (mem_cgroup_disabled() || !folio_memcg_charged(folio)) > + if (!memcg_data) > return; > > - for (i = new_nr; i < old_nr; i += new_nr) > - folio_page(folio, i)->memcg_data = folio->memcg_data; > + VM_BUG_ON_PAGE((memcg_data & OBJEXTS_FLAGS_MASK) != MEMCG_DATA_KMEM, > + first); > + objcg = (void *)(memcg_data & ~OBJEXTS_FLAGS_MASK); I'm not sure if dropping the if (mem_cgroup_disabled() || !folio_memcg_charged(folio)) end adding that OBJEXTS_FLAGS_MASK magic here is the right thing to do. It also isn't really part of a revert of b8791381d7ed. -- Cheers, David / dhildenb