From nobody Tue Feb 10 23:01:26 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 61D5E23BF9B for ; Tue, 10 Feb 2026 00:38:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770683918; cv=none; b=OuOB4pkSHY3jNEsuM+kbwYuCOO8LObPat/L8i8tJE7llAnutpYyhrOa7JZML6cvp6MPLVGDFfevnovdnS/yeoq3b/21oIsijWqEKTKIsNMbhOvxotfUUZ/d/HsprT8E/vkxL8lTJ5OhR4wNkdBqogDPWC950qb3bJS0PLt0Y8WY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770683918; c=relaxed/simple; bh=1Qt94GB4G3IwGLclm8KcPaUi5sZ/Z6HPS+sk0iKFMzE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Vf7fQGqs4C86YS3n5jfATwe0JAZMcSttufWK7K52ICYrxlbnORPIyfnxS3NMKfNTx5WRJZtssKfk61yzrW1jsbDiuSY0F6OOALGGyKOfHyCbvHQgvryMemGON/G3W6GG2WIcDObMl8Qm+A90zCjiU3AT2RSYtHcDKm10fRhSrg8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tjmercier.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3Wbbg7Tp; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tjmercier.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3Wbbg7Tp" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2a784b2234dso7649955ad.1 for ; Mon, 09 Feb 2026 16:38:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770683917; x=1771288717; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=D0Pi0e7p+zApj87fVsFVxZlxRDj171oPkvxq1iRYRTY=; b=3Wbbg7TpK9Xu4R+smXq77Pzb8HFn3IhHQdo3ZV6vAs6likXrwBjBK41dNcCVDkh58z cP1nOCEVVxGa/wYoKfmOSEq024dYBTfezNYay4tVcZAHaq13u+ZrB+93HuMInfMiPBff Pga/Xacrj6YtpL5AjD0qzbrNHWz6wiMYD66jURzTKaON83LLmk4a23K5U60NMqXMBya0 6LFGIovsI9sWyL2Vnt3P4UFDEWbDIxMBAV+vnxMPHrgfMEpsH1tpXvPLkb1d2wwXtnGo ZxkP/glCnhawW9n7i9rDxB2H4IBQ/AITXwts2NCj7cb3rAfmMWmmiYsS1I0ulnt0tPH7 090A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770683917; x=1771288717; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D0Pi0e7p+zApj87fVsFVxZlxRDj171oPkvxq1iRYRTY=; b=ID6xev7OVod27o8R8JzGzrnDc3uNFEsw7UNiZHwoNw9XMuUKp2WAGx+Tdw3SNvMOO4 kQaO+Yzd7IOW48SYGd06T4h/BPPTUC0EltMUhX6vwnUjGod2TCbXPI6gwI7RS3jwonEB pQ7F6XGBZh6DQnyRx9YUGpXqsTspxq9FKkG5F/gIYlFwCKA+jmK626rTq+lIcAMq6Q5F JcjJ6Ii5LbmBt/8815/4I2Ih0pBqPSpqRpKJDJF2twy0XeP/Qu6Xbb7MqnE3b1y/l0j4 Uga09Kq2Qdhhd214wxrtWhV/4wpjzAxXohj9pPtqI1LsEh/20g2RjKrni8RA3QYecaQ9 nAww== X-Forwarded-Encrypted: i=1; AJvYcCW57KpTLXaVNvs3hFuKCCEgv8sWCtgYNxwoKQvizyvm85ug761pOHeZ8Ot4Nj5IYKDajDQnd2q3mfM2Pyk=@vger.kernel.org X-Gm-Message-State: AOJu0YzngFU5BUPiH2eUW7pMoAWiZ0cM1Ir7ALPCmSwGT0103+AxSIEm xIvPR1t2mgYgITrAZYqPrzBiGJSh0kPH+3e+pHwl48yabYu73EhSPErQ9ZoP2ERF8UjoAD/j9RM DCntvC97uHtmPs8+7ww== X-Received: from plzv5.prod.google.com ([2002:a17:902:b7c5:b0:2a8:759b:173d]) (user=tjmercier job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e744:b0:2a1:3cd9:a737 with SMTP id d9443c01a7336-2a95194698fmr165463975ad.36.1770683916818; Mon, 09 Feb 2026 16:38:36 -0800 (PST) Date: Mon, 9 Feb 2026 16:38:01 -0800 In-Reply-To: <20260210003801.2834976-1-tjmercier@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260210003801.2834976-1-tjmercier@google.com> X-Mailer: git-send-email 2.53.0.rc2.204.g2597b5adb4-goog Message-ID: <20260210003801.2834976-4-tjmercier@google.com> Subject: [PATCH 3/3] selftests: memcg: Add tests IN_DELETE_SELF and IN_IGNORED on memory.events From: "T.J. Mercier" To: gregkh@linuxfoundation.org, tj@kernel.org, driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org Cc: "T.J. Mercier" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add two new tests that verify inotify events are sent when memcg files are removed. Signed-off-by: T.J. Mercier --- .../selftests/cgroup/test_memcontrol.c | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testi= ng/selftests/cgroup/test_memcontrol.c index 4e1647568c5b..25a495347f7c 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -1625,6 +1626,129 @@ static int test_memcg_oom_group_score_events(const = char *root) return ret; } =20 +static int read_event(int inotify_fd, int expected_event, int expected_wd) +{ + struct inotify_event event; + ssize_t len =3D 0; + + len =3D read(inotify_fd, &event, sizeof(event)); + if (len < (ssize_t)sizeof(event)) + return -1; + + if (event.mask !=3D expected_event || event.wd !=3D expected_wd) { + fprintf(stderr, + "event does not match expected values: mask %d (expected %d) wd %d (exp= ected %d)\n", + event.mask, expected_event, event.wd, expected_wd); + return -1; + } + + return 0; +} + +static int test_memcg_inotify_delete_file(const char *root) +{ + int ret =3D KSFT_FAIL; + char *memcg, *child_memcg; + int fd, wd; + struct inotify_event event; + ssize_t len =3D 0; + + memcg =3D cg_name(root, "memcg_test_0"); + + if (!memcg) + goto cleanup; + + if (cg_create(memcg)) + goto cleanup; + + if (cg_write(memcg, "cgroup.subtree_control", "+memory")) + goto cleanup; + + child_memcg =3D cg_name(memcg, "child"); + if (!child_memcg) + goto cleanup; + + if (cg_create(child_memcg)) + goto cleanup; + + fd =3D inotify_init1(0); + if (fd =3D=3D -1) + goto cleanup; + + wd =3D inotify_add_watch(fd, cg_control(child_memcg, "memory.events"), IN= _DELETE_SELF); + if (wd =3D=3D -1) + goto cleanup; + + cg_write(memcg, "cgroup.subtree_control", "-memory"); + + if (read_event(fd, IN_DELETE_SELF, wd)) + goto cleanup; + + if (read_event(fd, IN_IGNORED, wd)) + goto cleanup; + + ret =3D KSFT_PASS; + +cleanup: + if (fd >=3D 0) + close(fd); + if (child_memcg) + cg_destroy(child_memcg); + free(child_memcg); + if (memcg) + cg_destroy(memcg); + free(memcg); + + return ret; +} + +static int test_memcg_inotify_delete_rmdir(const char *root) +{ + int ret =3D KSFT_FAIL; + char *memcg; + int fd, wd; + struct inotify_event event; + ssize_t len =3D 0; + + memcg =3D cg_name(root, "memcg_test_0"); + + if (!memcg) + goto cleanup; + + if (cg_create(memcg)) + goto cleanup; + + fd =3D inotify_init1(0); + if (fd =3D=3D -1) + goto cleanup; + + wd =3D inotify_add_watch(fd, cg_control(memcg, "memory.events"), IN_DELET= E_SELF); + if (wd =3D=3D -1) + goto cleanup; + + if (cg_destroy(memcg)) + goto cleanup; + free(memcg); + memcg =3D NULL; + + if (read_event(fd, IN_DELETE_SELF, wd)) + goto cleanup; + + if (read_event(fd, IN_IGNORED, wd)) + goto cleanup; + + ret =3D KSFT_PASS; + +cleanup: + if (fd >=3D 0) + close(fd); + if (memcg) + cg_destroy(memcg); + free(memcg); + + return ret; +} + #define T(x) { x, #x } struct memcg_test { int (*fn)(const char *root); @@ -1644,6 +1768,8 @@ struct memcg_test { T(test_memcg_oom_group_leaf_events), T(test_memcg_oom_group_parent_events), T(test_memcg_oom_group_score_events), + T(test_memcg_inotify_delete_file), + T(test_memcg_inotify_delete_rmdir), }; #undef T =20 --=20 2.53.0.rc2.204.g2597b5adb4-goog