From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH 3/4] selftests: memcg: Adjust expected reclaim values of protected cgroups Date: Fri, 13 May 2022 19:18:10 +0200 Message-ID: <20220513171811.730-4-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=p/VfT98eDaSoE5VMKiC0q6OouDpijrF5gH7LM1N1KeA=; b=fVXpbRI/iGLP8RPo840xZVGfonklr2K3QS8qE+DN+oazLFZTP2hlyqjJgLqukjjH2CqpWh PZYP9/xzMNqDE8Jl8jAtu7j1VFr7iFze/ij6U4OD3rGdE9N/B4jOlDbAApp7VMrRWiOGV5 eFIJLzK2Gmv1z5Jcy15l4Yo9/D+vQGs= 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 VGhlIG51bWJlcnMgYXJlIG5vdCBlYXN5IHRvIGRlcml2ZSBpbiBhIGNsb3NlZCBmb3JtIChjZXJ0 YWlubHkgbWVyZQpwcm90ZWN0aW9ucyByYXRpb3MgZG8gbm90IGFwcGx5KSwgdGhlcmVmb3JlIHVz ZSBhIHNpbXVsYXRpb24gdG8gb2J0YWluCmV4cGVjdGVkIG51bWJlcnMuCgpUaGUgbmV3IHZhbHVl cyBtYWtlIHRoZSBwcm90ZWN0aW9uIHRlc3RzIHN1Y2NlZWQgbW9yZSBwcmVjaXNlbHkuCgoJJSBy dW4gYXM6IG9jdGF2ZS1jbGkgc2NyaXB0CgklCgklIElucHV0IGNvbmZpZ3VyYXRpb25zCgklIC0t LS0tLS0tLS0tLS0tLS0tLS0KCSUgRSBwYXJlbnQgZWZmZWN0aXZlIHByb3RlY3Rpb24KCSUgbiBu b21pbmFsIHByb3RlY3Rpb24gb2Ygc2libGluZ3Mgc2V0IGF0IHRoZSBnaXZlbCBsZXZlbAoJJSBj IGN1cnJlbnQgY29uc3VtcHRpb24gLSwsLQoKCSUgZXhhbXBsZSBmcm9tIHRlc3RjYXNlICh2YWx1 ZXMgaW4gR0IpCglFID0gNTAgLyAxMDI0OwoJbiA9IFs3NSAyNSAwIDUwMCBdIC8gMTAyNDsKCWMg PSBbNTAgNTAgNTAgMF0gLyAxMDI0OwoKCSUgUmVjbGFpbSBwYXJhbWV0ZXJzCgklIC0tLS0tLS0t LS0tLS0tLS0tLQoKCSUgTWluaW1hbCByZWNsYWltIGFtb3VudCAoR0IpCgljbHVzdGVyID0gMzIq NCAvIDIqKjIwOwoKCSUgUmVjbGFpbSBjb2VmZmljaWVudCAodGhpbmsgYXMgMC41XnNjLT5wcmlv cml0eSkKCWFscGhhID0gLjEKCgklIFNpbXVsYXRpb24gcGFyYW1ldGVycwoJJSAtLS0tLS0tLS0t LS0tLS0tLS0tLS0KCWVwc2lsb24gPSAxZS03OwoJdGltZW91dCA9IDEwMDA7CgoJJSBTaW11bGF0 aW9uIGxvb3AKCSUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tCgklIFNpbXVsYXRpb24gYXNzdW1lcyBz aWJsaW5ncyBjb25zdW1lZCB0aGUgaW5pdGlhbCBhbW91bnQgb2YgbWVtb3J5ICh3L291dAoJJSBy ZWNsYWltKSBhbmQgdGhlbiB0aGUgcmVjbGFpbSBzdGFydHMsIGFsbCBtZW1vcnkgaXMgcmVjbGFp bWFibGUsIGkuZS4gdHJlYXRlZAoJJSBzYW1lLiBJdCBzaW11bGF0ZXMgb25seSBub24tbG93IHJl Y2xhaW0gYW5kIGFzc3VtZXMgYWxsIG1lbW9yeS5taW4gPSAwLgoKCWNoID0gW107CgllaCA9IFtd OwoJcmggPSBbXTsKCglmb3IgdCA9IDE6dGltZW91dAoJCSUgbG93X3VzYWdlCgkJdSA9IG1pbihj LCBuKTsKCQlzaWJsaW5ncyA9IHN1bSh1KTsKCgkJJSBlZmZlY3RpdmVfcHJvdGVjdGlvbigpCgkJ cHJvdGVjdGVkID0gbWluKG4sIGMpOyAgICAgICAgICAgICAgICAlIHN0YXJ0IHdpdGggbm9taW5h bAoJCWUgPSBwcm90ZWN0ZWQgKiBtaW4oMSwgRSAvIHNpYmxpbmdzKTsgJSBub3JtYWxpemUgb3Zl cmNvbW1pdAoKCQklIHJlY3Vyc2l2ZSBwcm90ZWN0aW9uCgkJdW5jbGFpbWVkID0gbWF4KDAsIEUg LSBzaWJsaW5ncyk7CgkJcGFyZW50X292ZXJ1c2UgPSBzdW0oYykgLSBzaWJsaW5nczsKCQlpZiAo dW5jbGFpbWVkID4gMCAmJiBwYXJlbnRfb3ZlcnVzZSA+IDApCgkJCW92ZXJ1c2UgPSBtYXgoMCwg YyAtIHByb3RlY3RlZCk7CgkJCWUgKz0gdW5jbGFpbWVkICogKG92ZXJ1c2UgLyBwYXJlbnRfb3Zl cnVzZSk7CgkJZW5kaWYKCgkJJSBnZXRfc2Nhbl9jb3VudCgpCgkJciA9IGFscGhhICogYzsgICAg ICAgICAgICAgJSBhc3N1bWUgYWxsIG1lbW9yeSBpcyBpbiBhIHNpbmdsZSBMUlUgbGlzdAoKCQkl IGNvbW1pdCAxYmM2M2ZiMTI3MmIgKCJtbSwgbWVtY2c6IG1ha2Ugc2NhbiBhZ2dyZXNzaW9uIGFs d2F5cyBleGNsdWRlIHByb3RlY3Rpb24iKQoJCXN6ID0gbWF4KGUsIGMpOwoJCXIgLio9ICgxIC0g KGUrZXBzaWxvbikgLi8gKHN6K2Vwc2lsb24pKTsKCgkJJSB1bmNvbW1lbnQgdG8gZGVidWcgcHJp bnRzCgkJJSBlLCBjLCByCgoJCSUgbm90aGluZyB0byByZWNsYWltLCByZWFjaGVkIGVxdWlsaWJy aXVtCgkJaWYgbWF4KHIpIDwgZXBzaWxvbgoJCQlicmVhazsKCQllbmRpZgoKCQklIFNXQVBfQ0xV U1RFUl9NQVgKCQlyID0gbWF4KHIsIChyID4gZXBzaWxvbikgLiogY2x1c3Rlcik7CgkJJSBYWFgg aGVyZSBJIGRvIHBhcmFsbGVsIHJlY2xhaW0gb2YgYWxsIHNpYmxpbmdzCgkJJSBpbiByZWFsaXR5 IHJlY2xhaW0gaXMgc2VyaWFsaXplZCBhbmQgZWFjaCBzaWJsaW5nIHJlY2FsY3VsYXRlcyBvd24g cmVzaWR1YWwKCQljID0gbWF4KGMgLSByLCAwKTsKCgkJY2ggPSBbY2ggOyBjXTsKCQllaCA9IFtl aCA7IGVdOwoJCXJoID0gW3JoIDsgcl07CgllbmRmb3IKCgl0CgljLCBlCgpTaWduZWQtb2ZmLWJ5 OiBNaWNoYWwgS291dG7DvSA8bWtvdXRueS1JQmk5UkcvYjY3a0BwdWJsaWMuZ21hbmUub3JnPgot LS0KIC4uLi9zZWxmdGVzdHMvY2dyb3VwL3Rlc3RfbWVtY29udHJvbC5jICAgICAgICB8IDIwICsr KysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy90ZXN0aW5nL3NlbGZ0ZXN0cy9jZ3JvdXAv dGVzdF9tZW1jb250cm9sLmMgYi90b29scy90ZXN0aW5nL3NlbGZ0ZXN0cy9jZ3JvdXAvdGVzdF9t ZW1jb250cm9sLmMKaW5kZXggZWJhMjUyZmE2NGFjLi45ZmZhY2YwMjRiYmQgMTAwNjQ0Ci0tLSBh L3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL2Nncm91cC90ZXN0X21lbWNvbnRyb2wuYworKysgYi90 b29scy90ZXN0aW5nL3NlbGZ0ZXN0cy9jZ3JvdXAvdGVzdF9tZW1jb250cm9sLmMKQEAgLTI2MCw5 ICsyNjAsOSBAQCBzdGF0aWMgaW50IGNnX3Rlc3RfcHJvY19raWxsZWQoY29uc3QgY2hhciAqY2dy b3VwKQogICogbWVtb3J5IHByZXNzdXJlIGluIGl0LgogICoKICAqIEEvQiAgICBtZW1vcnkuY3Vy cmVudCB+PSA1ME0KLSAqIEEvQi9DICBtZW1vcnkuY3VycmVudCB+PSAzM00KLSAqIEEvQi9EICBt ZW1vcnkuY3VycmVudCB+PSAxN00KLSAqIEEvQi9GICBtZW1vcnkuY3VycmVudCB+PSAwCisgKiBB L0IvQyAgbWVtb3J5LmN1cnJlbnQgfj0gMjlNCisgKiBBL0IvRCAgbWVtb3J5LmN1cnJlbnQgfj0g MjFNCisgKiBBL0IvRSAgbWVtb3J5LmN1cnJlbnQgfj0gMAogICoKICAqIEFmdGVyIHRoYXQgaXQg dHJpZXMgdG8gYWxsb2NhdGUgbW9yZSB0aGFuIHRoZXJlIGlzCiAgKiB1bnByb3RlY3RlZCBtZW1v cnkgaW4gQSBhdmFpbGFibGUsIGFuZCBjaGVja3MKQEAgLTM2NSwxMCArMzY1LDEwIEBAIHN0YXRp YyBpbnQgdGVzdF9tZW1jZ19taW4oY29uc3QgY2hhciAqcm9vdCkKIAlmb3IgKGkgPSAwOyBpIDwg QVJSQVlfU0laRShjaGlsZHJlbik7IGkrKykKIAkJY1tpXSA9IGNnX3JlYWRfbG9uZyhjaGlsZHJl bltpXSwgIm1lbW9yeS5jdXJyZW50Iik7CiAKLQlpZiAoIXZhbHVlc19jbG9zZShjWzBdLCBNQigz MyksIDEwKSkKKwlpZiAoIXZhbHVlc19jbG9zZShjWzBdLCBNQigyOSksIDEwKSkKIAkJZ290byBj bGVhbnVwOwogCi0JaWYgKCF2YWx1ZXNfY2xvc2UoY1sxXSwgTUIoMTcpLCAxMCkpCisJaWYgKCF2 YWx1ZXNfY2xvc2UoY1sxXSwgTUIoMjEpLCAxMCkpCiAJCWdvdG8gY2xlYW51cDsKIAogCWlmIChj WzNdICE9IDApCkBAIC00MTcsOSArNDE3LDkgQEAgc3RhdGljIGludCB0ZXN0X21lbWNnX21pbihj b25zdCBjaGFyICpyb290KQogICoKICAqIFRoZW4gaXQgY2hlY2tzIGFjdHVhbCBtZW1vcnkgdXNh Z2VzIGFuZCBleHBlY3RzIHRoYXQ6CiAgKiBBL0IgICAgbWVtb3J5LmN1cnJlbnQgfj0gNTBNCi0g KiBBL0IvICAgbWVtb3J5LmN1cnJlbnQgfj0gMzNNCi0gKiBBL0IvRCAgbWVtb3J5LmN1cnJlbnQg fj0gMTdNCi0gKiBBL0IvRiAgbWVtb3J5LmN1cnJlbnQgfj0gMAorICogQS9CLyAgIG1lbW9yeS5j dXJyZW50IH49IDI5TQorICogQS9CL0QgIG1lbW9yeS5jdXJyZW50IH49IDIxTQorICogQS9CL0Ug IG1lbW9yeS5jdXJyZW50IH49IDAKICAqCiAgKiBBZnRlciB0aGF0IGl0IHRyaWVzIHRvIGFsbG9j YXRlIG1vcmUgdGhhbiB0aGVyZSBpcwogICogdW5wcm90ZWN0ZWQgbWVtb3J5IGluIEEgYXZhaWxh YmxlLApAQCAtNTEyLDEwICs1MTIsMTAgQEAgc3RhdGljIGludCB0ZXN0X21lbWNnX2xvdyhjb25z dCBjaGFyICpyb290KQogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGNoaWxkcmVuKTsgaSsr KQogCQljW2ldID0gY2dfcmVhZF9sb25nKGNoaWxkcmVuW2ldLCAibWVtb3J5LmN1cnJlbnQiKTsK IAotCWlmICghdmFsdWVzX2Nsb3NlKGNbMF0sIE1CKDMzKSwgMTApKQorCWlmICghdmFsdWVzX2Ns b3NlKGNbMF0sIE1CKDI5KSwgMTApKQogCQlnb3RvIGNsZWFudXA7CiAKLQlpZiAoIXZhbHVlc19j bG9zZShjWzFdLCBNQigxNyksIDEwKSkKKwlpZiAoIXZhbHVlc19jbG9zZShjWzFdLCBNQigyMSks IDEwKSkKIAkJZ290byBjbGVhbnVwOwogCiAJaWYgKGNbM10gIT0gMCkKLS0gCjIuMzUuMwoK 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 F18BAC433FE for ; Fri, 13 May 2022 17:18:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C9B76B0078; Fri, 13 May 2022 13:18:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4262C6B0081; 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 F22C86B007B; Fri, 13 May 2022 13:18:42 -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 D84556B0075 for ; Fri, 13 May 2022 13:18:42 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AF58A60B0A for ; Fri, 13 May 2022 17:18:42 +0000 (UTC) X-FDA: 79461379284.05.F093264 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf27.hostedemail.com (Postfix) with ESMTP id A25F4400AD for ; Fri, 13 May 2022 17:18:39 +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 0A3CB1F971; 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=p/VfT98eDaSoE5VMKiC0q6OouDpijrF5gH7LM1N1KeA=; b=fVXpbRI/iGLP8RPo840xZVGfonklr2K3QS8qE+DN+oazLFZTP2hlyqjJgLqukjjH2CqpWh PZYP9/xzMNqDE8Jl8jAtu7j1VFr7iFze/ij6U4OD3rGdE9N/B4jOlDbAApp7VMrRWiOGV5 eFIJLzK2Gmv1z5Jcy15l4Yo9/D+vQGs= 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 B820513B3D; Fri, 13 May 2022 17:18:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MEX6K/CSfmIeUgAAMHmgww (envelope-from ); Fri, 13 May 2022 17:18:40 +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 3/4] selftests: memcg: Adjust expected reclaim values of protected cgroups Date: Fri, 13 May 2022 19:18:10 +0200 Message-Id: <20220513171811.730-4-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 Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b="fVXpbRI/"; spf=pass (imf27.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-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A25F4400AD X-Stat-Signature: shek9drmug5s8gcdt8p4ynis8motx1wm X-HE-Tag: 1652462319-116053 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000632, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The numbers are not easy to derive in a closed form (certainly mere protections ratios do not apply), therefore use a simulation to obtain expected numbers. The new values make the protection tests succeed more precisely. % run as: octave-cli script % % Input configurations % ------------------- % E parent effective protection % n nominal protection of siblings set at the givel level % c current consumption -,,- % example from testcase (values in GB) E = 50 / 1024; n = [75 25 0 500 ] / 1024; c = [50 50 50 0] / 1024; % Reclaim parameters % ------------------ % Minimal reclaim amount (GB) cluster = 32*4 / 2**20; % Reclaim coefficient (think as 0.5^sc->priority) alpha = .1 % Simulation parameters % --------------------- epsilon = 1e-7; timeout = 1000; % Simulation loop % --------------------- % Simulation assumes siblings consumed the initial amount of memory (w/out % reclaim) and then the reclaim starts, all memory is reclaimable, i.e. treated % same. It simulates only non-low reclaim and assumes all memory.min = 0. ch = []; eh = []; rh = []; for t = 1:timeout % low_usage u = min(c, n); siblings = sum(u); % effective_protection() protected = min(n, c); % start with nominal e = protected * min(1, E / siblings); % normalize overcommit % recursive protection unclaimed = max(0, E - siblings); parent_overuse = sum(c) - siblings; if (unclaimed > 0 && parent_overuse > 0) overuse = max(0, c - protected); e += unclaimed * (overuse / parent_overuse); endif % get_scan_count() r = alpha * c; % assume all memory is in a single LRU list % commit 1bc63fb1272b ("mm, memcg: make scan aggression always exclude protection") sz = max(e, c); r .*= (1 - (e+epsilon) ./ (sz+epsilon)); % uncomment to debug prints % e, c, r % nothing to reclaim, reached equilibrium if max(r) < epsilon break; endif % SWAP_CLUSTER_MAX r = max(r, (r > epsilon) .* cluster); % XXX here I do parallel reclaim of all siblings % in reality reclaim is serialized and each sibling recalculates own residual c = max(c - r, 0); ch = [ch ; c]; eh = [eh ; e]; rh = [rh ; r]; endfor t c, e Signed-off-by: Michal Koutný --- .../selftests/cgroup/test_memcontrol.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index eba252fa64ac..9ffacf024bbd 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -260,9 +260,9 @@ static int cg_test_proc_killed(const char *cgroup) * memory pressure in it. * * A/B memory.current ~= 50M - * A/B/C memory.current ~= 33M - * A/B/D memory.current ~= 17M - * A/B/F memory.current ~= 0 + * A/B/C memory.current ~= 29M + * A/B/D memory.current ~= 21M + * A/B/E memory.current ~= 0 * * After that it tries to allocate more than there is * unprotected memory in A available, and checks @@ -365,10 +365,10 @@ static int test_memcg_min(const char *root) for (i = 0; i < ARRAY_SIZE(children); i++) c[i] = cg_read_long(children[i], "memory.current"); - if (!values_close(c[0], MB(33), 10)) + if (!values_close(c[0], MB(29), 10)) goto cleanup; - if (!values_close(c[1], MB(17), 10)) + if (!values_close(c[1], MB(21), 10)) goto cleanup; if (c[3] != 0) @@ -417,9 +417,9 @@ static int test_memcg_min(const char *root) * * Then it checks actual memory usages and expects that: * A/B memory.current ~= 50M - * A/B/ memory.current ~= 33M - * A/B/D memory.current ~= 17M - * A/B/F memory.current ~= 0 + * A/B/ memory.current ~= 29M + * A/B/D memory.current ~= 21M + * A/B/E memory.current ~= 0 * * After that it tries to allocate more than there is * unprotected memory in A available, @@ -512,10 +512,10 @@ static int test_memcg_low(const char *root) for (i = 0; i < ARRAY_SIZE(children); i++) c[i] = cg_read_long(children[i], "memory.current"); - if (!values_close(c[0], MB(33), 10)) + if (!values_close(c[0], MB(29), 10)) goto cleanup; - if (!values_close(c[1], MB(17), 10)) + if (!values_close(c[1], MB(21), 10)) goto cleanup; if (c[3] != 0) -- 2.35.3