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 89D36C433EF for ; Tue, 14 Dec 2021 09:39:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C40AC6B0071; Tue, 14 Dec 2021 04:39:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF14A6B0072; Tue, 14 Dec 2021 04:39:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB8856B0074; Tue, 14 Dec 2021 04:39:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0018.hostedemail.com [216.40.44.18]) by kanga.kvack.org (Postfix) with ESMTP id 9C63E6B0071 for ; Tue, 14 Dec 2021 04:39:01 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5FCBC8249980 for ; Tue, 14 Dec 2021 09:38:51 +0000 (UTC) X-FDA: 78915900462.25.A7040FB Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf07.hostedemail.com (Postfix) with ESMTP id 789C04000A for ; Tue, 14 Dec 2021 09:38:50 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 0BCE92113A; Tue, 14 Dec 2021 09:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1639474729; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DZOd/YlnoT6tjCOMidF4fHVU5QDgu/mXU178ktIvi5s=; b=kuEtYIU7reYiVep3MAXrOtg9r/HPOo3becXk8V6gOocQyNceBmW9ZvQ7CnlAkD7kC4cmOK GJTjoFlDbqJGuc3/oBRu3gf1HFGFEpzUgDQMDv858fev78o1v1fGcun5kHpqo+4T2K2fs0 xeRmqbHfcE8mmD7Xx4OCuWMl+JXehhA= Received: from suse.cz (unknown [10.100.201.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 6D2ADA3B8F; Tue, 14 Dec 2021 09:38:48 +0000 (UTC) Date: Tue, 14 Dec 2021 10:38:47 +0100 From: Michal Hocko To: Dan Schatzberg Cc: Andrew Morton , Roman Gushchin , Chris Down , Johannes Weiner , Tejun Heo , Zefan Li , Jonathan Corbet , Vladimir Davydov , "open list:CONTROL GROUP (CGROUP)" , "open list:DOCUMENTATION" , open list , "open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)" Subject: Re: [PATCH] mm: add group_oom_kill memory.event fix Message-ID: References: <20211213162511.2492267-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211213162511.2492267-1-schatzberg.dan@gmail.com> X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 789C04000A X-Stat-Signature: b67ncfuiso1kjbs6amek9tegm9mqa85q Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=kuEtYIU7; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf07.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com X-HE-Tag: 1639474730-164291 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 Mon 13-12-21 08:25:10, Dan Schatzberg wrote: > Andrew, could you please amend the prior patch "mm: add group_oom_kill > memory.event" with these changes from Johannes and Chris? > > Also - small nit: it makes better sense to > s/group_oom_kill/oom_group_kill/g in the patch title. Agreed. This is more in line with the oom.group knob we export. > > Reviewed-by: Roman Gushchin > Acked-by: Chris Down > Acked-by: Johannes Weiner > Signed-off-by: Dan Schatzberg With these changes feel free to add Acked-by: Michal Hocko > --- > Documentation/admin-guide/cgroup-v2.rst | 3 +-- > mm/memcontrol.c | 3 --- > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst > index eec830ce2068..8269bfa240f4 100644 > --- a/Documentation/admin-guide/cgroup-v2.rst > +++ b/Documentation/admin-guide/cgroup-v2.rst > @@ -1269,8 +1269,7 @@ PAGE_SIZE multiple when read back. > killed by any kind of OOM killer. > > oom_group_kill > - The number of times all tasks in the cgroup were killed > - due to memory.oom.group. > + The number of times a group OOM has occurred. > > memory.events.local > Similar to memory.events but the fields in the file are local > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5ab3b9ce90de..b5454d8fc344 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4390,9 +4390,6 @@ static int mem_cgroup_oom_control_read(struct seq_file *sf, void *v) > seq_printf(sf, "under_oom %d\n", (bool)memcg->under_oom); > seq_printf(sf, "oom_kill %lu\n", > atomic_long_read(&memcg->memory_events[MEMCG_OOM_KILL])); > - seq_printf(sf, "oom_group_kill %lu\n", > - atomic_long_read( > - &memcg->memory_events[MEMCG_OOM_GROUP_KILL])); > return 0; > } > > -- > 2.30.2 -- Michal Hocko SUSE Labs