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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 470D9C433EF for ; Tue, 5 Oct 2021 10:50:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BF29E61425 for ; Tue, 5 Oct 2021 10:50:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BF29E61425 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 47924900002; Tue, 5 Oct 2021 06:50:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42A446B0071; Tue, 5 Oct 2021 06:50:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F146900002; Tue, 5 Oct 2021 06:50:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0028.hostedemail.com [216.40.44.28]) by kanga.kvack.org (Postfix) with ESMTP id 2150C6B006C for ; Tue, 5 Oct 2021 06:50:11 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id CC1D52DD77 for ; Tue, 5 Oct 2021 10:50:10 +0000 (UTC) X-FDA: 78662064180.30.DBBDF32 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf22.hostedemail.com (Postfix) with ESMTP id 5439B1903 for ; Tue, 5 Oct 2021 10:50:10 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4018322399; Tue, 5 Oct 2021 10:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1633431009; 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; bh=2DQaqPggyWWoMxTaHdXWjVgb1l7WIagrAmguoKg/TnA=; b=msbAxrcHNubAn4zcdV6E1sjtDeOExeet6Mk1x5PUjh5jk4CYXlnUsbHi7l5lErdO8Pr3rt Kty8j4tjrm+his1g8oAdAa+8rbUxPJemSspEcbeZrOUnAoLgCnIV2/Yju3ddhjs/fC2yRn I9fYpJEQbzEkY05n8+os4d/UVagTtC4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1633431009; 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; bh=2DQaqPggyWWoMxTaHdXWjVgb1l7WIagrAmguoKg/TnA=; b=33vDENUIGNRWQAb7RlL6sSYQ2YLfGmED7HTQCx9nMia+qHjH+MfivbCfE4Zh6mCpfT92LA mHO++pdnkc/8vWCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id EC2A613C2B; Tue, 5 Oct 2021 10:50:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id jyGIOOAtXGGsKgAAMHmgww (envelope-from ); Tue, 05 Oct 2021 10:50:08 +0000 Message-ID: <25db026b-76bc-cad3-7913-c310fc6cd822@suse.cz> Date: Tue, 5 Oct 2021 12:50:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.2 Subject: Re: [PATCH 5/5] mm, slub: fix incorrect memcg slab count for bulk free Content-Language: en-US To: Miaohe Lin , akpm@linux-foundation.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com Cc: gregkh@linuxfoundation.org, faiyazm@codeaurora.org, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, thgarnie@google.com, keescook@chromium.org, bharata@linux.ibm.com, guro@fb.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20210916123920.48704-1-linmiaohe@huawei.com> <20210916123920.48704-6-linmiaohe@huawei.com> From: Vlastimil Babka In-Reply-To: <20210916123920.48704-6-linmiaohe@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 5439B1903 X-Stat-Signature: ibbufk9d1ag57ksgaqe9a9g3irrk3k59 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=msbAxrcH; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=33vDENUI; spf=pass (imf22.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-HE-Tag: 1633431010-653627 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: On 9/16/21 14:39, Miaohe Lin wrote: > kmem_cache_free_bulk() will call memcg_slab_free_hook() for all objects > when doing bulk free. So we shouldn't call memcg_slab_free_hook() again > for bulk free to avoid incorrect memcg slab count. > > Fixes: d1b2cf6cb84a ("mm: memcg/slab: uncharge during kmem_cache_free_bulk()") > Signed-off-by: Miaohe Lin Reviewed-by: Vlastimil Babka I now noticed the series doesn't Cc: stable and it should, so I hope Andrew can add those together with the review tags. Thanks. > --- > mm/slub.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/slub.c b/mm/slub.c > index f3df0f04a472..d8f77346376d 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3420,7 +3420,9 @@ static __always_inline void do_slab_free(struct kmem_cache *s, > struct kmem_cache_cpu *c; > unsigned long tid; > > - memcg_slab_free_hook(s, &head, 1); > + /* memcg_slab_free_hook() is already called for bulk free. */ > + if (!tail) > + memcg_slab_free_hook(s, &head, 1); > redo: > /* > * Determine the currently cpus per cpu slab. >