From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDCDB358D3F for ; Wed, 19 Nov 2025 12:28:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763555296; cv=none; b=hQvdoWRTFEoiwLPS8ZgSBTdDQs0j2+MWcNpP1Ixk94AhwnP0WDeNYO+eHhTFDxcJlMEoh9PoVIuFVTCCQkavgyDy9hOuzRWMgS13BNCMkltdo8xZX9YyhgRNQxmYdyRfMP0yn4nvUx502LspoG18XTpMOJuqpSSBrDZy9YPxzZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763555296; c=relaxed/simple; bh=FwNfJ1FkJj/jUj+TxbqbW6X3s7ImIQRrELHQjc029ok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WIulzUfwqTadw4Qm5PzbAHLAV++qA8/FV2/1DbJ6hfmAtzK+7AyE8BcA/Vpm3m0PqLAaHA7Ph8jMGfbTEhMIOZibZmfoTAc8SOYWnbAYoGVAlwMcI7lAs+cP91b2HPB5dJWz+nK9QYFWlAMl+sUR/NTKIs5C/xM7CclcB2qsRs4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XNYCScuh; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XNYCScuh" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7b89c1ce9easo6792644b3a.2 for ; Wed, 19 Nov 2025 04:28:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763555293; x=1764160093; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+CKhj841T0e6qZvubDhvAJxg1sC8gp96pehxxFiAmCs=; b=XNYCScuhJS2JjLhjxjpU18f/RptwLCzoG0Mzng14GEZ9124zrVQkxmjJwx5BS1HCzO TWHY5lRaQpP8ft1nNJ1HZIPdo7mwaynJ5VC7NYWQPiH/8d73bKhE2jNBUwLDQyZlfRj6 bH4ziETXbIXRX7nDVpeWT6jGjYYuGJzNLm5PobFvzOQRXJ1PTj/Ick26Lcd7wlTE7LMW a1xPcKqBL4mTt5peXC9EXMKX70ysLoBkS40DivvjxTg/QUQcVvN+mHxIq7KZrPUztdVs fEwSCk1Z4GJ10srWZRDEW7CMd2l9Rpisr7WLEw11+Upwgub8+fl5axyAFABUInQYqwsv s1ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763555293; x=1764160093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+CKhj841T0e6qZvubDhvAJxg1sC8gp96pehxxFiAmCs=; b=eQAIpv8Kx0UWiM18WDwwhHqzB9ESC1CCEyMElS20BhLfIo8EwpgfMJetOQ3x7v+l3L YiQJvME/CWsCd1Ruo32cPOv3SBer8SRzlYmfjJBR2w2UOhbe1uAADjT5EUsCDz20L356 FTyQMIiiSLaVc3tXcnhAIbtK0hs/IGflRsMob2JjreFyG+kSWumVaBIXgxc20+i5GaD3 3FLpGL2vlYgl7ZhJxV2RsRepmbB8LQYlu5QJthwua986+SgQFEjI4Y69OHFZMqcH0aml iAPP4XFV4pDAdVEpii2BmkJAS/+xYZk+7IfSepwra4azLWrOqsVY5vM9SoulKaQMH6Nb wiJg== X-Forwarded-Encrypted: i=1; AJvYcCUH0OMLz+F0tf6kOxYD77Si7l9qzE4R1t0yeCvA6C+JJIHQmmE/rejqMLOcM5e2OfnsLjLrK/7joqMaBy0=@vger.kernel.org X-Gm-Message-State: AOJu0YwyKfOSuej1rTQn6Kp+sbLRUBJ3WfzIi0p5aSgyr/OggmcUGoKC +oxlxnKD3qZMCu8zKITzLeXWveUz3DoALzgRjpHz6a5bJMExm51/Bxus X-Gm-Gg: ASbGncvpznu9ClPRpVNjMuZcUHNOEoSy6B6fA96VXo8I8EDf34Xt7BYPgYPjYYW6nSd f/vgV4dpfyn4BrHjOM7P/TrbqKSSGXhMRW9imXr1kHYVST9P3N/hxwkl6BCnNcIuPes03SWRDHB wf3YEqVrAw+dHXtDB0G0v+eaV+N3pBkZgHYgm3pCYFw+GyrA1zoF5TUgIXgWeMhPgZs49EIe4Kq POb8qjnSzqnnhNL5PtGdk/lbppDZBc9a/l1dCLBoKyRKOv8rd2CoGIvQq6DnK5eHnGPas+aPlOI A1G5ORNjPih3eOEEri0dwEPU6FqQCOgUtOBOh7E7+JvF4Xg2ssBOd8RAuhZfgEui6cscwFvd2GG W+vMFArMbr/vLNxccuD3zaoWzv9iigGqsDsvJmJuS60Igqm3SbxRLK2lbDGUXeOZRzRCkQ/yDTW P/mDwkikY6mJRq6Or6iSU= X-Google-Smtp-Source: AGHT+IEJJjWz+MJzpUl7ns76a+Og9nUY/w0T8Ert+O7huCBITXi39FiE1X0vmFKSLM4XAxMf1Yzn/A== X-Received: by 2002:a05:6a00:22c5:b0:7ab:8d8a:1024 with SMTP id d2e1a72fcca58-7ba39bbdfcdmr21856893b3a.7.1763555292868; Wed, 19 Nov 2025 04:28:12 -0800 (PST) Received: from EBJ9932692.tcent.cn ([45.8.220.113]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b92782d39bsm19596383b3a.63.2025.11.19.04.28.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Nov 2025 04:28:12 -0800 (PST) From: Lance Yang To: zhangguopeng@kylinos.cn Cc: hannes@cmpxchg.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, mhocko@kernel.org, mkoutny@suse.com, muchun.song@linux.dev, roman.gushchin@linux.dev, shakeel.butt@linux.dev, shuah@kernel.org, tj@kernel.org, leon.huangfu@shopee.com, Lance Yang Subject: Re: [PATCH] selftests: cgroup: make test_memcg_sock robust against delayed sock stats Date: Wed, 19 Nov 2025 20:27:58 +0800 Message-ID: <20251119122758.85610-1-ioworker0@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20251119105216.1675608-1-zhangguopeng@kylinos.cn> References: <20251119105216.1675608-1-zhangguopeng@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Lance Yang On Wed, 19 Nov 2025 18:52:16 +0800, Guopeng Zhang wrote: > test_memcg_sock() currently requires that memory.stat's "sock " counter > is exactly zero immediately after the TCP server exits. On a busy system > this assumption is too strict: > > - Socket memory may be freed with a small delay (e.g. RCU callbacks). > - memcg statistics are updated asynchronously via the rstat flushing > worker, so the "sock " value in memory.stat can stay non-zero for a > short period of time even after all socket memory has been uncharged. > > As a result, test_memcg_sock() can intermittently fail even though socket > memory accounting is working correctly. > > Make the test more robust by polling memory.stat for the "sock " counter > and allowing it some time to drop to zero instead of checking it only > once. If the counter does not become zero within the timeout, the test > still fails as before. > > On my test system, running test_memcontrol 50 times produced: > > - Before this patch: 6/50 runs passed. > - After this patch: 50/50 runs passed. Good catch! Thanks! With more CPU cores, updates may be distributed across cores, making it slower to reach the per-CPU flush threshold, IIUC :) > > Signed-off-by: Guopeng Zhang > --- > .../selftests/cgroup/test_memcontrol.c | 24 ++++++++++++++++++- > 1 file changed, 23 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c > index 4e1647568c5b..86d9981cddd8 100644 > --- a/tools/testing/selftests/cgroup/test_memcontrol.c > +++ b/tools/testing/selftests/cgroup/test_memcontrol.c > @@ -1384,6 +1384,8 @@ static int test_memcg_sock(const char *root) > int bind_retries = 5, ret = KSFT_FAIL, pid, err; > unsigned short port; > char *memcg; > + long sock_post = -1; > + int i, retries = 30; > > memcg = cg_name(root, "memcg_test"); > if (!memcg) > @@ -1432,7 +1434,27 @@ static int test_memcg_sock(const char *root) > if (cg_read_long(memcg, "memory.current") < 0) > goto cleanup; > > - if (cg_read_key_long(memcg, "memory.stat", "sock ")) > + /* > + * memory.stat is updated asynchronously via the memcg rstat > + * flushing worker, so the "sock " counter may stay non-zero > + * for a short period of time after the TCP connection is > + * closed and all socket memory has been uncharged. > + * > + * Poll memory.stat for up to 3 seconds and require that the > + * "sock " counter eventually drops to zero. It might be worth mentioning that the current periodic rstat flush happens every 2 seconds (#define FLUSH_TIME (2UL*HZ)). Adding this context to the comment would explain why the 3-second timeout was chosen ;) > + */ > + for (i = 0; i < retries; i++) { > + sock_post = cg_read_key_long(memcg, "memory.stat", "sock "); > + if (sock_post < 0) > + goto cleanup; > + > + if (!sock_post) > + break; > + > + usleep(100 * 1000); /* 100ms */ Nit: It would be better to define the retry count and interval as macros (e.g., MAX_RETRIES, WAIT_INTERVAL) to avoid magic numbers and make the 3s timeout calculation explicit. > + } > + > + if (sock_post) > goto cleanup; > > ret = KSFT_PASS; Thanks, Lance