From patchwork Wed Jan 6 07:27:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiyu Zhu X-Patchwork-Id: 1422846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D9gvr6LPrz9sVw for ; Wed, 6 Jan 2021 18:28:40 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id C399F3C31E8 for ; Wed, 6 Jan 2021 08:28:25 +0100 (CET) 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]) by picard.linux.it (Postfix) with ESMTP id DF04E3C31C3 for ; Wed, 6 Jan 2021 08:27:57 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-3.smtp.seeweb.it (Postfix) with ESMTP id 9A8EE1A00902 for ; Wed, 6 Jan 2021 08:27:56 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.78,479,1599494400"; d="scan'208";a="103232510" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 06 Jan 2021 15:27:49 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 3648F4CE6029 for ; Wed, 6 Jan 2021 15:27:46 +0800 (CST) Received: from RHEL74GA.g08.fujitsu.local (10.167.220.48) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 6 Jan 2021 15:27:45 +0800 From: Feiyu Zhu To: Date: Wed, 6 Jan 2021 02:27:40 -0500 Message-ID: <1609918063-15810-2-git-send-email-zhufy.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609918063-15810-1-git-send-email-zhufy.jy@cn.fujitsu.com> References: <1609918063-15810-1-git-send-email-zhufy.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.48] X-ClientProxiedBy: G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) To G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) X-yoursite-MailScanner-ID: 3648F4CE6029.A7CF3 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhufy.jy@cn.fujitsu.com X-Spam-Status: No, score=0.2 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.4 X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH 2/5] syscalls/ipc: semctl03: Convert to new API and cleanup 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" Also make use of TST_EXP_FAIL Signed-off-by: Feiyu Zhu --- testcases/kernel/syscalls/ipc/semctl/Makefile | 4 +- testcases/kernel/syscalls/ipc/semctl/semctl03.c | 173 +++++------------------- 2 files changed, 36 insertions(+), 141 deletions(-) diff --git a/testcases/kernel/syscalls/ipc/semctl/Makefile b/testcases/kernel/syscalls/ipc/semctl/Makefile index f04983d..2f64ccf 100644 --- a/testcases/kernel/syscalls/ipc/semctl/Makefile +++ b/testcases/kernel/syscalls/ipc/semctl/Makefile @@ -7,7 +7,7 @@ LTPLIBS = ltpipc ltpnewipc include $(top_srcdir)/include/mk/testcases.mk -semctl01 semctl03 semctl04 semctl05 semctl06 semctl07: LTPLDLIBS = -lltpipc -semctl02 semctl08 semctl09: LTPLDLIBS = -lltpnewipc +semctl01 semctl04 semctl05 semctl06 semctl07: LTPLDLIBS = -lltpipc +semctl02 semctl03 semctl08 semctl09: LTPLDLIBS = -lltpnewipc include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c index dc851bf..7650355 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c @@ -1,56 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * - * Copyright (c) International Business Machines Corp., 2001 - * - * 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 - */ - -/* - * NAME - * semctl03.c + * Copyright (c) International Business Machines Corp., 2001 * * DESCRIPTION * semctl03 - test for EINVAL and EFAULT errors * - * ALGORITHM - * create a semaphore set with read and alter permissions - * loop if that option was specified - * call semctl() using four different invalid cases - * check the errno value - * issue a PASS message if we get EINVAL or EFAULT - * otherwise, the tests fails - * issue a FAIL message - * call cleanup - * - * USAGE: - * semctl03 [-c n] [-e] [-i n] [-I x] [-P x] [-t] - * where, -c n : Run n copies concurrently. - * -e : Turn on errno logging. - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -P x : Pause for x seconds between iterations. - * -t : Turn on syscall timing. - * * HISTORY * 03/2001 - Written by Wayne Boyer - * - * RESTRICTIONS - * none */ -#include "ipcsem.h" +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "lapi/sem.h" +#include "libnewipc.h" #ifdef _XLC_COMPILER #define SEMUN_CAST @@ -58,118 +20,51 @@ #define SEMUN_CAST (union semun) #endif -char *TCID = "semctl03"; -int TST_TOTAL = 4; +static int sem_id = -1; +static int bad_id = -1; -#ifdef _XLC_COMPILER -#define SEMUN_CAST -#else -#define SEMUN_CAST (union semun) -#endif +static struct semid_ds sem_ds; -int sem_id_1 = -1; -int bad_id = -1; - -struct semid_ds sem_ds; - -struct test_case_t { +static struct tcases { int *sem_id; int ipc_cmd; union semun arg; int error; -} TC[] = { - /* EINVAL - the IPC command is not valid */ - { - &sem_id_1, -1, SEMUN_CAST & sem_ds, EINVAL}, - /* EINVAL - the semaphore ID is not valid */ - { - &bad_id, IPC_STAT, SEMUN_CAST & sem_ds, EINVAL}, - /* EFAULT - the union arg is invalid when expecting "ushort *array" */ - { - &sem_id_1, GETALL, SEMUN_CAST - 1, EFAULT}, - /* EFAULT - the union arg is invalid when expecting */ - /* "struct semid_ds *buf */ - { - &sem_id_1, IPC_SET, SEMUN_CAST - 1, EFAULT} + char *message; +} tests[] = { + {&sem_id, -1, SEMUN_CAST & sem_ds, EINVAL, "invalid IPC command"}, + {&bad_id, IPC_STAT, SEMUN_CAST & sem_ds, EINVAL, "invalid sem id"}, + {&sem_id, GETALL, SEMUN_CAST - 1, EFAULT, "invalid union arg"}, + {&sem_id, IPC_SET, SEMUN_CAST - 1, EFAULT, "invalid union arg"} }; -int main(int ac, char **av) +static void verify_semctl(unsigned int n) { - int lc; - int i; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); /* global setup */ + struct tcases *tc = &tests[n]; - /* The following loop checks looping state if -i option given */ - - for (lc = 0; TEST_LOOPING(lc); lc++) { - /* reset tst_count in case we are looping */ - tst_count = 0; - - for (i = 0; i < TST_TOTAL; i++) { - - TEST(semctl(*(TC[i].sem_id), 0, TC[i].ipc_cmd, - TC[i].arg)); - - if (TEST_RETURN != -1) { - tst_resm(TFAIL, "call succeeded unexpectedly"); - continue; - } - - if (TEST_ERRNO == TC[i].error) { - tst_resm(TPASS, "expected failure - errno = %d" - " : %s", TEST_ERRNO, - strerror(TEST_ERRNO)); - } else { - tst_resm(TFAIL, "unexpected error - %d : %s", - TEST_ERRNO, strerror(TEST_ERRNO)); - } - } - } - - cleanup(); - - tst_exit(); + TST_EXP_FAIL(semctl(*(tc->sem_id), 0, tc->ipc_cmd, tc->arg), + tc->error, "semctl() with %s", tc->message); } -/* - * setup() - performs all the ONE TIME setup for this test. - */ -void setup(void) +static void setup(void) { + static key_t semkey; - tst_sig(NOFORK, DEF_HANDLER, cleanup); + semkey = GETIPCKEY(); - TEST_PAUSE; - - /* - * Create a temporary directory and cd into it. - * This helps to ensure that a unique msgkey is created. - * See libs/libltpipc/libipc.c for more information. - */ - tst_tmpdir(); - - /* get an IPC resource key */ - semkey = getipckey(); - - /* create a semaphore set with read and alter permissions */ - if ((sem_id_1 = - semget(semkey, PSEMS, IPC_CREAT | IPC_EXCL | SEM_RA)) == -1) { - tst_brkm(TBROK, cleanup, "couldn't create semaphore in setup"); - } + sem_id = SAFE_SEMGET(semkey, PSEMS, IPC_CREAT | IPC_EXCL | SEM_RA); } -/* - * cleanup() - performs all the ONE TIME cleanup for this test at completion - * or premature exit. - */ void cleanup(void) { - /* if it exists, remove the semaphore resouce */ - rm_sema(sem_id_1); - - tst_rmdir(); - + if (sem_id != -1) + SAFE_SEMCTL(sem_id, 0, IPC_RMID); } + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .test = verify_semctl, + .tcnt = ARRAY_SIZE(tests), +};