From patchwork Fri Apr 21 01:26:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Gao X-Patchwork-Id: 1771654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=DF3Z+AM6; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q2cMn6S29z23tk for ; Fri, 21 Apr 2023 11:27:33 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A3FFE3CBFE7 for ; Fri, 21 Apr 2023 03:27:31 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 0F8433CBFCA for ; Fri, 21 Apr 2023 03:27:12 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id AF1971000A29 for ; Fri, 21 Apr 2023 03:27:10 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 90BED21A30; Fri, 21 Apr 2023 01:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1682040429; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=scD3ru10bN4Ri1Ll4aHJKpaxMl8KpSYOgIyXC+06Tkc=; b=DF3Z+AM6tzuVLlzTzU5kdTVSu50MEz+zQUZY5JghbSa6DYcy6tFCFn3Oer1SB9KSvH/vk2 Eddeu4kUvEIHtdy0eiReK4LVa1YYXKvNKkgH5b688Xpr1XJd8Fi1W8r6QxrEIerxmjMmmZ XqIu16gLYWMLtoyFsggiKwcsUqWqh3U= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E9CAE13584; Fri, 21 Apr 2023 01:27:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SDbPL2zmQWT7eAAAMHmgww (envelope-from ); Fri, 21 Apr 2023 01:27:08 +0000 To: ltp@lists.linux.it Date: Thu, 20 Apr 2023 21:26:41 -0400 Message-Id: <20230421012642.16625-2-wegao@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230421012642.16625-1-wegao@suse.com> References: <20230419151849.13152-1-wegao@suse.com> <20230421012642.16625-1-wegao@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v8 1/2] kill01: New case cgroup kill X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Wei Gao via ltp From: Wei Gao Reply-To: Wei Gao Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Wei Gao --- lib/tst_cgroup.c | 1 + runtest/controllers | 1 + .../kernel/controllers/cgroup/kill/.gitignore | 1 + .../kernel/controllers/cgroup/kill/Makefile | 6 + .../kernel/controllers/cgroup/kill/kill01.c | 144 ++++++++++++++++++ 5 files changed, 153 insertions(+) create mode 100644 testcases/kernel/controllers/cgroup/kill/.gitignore create mode 100644 testcases/kernel/controllers/cgroup/kill/Makefile create mode 100644 testcases/kernel/controllers/cgroup/kill/kill01.c diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c index 50699bc63..77575431d 100644 --- a/lib/tst_cgroup.c +++ b/lib/tst_cgroup.c @@ -166,6 +166,7 @@ static const struct cgroup_file cgroup_ctrl_files[] = { { "cgroup.controllers", NULL, 0 }, { "cgroup.subtree_control", NULL, 0 }, { "cgroup.clone_children", "cgroup.clone_children", 0 }, + { "cgroup.kill", NULL, 0 }, { } }; diff --git a/runtest/controllers b/runtest/controllers index 8d1b936bf..2f69a8ec2 100644 --- a/runtest/controllers +++ b/runtest/controllers @@ -23,6 +23,7 @@ memcontrol01 memcontrol01 memcontrol02 memcontrol02 memcontrol03 memcontrol03 memcontrol04 memcontrol04 +kill01 kill01 cgroup_fj_function_debug cgroup_fj_function.sh debug cgroup_fj_function_cpuset cgroup_fj_function.sh cpuset diff --git a/testcases/kernel/controllers/cgroup/kill/.gitignore b/testcases/kernel/controllers/cgroup/kill/.gitignore new file mode 100644 index 000000000..4f9649e27 --- /dev/null +++ b/testcases/kernel/controllers/cgroup/kill/.gitignore @@ -0,0 +1 @@ +/kill01 diff --git a/testcases/kernel/controllers/cgroup/kill/Makefile b/testcases/kernel/controllers/cgroup/kill/Makefile new file mode 100644 index 000000000..bf5aea9e7 --- /dev/null +++ b/testcases/kernel/controllers/cgroup/kill/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../../../ + +include $(top_srcdir)/include/mk/testcases.mk +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/controllers/cgroup/kill/kill01.c b/testcases/kernel/controllers/cgroup/kill/kill01.c new file mode 100644 index 000000000..6a328a770 --- /dev/null +++ b/testcases/kernel/controllers/cgroup/kill/kill01.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2012 Christian Brauner + * Copyright (c) 2023 SUSE LLC + */ + +/*\ + * [Description] + * + * This test is copied from kselftest + * tools/testing/selftests/cgroup/test_kill.c + * Only simple test implemented within current case, the other cases such + * as test_cgkill_tree and test_cgkill_forkbomb can be created later. + * + */ + +#include + +#include "lapi/syscalls.h" +#include "tst_test.h" + +#define MAX_PID_NUM 100 +#define PID_NUM MIN(MAX_PID_NUM, (tst_ncpus_available() + 1)) +#define BUF_LEN (20 * PID_NUM) + +static int *data_ptr; +static char *buf; +static struct tst_cg_group *cg_child_test_simple; + +static int wait_for_pid(pid_t pid) +{ + int status, ret; + +again: + ret = waitpid(pid, &status, 0); + if (ret == -1) { + if (errno == EINTR) + goto again; + + return -1; + } + + if (WIFSIGNALED(status)) + return 0; + + return -1; +} + +/* + * A simple process running in a sleep loop until being + * re-parented. + */ +static void child_fn(void) +{ + int ppid = getppid(); + + while (getppid() == ppid) + usleep(1000); + +} + +static int cg_run_nowait(const struct tst_cg_group *const cg, + void (*fn)(void)) +{ + int pid; + + pid = SAFE_FORK(); + if (pid == 0) { + SAFE_CG_PRINTF(cg, "cgroup.procs", "%d", getpid()); + tst_atomic_inc(data_ptr); + if (tst_atomic_load(data_ptr) == PID_NUM) + TST_CHECKPOINT_WAKE(0); + fn(); + } + + return pid; +} + +static int cg_wait_for_proc_count(const struct tst_cg_group *cg, int count) +{ + char *ptr; + + int nr = 0; + + SAFE_CG_READ(cg, "cgroup.procs", buf, BUF_LEN); + + for (ptr = buf; *ptr; ptr++) + if (*ptr == '\n') + nr++; + + if (nr >= count) + return 0; + + tst_res(TINFO, "Expect process num is %d but get %d", count, nr); + + return -1; +} + +static void run(void) +{ + pid_t pids[MAX_PID_NUM]; + int i; + *data_ptr = 0; + + cg_child_test_simple = tst_cg_group_mk(tst_cg, "cg_test_simple"); + + memset(buf, 0, BUF_LEN); + + for (i = 0; i < PID_NUM; i++) + pids[i] = cg_run_nowait(cg_child_test_simple, child_fn); + + TST_CHECKPOINT_WAIT(0); + TST_EXP_PASS(cg_wait_for_proc_count(cg_child_test_simple, PID_NUM)); + SAFE_CG_PRINTF(cg_child_test_simple, "cgroup.kill", "%d", 1); + + for (i = 0; i < PID_NUM; i++) + TST_EXP_PASS_SILENT(wait_for_pid(pids[i])); + + cg_child_test_simple = tst_cg_group_rm(cg_child_test_simple); +} + +static void setup(void) +{ + buf = tst_alloc(BUF_LEN); + data_ptr = SAFE_MMAP(NULL, sizeof(uintptr_t), PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, -1, 0); +} + +static void cleanup(void) +{ + if (data_ptr) + SAFE_MUNMAP(data_ptr, sizeof(uintptr_t)); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .forks_child = 1, + .max_runtime = 20, + .needs_cgroup_ctrls = (const char *const []){ "memory", NULL }, + .needs_cgroup_ver = TST_CG_V2, + .needs_checkpoints = 1, +}; From patchwork Fri Apr 21 01:26:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Gao X-Patchwork-Id: 1771653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=Wzi8nQ7s; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q2cMZ6vszz1ybF for ; Fri, 21 Apr 2023 11:27:22 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 587F13CBFBF for ; Fri, 21 Apr 2023 03:27:20 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 622743CBFE4 for ; Fri, 21 Apr 2023 03:27:13 +0200 (CEST) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 7766A6009F1 for ; Fri, 21 Apr 2023 03:27:11 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5F5EE1FDD6; Fri, 21 Apr 2023 01:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1682040431; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=av7O8wqA5l5acpG9v4iebekjhlfuxbzl44uj2XY0t4c=; b=Wzi8nQ7sHtrr8x7IG/ny3h5v0ZtxPHKCgLLmo8tm9rzKU3V5Fcu+pC0/1O8jwEXTISZGgQ pMzdvZOEhZZy0UBzVIj2KzKdHFjmgoj7QXcQiD/UgluvG408Ox36ZnZfaf4AG6OMZZdMka OnYzM+Cr7muKkIjpXM4gEmjWuZOl/5s= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B25F613584; Fri, 21 Apr 2023 01:27:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QJY1IW7mQWT7eAAAMHmgww (envelope-from ); Fri, 21 Apr 2023 01:27:10 +0000 To: ltp@lists.linux.it Date: Thu, 20 Apr 2023 21:26:42 -0400 Message-Id: <20230421012642.16625-3-wegao@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230421012642.16625-1-wegao@suse.com> References: <20230419151849.13152-1-wegao@suse.com> <20230421012642.16625-1-wegao@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v8 2/2] tst_cgroup.c: Add a cgroup pseudo controller X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Wei Gao via ltp From: Wei Gao Reply-To: Wei Gao Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" For new test case such as kill01.c no need specific controller, it just need LTP cgroup library start work, so we need add a "cgroup" pseudo controller. Signed-off-by: Wei Gao --- lib/tst_cgroup.c | 54 +++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c index 77575431d..6a70bf4b4 100644 --- a/lib/tst_cgroup.c +++ b/lib/tst_cgroup.c @@ -94,9 +94,10 @@ enum cgroup_ctrl_indx { CTRL_MISC, CTRL_PERFEVENT, CTRL_DEBUG, - CTRL_RDMA + CTRL_RDMA, + CTRL_PSEUDO }; -#define CTRLS_MAX CTRL_RDMA +#define CTRLS_MAX CTRL_PSEUDO /* At most we can have one cgroup V1 tree for each controller and one * (empty) v2 tree. @@ -259,6 +260,10 @@ static const struct cgroup_file rdma_ctrl_files[] = { { } }; +static const struct cgroup_file cgroup_pseudo_ctrl_files[] = { + { } +}; + #define CTRL_NAME_MAX 31 #define CGROUP_CTRL_MEMBER(x, y)[y] = { .ctrl_name = #x, .files = \ x ## _ctrl_files, .ctrl_indx = y, NULL, 0 } @@ -282,6 +287,7 @@ static struct cgroup_ctrl controllers[] = { CGROUP_CTRL_MEMBER(perf_event, CTRL_PERFEVENT), CGROUP_CTRL_MEMBER(debug, CTRL_DEBUG), CGROUP_CTRL_MEMBER(rdma, CTRL_RDMA), + CGROUP_CTRL_MEMBER(cgroup_pseudo, CTRL_PSEUDO), { } }; @@ -798,6 +804,7 @@ void tst_cg_require(const char *const ctrl_name, const char *const cgsc = "cgroup.subtree_control"; struct cgroup_ctrl *const ctrl = cgroup_find_ctrl(ctrl_name); struct cgroup_root *root; + int cgroup_pseudo = !strcmp(ctrl->ctrl_name, "cgroup_pseudo"); if (!ctrl) { tst_brk(TBROK, "'%s' controller is unknown to LTP", ctrl_name); @@ -827,6 +834,9 @@ void tst_cg_require(const char *const ctrl_name, if (options->needs_ver != TST_CG_V2) cgroup_mount_v1(ctrl); + if (cgroup_pseudo) + ctrl->ctrl_root = roots; + if (!ctrl->ctrl_root) { tst_brk(TCONF, "'%s' controller required, but not available", @@ -849,13 +859,15 @@ mkdirs: ctrl->ctrl_name); } - if (cgroup_ctrl_on_v2(ctrl)) { - if (root->we_mounted_it) { - SAFE_FILE_PRINTFAT(root->mnt_dir.dir_fd, - cgsc, "+%s", ctrl->ctrl_name); - } else { - tst_file_printfat(root->mnt_dir.dir_fd, - cgsc, "+%s", ctrl->ctrl_name); + if (!cgroup_pseudo) { + if (cgroup_ctrl_on_v2(ctrl)) { + if (root->we_mounted_it) { + SAFE_FILE_PRINTFAT(root->mnt_dir.dir_fd, + cgsc, "+%s", ctrl->ctrl_name); + } else { + tst_file_printfat(root->mnt_dir.dir_fd, + cgsc, "+%s", ctrl->ctrl_name); + } } } @@ -864,15 +876,17 @@ mkdirs: else root->ltp_dir.ctrl_field |= root->mnt_dir.ctrl_field; - if (cgroup_ctrl_on_v2(ctrl)) { - SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd, - cgsc, "+%s", ctrl->ctrl_name); - } else { - SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd, - "cgroup.clone_children", "%d", 1); + if (!cgroup_pseudo) { + if (cgroup_ctrl_on_v2(ctrl)) { + SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd, + cgsc, "+%s", ctrl->ctrl_name); + } else { + SAFE_FILE_PRINTFAT(root->ltp_dir.dir_fd, + "cgroup.clone_children", "%d", 1); - if (ctrl->ctrl_indx == CTRL_CPUSET) - cgroup_copy_cpuset(root); + if (ctrl->ctrl_indx == CTRL_CPUSET) + cgroup_copy_cpuset(root); + } } cgroup_dir_mk(&root->ltp_dir, cgroup_ltp_drain_dir, &root->drain_dir); @@ -1050,8 +1064,10 @@ static void cgroup_group_add_dir(const struct tst_cg_group *const parent, if (!parent || dir->dir_root->ver == TST_CG_V1) continue; - SAFE_CG_PRINTF(parent, "cgroup.subtree_control", - "+%s", ctrl->ctrl_name); + if (strcmp(ctrl->ctrl_name, "cgroup_pseudo")) { + SAFE_CG_PRINTF(parent, "cgroup.subtree_control", + "+%s", ctrl->ctrl_name); + } } for (i = 0; cg->dirs[i]; i++)