From nobody Thu Apr 2 22:07:12 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 5D8B32DEA95 for ; Wed, 18 Feb 2026 03:22:59 +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=1771384980; cv=none; b=rl5xHtG0POdiVewPnIzxAbw3LTdb6DMh7vALTfOLvnGRM6/L0sAgYVXbfE4l3j7peGB+XZAvhSEJMwyE61m+DuSLzi0F3ZbmpervW3wsUEmz/eVueVZFWKabZItjkxNzYz3dQSmfv4iwvk2x3gKNadGobuqgLpC2smnExpUr7bA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771384980; c=relaxed/simple; bh=amJ6sTsdRzljNmWNFyyNWbH0+wmhpkN9l7CXsUdsmJY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=t0CCWBq4sK8Y4HUnXlUv9mEqSl+0swy0pOJP1gdb/tImDly3AN5RUOwg6GRkW2l7Oe5SNPkZ3+E9VAqr5zHKocXJZG8EWx6tkAHWRkfT+/TN0EMW8Y0nRNCvOaPcrOpzNeMCaxm4f3WfnrindGEamxt8Wv4e9036LlXMKR5R6u0= 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=KwsBFT7J; 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="KwsBFT7J" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2a863be8508so54072645ad.2 for ; Tue, 17 Feb 2026 19:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771384979; x=1771989779; 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=fK/D1opWbvNOOx0YfmI5FNRjOmnqGdMEH8VMO81NrfE=; b=KwsBFT7J4jYlacwY5b6LXwNUxYhroxASeKKBDpzY0RzrPypElBwUwIGQJ/QwymGZs6 1s2pVOf4ZhbLymL73iZPExX2c5la+7uM3+8u7XEXT226z4K+PEN8ef6CnjvfHQ7m9/FB WoUFR+8AUVWz668Gi2+zF5M71r2XjvdKFz3ZwqFRWWyNUTBGv5hEJkxkBJtam9mBiBsq Ul7blxHCa1rWPMF3aFfbQNSWD9JhwjX0w1O15f7CJf59JP61L4TF6FFoDz5HUnTd2YP+ AMMcU29tcw9fCiFgoOcKlFKP9gvqkyCjReeT9ZOTOHB7x7diTbkbKNynsbRdyyETqLrY 95Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771384979; x=1771989779; 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=fK/D1opWbvNOOx0YfmI5FNRjOmnqGdMEH8VMO81NrfE=; b=CnB6Klo4pxC5pxRp70bCsoAt1KELwsQtmt2K3r3msb4NIfpusbwhGdIaf5zJuxvVvC 9AWHVgcZ3QAPLicusXPskQrCv+m67SeHk7RuSCAlsgsNymBtKkrV7+xXOmcIMjONPnPi omdbvUr5pGfee/UGlb0+y5Bw1GlMpQuUq2VU2F0+KHhiBuUSHcXSJ3gj1ByXQiv8PQJy 1LF2Ocb2p5dRGqKWUzt2zR3sbJlJWxfZPqoY5rnXHAaEPyNSYGruNQkavPZbSYlfFSeU lEP1ZNTR0BQCebD5v2XNfYRqHKg2RVTYUXzuGOaH4T0JxmXssuCOHRAl8yqGcFwAozKI a71w== X-Forwarded-Encrypted: i=1; AJvYcCVEXRAZ5rKe92IayNfKd0SZlnmrQwp77Nswb5J31PL2QPbdLixiELGocTvngN5S10XC9DLGF3CIpM8W9XU=@vger.kernel.org X-Gm-Message-State: AOJu0YyQiGFksdpYLcY2fKBCsWvdT701EznAC94PSEqeYcyBQ9e6KZ0S 1iKTvrBRWPmIcvhhTHNpmKsIe303osxKYs6UM8T7XFE8l3sU1t5NzfYRfxd5uQH08IvPfS8/sig s97IcCxjosOjUq1sGfQ== X-Received: from pfbhc6.prod.google.com ([2002:a05:6a00:6506:b0:823:c4bd:60eb]) (user=tjmercier job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:f8f:b0:81d:a1b1:731b with SMTP id d2e1a72fcca58-824d951b02dmr12246190b3a.19.1771384978430; Tue, 17 Feb 2026 19:22:58 -0800 (PST) Date: Tue, 17 Feb 2026 19:22:32 -0800 In-Reply-To: <20260218032232.4049467-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: <20260218032232.4049467-1-tjmercier@google.com> X-Mailer: git-send-email 2.53.0.310.g728cabbaf7-goog Message-ID: <20260218032232.4049467-4-tjmercier@google.com> Subject: [PATCH v3 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, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, 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 Acked-by: Tejun Heo Acked-by: Amir Goldstein --- .../selftests/cgroup/test_memcontrol.c | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testi= ng/selftests/cgroup/test_memcontrol.c index 4e1647568c5b..2b065d03b730 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,125 @@ 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 =3D NULL, *child_memcg =3D NULL; + int fd, wd; + + 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 =3D NULL; + int fd, wd; + + 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 +1764,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.310.g728cabbaf7-goog