From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B23172 for ; Mon, 3 May 2021 14:40:25 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 199466108B; Mon, 3 May 2021 14:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620052824; bh=6Sf1JD7r+JgTYZS8K/J2qUYaOsenxFzh+TJhtjMKVCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HqpNc3ZvgN4cXp1Ru0F1DLJHflD0heZFRKV3i5HuYJx5VclfS27QcXJpRbKxOstDV rdVj9pUhi36fcuL8TqitF/tLZj5KDm8pitzOiFEc/1HeFiOmMLAIQtQ8WfnXwmXmcq H7OX7YiTYFgX9ym8sY9te0reLYSPiYpCQF53C2dW1P2cF3XAI7ZzL6KVzWvcwlHop9 L/NYGolgcoN07DokUGCrMmoMeMWvIZ/OBWdZQXFVO43b1FLWcvBOvsEKL/aNJId3UE a78s0wcuQfO5bxnr2WjYmJnOhNPXN8iW36mQRZhLpwXoZlc3Gcus6EbQWQFfg9KxjL jsLrOI8w8S7dA== From: Christian Brauner To: Tejun Heo , Roman Gushchin Cc: Shakeel Butt , Zefan Li , Johannes Weiner , cgroups@vger.kernel.org, containers@lists.linux.dev, Christian Brauner Subject: [PATCH v2 3/5] tests/cgroup: use cgroup.kill in cg_killall() Date: Mon, 3 May 2021 16:39:21 +0200 Message-Id: <20210503143922.3093755-3-brauner@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210503143922.3093755-1-brauner@kernel.org> References: <20210503143922.3093755-1-brauner@kernel.org> X-Mailing-List: containers@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patch-Hashes: v=1; h=sha256; i=DIB/9pEGy9llyw8JVnB5N3xonNHMlykb1jj0N6tKKZc=; m=N4CiSeYEjjigDgiqqFvr6DAlj4IvG2/Qdx6umJFFRGk=; p=DHUt07yqiAMnkkMUKU00TMtgEeY5ceCRlyT9YTuFjfA=; g=f9f764d90d255b615ede51d62b8fdc79385ad80c X-Patch-Sig: m=pgp; i=christian.brauner@ubuntu.com; s=0x0x91C61BC06578DCA2; b=iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCYJAK7wAKCRCRxhvAZXjcoqmkAQD2ULp GEK3wx+KT0VzyGkqqgAYQKw982ZetTna/kDmE/gEA0QDCOmbPNaHHS75MVt9T8RBAdp+RU9zyTMKk 9lNuSwA= Content-Transfer-Encoding: 8bit From: Christian Brauner If cgroup.kill file is supported make use of it. Cc: Tejun Heo Cc: cgroups@vger.kernel.org Acked-by: Roman Gushchin Signed-off-by: Christian Brauner --- /* v2 */ - Roman Gushchin : - Fix whitespace. --- tools/testing/selftests/cgroup/cgroup_util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c index 027014662fb2..f60f7d764690 100644 --- a/tools/testing/selftests/cgroup/cgroup_util.c +++ b/tools/testing/selftests/cgroup/cgroup_util.c @@ -252,6 +252,10 @@ int cg_killall(const char *cgroup) char buf[PAGE_SIZE]; char *ptr = buf; + /* If cgroup.kill exists use it. */ + if (!cg_write(cgroup, "cgroup.kill", "1")) + return 0; + if (cg_read(cgroup, "cgroup.procs", buf, sizeof(buf))) return -1; -- 2.27.0