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 26EFFC433EF for ; Fri, 13 May 2022 17:40:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60BA16B0080; Fri, 13 May 2022 13:40:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 593416B0081; Fri, 13 May 2022 13:40:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 434AE6B0082; Fri, 13 May 2022 13:40:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2E2246B0080 for ; Fri, 13 May 2022 13:40:44 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F1444460 for ; Fri, 13 May 2022 17:40:43 +0000 (UTC) X-FDA: 79461434766.15.3265934 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by imf04.hostedemail.com (Postfix) with ESMTP id 66AF9400CD for ; Fri, 13 May 2022 17:40:32 +0000 (UTC) Received: by mail-qv1-f48.google.com with SMTP id f3so7185537qvi.2 for ; Fri, 13 May 2022 10:40:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=MZPDNReCfpGOB46frlHXLcrwoU/2JHKCaMINteeNS58=; b=LWcEgmvM2iK0qZTqQp9MSeRiVcJxA4lCI4VND7AaIC0dLxcTI/uCD9+538JVv9CRgX i4v5XsE0dld9H0pt+MRNdrKtPdU61U4gbuFlpve02RjgF670d8xeCdPcED/KMHhzpp3W gEsnwetJ7yvF9VllCOJ83gObWwbkGS3tbEgRFUFXjjNj5rHD8bWrvJ80phBk+rrn+pHZ vrnrGLfeEYNlp9POC9VrkWRWcOhmczjU5lnzrC2MxPNmvLsGg6jPG72+866P/Ba3ubXo pDA7bLmTKF9aGPONbKH+sydtx1FOTG8x1MxqphaKIRXD602YGiK8rBDsiuCPR66IEMly giaw== X-Gm-Message-State: AOAM5326o/VkA6QZgdVYHpvnRElLDLlEWDuirsg5b8ZrZWWM/TYIkyYA tzaNK46katq3nWhK55i3n50= X-Google-Smtp-Source: ABdhPJzp7kF41QYLvl7mWpcQEP8IwMsLosXZMY7YCtTDaXVD4DMh7jSdnT14/vWxbkpYN3ZvbpIWhg== X-Received: by 2002:ad4:5bc1:0:b0:42c:3700:a6df with SMTP id t1-20020ad45bc1000000b0042c3700a6dfmr5395752qvt.94.1652463642530; Fri, 13 May 2022 10:40:42 -0700 (PDT) Received: from dev0025.ash9.facebook.com (fwdproxy-ash-119.fbsv.net. [2a03:2880:20ff:77::face:b00c]) by smtp.gmail.com with ESMTPSA id y68-20020a37af47000000b0069fc13ce1f3sm1723568qke.36.2022.05.13.10.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 May 2022 10:40:42 -0700 (PDT) Date: Fri, 13 May 2022 10:40:40 -0700 From: David Vernet To: Michal =?utf-8?Q?Koutn=C3=BD?= Cc: 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, roman.gushchin@linux.dev, shakeelb@google.com, tj@kernel.org, Richard Palethorpe Subject: Re: [PATCH 1/4] selftests: memcg: Fix compilation Message-ID: <20220513174040.x5fgcla3q3cqkeck@dev0025.ash9.facebook.com> 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: <20220513171811.730-2-mkoutny@suse.com> User-Agent: NeoMutt/20211029 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 66AF9400CD Authentication-Results: imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of dcvernet@gmail.com designates 209.85.219.48 as permitted sender) smtp.mailfrom=dcvernet@gmail.com; dmarc=none X-Rspam-User: X-Stat-Signature: h3qhat6za4j6x63aux85t5bphbirc37k X-HE-Tag: 1652463632-771903 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 07:18:08PM +0200, Michal Koutný 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 > Thanks for the fix, Michal. Reviewed-by: David Vernet