From patchwork Tue May 2 09:37:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1775776 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.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=gkA2trIv; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=C8jJ2tki; 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 4Q9Zmn2l8pz1ymp for ; Tue, 2 May 2023 19:39:53 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 379583CB8F3 for ; Tue, 2 May 2023 11:39:50 +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 [217.194.8.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 picard.linux.it (Postfix) with ESMTPS id EBD843CB8C4 for ; Tue, 2 May 2023 11:39:47 +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-2.smtp.seeweb.it (Postfix) with ESMTPS id D8C0B60043A for ; Tue, 2 May 2023 11:39:46 +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 E1BE122303; Tue, 2 May 2023 09:39:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683020385; 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; bh=NJemPZh55/O4LEdFpyPzfmEtAhRWSS+bBE0rUpv0j3E=; b=gkA2trIvmJ02T1mTJJx/aBiiGtuJeYngXZLu6vKNC1a0cF1IV75xNeCVyJWXF3RWxFcvpt 4xV56eIzMZICxStridznqQSAoak7e+LHpEs8lQvgABkKq+8JGfHtbTcMNJibpd2OaRoN+g JMM3xfVsJfOQVHBtlc15BI75o6tOS8Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683020385; 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; bh=NJemPZh55/O4LEdFpyPzfmEtAhRWSS+bBE0rUpv0j3E=; b=C8jJ2tkiH5F0dhV193wLQb4EQqyZdneCmhrzoV0p3Qd72qNcg8VxFdu+TqUUZ5DuuOUU1g 7DYeieNOFTuIVMAQ== 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 A5A07139C3; Tue, 2 May 2023 09:39:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ABC9ImHaUGQjXAAAMHmgww (envelope-from ); Tue, 02 May 2023 09:39:45 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Tue, 2 May 2023 11:37:24 +0200 Message-Id: <20230502093724.4879-1-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.3 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 v3] Remove ltp_clone_quick usage from pidns suite 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: Andrea Cervesato Replaced ltp_clone_quick with SAFE_CLONE inside the pidns testing suite. Fixed also errors in pidns0[12] where in previous patches we used CLONE_NEWNS instead of CLONE_NEWPID. Signed-off-by: Andrea Cervesato Reviewed-by: Petr Vorel --- Changed pidns02 to make sure setsid is applied testcases/kernel/containers/pidns/pidns01.c | 24 +++++++++------- testcases/kernel/containers/pidns/pidns02.c | 31 ++++++++++++--------- testcases/kernel/containers/pidns/pidns03.c | 18 +++++++----- testcases/kernel/containers/pidns/pidns12.c | 22 +++++++++------ testcases/kernel/containers/pidns/pidns20.c | 28 +++++++++++-------- 5 files changed, 74 insertions(+), 49 deletions(-) diff --git a/testcases/kernel/containers/pidns/pidns01.c b/testcases/kernel/containers/pidns/pidns01.c index 5080b6fad..6b5ec48ac 100644 --- a/testcases/kernel/containers/pidns/pidns01.c +++ b/testcases/kernel/containers/pidns/pidns01.c @@ -8,7 +8,7 @@ /*\ * [Description] * - * Clone a process with CLONE_NEWNS flag and check: + * Clone a process with CLONE_NEWPID flag and check: * * - child process ID must be 1 * - parent process ID must be 0 @@ -17,29 +17,33 @@ #include "tst_test.h" #include "lapi/sched.h" -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { pid_t cpid, ppid; cpid = getpid(); ppid = getppid(); - TST_EXP_PASS(cpid == 1); - TST_EXP_PASS(ppid == 0); - - return 0; + TST_EXP_EQ_LI(cpid, 1); + TST_EXP_EQ_LI(ppid, 0); } static void run(void) { - int ret; + const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD }; - ret = ltp_clone_quick(CLONE_NEWNS | SIGCHLD, child_func, NULL); - if (ret < 0) - tst_brk(TBROK | TERRNO, "clone failed"); + if (!SAFE_CLONE(&args)) { + child_func(); + return; + } } static struct tst_test test = { .test_all = run, .needs_root = 1, + .forks_child = 1, + .needs_kconfigs = (const char *[]) { + "CONFIG_PID_NS", + NULL, + }, }; diff --git a/testcases/kernel/containers/pidns/pidns02.c b/testcases/kernel/containers/pidns/pidns02.c index b8913d3f6..07eda0c3a 100644 --- a/testcases/kernel/containers/pidns/pidns02.c +++ b/testcases/kernel/containers/pidns/pidns02.c @@ -7,7 +7,7 @@ /*\ * [Description] * - * Clone a process with CLONE_NEWNS flag and check: + * Clone a process with CLONE_NEWPID flag and check: * * - child session ID must be 1 * - parent process group ID must be 1 @@ -16,29 +16,34 @@ #include "tst_test.h" #include "lapi/sched.h" -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { - pid_t sid, pgid; + TST_EXP_EQ_LI(getsid(0), 0); + TST_EXP_EQ_LI(getpgid(0), 0); - sid = getsid(0); - pgid = getpgid(0); + tst_res(TINFO, "setsid()"); + SAFE_SETSID(); - TST_EXP_PASS(sid == 1); - TST_EXP_PASS(pgid == 1); - - return 0; + TST_EXP_EQ_LI(getsid(0), 1); + TST_EXP_EQ_LI(getpgid(0), 1); } static void run(void) { - int ret; + const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD }; - ret = ltp_clone_quick(CLONE_NEWNS | SIGCHLD, child_func, NULL); - if (ret < 0) - tst_brk(TBROK | TERRNO, "clone failed"); + if (!SAFE_CLONE(&args)) { + child_func(); + return; + } } static struct tst_test test = { .test_all = run, .needs_root = 1, + .forks_child = 1, + .needs_kconfigs = (const char *[]) { + "CONFIG_PID_NS", + NULL, + }, }; diff --git a/testcases/kernel/containers/pidns/pidns03.c b/testcases/kernel/containers/pidns/pidns03.c index 122ba7891..d0d26c8a5 100644 --- a/testcases/kernel/containers/pidns/pidns03.c +++ b/testcases/kernel/containers/pidns/pidns03.c @@ -17,7 +17,7 @@ #define PROCDIR "proc" -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { char proc_self[10]; @@ -28,8 +28,6 @@ static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) SAFE_UMOUNT(PROCDIR); TST_EXP_PASS(strcmp(proc_self, "1"), PROCDIR"/self contains 1:"); - - return 0; } static void setup(void) @@ -45,11 +43,12 @@ static void cleanup(void) static void run(void) { - int ret; + const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD }; - ret = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_func, NULL); - if (ret < 0) - tst_brk(TBROK | TERRNO, "clone failed"); + if (!SAFE_CLONE(&args)) { + child_func(); + return; + } } static struct tst_test test = { @@ -57,5 +56,10 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .needs_root = 1, + .forks_child = 1, .needs_tmpdir = 1, + .needs_kconfigs = (const char *[]) { + "CONFIG_PID_NS", + NULL, + }, }; diff --git a/testcases/kernel/containers/pidns/pidns12.c b/testcases/kernel/containers/pidns/pidns12.c index fb1ec90ca..ab035f33d 100644 --- a/testcases/kernel/containers/pidns/pidns12.c +++ b/testcases/kernel/containers/pidns/pidns12.c @@ -25,7 +25,7 @@ static void child_signal_handler(LTP_ATTRIBUTE_UNUSED int sig, siginfo_t *si, LT sig_pid = si->si_pid; } -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { struct sigaction sa; @@ -41,21 +41,22 @@ static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) TST_CHECKPOINT_WAKE_AND_WAIT(0); TST_EXP_EQ_LI(sig_pid, 0); - - return 0; } static void run(void) { - int ret; + const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD }; + int pid; - ret = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_func, NULL); - if (ret < 0) - tst_brk(TBROK | TERRNO, "clone failed"); + pid = SAFE_CLONE(&args); + if (!pid) { + child_func(); + return; + } TST_CHECKPOINT_WAIT(0); - SAFE_KILL(ret, SIGUSR1); + SAFE_KILL(pid, SIGUSR1); TST_CHECKPOINT_WAKE(0); } @@ -63,5 +64,10 @@ static void run(void) static struct tst_test test = { .test_all = run, .needs_root = 1, + .forks_child = 1, .needs_checkpoints = 1, + .needs_kconfigs = (const char *[]) { + "CONFIG_PID_NS", + NULL, + }, }; diff --git a/testcases/kernel/containers/pidns/pidns20.c b/testcases/kernel/containers/pidns/pidns20.c index 9f369699a..4d0924c4e 100644 --- a/testcases/kernel/containers/pidns/pidns20.c +++ b/testcases/kernel/containers/pidns/pidns20.c @@ -26,7 +26,7 @@ static void child_signal_handler(LTP_ATTRIBUTE_UNUSED int sig, siginfo_t *si, LT signals++; } -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { struct sigaction sa; sigset_t newset; @@ -37,7 +37,7 @@ static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) if (cpid != 1 || ppid != 0) { tst_res(TFAIL, "Got unexpected result of cpid=%d ppid=%d", cpid, ppid); - return 0; + return; } SAFE_SIGEMPTYSET(&newset); @@ -56,30 +56,31 @@ static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) if (signals != 1) { tst_res(TFAIL, "Received %d signals", signals); - return 0; + return; } if (last_signo != SIGUSR1) { tst_res(TFAIL, "Received %s signal", tst_strsig(last_signo)); - return 0; + return; } tst_res(TPASS, "Received SIGUSR1 signal after unblock"); - - return 0; } static void run(void) { - int ret; + const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD }; + int pid; - ret = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_func, NULL); - if (ret < 0) - tst_brk(TBROK | TERRNO, "clone failed"); + pid = SAFE_CLONE(&args); + if (!pid) { + child_func(); + return; + } TST_CHECKPOINT_WAIT(0); - SAFE_KILL(ret, SIGUSR1); + SAFE_KILL(pid, SIGUSR1); TST_CHECKPOINT_WAKE(0); } @@ -87,5 +88,10 @@ static void run(void) static struct tst_test test = { .test_all = run, .needs_root = 1, + .forks_child = 1, .needs_checkpoints = 1, + .needs_kconfigs = (const char *[]) { + "CONFIG_PID_NS", + NULL, + }, };