From patchwork Mon Feb 13 09:47:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1741528 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=213.254.12.146; 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=R4x+2Ub8; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (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 4PFfgW1gt4z23h0 for ; Mon, 13 Feb 2023 20:49:11 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 60F533CBF81 for ; Mon, 13 Feb 2023 10:49:08 +0100 (CET) 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 31B643C07B4 for ; Mon, 13 Feb 2023 10:49:06 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (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 7A03110006AE for ; Mon, 13 Feb 2023 10:49:06 +0100 (CET) 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 E31371F892; Mon, 13 Feb 2023 09:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1676281745; 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=eZY3+uoGPxsO8tbtGb7NUjE3XO9qmnHAJRprXHiJdNs=; b=R4x+2Ub8cJefBXgzNwqQY5a6Sbn/W7maECy7ryFPJIIKyETVmJWKm19XIJdheEwLXncaXU eHsOkDY1UimoJ+d04W+E4OHpt2mrs2iNSX+hA/E/Ng2BCMk8jNZ4dwKSqUWoq8sz0+l5xs IlYbpsubslc+jZVdZhfQ8x/rJbezemA= 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 78506138E6; Mon, 13 Feb 2023 09:49:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +0i6F5EH6mPIZQAAMHmgww (envelope-from ); Mon, 13 Feb 2023 09:49:05 +0000 To: ltp@lists.linux.it Date: Mon, 13 Feb 2023 10:47:03 +0100 Message-Id: <20230213094703.28746-1-andrea.cervesato@suse.com> X-Mailer: git-send-email 2.35.3 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 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 v2] Refactor pidns32 test using new LTP API 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: Andrea Cervesato via ltp From: Andrea Cervesato Reply-To: Andrea Cervesato Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- Using SAFE_CLONE Using TST_EXP_* macros testcases/kernel/containers/pidns/pidns32.c | 41 +++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/testcases/kernel/containers/pidns/pidns32.c b/testcases/kernel/containers/pidns/pidns32.c index 3f7df788e..c9f8db3e5 100644 --- a/testcases/kernel/containers/pidns/pidns32.c +++ b/testcases/kernel/containers/pidns/pidns32.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Huawei Technologies Co., Ltd., 2015 - * Copyright (C) 2022 SUSE LLC Andrea Cervesato + * Copyright (C) 2023 SUSE LLC Andrea Cervesato */ /*\ @@ -12,32 +12,32 @@ */ #define _GNU_SOURCE - #include #include "tst_test.h" #include "lapi/sched.h" #define MAXNEST 32 +static const struct tst_clone_args args = { CLONE_NEWPID, SIGCHLD }; static int *level; -static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) +static void child_func(void) { pid_t cpid; int status; if (*level == MAXNEST) - return 0; + return; (*level)++; - cpid = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_func, 0); - if (cpid < 0) - tst_brk(TBROK | TERRNO, "clone failed"); + cpid = SAFE_CLONE(&args); + if (!cpid) { + child_func(); + return; + } SAFE_WAITPID(cpid, &status, 0); - - return 0; } static void setup(void) @@ -45,28 +45,29 @@ static void setup(void) level = SAFE_MMAP(NULL, sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0); } -static void run(void) +static void cleanup(void) { - int ret, status; + SAFE_MUNMAP(level, sizeof(int)); +} +static void run(void) +{ *level = 1; - ret = ltp_clone_quick(CLONE_NEWPID | SIGCHLD, child_func, 0); - if (ret < 0) - tst_brk(TBROK | TERRNO, "clone failed"); - - SAFE_WAITPID(ret, &status, 0); - - if (*level < MAXNEST) { - tst_res(TFAIL, "Nested containers should be %d, but they are %d", MAXNEST, *level); + if (!SAFE_CLONE(&args)) { + child_func(); return; } - tst_res(TPASS, "All %d containers have been nested", MAXNEST); + tst_reap_children(); + + TST_EXP_EQ_LI(*level, MAXNEST); } static struct tst_test test = { .test_all = run, .needs_root = 1, .setup = setup, + .cleanup = cleanup, + .forks_child = 1, };