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 9E03E72 for ; Sat, 8 May 2021 12:15:57 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 73E8E6147E; Sat, 8 May 2021 12:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620476157; bh=7eUgs0ekWyt837T6LcGkgs858Rf04B5QX6Bu8MJC1M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlWtUUcBhcUYyLTFNnIpiQz2INQqQ+j8PvRiTBdB6aT8IHclKvX+sGHML1HcJBVOx KnFt2ksYnEpo5M5mjRbI4fIm3Phqrgfn4muJDdt/hnP1JHX/ZzT7ItKkye3mDXYO5N aUYsu7S3EB4n4SkCTRgR5fvaZHHkoEmDgr8TQeFxH5l/yvIOizdB7ap9gIZiq8PPHh W/Q2Jir97d28xsTG7QGV5VoLS9anCsqPpmV2sCtGR9wA5/BG5B40EcA7Op4VFpVYOh 3CTejniEES/tWhIhb+zdZaDxxwdoTxMXzEDqsfBgoHyyiCO9Uykg8dEJ1h5xYtYI92 RXpct/e2EjaXA== 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 v3 3/5] tests/cgroup: use cgroup.kill in cg_killall() Date: Sat, 8 May 2021 14:15:40 +0200 Message-Id: <20210508121542.1269256-3-brauner@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210508121542.1269256-1-brauner@kernel.org> References: <20210508121542.1269256-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=AINvc3b3JybbVUtUd5efhWEUs+WExpok1nDwV9EPyE0=; p=DHUt07yqiAMnkkMUKU00TMtgEeY5ceCRlyT9YTuFjfA=; g=f9f764d90d255b615ede51d62b8fdc79385ad80c X-Patch-Sig: m=pgp; i=christian.brauner@ubuntu.com; s=0x0x91C61BC06578DCA2; b=iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCYJaA0AAKCRCRxhvAZXjcomliAQCaGV/ jhSrBqNku77s1VvRiYCZ6tdf4oxEd+YuN1z+7fgEAy/WBfg/6Tj0e6t5RHgICoVpUSRBJNGrbRQ3B bxR7agc= Content-Transfer-Encoding: 8bit From: Christian Brauner If cgroup.kill file is supported make use of it. Link: https://lore.kernel.org/r/20210503143922.3093755-3-brauner@kernel.org Cc: Tejun Heo Cc: cgroups@vger.kernel.org Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Signed-off-by: Christian Brauner --- /* v2 */ - Roman Gushchin : - Fix whitespace. /* v3 */ unchanged --- 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