From patchwork Thu Mar 10 10:59: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: 1603723 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.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=QqmF8DzJ; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=HJMUsw4T; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KDmLz3nnmz9sGY for ; Thu, 10 Mar 2022 22:00:43 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E53FF3C5594 for ; Thu, 10 Mar 2022 12:00:40 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) (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 9F9573C0FA8 for ; Thu, 10 Mar 2022 11:59:23 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (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-7.smtp.seeweb.it (Postfix) with ESMTPS id C35B6200DD0 for ; Thu, 10 Mar 2022 11:59:22 +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-out1.suse.de (Postfix) with ESMTPS id 5798F21123; Thu, 10 Mar 2022 10:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646909962; 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=mjX7koULgtkUV8AhTA3FsppjXcTBeboHkV/mury83lE=; b=QqmF8DzJy0CPi3b2lRfqi42cS1dV6UThh0uue2vOs+reuxjjwP6023LHoG9mAMRQM08M4J vtyt4XTO/Y6+ytYDF2id1kFscBFBuMFvfBNdUk+SAcxSl0UfQNxn6QL4DvGu8i+HTy9Oa8 IRvWh5YBF68agi/ecQgsRg3DihtpNsQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646909962; 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=mjX7koULgtkUV8AhTA3FsppjXcTBeboHkV/mury83lE=; b=HJMUsw4TV5UIQbT8AO3+KNreU0uTrc+bUXkuJVjG2PH99WTs2/b7Bm1R+w3MzQdo8/lmuH wEytNd0ILQhLrCAA== 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 3298B13A3D; Thu, 10 Mar 2022 10:59:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uD9iCgraKWK8fgAAMHmgww (envelope-from ); Thu, 10 Mar 2022 10:59:22 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Thu, 10 Mar 2022 11:59:11 +0100 Message-Id: <20220310105916.7960-6-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220310105916.7960-1-andrea.cervesato@suse.de> References: <20220310105916.7960-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-7.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-7.smtp.seeweb.it Subject: [LTP] [PATCH v2 05/10] Rewrite semtest_2ns.c 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Andrea Cervesato --- .../kernel/containers/sysvipc/semtest_2ns.c | 295 +++++++----------- 1 file changed, 107 insertions(+), 188 deletions(-) diff --git a/testcases/kernel/containers/sysvipc/semtest_2ns.c b/testcases/kernel/containers/sysvipc/semtest_2ns.c index c3483b675..c0c6f445e 100644 --- a/testcases/kernel/containers/sysvipc/semtest_2ns.c +++ b/testcases/kernel/containers/sysvipc/semtest_2ns.c @@ -1,230 +1,149 @@ -/* ************************************************************************* -* Copyright (c) International Business Machines Corp., 2009 -* 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 -* -* Author: Veerendra C -* -* Test Assertion: -* This testcase verifies the semaphore isoloation in 2 diff containers. -* It tries to create/access a semaphore created with the same KEY. -* -* Description: -* Create 2 'containers' with the below flag value -* Flag = clone, clone(CLONE_NEWIPC), or unshare(CLONE_NEWIPC) -* In Cont1, create semaphore with key 124326L -* In Cont2, try to access the semaphore created in Cont1. -* PASS : -* If flag = None and the semaphore is accessible in Cont2. -* If flag = unshare/clone and the semaphore is not accessible in Cont2. -* If semaphore is not accessible in Cont2, creates new semaphore with -* the same key to double check isloation in IPCNS. -* -* FAIL : -* If flag = none and the semaphore is not accessible. -* If flag = unshare/clone and semaphore is accessible in Cont2. -* If the new semaphore creation Fails. -***************************************************************************/ - -#define _GNU_SOURCE 1 -#include -#include -#include -#include -#include +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) International Business Machines Corp., 2009 + * Veerendra C + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] + * + * Test SysV IPC semaphore usage between namespaces. + * + * [Algorithm] + * + * Create 2 'containers' + * In container1 create semaphore with a specific key + * In container2 try to access the semaphore created in container1 + * + * Test is PASS if flag = none and the semaphore is accessible in container2 or + * if flag = unshare/clone and the semaphore is not accessible in container2. + * If semaphore is not accessible in container2, creates new semaphore with the + * same key to double check isloation in IPCNS. + * + * Test is FAIL if flag = none and the semaphore is not accessible, if + * flag = unshare/clone and semaphore is accessible in container2 or if the new + * semaphore creation Fails. + */ + +#define _GNU_SOURCE + +#include +#include +#include #include -#include -#include "test.h" -#include "ipcns_helper.h" - -#define MY_KEY 124326L -#define UNSHARESTR "unshare" -#define CLONESTR "clone" -#define NONESTR "none" - -char *TCID = "semtest_2ns"; -int TST_TOTAL = 1; -int p1[2]; -int p2[2]; +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" + +#define MY_KEY 124326L + +static char *str_op = "clone"; +static int use_clone; + static struct sembuf semop_lock[2] = { /* sem_num, sem_op, flag */ - {0, 0, 0}, /* wait for sem#0 to become 0 */ - {0, 1, SEM_UNDO} /* then increment sem#0 by 1 */ + { 0, 0, 0 }, /* wait for sem#0 to become 0 */ + { 0, 1, SEM_UNDO } /* then increment sem#0 by 1 */ }; static struct sembuf semop_unlock[1] = { /* sem_num, sem_op, flag */ - {0, -1, (IPC_NOWAIT | SEM_UNDO)} /* decrement sem#0 by 1 (sets it to 0) */ + { 0, -1, (IPC_NOWAIT | SEM_UNDO) } /* decrement sem#0 by 1 (sets it to 0) */ }; /* * sem_lock() - Locks the semaphore for crit-sec updation, and unlocks it later */ -void sem_lock(int id) +static void sem_lock(int id) { - /* Checking the semlock and simulating as if the crit-sec is updated */ - if (semop(id, &semop_lock[0], 2) < 0) { - perror("sem lock error"); - tst_brkm(TBROK, NULL, "semop failed"); - } - tst_resm(TINFO, "Sem1: File locked, Critical section is updated..."); + SAFE_SEMOP(id, &semop_lock[0], 2); + + tst_res(TINFO, "semaphore1: File locked, Critical section is updated..."); + sleep(2); - if (semop(id, &semop_unlock[0], 1) < 0) { - perror("sem unlock error"); - tst_brkm(TBROK, NULL, "semop failed"); - } + + SAFE_SEMOP(id, &semop_unlock[0], 1); } /* * check_sem1 - does not read -- it writes to check_sem2() when it's done. */ -int check_sem1(void *vtest) +static int check_sem1(LTP_ATTRIBUTE_UNUSED void *vtest) { - int id1; - - (void) vtest; - - close(p1[0]); - /* 1. Create (or fetch if existing) the binary semaphore */ - id1 = semget(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666); - if (id1 == -1) { - perror("Semaphore create"); - if (errno != EEXIST) { - perror("semget failure"); - tst_brkm(TBROK, NULL, "semget failure"); - } - id1 = semget(MY_KEY, 1, 0); - if (id1 == -1) { - perror("Semaphore create"); - tst_brkm(TBROK, NULL, "semget failure"); - } + TEST(semget(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666)); + if (TST_RET < 0) { + tst_res(TINFO, "semget failure. Checking existing semaphore"); + + if (TST_ERR != EEXIST) + tst_brk(TBROK | TRERRNO, "Semaphore creation failed"); + + SAFE_SEMGET(MY_KEY, 1, 0); } - write(p1[1], "go", 3); - tst_resm(TINFO, "Cont1: Able to create semaphore"); - tst_exit(); + tst_res(TINFO, "container1: Able to create semaphore"); + + return 0; } /* * check_sem2() reads from check_sem1() and writes to main() when it's done. */ - -int check_sem2(void *vtest) +static int check_sem2(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[3]; - int id2; - - (void) vtest; + int id; - close(p1[1]); - close(p2[0]); - read(p1[0], buf, 3); + id = semget(MY_KEY, 1, 0); + if (id >= 0) { + sem_lock(id); - id2 = semget(MY_KEY, 1, 0); - if (id2 != -1) { - sem_lock(id2); - write(p2[1], "exists", 7); + if (use_clone == T_NONE) + tst_res(TPASS, "Plain cloned process able to access the semaphore created"); + else + tst_res(TFAIL, "%s : In namespace2 found the semaphore created in Namespace1", str_op); } else { /* Trying to create a new semaphore, if semaphore is not existing */ - id2 = semget(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666); - if (id2 == -1) { - perror("Semaphore create"); - if (errno != EEXIST) { - perror("semget failure"); - tst_resm(TBROK, "semget failure"); - } - } else - tst_resm(TINFO, - "Cont2: Able to create semaphore with sameKey"); - /* Passing the pipe Not-found mesg */ - write(p2[1], "notfnd", 7); + TEST(semget(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666)); + if (TST_RET < 0) { + if (TST_ERR != EEXIST) + tst_brk(TBROK | TERRNO, "semget error"); + } else { + tst_res(TINFO, "container2: Able to create semaphore with sameKey"); + } + + if (use_clone == T_NONE) + tst_res(TFAIL, "Plain cloned process didn't find semaphore"); + else + tst_res(TPASS, "%s : In namespace2 unable to access the semaphore created in namespace1", str_op); } - tst_exit(); + id = SAFE_SEMGET(MY_KEY, 1, 0); + SAFE_SEMCTL(id, IPC_RMID, 0); + + return 0; } -static void setup(void) +static void run(void) { - tst_require_root(); - check_newipc(); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_sem1, NULL); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_sem2, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int ret, id, use_clone = T_NONE; - char *tsttype = NONESTR; - char buf[7]; - - setup(); - - if (argc != 2) { - tst_resm(TINFO, "Usage: %s ", argv[0]); - tst_resm(TINFO, " where clone, unshare, or fork specifies" - " unshare method."); - tst_exit(); - } - - /* Using PIPE's to sync between container and Parent */ - if (pipe(p1) == -1) { - perror("pipe1"); - tst_exit(); - } - if (pipe(p2) == -1) { - perror("pipe2"); - tst_exit(); - } + use_clone = get_clone_unshare_enum(str_op); - if (strcmp(argv[1], "clone") == 0) { - use_clone = T_CLONE; - tsttype = CLONESTR; - } else if (strcmp(argv[1], "unshare") == 0) { - use_clone = T_UNSHARE; - tsttype = UNSHARESTR; - } - - tst_resm(TINFO, "Semaphore Namespaces Test : %s", tsttype); - - /* Create 2 containers */ - ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_sem1, NULL); - if (ret < 0) { - tst_brkm(TFAIL, NULL, "clone/unshare failed"); - } - - ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_sem2, NULL); - if (ret < 0) { - tst_brkm(TFAIL, NULL, "clone/unshare failed"); - } - close(p2[1]); - read(p2[0], buf, 7); - - if (strcmp(buf, "exists") == 0) - if (use_clone == T_NONE) - tst_resm(TPASS, - "Plain cloned process able to access the semaphore " - "created"); - else - tst_resm(TFAIL, - "%s : In namespace2 found the semaphore " - "created in Namespace1", tsttype); - else if (use_clone == T_NONE) - tst_resm(TFAIL, "Plain cloned process didn't find semaphore"); - else - tst_resm(TPASS, - "%s : In namespace2 unable to access the semaphore " - "created in Namespace1", tsttype); - - /* Delete the semaphore */ - id = semget(MY_KEY, 1, 0); - semctl(id, IPC_RMID, 0); - tst_exit(); + if (use_clone != T_NONE) + check_newipc(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .needs_root = 1, + .forks_child = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +};