From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH 4/4] selftests: memcg: Remove protection from top level memcg Date: Fri, 13 May 2022 19:18:11 +0200 Message-ID: <20220513171811.730-5-mkoutny@suse.com> References: <20220512174452.tr34tuh4k5jm6qjs@dev0025.ash9.facebook.com> <20220513171811.730-1-mkoutny@suse.com> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1652462321; 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=nGOjxaCmozTaID0zJr5Qv3xqJGJFYW6IddaRszUZ5Io=; b=dcwHbrpOZZGq4sZL0dOj2zRX5fkU64ob6AlrrVT/bt7LHf5Ile5wwbwVsc9cDSFohUKRz+ QnaJy5RMBF3fbRdRRhS5l7TwtqiF+ZnIknwF4efi0G1mBDRXrrVDKWJ4EEViBOvx778RsR 0zwUeiqRJIGqFgegSEOmB1OTPOda+vo= In-Reply-To: <20220513171811.730-1-mkoutny-IBi9RG/b67k@public.gmane.org> List-ID: Content-Type: text/plain; charset="macroman" To: void-gq6j2QGBifHby3iVrkZq2A@public.gmane.org Cc: akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org, kernel-team-b10kYP2dOMg@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, mhocko-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, mkoutny-IBi9RG/b67k@public.gmane.org, roman.gushchin-fxUVXftIFDnyG1zEObXtfA@public.gmane.org, shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, Richard Palethorpe VGhlIHJlY2xhaW0gaXMgdHJpZ2dlcmVkIGJ5IG1lbW9yeSBsaW1pdCBpbiBhIHN1YnRyZWUsIHRo ZXJlZm9yZSB0aGUKdGVzdGNhc2UgZG9lcyBub3QgbmVlZCBjb25maWd1cmVkIHByb3RlY3Rpb24g YWdhaW5zdCBleHRlcm5hbCByZWNsYWltLgoKQWxzbywgY29ycmVjdC9kZWR1cGxpY2F0ZSByZXNw ZWN0aXZlIGNvbW1lbnRzCgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWwgS291dG7DvSA8bWtvdXRueS1J Qmk5UkcvYjY3a0BwdWJsaWMuZ21hbmUub3JnPgotLS0KIHRvb2xzL3Rlc3Rpbmcvc2VsZnRlc3Rz L2Nncm91cC90ZXN0X21lbWNvbnRyb2wuYyB8IDEyICsrKystLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy90 ZXN0aW5nL3NlbGZ0ZXN0cy9jZ3JvdXAvdGVzdF9tZW1jb250cm9sLmMgYi90b29scy90ZXN0aW5n L3NlbGZ0ZXN0cy9jZ3JvdXAvdGVzdF9tZW1jb250cm9sLmMKaW5kZXggOWZmYWNmMDI0YmJkLi45 ZDM3MGFhZmQ3OTkgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL2Nncm91cC90 ZXN0X21lbWNvbnRyb2wuYworKysgYi90b29scy90ZXN0aW5nL3NlbGZ0ZXN0cy9jZ3JvdXAvdGVz dF9tZW1jb250cm9sLmMKQEAgLTI0Nyw3ICsyNDcsNyBAQCBzdGF0aWMgaW50IGNnX3Rlc3RfcHJv Y19raWxsZWQoY29uc3QgY2hhciAqY2dyb3VwKQogCiAvKgogICogRmlyc3QsIHRoaXMgdGVzdCBj cmVhdGVzIHRoZSBmb2xsb3dpbmcgaGllcmFyY2h5OgotICogQSAgICAgICBtZW1vcnkubWluID0g NTBNLCAgbWVtb3J5Lm1heCA9IDIwME0KKyAqIEEgICAgICAgbWVtb3J5Lm1pbiA9IDAsICAgIG1l bW9yeS5tYXggPSAyMDBNCiAgKiBBL0IgICAgIG1lbW9yeS5taW4gPSA1ME0sICBtZW1vcnkuY3Vy cmVudCA9IDUwTQogICogQS9CL0MgICBtZW1vcnkubWluID0gNzVNLCAgbWVtb3J5LmN1cnJlbnQg PSA1ME0KICAqIEEvQi9EICAgbWVtb3J5Lm1pbiA9IDI1TSwgIG1lbW9yeS5jdXJyZW50ID0gNTBN CkBAIC0yNTcsNyArMjU3LDcgQEAgc3RhdGljIGludCBjZ190ZXN0X3Byb2Nfa2lsbGVkKGNvbnN0 IGNoYXIgKmNncm91cCkKICAqIFVzYWdlcyBhcmUgcGFnZWNhY2hlLCBidXQgdGhlIHRlc3Qga2Vl cHMgYSBydW5uaW5nCiAgKiBwcm9jZXNzIGluIGV2ZXJ5IGxlYWYgY2dyb3VwLgogICogVGhlbiBp dCBjcmVhdGVzIEEvRyBhbmQgY3JlYXRlcyBhIHNpZ25pZmljYW50Ci0gKiBtZW1vcnkgcHJlc3N1 cmUgaW4gaXQuCisgKiBtZW1vcnkgcHJlc3N1cmUgaW4gQS4KICAqCiAgKiBBL0IgICAgbWVtb3J5 LmN1cnJlbnQgfj0gNTBNCiAgKiBBL0IvQyAgbWVtb3J5LmN1cnJlbnQgfj0gMjlNCkBAIC0zMzUs OCArMzM1LDYgQEAgc3RhdGljIGludCB0ZXN0X21lbWNnX21pbihjb25zdCBjaGFyICpyb290KQog CQkJICAgICAgKHZvaWQgKikobG9uZylmZCk7CiAJfQogCi0JaWYgKGNnX3dyaXRlKHBhcmVudFsw XSwgIm1lbW9yeS5taW4iLCAiNTBNIikpCi0JCWdvdG8gY2xlYW51cDsKIAlpZiAoY2dfd3JpdGUo cGFyZW50WzFdLCAibWVtb3J5Lm1pbiIsICI1ME0iKSkKIAkJZ290byBjbGVhbnVwOwogCWlmIChj Z193cml0ZShjaGlsZHJlblswXSwgIm1lbW9yeS5taW4iLCAiNzVNIikpCkBAIC00MDQsOCArNDAy LDggQEAgc3RhdGljIGludCB0ZXN0X21lbWNnX21pbihjb25zdCBjaGFyICpyb290KQogCiAvKgog ICogRmlyc3QsIHRoaXMgdGVzdCBjcmVhdGVzIHRoZSBmb2xsb3dpbmcgaGllcmFyY2h5OgotICog QSAgICAgICBtZW1vcnkubG93ID0gNTBNLCAgbWVtb3J5Lm1heCA9IDIwME0KLSAqIEEvQiAgICAg bWVtb3J5LmxvdyA9IDUwTSwgIG1lbW9yeS5jdXJyZW50ID0gNTBNCisgKiBBICAgICAgIG1lbW9y eS5sb3cgPSAwLCAgICBtZW1vcnkubWF4ID0gMjAwTQorICogQS9CICAgICBtZW1vcnkubG93ID0g NTBNLCAgbWVtb3J5LmN1cnJlbnQgPSAuLi4KICAqIEEvQi9DICAgbWVtb3J5LmxvdyA9IDc1TSwg IG1lbW9yeS5jdXJyZW50ID0gNTBNCiAgKiBBL0IvRCAgIG1lbW9yeS5sb3cgPSAyNU0sICBtZW1v cnkuY3VycmVudCA9IDUwTQogICogQS9CL0UgICBtZW1vcnkubG93ID0gMCwgICAgbWVtb3J5LmN1 cnJlbnQgPSA1ME0KQEAgLTQ5MCw4ICs0ODgsNiBAQCBzdGF0aWMgaW50IHRlc3RfbWVtY2dfbG93 KGNvbnN0IGNoYXIgKnJvb3QpCiAJCQlnb3RvIGNsZWFudXA7CiAJfQogCi0JaWYgKGNnX3dyaXRl KHBhcmVudFswXSwgIm1lbW9yeS5sb3ciLCAiNTBNIikpCi0JCWdvdG8gY2xlYW51cDsKIAlpZiAo Y2dfd3JpdGUocGFyZW50WzFdLCAibWVtb3J5LmxvdyIsICI1ME0iKSkKIAkJZ290byBjbGVhbnVw OwogCWlmIChjZ193cml0ZShjaGlsZHJlblswXSwgIm1lbW9yeS5sb3ciLCAiNzVNIikpCi0tIAoy LjM1LjMKCg== 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 6AA93C433EF for ; Fri, 13 May 2022 17:18:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BC1D6B0075; Fri, 13 May 2022 13:18:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7348E6B0080; Fri, 13 May 2022 13:18:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A9D86B0075; Fri, 13 May 2022 13:18:43 -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 06E466B0075 for ; Fri, 13 May 2022 13:18:43 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id D696680299 for ; Fri, 13 May 2022 17:18:42 +0000 (UTC) X-FDA: 79461379284.15.837E26A Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf31.hostedemail.com (Postfix) with ESMTP id 595D5200AD for ; Fri, 13 May 2022 17:18:18 +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-out2.suse.de (Postfix) with ESMTPS id 5048F1F972; Fri, 13 May 2022 17:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1652462321; 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=nGOjxaCmozTaID0zJr5Qv3xqJGJFYW6IddaRszUZ5Io=; b=dcwHbrpOZZGq4sZL0dOj2zRX5fkU64ob6AlrrVT/bt7LHf5Ile5wwbwVsc9cDSFohUKRz+ QnaJy5RMBF3fbRdRRhS5l7TwtqiF+ZnIknwF4efi0G1mBDRXrrVDKWJ4EEViBOvx778RsR 0zwUeiqRJIGqFgegSEOmB1OTPOda+vo= 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 0DD6713446; Fri, 13 May 2022 17:18:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qKJ7AvGSfmIeUgAAMHmgww (envelope-from ); Fri, 13 May 2022 17:18:41 +0000 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: void@manifault.com 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, mkoutny@suse.com, roman.gushchin@linux.dev, shakeelb@google.com, tj@kernel.org, Richard Palethorpe Subject: [PATCH 4/4] selftests: memcg: Remove protection from top level memcg Date: Fri, 13 May 2022 19:18:11 +0200 Message-Id: <20220513171811.730-5-mkoutny@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220513171811.730-1-mkoutny@suse.com> References: <20220512174452.tr34tuh4k5jm6qjs@dev0025.ash9.facebook.com> <20220513171811.730-1-mkoutny@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 595D5200AD X-Stat-Signature: pt8akfwjjwz5yjesnb9gy116m87wdesj X-Rspam-User: Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=dcwHbrpO; spf=pass (imf31.hostedemail.com: domain of mkoutny@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mkoutny@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com X-HE-Tag: 1652462298-219895 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: The reclaim is triggered by memory limit in a subtree, therefore the testcase does not need configured protection against external reclaim. Also, correct/deduplicate respective comments Signed-off-by: Michal Koutný --- tools/testing/selftests/cgroup/test_memcontrol.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 9ffacf024bbd..9d370aafd799 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -247,7 +247,7 @@ static int cg_test_proc_killed(const char *cgroup) /* * First, this test creates the following hierarchy: - * A memory.min = 50M, memory.max = 200M + * A memory.min = 0, memory.max = 200M * A/B memory.min = 50M, memory.current = 50M * A/B/C memory.min = 75M, memory.current = 50M * A/B/D memory.min = 25M, memory.current = 50M @@ -257,7 +257,7 @@ static int cg_test_proc_killed(const char *cgroup) * Usages are pagecache, but the test keeps a running * process in every leaf cgroup. * Then it creates A/G and creates a significant - * memory pressure in it. + * memory pressure in A. * * A/B memory.current ~= 50M * A/B/C memory.current ~= 29M @@ -335,8 +335,6 @@ static int test_memcg_min(const char *root) (void *)(long)fd); } - if (cg_write(parent[0], "memory.min", "50M")) - goto cleanup; if (cg_write(parent[1], "memory.min", "50M")) goto cleanup; if (cg_write(children[0], "memory.min", "75M")) @@ -404,8 +402,8 @@ static int test_memcg_min(const char *root) /* * First, this test creates the following hierarchy: - * A memory.low = 50M, memory.max = 200M - * A/B memory.low = 50M, memory.current = 50M + * A memory.low = 0, memory.max = 200M + * A/B memory.low = 50M, memory.current = ... * A/B/C memory.low = 75M, memory.current = 50M * A/B/D memory.low = 25M, memory.current = 50M * A/B/E memory.low = 0, memory.current = 50M @@ -490,8 +488,6 @@ static int test_memcg_low(const char *root) goto cleanup; } - if (cg_write(parent[0], "memory.low", "50M")) - goto cleanup; if (cg_write(parent[1], "memory.low", "50M")) goto cleanup; if (cg_write(children[0], "memory.low", "75M")) -- 2.35.3