From mboxrd@z Thu Jan 1 00:00:00 1970 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 C279035E528 for ; Thu, 12 Feb 2026 21:58:38 +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=1770933521; cv=none; b=loI1bMWFw0F/yPIDVbggPRq4CPiE5Uj0RVB3aYA79rbUTxkfpNbHVpQgfTUW2+ftqyDJfUa8ddXdENthNgnvbV33BAoSDWQGshcT/ZOIEo3jqAA3vT3RAx5GNBG2LovCI+nbr1uXKnGPra9kAhS2fEbzcJQnLLgNnw62Eg3N4Tg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770933521; c=relaxed/simple; bh=ezbBm/Tq1NbOZNYchfM5BrbiYJXHM46rp75jJpESgIM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YoHnVMy+i2g1ujpH2MXu+KqRDwOFyUMWxf2KUK3+Y8jed2yn2uLvpZqXg7lPWtT6C1PU4h3HLGB+7M0MVxCuuqQNRH6UgjqVVDN6AQB0w7W8pFSkbAb4AYpctkhW15315Gp2CH+LdnDph95yixPL7GjGSkE8h9B3Y5ZXaQOXy8s= 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=cwnua99f; 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="cwnua99f" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2a75ed2f89dso2715675ad.1 for ; Thu, 12 Feb 2026 13:58:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770933518; x=1771538318; 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=/49beE9xrDbjk2PTkq3bWwQqpKtfvuvBtaf8t9tZ8yg=; b=cwnua99fB0+vvZARrjQFt2miVg+prGDbN9oZs8jB2HxK+GLIItGcsZ8RhBu0tPl5Ks FwIjMBKXn6hfVVGCPeSN4XD4fBLobGDf+RXFLP9RyiD6hH+eQWCAZXWWPJYge0aCUHN0 mVwaUY/03pV5wEs7VH7a4him0RbU2HiSifwQOszre/RrgNqXXsI0Hvu0b8wLkQRvON9a jE1v3Ar8l2WQdbFahdVVRJwuiSR3quYjEz/GgfxXoB0vcpz6tA1M/3B6Oq4bp1BMK4I9 4yjZZxZc1tsLwWEZLNtv4o553Wa6kjv3pXWWXb8uzmKPKoGQpN+MBaT5/9vdrofO4EpN yrIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770933518; x=1771538318; 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=/49beE9xrDbjk2PTkq3bWwQqpKtfvuvBtaf8t9tZ8yg=; b=DQTCJTJTXq57kdBeKR3xX1hCmvD0WBB9pkKqkoBWDvssMO18N0hS0ZYsTqknDveszT 3TxII906iNi5w02chWE+ZsXMRlsNi3w94psVzQ5YMhUAU/apjFUZrvlggTwMwvBUmJjM b+bvcNdKwBNPjZFEIhwmvFifv2AQx2nRQ9rVBlOpNVK1eebFe9/+qpNJshdsG5L31/EK lgRkRwE8OveFi4YnkF+CBqpKp1QuQ0seynug08MeBEzgw+KzMIH4cldBmJmAHuhqRK2s XnrJLfxTY6QQWBrzFVmJDBz/7PzzaGiczD5joF+wLzV3MOAe6MdjnbbZUI0eNl+6sWB1 nzaQ== X-Forwarded-Encrypted: i=1; AJvYcCUD09xHdCxE7qGuIV7Ri4JyTxJp111EZUcic0Z5GS9zrg5MxJzsN6xTSkooYDTzvbHxjJUictEb4L4PWRU8Hgs=@vger.kernel.org X-Gm-Message-State: AOJu0YwnxzoYUH5HpSgZr2Lcwqzuxw631hvw+WrJMGC4xPYeaaIIfdru H6El7kq1akiupt7S60VZ5j1ynjQ1sQtmQ2y9X20WFK73rV3Xh/0JZhiazPiras/8yXqXTzf+2JF gMSG8MvrNtGWytPyTrA== X-Received: from pjbqx6.prod.google.com ([2002:a17:90b:3e46:b0:354:c41d:dd42]) (user=tjmercier job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:544e:b0:356:268e:ff97 with SMTP id 98e67ed59e1d1-356a792ab7fmr512870a91.20.1770933517978; Thu, 12 Feb 2026 13:58:37 -0800 (PST) Date: Thu, 12 Feb 2026 13:58:14 -0800 In-Reply-To: <20260212215814.629709-1-tjmercier@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260212215814.629709-1-tjmercier@google.com> X-Mailer: git-send-email 2.53.0.273.g2a3d683680-goog Message-ID: <20260212215814.629709-4-tjmercier@google.com> Subject: [PATCH v2 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-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 | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 4e1647568c5b..be0e78809494 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; } +static int read_event(int inotify_fd, int expected_event, int expected_wd) +{ + struct inotify_event event; + ssize_t len = 0; + + len = read(inotify_fd, &event, sizeof(event)); + if (len < (ssize_t)sizeof(event)) + return -1; + + if (event.mask != expected_event || event.wd != expected_wd) { + fprintf(stderr, + "event does not match expected values: mask %d (expected %d) wd %d (expected %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 = KSFT_FAIL; + char *memcg, *child_memcg; + int fd, wd; + + memcg = 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 = cg_name(memcg, "child"); + if (!child_memcg) + goto cleanup; + + if (cg_create(child_memcg)) + goto cleanup; + + fd = inotify_init1(0); + if (fd == -1) + goto cleanup; + + wd = inotify_add_watch(fd, cg_control(child_memcg, "memory.events"), IN_DELETE_SELF); + if (wd == -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 = KSFT_PASS; + +cleanup: + if (fd >= 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 = KSFT_FAIL; + char *memcg; + int fd, wd; + + memcg = cg_name(root, "memcg_test_0"); + + if (!memcg) + goto cleanup; + + if (cg_create(memcg)) + goto cleanup; + + fd = inotify_init1(0); + if (fd == -1) + goto cleanup; + + wd = inotify_add_watch(fd, cg_control(memcg, "memory.events"), IN_DELETE_SELF); + if (wd == -1) + goto cleanup; + + if (cg_destroy(memcg)) + goto cleanup; + free(memcg); + memcg = NULL; + + if (read_event(fd, IN_DELETE_SELF, wd)) + goto cleanup; + + if (read_event(fd, IN_IGNORED, wd)) + goto cleanup; + + ret = KSFT_PASS; + +cleanup: + if (fd >= 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 -- 2.53.0.273.g2a3d683680-goog