From patchwork Thu Aug 4 08:48:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1663593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Fb/OOItY; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lz2TH3ls3z9sGR for ; Thu, 4 Aug 2022 18:49:07 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 0DDE03C94B4 for ; Thu, 4 Aug 2022 10:49:05 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (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 7045E3C93EF for ; Thu, 4 Aug 2022 10:48:50 +0200 (CEST) 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-3.smtp.seeweb.it (Postfix) with ESMTPS id 0196E1A011FF for ; Thu, 4 Aug 2022 10:48:49 +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 11CFF20385; Thu, 4 Aug 2022 08:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1659602929; 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=w+UubMNtBeYvJTsQ4aGDiShnaAzPJeRbyLSawjTNmBY=; b=Fb/OOItYHFoST+KLW1e5st5Adw52KuWnm1VEnPyGf6BksreIkgJmhgm2yL6GFwXg5T+NAu WhULt/1DlTGJ7AwleEjFOzLdc/rJEl26bxY5ZJYUUqsmq0yKmTp5U3TK9j1760EZ/CB3mR ijNzK8zsF7yL6p29aLKX0AAGRiZkBlM= 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 9CC541348A; Thu, 4 Aug 2022 08:48:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 1olrIPCH62IWPAAAMHmgww (envelope-from ); Thu, 04 Aug 2022 08:48:48 +0000 To: ltp@lists.linux.it Date: Thu, 4 Aug 2022 10:48:11 +0200 Message-Id: <20220804084812.22737-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-3.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-3.smtp.seeweb.it Subject: [LTP] [PATCH v1 1/2] Refactor pidns01 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 --- testcases/kernel/containers/pidns/pidns01.c | 131 +++++--------------- 1 file changed, 29 insertions(+), 102 deletions(-) diff --git a/testcases/kernel/containers/pidns/pidns01.c b/testcases/kernel/containers/pidns/pidns01.c index ac702dd14..0633bb07d 100644 --- a/testcases/kernel/containers/pidns/pidns01.c +++ b/testcases/kernel/containers/pidns/pidns01.c @@ -1,118 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (c) International Business Machines Corp., 2007 -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -* -*************************************************************************** - -* File: pidns01.c -* -* Description: -* The pidns01.c testcase builds into the ltp framework to verify -* the basic functionality of PID Namespace. -* -* Verify that: -* 1. When parent clone a process with flag CLONE_NEWPID, the process ID of -* child should be always one. -* -* 2. When parent clone a process with flag CLONE_NEWPID, the parent process ID of -* should be always zero. -* -* Total Tests: -* -* Test Name: pidns01 -* -* Test Assertion & Strategy: -* -* From main() clone a new child process with passing the clone_flag as CLONE_NEWPID, -* Inside the cloned pid check for the getpid() and getppid() -* Verify with global macro defined value for parent pid & child pid. -* -* Usage: -* pidns01 -* -* History: -* -* FLAG DATE NAME DESCRIPTION -* 27/12/07 RISHIKESH K RAJAK Created this test -* -*******************************************************************************************/ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include "pidns_helper.h" -#include "test.h" + * Copyright (c) International Business Machines Corp., 2007 + * 27/12/07 Rishikesh K Rajak + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ -char *TCID = "pidns01"; -int TST_TOTAL = 1; +/*\ + * [Description] + * + * Clone a process with CLONE_NEWPID flag and check: + * + * - child process ID must be 1 + * - parent process ID must be 0 + */ -#define CHILD_PID 1 -#define PARENT_PID 0 +#include "tst_test.h" +#include "lapi/namespaces_constants.h" -/* - * child_fn1() - Inside container - */ -int child_fn1(void *ttype LTP_ATTRIBUTE_UNUSED) +static int child_func(LTP_ATTRIBUTE_UNUSED void *arg) { - int exit_val; pid_t cpid, ppid; + cpid = getpid(); ppid = getppid(); - tst_resm(TINFO, "PIDNS test is running inside container"); - if (cpid == CHILD_PID && ppid == PARENT_PID) { - printf("Got expected cpid and ppid\n"); - exit_val = 0; - } else { - printf("Got unexpected result of cpid=%d ppid=%d\n", - cpid, ppid); - exit_val = 1; - } + TST_EXP_PASS(cpid == 1); + TST_EXP_PASS(ppid == 0); - return exit_val; + return 0; } -static void setup(void) +static void run(void) { - tst_require_root(); - check_newpid(); -} - -int main(int argc, char *argv[]) -{ - int status; - tst_parse_opts(argc, argv, NULL, NULL); - setup(); - - TEST(do_clone_unshare_test(T_CLONE, CLONE_NEWPID, child_fn1, NULL)); - - if (TEST_RETURN == -1) { - tst_brkm(TFAIL | TTERRNO, NULL, "clone failed"); - } else if ((wait(&status)) == -1) { - tst_brkm(TWARN | TERRNO, NULL, "wait failed"); - } - - if (WIFEXITED(status) && WEXITSTATUS(status) != 0) - tst_resm(TFAIL, "child exited abnormally"); - else if (WIFSIGNALED(status)) { - tst_resm(TFAIL, "child was killed with signal = %d", - WTERMSIG(status)); - } + int ret; - tst_exit(); + ret = ltp_clone_quick(CLONE_NEWNS | SIGCHLD, child_func, NULL); + if (ret < 0) + tst_brk(TBROK | TERRNO, "clone failed"); } +static struct tst_test test = { + .test_all = run, + .needs_root = 1, +};