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 778B9C433EF for ; Fri, 13 May 2022 19:10:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA4176B0073; Fri, 13 May 2022 15:09:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2A9F6B0075; Fri, 13 May 2022 15:09:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCB0A6B0078; Fri, 13 May 2022 15:09:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BA44F6B0073 for ; Fri, 13 May 2022 15:09:59 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 928D060C69 for ; Fri, 13 May 2022 19:09:59 +0000 (UTC) X-FDA: 79461659718.04.AF45A80 Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by imf23.hostedemail.com (Postfix) with ESMTP id 2EE911400B5 for ; Fri, 13 May 2022 19:09:44 +0000 (UTC) Date: Fri, 13 May 2022 12:09:52 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1652468997; 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; bh=kCBVoc6lYe16FY7d0e0dFTCVD0ucTi0jf0UlBuTq+3o=; b=Ocf9FoXp8spyscHpEzxfyBuEOGxocpgRSSfg462ROFs8S7hILkbn49hl1CDgBKLH9cNJlZ JUMNb2PXigJ7yZtVDsU8lVoqTXBLgUgbNITjQfu53A3A0kHU63xoqRjW6JqCcoExP2DO61 yqOSGlRPdTrIIBJZpzdZ0g9IU+alaeo= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Michal =?iso-8859-1?Q?Koutn=FD?= Cc: void@manifault.com, akpm@linux-foundation.org, cgroups@vger.kernel.org, hannes@cmpxchg.org, kernel-team@fb.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhocko@kernel.org, shakeelb@google.com, tj@kernel.org, Richard Palethorpe Subject: Re: [PATCH 1/4] selftests: memcg: Fix compilation Message-ID: References: <20220512174452.tr34tuh4k5jm6qjs@dev0025.ash9.facebook.com> <20220513171811.730-1-mkoutny@suse.com> <20220513171811.730-2-mkoutny@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 2EE911400B5 X-Stat-Signature: uk3ntwhx5ozzsbwyz1adibsd9uosk44y Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Ocf9FoXp; spf=pass (imf23.hostedemail.com: domain of roman.gushchin@linux.dev designates 94.23.1.103 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-HE-Tag: 1652468984-994150 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 Fri, May 13, 2022 at 11:53:26AM -0700, Roman Gushchin wrote: > On Fri, May 13, 2022 at 07:18:08PM +0200, Michal Koutny wrote: > > This fixes mis-applied changes from commit 72b1e03aa725 ("cgroup: > > account for memory_localevents in test_memcg_oom_group_leaf_events()"). > > > > Signed-off-by: Michal Koutný > > --- > > .../selftests/cgroup/test_memcontrol.c | 25 +++++++++++-------- > > 1 file changed, 14 insertions(+), 11 deletions(-) > > > > diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c > > index 6ab94317c87b..4958b42201a9 100644 > > --- a/tools/testing/selftests/cgroup/test_memcontrol.c > > +++ b/tools/testing/selftests/cgroup/test_memcontrol.c > > @@ -1241,7 +1241,16 @@ static int test_memcg_oom_group_leaf_events(const char *root) > > if (cg_read_key_long(child, "memory.events", "oom_kill ") <= 0) > > goto cleanup; > > > > - if (cg_read_key_long(parent, "memory.events", "oom_kill ") <= 0) > > + parent_oom_events = cg_read_key_long( > > + parent, "memory.events", "oom_kill "); > > + /* > > + * If memory_localevents is not enabled (the default), the parent should > > + * count OOM events in its children groups. Otherwise, it should not > > + * have observed any events. > > + */ > > + if (has_localevents && parent_oom_events != 0) > > + goto cleanup; > > + else if (!has_localevents && parent_oom_events <= 0) > > goto cleanup; > > > > ret = KSFT_PASS; > > @@ -1349,20 +1358,14 @@ static int test_memcg_oom_group_score_events(const char *root) > > if (!cg_run(memcg, alloc_anon, (void *)MB(100))) > > goto cleanup; > > > > - parent_oom_events = cg_read_key_long( > > - parent, "memory.events", "oom_kill "); > > - /* > > - * If memory_localevents is not enabled (the default), the parent should > > - * count OOM events in its children groups. Otherwise, it should not > > - * have observed any events. > > - */ > > - if ((has_localevents && parent_oom_events == 0) || > > - parent_oom_events > 0) > > - ret = KSFT_PASS; > > + if (cg_read_key_long(memcg, "memory.events", "oom_kill ") != 3) > > + FAIL(cleanup); > > > > if (kill(safe_pid, SIGKILL)) > > goto cleanup; > > > > + ret = KSFT_PASS; > > + > > cleanup: > > if (memcg) > > cg_destroy(memcg); > > -- > > 2.35.3 > > > > My bad. Actually not, as pointed by David. Seems like it's git fault. The original patch looks correct.