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 34A19E7717F for ; Tue, 10 Dec 2024 08:30:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD47E6B0136; Tue, 10 Dec 2024 03:30:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B83A46B0138; Tue, 10 Dec 2024 03:30:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D5946B0139; Tue, 10 Dec 2024 03:30:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7F1946B0136 for ; Tue, 10 Dec 2024 03:30:04 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4174F120635 for ; Tue, 10 Dec 2024 08:30:04 +0000 (UTC) X-FDA: 82878376266.18.FA92AC0 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf25.hostedemail.com (Postfix) with ESMTP id 49AECA0012 for ; Tue, 10 Dec 2024 08:29:46 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=WrXofa2J; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=o1+KVgnT; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=WrXofa2J; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=o1+KVgnT; dmarc=none; spf=pass (imf25.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733819392; 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=ApdSLR0r8cd970X2qr0oOIJrWO2V7cAKvQY5rDwxHLs=; b=w/7Nk7OwzxAMfaydhg4Tp7mQ5Rf2Xfy8xbpWgtO8ibN4GZo7u3/PbkMD+b0+s+BlKddQVf DKKVenatIMK2j5rrz2L3B+QjijUPLP7W0BT0uWZsbDw8fLbtISqIZLi/DHumhx6mHwrq36 rFhvh8IFtqZ1xp7e3dbnd4wMvoI+yKE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733819392; a=rsa-sha256; cv=none; b=S73jkU+DoMc069ZpPinNlI5wXfco72tJpKwVzv01Ii6TrYPFPhJZ56uIG1eFENlevTfZXq kp9tQfYpNMwXA1cwPjmVKPlm+5H8ocRw0htTGC+EDVi8ciXwyfo3VT3FBr1vHaRB3N7AZn guxL1QejC/m9M2igmVoM27yRMLfCjk4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=WrXofa2J; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=o1+KVgnT; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=WrXofa2J; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=o1+KVgnT; dmarc=none; spf=pass (imf25.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz 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 03CE72116C; Tue, 10 Dec 2024 08:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1733819400; 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=ApdSLR0r8cd970X2qr0oOIJrWO2V7cAKvQY5rDwxHLs=; b=WrXofa2JK+JbsXDnhzOMDmTAjc/vOe1RL0CmqEudu755eLGlqSfKuK1MA+h4XkA5OiNxES k6h6OCv1LhZn3M+4nX5s34iaeL2+/+ZFFAF4PMLUdxiG4FmUzUcJc/3MCecSAsm0W96qNN FERMOEz4a7xV4OH37miTxrjSAupVrL4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1733819400; 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=ApdSLR0r8cd970X2qr0oOIJrWO2V7cAKvQY5rDwxHLs=; b=o1+KVgnT9tF7i2bJ1D9/8zB6tZwNEio4CTv8tegBVMqNMRZikedE9D7QHMzbi3pU7Ods6k Kv1XGwjruKfgt1Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1733819400; 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=ApdSLR0r8cd970X2qr0oOIJrWO2V7cAKvQY5rDwxHLs=; b=WrXofa2JK+JbsXDnhzOMDmTAjc/vOe1RL0CmqEudu755eLGlqSfKuK1MA+h4XkA5OiNxES k6h6OCv1LhZn3M+4nX5s34iaeL2+/+ZFFAF4PMLUdxiG4FmUzUcJc/3MCecSAsm0W96qNN FERMOEz4a7xV4OH37miTxrjSAupVrL4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1733819400; 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=ApdSLR0r8cd970X2qr0oOIJrWO2V7cAKvQY5rDwxHLs=; b=o1+KVgnT9tF7i2bJ1D9/8zB6tZwNEio4CTv8tegBVMqNMRZikedE9D7QHMzbi3pU7Ods6k Kv1XGwjruKfgt1Bg== 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 D95A113A15; Tue, 10 Dec 2024 08:29:59 +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 vsy4NAf8V2d2HwAAD6G6ig (envelope-from ); Tue, 10 Dec 2024 08:29:59 +0000 Message-ID: <5a047afd-1e9f-4e68-8c8a-d5b0b5506bb3@suse.cz> Date: Tue, 10 Dec 2024 09:29:59 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] memcg: slub: fix SUnreclaim for post charged objects To: Shakeel Butt , Andrew Morton Cc: Yosry Ahmed , Roman Gushchin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Meta kernel team References: <20241210040657.3441287-1-shakeel.butt@linux.dev> From: Vlastimil Babka Content-Language: en-US Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: <20241210040657.3441287-1-shakeel.butt@linux.dev> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: menryaetjs7tb6anyxwtj854tohpuetc X-Rspamd-Queue-Id: 49AECA0012 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1733819386-966300 X-HE-Meta: U2FsdGVkX18lPECdIIgTbWg5JZqxJJqbU2dWrbh+Pgghlo3wHnXEm9omaEO046ob2jAlALPLkZyVmiLzKsgiSbJyHNKIZjx7z4ZJM61fmJRMw28e2QWZ20QKsz/8ckekCINq6Icut2HHzfw3GHYDQt5AsY3E3IXqddtOsVPhpu9IZ6D8xBRTBWJv/4fWvF/fk8a/uge7wa5GgSEr4gssQjvk3hPy4bq3vlyLMXEIpo18YhIFsl6P+ZLpSJxpyoRf0/GMqxRPXcgJjAjA1ggbba6UdMV5yS+LCOk4UobyTB4rPD8zJMS7h3P+VpMqxoIAwP9dpAyDzF38gUWWDwzB9ozpyC0TO1OrSNlGjMd8F0RW6dBuUGYx/9Si4li60jUjwBco6JslL8hXKNcTEn5emrRHD6Uawtj8oY3imrUMrBCw/xSd0YcIiMlC0OBf4rvvfNSCihOMsf6eQNPRFiX1qhbpbd167+Dlm79R1Kvk/72J0YAtJR/EtyYi9y0tCTp1rsxJioAhlJeNAlQh8nAxWTCsbF0lH8et2VxVpYbvz9q+q3T+qxOoIpfooWKghURBRfJTapLuPwUu4fCEktp4f/O6tu4dfgBKyx6mYUlQuynQGTpxAno5DZguDZAj2O3ABkOb08DTk5j8Hgnq0JOoAKSfxL4Yqul2ExvgVTmKPxBekIwjmqjka+FiZ9g2ETc33Qkb+kZCiJYCNhe9t5UmBaqOPXtY7+nlQr7InAq7WESGbw0YXU9eXKxE2tI9JjPIa5IjM0aZC9sAsDQD1AYaYgwu+dn89YFGRReewf5YomuBkXSW02qMkFQ/KUzeizjgKeA06oin1YXpVHpaODMVVz3NQw/7c8WIdgt94hKqLRAx77r4cO5trCcKpdLrzvD9LCmp8MHA1Zy6+2WBewNxksej8TSlRJnbSlssDsrFf27sBwS3jUBHv+KyBjK2x4p/HmQOu3plhqRzgLHupwf sXW/+h9b pkHRhzIg2HoVgzu58yJFgmp82w8+BQGREmx7gPlaAm41Oh/10YncUTBSXoVZi7t1wen86DCr53k+a4R3r7WjlaLaoVoXgom5dvrxYIQENE+vIkkjPXEk120T9O0/KMW2Up2gEKXSrEeaTI++86vFiU+FqR/zo9zfv0+SPrBgACr9HP5fXBmSZ/jlRmDJOtCFJwIPELXP+v8nYxS0aBeAlRLa9q1mUdhntow6IjKsW8D0XpgDzSY5BtfumIIle/XPl/qGtuUXCrluwrLsfAXYx0Ap2J2ihokI0wSo1 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 12/10/24 05:06, Shakeel Butt wrote: > Large kmalloc directly allocates from the page allocator and then use > lruvec_stat_mod_folio() to increment the unreclaimable slab stats for > global and memcg. However when post memcg charging of slab objects was > added in commit 9028cdeb38e1 ("memcg: add charging of already allocated > slab objects"), it missed to correctly handle the unreclaimable slab > stats for memcg. > > One user visisble effect of that bug is that the node level > unreclaimable slab stat will work correctly but the memcg level stat can > underflow as kernel correctly handles the free path but the charge path > missed to increment the memcg level unreclaimable slab stat. Let's fix > by correctly handle in the post charge code path. > > Fixes: 9028cdeb38e1 ("memcg: add charging of already allocated slab objects") That's a 6.12-rc1 commit so I'm adding cc stable. > Signed-off-by: Shakeel Butt Queued in slab/for-next-fixes, thanks! Vlastimil > --- > mm/slub.c | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index f62c829b7b6b..88bf2bf51bd6 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -2189,9 +2189,24 @@ bool memcg_slab_post_charge(void *p, gfp_t flags) > > folio = virt_to_folio(p); > if (!folio_test_slab(folio)) { > - return folio_memcg_kmem(folio) || > - (__memcg_kmem_charge_page(folio_page(folio, 0), flags, > - folio_order(folio)) == 0); > + int size; > + > + if (folio_memcg_kmem(folio)) > + return true; > + > + if (__memcg_kmem_charge_page(folio_page(folio, 0), flags, > + folio_order(folio))) > + return false; > + > + /* > + * This folio has already been accounted in the global stats but > + * not in the memcg stats. So, subtract from the global and use > + * the interface which adds to both global and memcg stats. > + */ > + size = folio_size(folio); > + node_stat_mod_folio(folio, NR_SLAB_UNRECLAIMABLE_B, -size); > + lruvec_stat_mod_folio(folio, NR_SLAB_UNRECLAIMABLE_B, size); > + return true; > } > > slab = folio_slab(folio);