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 DD4EEC7EE26 for ; Mon, 22 May 2023 09:53:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C4CD6B0075; Mon, 22 May 2023 05:53:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 374CF6B0078; Mon, 22 May 2023 05:53:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 23CD7900002; Mon, 22 May 2023 05:53:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 141456B0075 for ; Mon, 22 May 2023 05:53:26 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D2AE0802A6 for ; Mon, 22 May 2023 09:53:25 +0000 (UTC) X-FDA: 80817428370.24.54DF542 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf26.hostedemail.com (Postfix) with ESMTP id 10D27140019 for ; Mon, 22 May 2023 09:53:23 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b="AOzpCt/R"; spf=pass (imf26.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684749204; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=hnIfipm8ADmVcPlfJeR2m6dzYHlF2xT+Sv9iRF6t3cY=; b=Ol7W4+cHw8DOYsKnrUz3ZRi6VDzbI9QWz3QKyDIAVwJt2FroSjB5edvm2KxyGvBArdDwFn zqRI152tOlaRH5MZUM/J6aU6kuLZsmBwB4F179fj7ijxXRjeUfYqvGmPOFJjA5hRiDx8HN n4uX7M4X7FoGifH6D/hOqP6R/a3gjBY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b="AOzpCt/R"; spf=pass (imf26.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684749204; a=rsa-sha256; cv=none; b=iDORQ25uuvxmA54K/h+HOThTZDQZzvmwFHZIOdUiGjBeFm5y+yVbJwUFRMGES93EmB5ZRb qz8RMF5DPKqIoHWnuhTYd7AmmxZkT9Ylr9ejo99xiACBGyYRoCHCF0BbtX1MEftJsG48aW UwituJqYZui/tbh0YhA70TuelC+VJVM= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-64d3491609fso2049387b3a.3 for ; Mon, 22 May 2023 02:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1684749203; x=1687341203; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hnIfipm8ADmVcPlfJeR2m6dzYHlF2xT+Sv9iRF6t3cY=; b=AOzpCt/R5/HiWo6POXCM45SpS08bNlo11NcaKUQY8fbE74t46SQzwFReeowIfN1QBH k42Pa4PS1GDGK68evYz8AKEVOtCHJrI1Ycb8tBHltfRKXUCfVX1cpN31oU4AKAUV/v3b atvu/X/oySVxlD9Eqt4fOQR6IS55Z8JZhWRWfm2AikBq/n8wh3FmecrWs6Y5Ev6ljHfQ u2sjZwIfVdOOAmurBV6Mx3WGS2fliHR2vLyTGHn7M5FHSLYPQ+zCv1C2h3ehMN+xzzZF 3022G70xrM3eiXml5jDArQFZrTLKq5hqXeoebTIw7Z+yxmB0sA3rMeGeSB+1U4Ak/wmv Xm/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684749203; x=1687341203; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hnIfipm8ADmVcPlfJeR2m6dzYHlF2xT+Sv9iRF6t3cY=; b=DUU3Oe4tAgpypS2qKeLuO0GlHO0KX8cgM8B70LCoRP7Ya11XeMeL5kYgk6uU3QzhjP QKhYdXcgAw2JsxQDWYmVbgMRyUPCdrfkkGEBxA+4pGqBNa4wbJzQk0A3f2hIGikZcUJO ohbg7iOgIHdoj0NnTaEqZsh4BWW/NxgcjQAspUSibTxShZ8iHkEXB9hESkDj+WiGiNx9 BPpbwJiKNJow8LKFZeUqsLVv90phy5J3UIupiIqvbyFeECimgz9xzeZuMhmFnfzeBil0 hnKvsvqVXKxhrs9V0a8iDjGtfUwhTpyFKaMayJ//pD5TZJqVnzMBbb54vEXqVuTrvzi/ yOuQ== X-Gm-Message-State: AC+VfDwxMCd8zsFUAZq8n7nQcl3tWWhoh0ipFoz8rFlmmkOcycH1Vf4t C+1MROUsS3x0eG5SxE8z9WgwWw== X-Google-Smtp-Source: ACHHUZ7Gqy8j0qxhN10JBGVVj+H/ve8NIo22gbIeyse0zofEfmRuw+x0w1VQUfHAQi9FO3kZQC6U3Q== X-Received: by 2002:a05:6a20:8e07:b0:104:62a9:9006 with SMTP id y7-20020a056a208e0700b0010462a99006mr12512823pzj.36.1684749202957; Mon, 22 May 2023 02:53:22 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id g37-20020a632025000000b0051b9e82d6d6sm4089267pgg.40.2023.05.22.02.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 02:53:22 -0700 (PDT) From: Haifeng Xu To: mhocko@kernel.org Cc: roman.gushchin@linux.dev, hannes@cmpxchg.org, shakeelb@google.com, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH 2/2] selftests: cgroup: fix unexpected failure on test_memcg_low Date: Mon, 22 May 2023 09:52:33 +0000 Message-Id: <20230522095233.4246-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 10D27140019 X-Rspam-User: X-Stat-Signature: m9fj1q13fgrmus4sckde9zjoyix856gx X-Rspamd-Server: rspam01 X-HE-Tag: 1684749203-990409 X-HE-Meta: U2FsdGVkX19O+7esZAAYi9X024t9876fwGuzc4ElmqcztCsAAYkVwsSxAfeZL7m65ilF6LspK+H/++C3IdFaMHMbTO+/o+EmcLchEEaCYm8pYlIJ7vh3eUMI/pYsSo4xwS/7f4cOEU48CtX+kIaowzsj42Y4w3Iv4KdhHITSGpypZ5qegwFziC9MzwpcAZIOyhjiWzHfWpH8QQaTHxE6oZjAZlPLbwH62WFld4gv8nZajobQjmN2vHhqu1F8oAywAuwaEohPsmAndQ8lx1zdExse1x2h9a7BSCwc71/qwIukXLVQlx/5OZu9Tqa5EVDyDlGJfXQKen//5J77GcMfo1ymOkjsTVs7GT8wBSXNax1Ez2gIVQezcZH/67eQiREOWgRdgtK75k46KWcpG7o8mqhHjxv/iVglLumGxTpYJ92Csa1amcgn8QKcaGuRBlFcyX2CrUp46CwzzO3sSguwGnlYWI/A3kWaXmVQg8MOasyko/AN3tSHL7jjqY9hqlwdVvxp6/P+Hbsdhxt6WSciJWZWgaCnK/Lbwbrf6dCBLXhQpbAqczdAYqDWKUC6cEX0+bfqydrKziU6TNnInwnfUJf8knhNnXR1OR15SfZAdYHmXkQRWtlfMHeV3iuGQeQlKEgdqa9BDuBGug7c+SJ3Jm0A71FRr86MOmEU6CxCzq8pVmiOMB92Kg111gGSGK8CJo8pxjAs3WtY7clgqYlAHInmH1O2Hr1n/KKUoekmIlJv5OqnayJZmq7hw5SdJlxBWpYwwUtFKs1EKxQbCBjaNV/2wQ5YtsrBM6yj6msKZzTiHSnUGZ+ZsyLq84Zo0eQZVQGZWBk9xAt8wPFUW/qHeGJB+WrOAPswV1OltORlxe24s0bOFxJ+9hohSlwOakEEk6bSfsF9tWwM39wrChXOZHB7wEmFd2RD0NM/ogElZxSMUcOl6JQqJs4Yfy51S6bz7y/kx1LrZJLzKFO+XW+ Q1niPuCb p+bL5Pso/aZBbtUYCXOIwGZhrqY7gcXq5dkklH/bvHDpwP4yVm1AeanyKlZ0ydchl7PW3habblHrun04EU3JOB7d7fWEG40SAE70UUZ21wIhml3loFE/UIMG9ESKUOQ+b/jw1g69xOe/miqRet5+LDHVctSPr9EIofTERY5MTbWykb8/JdkolPKXozlHPqfZC6g8qih7B0r3R61QV3u3Li+w7eObvpi0msXbx28ihSr5r+d7DAa70P1JMlraNqwADrGRfPZHWYQ4ocrPue2+0znYE5bh/skGnYxbIcHkHdCGsq5P5xNm2h7o7/lE/86pbo7TihSPuSVySMD3TrryNiJadnUt8MN4hDo+x7z6iKO59gg7Xmx4bOZS3Ytrel+kt63sTAirRWt6ShV7LFaXRuVktFV2gMSG/f6jkd7H5r7MqSZFPnQD1geFMe5ihS4XxoB4d 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: Since commit f079a020ba95 ("selftests: memcg: factor out common parts of memory.{low,min} tests"), the value used in second alloc_anon has changed from 148M to 170M. Because memory.low allows reclaiming page cache in child cgroups, so the memory.current is close to 30M instead of 50M. Therefore, adjust the expected value of parent cgroup. Fixes: f079a020ba95 ("selftests: memcg: factor out common parts of memory.{low,min} tests") Signed-off-by: Haifeng Xu --- tools/testing/selftests/cgroup/test_memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index f4f7c0aef702..a2a90f4bfe9f 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -292,6 +292,7 @@ static int test_memcg_protection(const char *root, bool min) char *children[4] = {NULL}; const char *attribute = min ? "memory.min" : "memory.low"; long c[4]; + long current; int i, attempts; int fd; @@ -400,7 +401,8 @@ static int test_memcg_protection(const char *root, bool min) goto cleanup; } - if (!values_close(cg_read_long(parent[1], "memory.current"), MB(50), 3)) + current = min ? MB(50) : MB(30); + if (!values_close(cg_read_long(parent[1], "memory.current"), current, 3)) goto cleanup; if (!reclaim_until(children[0], MB(10))) -- 2.25.1