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 E6B8FEB64D9 for ; Mon, 19 Jun 2023 12:48:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 752838D0006; Mon, 19 Jun 2023 08:48:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 701F48D0001; Mon, 19 Jun 2023 08:48:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C9F68D0006; Mon, 19 Jun 2023 08:48:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4D4818D0001 for ; Mon, 19 Jun 2023 08:48:52 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 133DC1C808E for ; Mon, 19 Jun 2023 12:48:52 +0000 (UTC) X-FDA: 80919476904.13.C675823 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf17.hostedemail.com (Postfix) with ESMTP id 16A1640008 for ; Mon, 19 Jun 2023 12:48:49 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=Sy4BZQSQ; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf17.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687178930; 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=zkvtgJhNiAhlhE/5X9KIzqXme2yxIHOQ4aJAd2h6f9c=; b=u2uaNJdHlfH6zYci/LrbGfb3gSDntVIWV2ZA3Zplx3EscYha62eyBerbHETi2XVdNVbnTK lpsQe8G0NV7G9jDd42cKezB5/Z4s4B0z1Vx9ICkPpKNW9ACAN/spvpgMpmhCoEg2TtnpeW Ffn2YDit/Mfut2hlslUqlMH9TGHSUns= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=Sy4BZQSQ; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf17.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687178930; a=rsa-sha256; cv=none; b=TSL0cBuvdbH6B7EEy+IL/5a4RmsntZUIcD7Tx84sIb26hAdUOPhZOWqEd8NTZQWXnWM/0W +FeJMUZOVLNy4jfEfcqSLZVGIzpoeanOzsBBVSOHnai72NvVYcfs50EaR4M1sLHKbi8VWw bRvFBJuhtuzVyau4h+6x+QaGLMkArEc= Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-54f85f8b961so2622043a12.3 for ; Mon, 19 Jun 2023 05:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1687178928; x=1689770928; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zkvtgJhNiAhlhE/5X9KIzqXme2yxIHOQ4aJAd2h6f9c=; b=Sy4BZQSQxGMw6NONjzbcq2N7RyjpWRHbA6AvoFZp8NRVHtp783fyfgNtZaScvfKhMq 6KVatXhq782lhFz5kt4R8SHgs3hbFpvVxWm1daPJds0XiUCcY/EeGoEciKB9xofPWt66 JXuOF9+OspCQ0j5tjiOMTFPPxsu7Q4j0y2G+eazqGvqqjbYr4uEGMBYBGnQuEhDHSeo7 iMKwKmjOxJj/nJBwMDF3ZHBclzTjYVRukgbfIPUb+BxtzacxWRMKd7RUjgz0YmtOd3Fy FVk5qmlxKAHp/4omdq9Ei3HsZX6yEwLpA3jTjIaADA+P/mP4WazNN694252yL4sU0wnM ya9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687178928; x=1689770928; 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=zkvtgJhNiAhlhE/5X9KIzqXme2yxIHOQ4aJAd2h6f9c=; b=a4kYd6W7OwE/o3VqRLai5rexKuC+CiOCE4DAQLZHynDf0XTK3rA1nMz4OWF7pbacdV Hi+LhPr/6I7QQoM2jSEpjmVq5OXg+6htjAxrxOOb2mjca2C1aUe4a6GqoGzizuEFqLWd hS4ApPo+Ffixb2Z7uxAVVh2TBNMkdSUt13VqckRd38xC3FvNKSw8NrAuU+Tja3yWIf1J gw/+j7+15n+mBJo5x1KZq8II7oFitKB55HgBTTyi/tUuqFqBvwMsLL/4HmD0zXVyqfEX CzTuKsIuKG6WjzAmy5r+DqNi34lQAA/4j3clHh8yQiRz/8zClMiIOhqf9vHiUUm0R90J DN6w== X-Gm-Message-State: AC+VfDwavJHwEkgGL9dymBt5WJWzn6kGvECsinOnI2zQKHN78dhAbaBR W1Io+ciryjgEcWJ3O2o//qbNEw== X-Google-Smtp-Source: ACHHUZ5mUsmBPn48KvGeEemZhnT2w4mL+mwLrRoTndxKIzScpVQqN0QtZtsqPxDgwaKC5qYR30kPBQ== X-Received: by 2002:a17:90a:ff09:b0:25c:7f2:2e5d with SMTP id ce9-20020a17090aff0900b0025c07f22e5dmr9442987pjb.13.1687178928639; Mon, 19 Jun 2023 05:48:48 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id fr3-20020a17090ae2c300b0024de39e8746sm5597090pjb.11.2023.06.19.05.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 05:48:48 -0700 (PDT) From: Haifeng Xu To: mhocko@kernel.org Cc: roman.gushchin@linux.dev, hannes@cmpxchg.org, shakeelb@google.com, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, mkoutny@suse.com, akpm@linux-foundation.org, Haifeng Xu Subject: [PATCH] selftests: cgroup: fix unexpected failure on test_memcg_sock Date: Mon, 19 Jun 2023 12:47:35 +0000 Message-Id: <20230619124735.2124-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 16A1640008 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: gntzzy84w8u5xoyr1tncabhhkbowyqjz X-HE-Tag: 1687178929-778347 X-HE-Meta: U2FsdGVkX18Va8rFjZLZk8a+7rvD95Hwuv/OirKJIOYCK1wKQQZoosEF2bvsIXdWjtOWwTFdD93Ko7zPzT4sQi1Qw7XcyzTSb5+veYGvH6oH/RqQKHtBjNSTJZAerwRpf/XlxpHpaU56lQIzvluySnYW9Ab6dqTdD/Lcg9cjZLVRQPUefuzv0giacuHslzPRU4mdumCtq6oq1Jk097J/4rXceQoQOZo84BZztaKn4KEgCYL3INR5MNx98+/xXH1b3TVb9wzslfm8jODHdlu77GYaX7Etgu/TBiNdS5QU1d1rHc8t0/jgtIOyR9Lv2Xto5V3t0W/Wt2elAyf4GJBr9JC9OOpOxylhdB6eJnpU4PWsbYivUY+IVXpz3D6KoOS4uL7nGjH9TZqBX2cZlgmD5rP+AJehZhIDKJETTwM6DkhkwfOoKUrcXqB79c8Zi6YrH4itdFCvDeTVO86+odLyNnWfju0EoY7T6dr9kpryPGR7lwj3i7JdfGZRTEYQypsmaMRpiEi9lO++lZUuImHFRcVL8QeVMYahSEmiSf1IAy+kphZ/lyezxEiFs2MBQzjmPb2o7b3Ux9A6LyCYqxxgtJT5+Xi/9iDf1KPE3kYL/FAMKNN+XQQhAnB+gqtK3aPISxn3ZhbPEJt2+3kyUqIdoU8ZmgBo0LjqRWcrR2OiLUfBB/ZhkK1QN8ty+HVjE3u4OK9l1qEJq/Af2sEC8T2AuGkkxiw/Pmol9GUbgkk+c4s6lKLfgZ5GJHDZj+Gvpr4BX21JVvJMpb2rB7EMxsyIWysYUBk8BTchjs+JFCE+1bZ+qHFyIxpMOL0rAD2KiItjOCqNAIyVaQp60bxgpPF/h49ArpuQQi9H3vRfuXgB3qU9mkHMIFVDOzh0tjLtPEB/KBMom11HXv79JOeBd/SuxwbZWe4STsy7HIGyHNXjMSooCAfXU57WrdIJHW4jz54kZhW66jOViDzRoN6/qMU 9uLKAB73 PxW5VIz515UimK5MtCjOyrrjf1g5ciCXBE1c1QSHd1RKrK5y979rGsp+L8mLaGcvsRW+xZim/73tyhnZxWVdJR5pQGle2Ecx60QeWcQoDkRbRJkalli2Ls0fYrRqUqat43N0FrGSymaOU3y4f/5aTkr9SUR0s1CB8W62Uii6S9uki6SsLxUyAzmmGJvAxWkyWJKBT8swabaN18nGCkp9sogjFSBtCzPhHVTK99v0I2LmXrQC8o4HkIupAllWL0ewdAs93WpSo3x69fh0UVXXnnbOte8/p6kM8Aysg+qJbOCPE24Da/2BfmcDy6Nb3Gp/o/a5r4rzeg3SOBRfjPozydXHR4ZplL3nI7P6t1mKV5VWB5JT8zB91FG4+APifP7NQrbEnvIq6tlMHhb3QUsEGDWM4ovM9fE4QJ+Z5JbOMNRVpSZp3estQnsiUJRBqFc+fUtkk 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: Before server got a client connection, there were some memory allocation in the test memcg, such as user stack. So do not count those memory not related to socket when checking socket memory accounting. Signed-off-by: Haifeng Xu --- tools/testing/selftests/cgroup/test_memcontrol.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index f4f7c0aef702..9e0d6d315826 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -987,7 +987,9 @@ static int tcp_client(const char *cgroup, unsigned short port) char servport[6]; int retries = 0x10; /* nice round number */ int sk, ret; + long allocated; + allocated = cg_read_long(cgroup, "memory.current"); snprintf(servport, sizeof(servport), "%hd", port); ret = getaddrinfo(server, servport, NULL, &ai); if (ret) @@ -1015,7 +1017,8 @@ static int tcp_client(const char *cgroup, unsigned short port) if (current < 0 || sock < 0) goto close_sk; - if (values_close(current, sock, 10)) { + /* exclude the memory not related to socket connection */ + if (values_close(current - allocated, sock, 10)) { ret = KSFT_PASS; break; } -- 2.25.1