From patchwork Fri Mar 25 12:54:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609427 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=WKvUbMhB; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ucxzFzuj; 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 4KQ2B15kSmz9s07 for ; Fri, 25 Mar 2022 23:55:05 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1ECEB3C93CA for ; Fri, 25 Mar 2022 13:55:03 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (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 7AFF93C1FF3 for ; Fri, 25 Mar 2022 13:54:48 +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-6.smtp.seeweb.it (Postfix) with ESMTPS id 7627014011A2 for ; Fri, 25 Mar 2022 13:54:47 +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 D72341F7AE; Fri, 25 Mar 2022 12:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212886; 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=c3ya8TuZGwmQMmbxEx6Ty587Yj1hYINJgGo46pSk7rc=; b=WKvUbMhBn6RLuKXwfu75zxFE9j7wra8fFMni6BThKwieDp6RiTLhsOUmrhTsm4O5BGj/jK uoL4ai0Klhz0gweqgeYJEKXaehTy17tQRNX/vLHBmo6t23m1dZqWns4UfnbG6m2G0MzcyN ybUYOiq0bF+VBR6Z+BS+LWVyNBLGc68= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212886; 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=c3ya8TuZGwmQMmbxEx6Ty587Yj1hYINJgGo46pSk7rc=; b=ucxzFzujdD0aitJxnSNK5vPGWioVYESHauz++QzqLG7W2K6sDbBIX/uW2yU7O7PRGh5D4f D3RUteNVD+8zVvDQ== 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 AB2B81332D; Fri, 25 Mar 2022 12:54:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EMraJ5a7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:46 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:36 +0100 Message-Id: <20220325125445.11984-2-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.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-6.smtp.seeweb.it Subject: [LTP] [PATCH v4 01/10] Rewrite mesgq_nstest.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" Added common.h that is replacing ipcns_helper.h for refactored tests. Updated containers runtime file to include the new mesgq_nstest.c command line options. Signed-off-by: Andrea Cervesato --- runtest/containers | 6 +- testcases/kernel/containers/sysvipc/common.h | 110 ++++++++ .../kernel/containers/sysvipc/mesgq_nstest.c | 244 +++++++----------- 3 files changed, 206 insertions(+), 154 deletions(-) create mode 100644 testcases/kernel/containers/sysvipc/common.h diff --git a/runtest/containers b/runtest/containers index eea7bfadb..d863c10a4 100644 --- a/runtest/containers +++ b/runtest/containers @@ -50,9 +50,9 @@ shmem_2nstest_none shmem_2nstest none shmem_2nstest_clone shmem_2nstest clone shmem_2nstest_unshare shmem_2nstest unshare shm_comm shm_comm -mesgq_nstest_none mesgq_nstest none -mesgq_nstest_clone mesgq_nstest clone -mesgq_nstest_unshare mesgq_nstest unshare +mesgq_nstest_none mesgq_nstest -m none +mesgq_nstest_clone mesgq_nstest -m clone +mesgq_nstest_unshare mesgq_nstest -m unshare msg_comm msg_comm sem_nstest_none sem_nstest none sem_nstest_clone sem_nstest clone diff --git a/testcases/kernel/containers/sysvipc/common.h b/testcases/kernel/containers/sysvipc/common.h new file mode 100644 index 000000000..d33185e1e --- /dev/null +++ b/testcases/kernel/containers/sysvipc/common.h @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) International Business Machines Corp., 2007 + * Rishikesh K Rajak + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +#ifndef COMMON_H +#define COMMON_H + +#include +#include "tst_test.h" +#include "lapi/syscalls.h" +#include "lapi/namespaces_constants.h" + +enum { + T_CLONE, + T_UNSHARE, + T_NONE, +}; + +static int dummy_child(void *v) +{ + (void)v; + return 0; +} + +static void check_newipc(void) +{ + int pid, status; + + pid = ltp_clone_quick(CLONE_NEWIPC | SIGCHLD, dummy_child, NULL); + if (pid < 0) + tst_brk(TCONF | TERRNO, "CLONE_NEWIPC not supported"); + + SAFE_WAITPID(pid, &status, 0); +} + +static inline int get_clone_unshare_enum(const char* str_op) +{ + int use_clone; + + use_clone = T_NONE; + + if (!str_op || !strcmp(str_op, "none")) + use_clone = T_NONE; + else if (!strcmp(str_op, "clone")) + use_clone = T_CLONE; + else if (!strcmp(str_op, "unshare")) + use_clone = T_UNSHARE; + else + tst_brk(TBROK, "Test execution mode "); + + return use_clone; +} + +static void clone_test(unsigned long clone_flags, int (*fn1)(void *arg), void *arg1) +{ + int pid; + + pid = ltp_clone_quick(clone_flags | SIGCHLD, fn1, arg1); + if (pid < 0) + tst_brk(TBROK | TERRNO, "ltp_clone_quick error"); +} + +static void unshare_test(unsigned long clone_flags, int (*fn1)(void *arg), void *arg1) +{ + int pid; + + pid = SAFE_FORK(); + + if (!pid) { + int ret; + + SAFE_UNSHARE(clone_flags); + + ret = fn1(arg1); + exit(ret); + } +} + +static void plain_test(int (*fn1)(void *arg), void *arg1) +{ + int pid; + + pid = SAFE_FORK(); + if (!pid) + exit(fn1(arg1)); +} + +static void clone_unshare_test(int use_clone, unsigned long clone_flags, + int (*fn1)(void *arg), void *arg1) +{ + switch (use_clone) { + case T_NONE: + plain_test(fn1, arg1); + break; + case T_CLONE: + clone_test(clone_flags, fn1, arg1); + break; + case T_UNSHARE: + unshare_test(clone_flags, fn1, arg1); + break; + default: + tst_brk(TBROK, "%s: bad use_clone option: %d", __FUNCTION__, use_clone); + break; + } +} + +#endif diff --git a/testcases/kernel/containers/sysvipc/mesgq_nstest.c b/testcases/kernel/containers/sysvipc/mesgq_nstest.c index dbf311dc8..d8cc0616d 100644 --- a/testcases/kernel/containers/sysvipc/mesgq_nstest.c +++ b/testcases/kernel/containers/sysvipc/mesgq_nstest.c @@ -1,175 +1,117 @@ -/* ************************************************************************* -* 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 -* -* In Parent Process , create mesgq with key 154326L -* Now create container by passing 1 of the flag values.. -* Flag = clone, clone(CLONE_NEWIPC), or unshare(CLONE_NEWIPC) -* In cloned process, try to access the created mesgq -* Test PASS: If the mesgq is readable when flag is None. -* Test FAIL: If the mesgq is readable when flag is Unshare or Clone. -***************************************************************************/ - -#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 message passing through different namespaces. + * + * [Algorithm] + * + * In parent process create a new mesgq with a specific key. + * In cloned process try to access the created mesgq. + * + * Test will PASS if the mesgq is readable when flag is None. + * Test will FAIL if the mesgq is readable when flag is Unshare or Clone or + * the message received is wrong. + */ + +#define _GNU_SOURCE + +#include #include -#include -#include "test.h" -#include "ipcns_helper.h" - -#define KEY_VAL 154326L -#define UNSHARESTR "unshare" -#define CLONESTR "clone" -#define NONESTR "none" - -char *TCID = "mesgq_nstest"; -int TST_TOTAL = 1; -int p1[2]; -int p2[2]; -struct msg_buf { - long int mtype; /* type of received/sent message */ - char mtext[80]; /* text of the message */ +#include +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" + +#define KEY_VAL 154326L +#define MSG_TYPE 5 +#define MSG_TEXT "My message!" + +static char *str_op; +static int use_clone; +static int ipc_id = -1; + +static struct msg_buf { + long mtype; + char mtext[80]; } msg; -void mesgq_read(int id) +static int check_mesgq(LTP_ATTRIBUTE_UNUSED void *vtest) { - int READMAX = 80; - int n; - /* read msg type 5 on the Q; msgtype, flags are last 2 params.. */ + int id, n; - n = msgrcv(id, &msg, READMAX, 5, 0); - if (n == -1) - perror("msgrcv"), tst_exit(); + id = msgget(KEY_VAL, 0); - tst_resm(TINFO, "Mesg read of %d bytes; Type %ld: Msg: %.*s", - n, msg.mtype, n, msg.mtext); -} + if (id < 0) { + if (use_clone == T_NONE) + tst_res(TFAIL, "Plain cloned process didn't find mesgq"); + else + tst_res(TPASS, "%s: container didn't find mesgq", str_op); -int check_mesgq(void *vtest) -{ - char buf[3]; - int id; + return 0; + } - (void) vtest; + if (use_clone == T_NONE) { + tst_res(TPASS, "Plain cloned process found mesgq inside container"); - close(p1[1]); - close(p2[0]); + n = SAFE_MSGRCV(id, &msg, sizeof(msg.mtext), MSG_TYPE, 0); - read(p1[0], buf, 3); - id = msgget(KEY_VAL, 0); - if (id == -1) - write(p2[1], "notfnd", 7); - else { - write(p2[1], "exists", 7); - mesgq_read(id); + tst_res(TINFO, "Mesg read of %d bytes, Type %ld, Msg: %s", n, msg.mtype, msg.mtext); + + if (strcmp(msg.mtext, MSG_TEXT)) + tst_res(TFAIL, "Received the wrong text message"); + } else { + tst_res(TFAIL, "%s: container init process found mesgq", str_op); } - tst_exit(); -} -static void setup(void) -{ - tst_require_root(); - check_newipc(); + return 0; } -int main(int argc, char *argv[]) +static void run(void) { - int ret, use_clone = T_NONE, id, n; - char *tsttype = NONESTR; - char buf[7]; - - setup(); + msg.mtype = MSG_TYPE; + strcpy(msg.mtext, "My message!"); - if (argc != 2) { - tst_resm(TFAIL, "Usage: %s ", argv[0]); - tst_brkm(TFAIL, NULL, " where clone, unshare, or fork specifies" - " unshare method."); - } - - /* Using PIPE's to sync between container and Parent */ - if (pipe(p1) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } - if (pipe(p2) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } + if (use_clone == T_NONE) + SAFE_MSGSND(ipc_id, &msg, strlen(msg.mtext), 0); - tsttype = NONESTR; + tst_res(TINFO, "mesgq namespaces test: %s", 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; - } + clone_unshare_test(use_clone, CLONE_NEWIPC, check_mesgq, NULL); +} - id = msgget(KEY_VAL, IPC_CREAT | IPC_EXCL | 0600); - if (id == -1) { - perror("msgget"); - /* Retry without attempting to create the MQ */ - id = msgget(KEY_VAL, 0); - if (id == -1) - perror("msgget failure"), exit(1); - } +static void setup(void) +{ + use_clone = get_clone_unshare_enum(str_op); - msg.mtype = 5; - strcpy(msg.mtext, "Message of type 5!"); - n = msgsnd(id, &msg, strlen(msg.mtext), 0); - if (n == -1) - perror("msgsnd"), tst_exit(); - - tst_resm(TINFO, "mesgq namespaces test : %s", tsttype); - /* fire off the test */ - ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_mesgq, NULL); - if (ret < 0) { - tst_brkm(TFAIL, NULL, "%s failed", tsttype); - } + if (use_clone != T_NONE) + check_newipc(); - close(p1[0]); - close(p2[1]); - write(p1[1], "go", 3); + ipc_id = SAFE_MSGGET(KEY_VAL, IPC_CREAT | IPC_EXCL | 0600); +} - read(p2[0], buf, 7); - if (strcmp(buf, "exists") == 0) { - if (use_clone == T_NONE) - tst_resm(TPASS, "Plain cloned process found mesgq " - "inside container"); - else - tst_resm(TFAIL, - "%s: Container init process found mesgq", - tsttype); - } else { - if (use_clone == T_NONE) - tst_resm(TFAIL, - "Plain cloned process didn't find mesgq"); - else - tst_resm(TPASS, "%s: Container didn't find mesgq", - tsttype); +static void cleanup(void) +{ + if (ipc_id != -1) { + tst_res(TINFO, "Destroy message"); + SAFE_MSGCTL(ipc_id, IPC_RMID, NULL); } - - /* Delete the mesgQ */ - id = msgget(KEY_VAL, 0); - msgctl(id, IPC_RMID, NULL); - - tst_exit(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Mar 25 12:54:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609429 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=FWVZ6riJ; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=teLJs91b; 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 4KQ2BW3wsgz9s07 for ; Fri, 25 Mar 2022 23:55:31 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E7A853C91B4 for ; Fri, 25 Mar 2022 13:55:28 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (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 884363C61C4 for ; Fri, 25 Mar 2022 13:54:48 +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-6.smtp.seeweb.it (Postfix) with ESMTPS id B83251401193 for ; Fri, 25 Mar 2022 13:54:47 +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 164B2210DD; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212887; 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=+TDY0MxFmE3IIJPKnbRUCxsYQP6Y2VMPufnuavtsxNw=; b=FWVZ6riJFP8So+y8dckkmqQRgHdjuP+JNhr5qCrP7nl8659DWvpLmhIdv3w2z6MX29yu6m X9hWX6Ws4U0GUQ16DeLGAHjDTkHt0KzJureM/g86ppGqSPnXr66zhFg2XmyoBLmDt4LKaF QgArIc3glfKz/2eKGuNnwOTPQGPK5sc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212887; 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=+TDY0MxFmE3IIJPKnbRUCxsYQP6Y2VMPufnuavtsxNw=; b=teLJs91b3UzMPpDGj9/8nsP1evXvSLPVZD2y0YBgSmuZ2k5NzYs9umZ1bmHltcsDtKtwWO 3UteKjjfCNU1exAA== 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 E1C4C1332D; Fri, 25 Mar 2022 12:54:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +KBPNZa7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:46 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:37 +0100 Message-Id: <20220325125445.11984-3-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.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-6.smtp.seeweb.it Subject: [LTP] [PATCH v4 02/10] Rewrite msg_comm.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/msg_comm.c | 180 ++++++------------ 1 file changed, 55 insertions(+), 125 deletions(-) diff --git a/testcases/kernel/containers/sysvipc/msg_comm.c b/testcases/kernel/containers/sysvipc/msg_comm.c index 0da328997..06439c4d0 100644 --- a/testcases/kernel/containers/sysvipc/msg_comm.c +++ b/testcases/kernel/containers/sysvipc/msg_comm.c @@ -1,20 +1,16 @@ -/* Copyright (c) 2014 Red Hat, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of version 2 the GNU General Public License as - * published by the Free Software Foundation. +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2014 Red Hat, Inc. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] * - * 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. + * Test SysV IPC message passing through different processes. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - *********************************************************************** - * File: msg_comm.c + * [Algorithm] * - * Description: * 1. Clones two child processes with CLONE_NEWIPC flag, each child * gets System V message queue (msg) with the _identical_ key. * 2. Child1 appends a message with identifier #1 to the message queue. @@ -27,152 +23,86 @@ */ #define _GNU_SOURCE -#include + +#include #include #include -#include -#include -#include -#include "ipcns_helper.h" -#include "test.h" -#include "safe_macros.h" +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" #define TESTKEY 124426L -#define MSGSIZE 50 -char *TCID = "msg_comm"; -int TST_TOTAL = 1; struct sysv_msg { long mtype; - char mtext[MSGSIZE]; + char mtext[1]; }; -static void cleanup(void) +static int chld1_msg(LTP_ATTRIBUTE_UNUSED void *arg) { - tst_rmdir(); -} - -static void setup(void) -{ - tst_require_root(); - check_newipc(); - tst_tmpdir(); - TST_CHECKPOINT_INIT(tst_rmdir); -} - -int chld1_msg(void *arg) -{ - int id, n, rval = 0; + int id; struct sysv_msg m; struct sysv_msg rec; - id = msgget(TESTKEY, IPC_CREAT | 0600); - if (id == -1) { - perror("msgget"); - return 2; - } + id = SAFE_MSGGET(TESTKEY, IPC_CREAT | 0600); m.mtype = 1; m.mtext[0] = 'A'; - if (msgsnd(id, &m, sizeof(struct sysv_msg) - sizeof(long), 0) == -1) { - perror("msgsnd"); - msgctl(id, IPC_RMID, NULL); - return 2; - } - /* wait for child2 to write into the message queue */ - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + SAFE_MSGSND(id, &m, sizeof(m.mtext), 0); + + TST_CHECKPOINT_WAIT(0); + + TEST(msgrcv(id, &rec, sizeof(rec.mtext), 2, IPC_NOWAIT)); + if (TST_RET < 0 && TST_ERR != ENOMSG) + tst_brk(TBROK | TERRNO, "msgrcv error"); /* if child1 message queue has changed (by child2) report fail */ - n = msgrcv(id, &rec, sizeof(struct sysv_msg) - sizeof(long), - 2, IPC_NOWAIT); - if (n == -1 && errno != ENOMSG) { - perror("msgrcv"); - msgctl(id, IPC_RMID, NULL); - return 2; - } - /* if mtype #2 was found in the message queue, it is fail */ - if (n > 0) { - rval = 1; - } - - /* tell child2 to continue */ - TST_SAFE_CHECKPOINT_WAKE(NULL, 0); - - msgctl(id, IPC_RMID, NULL); - return rval; + if (TST_RET > 0) + tst_res(TFAIL, "messages leak between namespacess"); + else + tst_res(TPASS, "messages does not leak between namespaces"); + + TST_CHECKPOINT_WAKE(0); + + SAFE_MSGCTL(id, IPC_RMID, NULL); + + return 0; } -int chld2_msg(void *arg) +static int chld2_msg(LTP_ATTRIBUTE_UNUSED void *arg) { int id; struct sysv_msg m; - id = msgget(TESTKEY, IPC_CREAT | 0600); - if (id == -1) { - perror("msgget"); - return 2; - } + id = SAFE_MSGGET(TESTKEY, IPC_CREAT | 0600); m.mtype = 2; m.mtext[0] = 'B'; - if (msgsnd(id, &m, sizeof(struct sysv_msg) - sizeof(long), 0) == -1) { - perror("msgsnd"); - msgctl(id, IPC_RMID, NULL); - return 2; - } - /* tell child1 to continue and wait for it */ - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); + SAFE_MSGSND(id, &m, sizeof(m.mtext), 0); + + TST_CHECKPOINT_WAKE_AND_WAIT(0); + + SAFE_MSGCTL(id, IPC_RMID, NULL); - msgctl(id, IPC_RMID, NULL); return 0; } -static void test(void) +static void run(void) { - int status, ret = 0; - - ret = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_msg, NULL); - if (ret == -1) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); - - ret = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_msg, NULL); - if (ret == -1) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); - - - while (wait(&status) > 0) { - if (WIFEXITED(status) && WEXITSTATUS(status) == 1) - ret = 1; - if (WIFEXITED(status) && WEXITSTATUS(status) == 2) - tst_brkm(TBROK | TERRNO, cleanup, "error in child"); - if (WIFSIGNALED(status)) { - tst_resm(TFAIL, "child was killed with signal %s", - tst_strsig(WTERMSIG(status))); - return; - } - } - - if (ret) - tst_resm(TFAIL, "SysV msg: communication with identical keys" - " between namespaces"); - else - tst_resm(TPASS, "SysV msg: communication with identical keys" - " between namespaces"); + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_msg, NULL); + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_msg, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) - test(); - - cleanup(); - tst_exit(); + check_newipc(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .needs_root = 1, + .needs_checkpoints = 1, +}; From patchwork Fri Mar 25 12:54:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609430 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=bmSfY2lf; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=qMpbfQ/g; 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 4KQ2Bk0NnXz9s07 for ; Fri, 25 Mar 2022 23:55:42 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8E61A3C8F91 for ; Fri, 25 Mar 2022 13:55:39 +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 [IPv6:2001:4b78:1:20::4]) (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 A04C33C6574 for ; Fri, 25 Mar 2022 13:54:48 +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-4.smtp.seeweb.it (Postfix) with ESMTPS id B8EB8100113F for ; Fri, 25 Mar 2022 13:54:47 +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 48521210F1; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212887; 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=c35/Pq/SNMQuQKVHAwG5eEVBU1zhwHFvikRuk4Wrzic=; b=bmSfY2lfHFykDmPWtUWvvON2D+/8/pdRw/ZS/YHrAeOgfqbj+jzHZkTYp7qMLqylpLbWE1 pRYmXvQvOoKlO20a5czoenfz8UaEAmRoYqVPom7iq++haamdOyAX6fttL8ziUxbUrRPRZY ag+gi2LOp49gX2y8YnuiqOICY4B2Ak0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212887; 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=c35/Pq/SNMQuQKVHAwG5eEVBU1zhwHFvikRuk4Wrzic=; b=qMpbfQ/gNB4SPxrjYgxgYXt6IS5y0xcubNKdsnQ5/x59QFqxJ8h2mk00RByS7Wm19o0B5f wPbqxyLZMaV3gmDQ== 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 20CDA1332D; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cCUtBpe7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:47 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:38 +0100 Message-Id: <20220325125445.11984-4-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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, T_SCC_BODY_TEXT_LINE 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 v4 03/10] Rewrite sem_comm.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/sem_comm.c | 178 +++++------------- 1 file changed, 52 insertions(+), 126 deletions(-) diff --git a/testcases/kernel/containers/sysvipc/sem_comm.c b/testcases/kernel/containers/sysvipc/sem_comm.c index a2c354a08..de548d3ec 100644 --- a/testcases/kernel/containers/sysvipc/sem_comm.c +++ b/testcases/kernel/containers/sysvipc/sem_comm.c @@ -1,20 +1,16 @@ -/* Copyright (c) 2014 Red Hat, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of version 2 the GNU General Public License as - * published by the Free Software Foundation. +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2014 Red Hat, Inc. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] * - * 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. + * Test SysV IPC semaphore usage between cloned processes. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - *********************************************************************** - * File: sem_comm.c + * [Algorithm] * - * Description: * 1. Clones two child processes with CLONE_NEWIPC flag, each child * creates System V semaphore (sem) with the _identical_ key. * 2. Child1 locks the semaphore. @@ -26,166 +22,96 @@ */ #define _GNU_SOURCE -#include -#include + #include -#include -#include -#include "ipcns_helper.h" -#include "test.h" -#include "safe_macros.h" +#include +#include +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" #include "lapi/sem.h" +#include "common.h" #define TESTKEY 124426L -char *TCID = "sem_comm"; -int TST_TOTAL = 1; -static void cleanup(void) -{ - tst_rmdir(); -} - -static void setup(void) -{ - tst_require_root(); - check_newipc(); - tst_tmpdir(); - TST_CHECKPOINT_INIT(tst_rmdir); -} - -int chld1_sem(void *arg) +static int chld1_sem(LTP_ATTRIBUTE_UNUSED void *arg) { int id; union semun su; struct sembuf sm; - id = semget(TESTKEY, 1, IPC_CREAT); - if (id == -1) { - perror("semget"); - return 2; - } + id = SAFE_SEMGET(TESTKEY, 1, IPC_CREAT); su.val = 1; - if (semctl(id, 0, SETVAL, su) == -1) { - perror("semctl"); - semctl(id, 0, IPC_RMID); - return 2; - } + SAFE_SEMCTL(id, 0, SETVAL, su); /* tell child2 to continue and wait for it to create the semaphore */ - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); + TST_CHECKPOINT_WAKE_AND_WAIT(0); sm.sem_num = 0; sm.sem_op = -1; sm.sem_flg = IPC_NOWAIT; - if (semop(id, &sm, 1) == -1) { - perror("semop"); - semctl(id, 0, IPC_RMID); - return 2; - } + SAFE_SEMOP(id, &sm, 1); /* tell child2 to continue and wait for it to lock the semaphore */ - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); + TST_CHECKPOINT_WAKE_AND_WAIT(0); - sm.sem_op = 1; - semop(id, &sm, 1); + SAFE_SEMCTL(id, 0, IPC_RMID); - semctl(id, 0, IPC_RMID); return 0; } -int chld2_sem(void *arg) +static int chld2_sem(LTP_ATTRIBUTE_UNUSED void *arg) { - int id, rval = 0; + int id; struct sembuf sm; union semun su; /* wait for child1 to create the semaphore */ - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); - id = semget(TESTKEY, 1, IPC_CREAT); - if (id == -1) { - perror("semget"); - return 2; - } + id = SAFE_SEMGET(TESTKEY, 1, IPC_CREAT); su.val = 1; - if (semctl(id, 0, SETVAL, su) == -1) { - perror("semctl"); - semctl(id, 0, IPC_RMID); - return 2; - } + SAFE_SEMCTL(id, 0, SETVAL, su); /* tell child1 to continue and wait for it to lock the semaphore */ - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); + TST_CHECKPOINT_WAKE_AND_WAIT(0); sm.sem_num = 0; sm.sem_op = -1; sm.sem_flg = IPC_NOWAIT; - if (semop(id, &sm, 1) == -1) { - if (errno == EAGAIN) { - rval = 1; - } else { - perror("semop"); - semctl(id, 0, IPC_RMID); - return 2; - } + TEST(semop(id, &sm, 1)); + if (TST_RET < 0) { + if (TST_ERR != EAGAIN) + tst_brk(TBROK | TERRNO, "semop error"); + + tst_res(TFAIL, "semaphore decremented from different namespace"); + } else { + tst_res(TPASS, "semaphore has not been decremented"); } /* tell child1 to continue */ - TST_SAFE_CHECKPOINT_WAKE(NULL, 0); + TST_CHECKPOINT_WAKE(0); - sm.sem_op = 1; - semop(id, &sm, 1); + SAFE_SEMCTL(id, 0, IPC_RMID); - semctl(id, 0, IPC_RMID); - return rval; + return 0; } -static void test(void) +static void run(void) { - int status, ret = 0; - - ret = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_sem, NULL); - if (ret == -1) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); - - ret = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_sem, NULL); - if (ret == -1) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); - - - while (wait(&status) > 0) { - if (WIFEXITED(status) && WEXITSTATUS(status) == 1) - ret = 1; - if (WIFEXITED(status) && WEXITSTATUS(status) == 2) - tst_brkm(TBROK | TERRNO, cleanup, "error in child"); - if (WIFSIGNALED(status)) { - tst_resm(TFAIL, "child was killed with signal %s", - tst_strsig(WTERMSIG(status))); - return; - } - } - - if (ret) - tst_resm(TFAIL, "SysV sem: communication with identical keys" - " between namespaces"); - else - tst_resm(TPASS, "SysV sem: communication with identical keys" - " between namespaces"); + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_sem, NULL); + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_sem, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) - test(); - - cleanup(); - tst_exit(); + check_newipc(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .needs_root = 1, + .needs_checkpoints = 1, +}; From patchwork Fri Mar 25 12:54:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609428 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=RrK7dvMR; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=SNghK9H8; 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 4KQ2BG6944z9s07 for ; Fri, 25 Mar 2022 23:55:18 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 226473C8C9C for ; Fri, 25 Mar 2022 13:55:16 +0100 (CET) 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)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 86A383C189A for ; Fri, 25 Mar 2022 13:54:48 +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-2.smtp.seeweb.it (Postfix) with ESMTPS id D4FF4601A71 for ; Fri, 25 Mar 2022 13:54:47 +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 839FF1F857; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212887; 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=8DaQwKlTdmTUaQ1LNFGeUVxsnIajrU4Zt83m8qVCx1A=; b=RrK7dvMRDcMJUzdeXX9BFecdn3Udb431vlsaH5wmzMuQcK9HNK2mJ2t+FjKqchBJYRz81u Wk8oVungm24m8BTIWPgV+3dffYBo19ug1d3JYnhcj5i4Eg5SibHeynM/I+PFWLDaIER7HG fOEmKortqKdDHvzE70DJOF1N4yLnfTU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212887; 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=8DaQwKlTdmTUaQ1LNFGeUVxsnIajrU4Zt83m8qVCx1A=; b=SNghK9H8ko4tHQqDF3jiIp/LWtYrR4TF0mfnaEgmv1Pg0d+hZKaZboy3lWWg3XrFNCPCqp Ct7AzEpxOvihFRBg== 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 53CC61332D; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0L+ZEpe7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:47 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:39 +0100 Message-Id: <20220325125445.11984-5-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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 v4 04/10] Rewrite sem_nstest.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" Updated containers runtest file to include new sem_nstest.c options. Signed-off-by: Andrea Cervesato --- runtest/containers | 6 +- .../kernel/containers/sysvipc/sem_nstest.c | 212 +++++++----------- 2 files changed, 78 insertions(+), 140 deletions(-) diff --git a/runtest/containers b/runtest/containers index d863c10a4..4f56b1b4d 100644 --- a/runtest/containers +++ b/runtest/containers @@ -54,9 +54,9 @@ mesgq_nstest_none mesgq_nstest -m none mesgq_nstest_clone mesgq_nstest -m clone mesgq_nstest_unshare mesgq_nstest -m unshare msg_comm msg_comm -sem_nstest_none sem_nstest none -sem_nstest_clone sem_nstest clone -sem_nstest_unshare sem_nstest unshare +sem_nstest_none sem_nstest -m none +sem_nstest_clone sem_nstest -m clone +sem_nstest_unshare sem_nstest -m unshare semtest_2ns_none semtest_2ns none semtest_2ns_clone semtest_2ns clone semtest_2ns_unshare semtest_2ns unshare diff --git a/testcases/kernel/containers/sysvipc/sem_nstest.c b/testcases/kernel/containers/sysvipc/sem_nstest.c index 72e04fe4f..af4e87e8f 100644 --- a/testcases/kernel/containers/sysvipc/sem_nstest.c +++ b/testcases/kernel/containers/sysvipc/sem_nstest.c @@ -1,158 +1,96 @@ -/* ************************************************************************* -* 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 -* -* In Parent Process , create semaphore with key 154326L -* Now create container by passing 1 of the below flag values.. -* clone(NONE), clone(CLONE_NEWIPC), or unshare(CLONE_NEWIPC) -* In cloned process, try to access the created semaphore -* Test PASS: If the semaphore is readable when flag is None. -* Test FAIL: If the semaphore is readable when flag is Unshare or Clone. -***************************************************************************/ - -#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] + * + * In parent process create a new semaphore with a specific key. + * In cloned process, try to access the created semaphore + * + * Test PASS if the semaphore is readable when flag is None. + * Test FAIL if the semaphore is readable when flag is Unshare or Clone. + */ + +#define _GNU_SOURCE + +#include +#include +#include #include -#include -#include "test.h" -#include "ipcns_helper.h" +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" -#define MY_KEY 154326L -#define UNSHARESTR "unshare" -#define CLONESTR "clone" -#define NONESTR "none" +#define MY_KEY 154326L -char *TCID = "sem_nstest"; -int TST_TOTAL = 1; -int p1[2]; -int p2[2]; +static char *str_op; +static int use_clone; +static int ipc_id = -1; -int check_semaphore(void *vtest) +static int check_semaphore(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[3]; int id; - (void) vtest; + id = semget(MY_KEY, 1, 0); - close(p1[1]); - close(p2[0]); + if (id < 0) { + if (use_clone == T_NONE) + tst_res(TFAIL, "Plain cloned process didn't find semaphore"); + else + tst_res(TPASS, "%s: container didn't find semaphore", str_op); - read(p1[0], buf, 3); - id = semget(MY_KEY, 1, 0); - if (id == -1) - write(p2[1], "notfnd", 7); - else { - write(p2[1], "exists", 7); - tst_resm(TINFO, "PID %d: Fetched existing semaphore..id = %d", - getpid(), id); + return 0; } - tst_exit(); + + tst_res(TINFO, "PID %d: fetched existing semaphore..id = %d", getpid(), id); + + if (use_clone == T_NONE) + tst_res(TPASS, "Plain cloned process found semaphore inside container"); + else + tst_res(TFAIL, "%s: Container init process found semaphore", str_op); + + return 0; } -static void setup(void) +static void run(void) { - tst_require_root(); - check_newipc(); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_semaphore, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int ret, use_clone = T_NONE, id; - char *tsttype = NONESTR; - char buf[7]; - - setup(); - - if (argc != 2) { - tst_resm(TFAIL, "Usage: %s ", argv[0]); - tst_brkm(TFAIL, NULL, " where clone, unshare, or fork specifies" - " unshare method."); - } - - /* Using PIPE's to sync between container and Parent */ - if (pipe(p1) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } - if (pipe(p2) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } + 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; - } - - /* 1. Create (or fetch if existing) the binary semaphore */ - id = semget(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666); - if (id == -1) { - perror("Semaphore create"); - if (errno != EEXIST) { - perror("semget failure"); - tst_brkm(TBROK, NULL, "Semaphore creation failed"); - } - id = semget(MY_KEY, 1, 0); - if (id == -1) { - perror("Semaphore create"); - tst_brkm(TBROK, NULL, "Semaphore operation failed"); - } - } - - tst_resm(TINFO, "Semaphore namespaces Isolation test : %s", tsttype); - /* fire off the test */ - ret = - do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_semaphore, - NULL); - if (ret < 0) { - tst_brkm(TFAIL, NULL, "%s failed", tsttype); - } + if (use_clone != T_NONE) + check_newipc(); - close(p1[0]); - close(p2[1]); - write(p1[1], "go", 3); - read(p2[0], buf, 7); + ipc_id = SAFE_SEMGET(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666); +} - if (strcmp(buf, "exists") == 0) { - if (use_clone == T_NONE) - tst_resm(TPASS, "Plain cloned process found semaphore " - "inside container"); - else - tst_resm(TFAIL, - "%s: Container init process found semaphore", - tsttype); - } else { - if (use_clone == T_NONE) - tst_resm(TFAIL, - "Plain cloned process didn't find semaphore"); - else - tst_resm(TPASS, "%s: Container didn't find semaphore", - tsttype); +static void cleanup(void) +{ + if (ipc_id != -1) { + tst_res(TINFO, "Delete semaphore"); + SAFE_SEMCTL(ipc_id, IPC_RMID, 0); } - - /* Delete the semaphore */ - id = semget(MY_KEY, 1, 0); - semctl(id, IPC_RMID, 0); - - tst_exit(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Mar 25 12:54:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609439 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=nDAgmjA/; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=WW64C4Me; 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 4KQ2D42pM4z9s07 for ; Fri, 25 Mar 2022 23:56:52 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id D406D3C93CA for ; Fri, 25 Mar 2022 13:56:49 +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 [IPv6:2001:4b78:1:20::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 53CDC3C696C for ; Fri, 25 Mar 2022 13:54:48 +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-3.smtp.seeweb.it (Postfix) with ESMTPS id 3573D1A00E7F for ; Fri, 25 Mar 2022 13:54:48 +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 BDE471F858; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212887; 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=sSYSM8SHi4m1OutMTYSSqVuCY8Gjq+EQ9Gq4IlZiP2k=; b=nDAgmjA/RVMSbL1tB4lsnAGNbikfTx0YQliwuIMGbetO2Wt/Wb8msDw5Fu4iA8sRudj+lr 6nsevT6WZk9zQ2dsROJrSCx0jigeWH2QCWmuEmMrFhJlwTS0XpvX8airNoTQoEsqcFER9B S+Wbt0RtA934eM4Kp9xCM48golyF5zo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212887; 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=sSYSM8SHi4m1OutMTYSSqVuCY8Gjq+EQ9Gq4IlZiP2k=; b=WW64C4MeqYTQoVjNigPVTYpLeC5dsefqeKI2sU48Qsxo15nYp3eF+1dnV9epmpygPAQFH+ 11Inl902taxTjTCw== 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 8FF8A1332D; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8OowIZe7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:47 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:40 +0100 Message-Id: <20220325125445.11984-6-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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, T_SCC_BODY_TEXT_LINE 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 v4 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" Updated containers runtest file to include new semtest_2ns.c options. Signed-off-by: Andrea Cervesato --- runtest/containers | 6 +- .../kernel/containers/sysvipc/semtest_2ns.c | 326 +++++++----------- 2 files changed, 127 insertions(+), 205 deletions(-) diff --git a/runtest/containers b/runtest/containers index 4f56b1b4d..3130ccfbd 100644 --- a/runtest/containers +++ b/runtest/containers @@ -57,9 +57,9 @@ msg_comm msg_comm sem_nstest_none sem_nstest -m none sem_nstest_clone sem_nstest -m clone sem_nstest_unshare sem_nstest -m unshare -semtest_2ns_none semtest_2ns none -semtest_2ns_clone semtest_2ns clone -semtest_2ns_unshare semtest_2ns unshare +semtest_2ns_none semtest_2ns -m none +semtest_2ns_clone semtest_2ns -m clone +semtest_2ns_unshare semtest_2ns -m unshare sem_comm sem_comm utstest_unshare_1 utstest unshare 1 diff --git a/testcases/kernel/containers/sysvipc/semtest_2ns.c b/testcases/kernel/containers/sysvipc/semtest_2ns.c index c3483b675..1666b1f04 100644 --- a/testcases/kernel/containers/sysvipc/semtest_2ns.c +++ b/testcases/kernel/containers/sysvipc/semtest_2ns.c @@ -1,230 +1,152 @@ -/* ************************************************************************* -* 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 -#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]; -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 */ -}; - -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) */ -}; - +// SPDX-License-Identifier: GPL-2.0-or-later /* - * sem_lock() - Locks the semaphore for crit-sec updation, and unlocks it later + * Copyright (c) International Business Machines Corp., 2009 + * Veerendra C + * Copyright (C) 2022 SUSE LLC Andrea Cervesato */ -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..."); - sleep(2); - if (semop(id, &semop_unlock[0], 1) < 0) { - perror("sem unlock error"); - tst_brkm(TBROK, NULL, "semop failed"); - } -} -/* - * check_sem1 - does not read -- it writes to check_sem2() when it's done. +/*\ + * [Description] + * + * Test SysV IPC semaphore usage between namespaces and processes. + * + * [Algorithm] + * + * Create 2 'containers' + * In container1 create semaphore with a specific key and lock it + * In container2 try to access the semaphore created in container1 and try to + * unlock it. + * + * If mode = None, test will PASS when semaphore created process1 can be read + * and unlocked from process2. + * If mode = Clone, test will PASS when semaphore created in container1 can't + * be accessed from container2. + * If mode = Unshare, test will PASS when semaphore created in container2 can't + * be accessed from container2. */ -int check_sem1(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"); - } - } - write(p1[1], "go", 3); - tst_resm(TINFO, "Cont1: Able to create semaphore"); - tst_exit(); -} +#define _GNU_SOURCE -/* - * check_sem2() reads from check_sem1() and writes to main() when it's done. - */ +#include +#include +#include +#include +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" -int check_sem2(void *vtest) +#define MY_KEY 124326L + +static char *str_op; +static int use_clone; + +static int check_sem1(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[3]; - int id2; + int id; + struct sembuf sm; - (void) vtest; + id = SAFE_SEMGET(MY_KEY, 1, IPC_CREAT | IPC_EXCL | 0666); - close(p1[1]); - close(p2[0]); - read(p1[0], buf, 3); + tst_res(TINFO, "%s: created key in child1", str_op); - id2 = semget(MY_KEY, 1, 0); - if (id2 != -1) { - sem_lock(id2); - write(p2[1], "exists", 7); - } 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); - } + TST_CHECKPOINT_WAKE_AND_WAIT(0); - tst_exit(); -} + tst_res(TINFO, "Lock semaphore in container1"); + sm.sem_num = 0; + sm.sem_op = 1; + sm.sem_flg = SEM_UNDO; + SAFE_SEMOP(id, &sm, 1); -static void setup(void) -{ - tst_require_root(); - check_newipc(); + TST_CHECKPOINT_WAKE_AND_WAIT(0); + + return 0; } -int main(int argc, char *argv[]) +static int check_sem2(LTP_ATTRIBUTE_UNUSED void *vtest) { - int ret, id, use_clone = T_NONE; - char *tsttype = NONESTR; - char buf[7]; + int id; + struct sembuf sm; - setup(); + TST_CHECKPOINT_WAIT(0); - if (argc != 2) { - tst_resm(TINFO, "Usage: %s ", argv[0]); - tst_resm(TINFO, " where clone, unshare, or fork specifies" - " unshare method."); - tst_exit(); - } + tst_res(TINFO, "%s: reading key in child2", str_op); - /* 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(); + id = semget(MY_KEY, 1, 0); + if (id >= 0) { + 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 semaphore created in namespace1", str_op); + } else { + 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 semaphore created in namespace1", 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_CHECKPOINT_WAKE_AND_WAIT(0); + + if (id >= 0) { + tst_res(TINFO, "Trying to unlock semaphore in container2"); + sm.sem_num = 0; + sm.sem_op = -1; + sm.sem_flg = IPC_NOWAIT | SEM_UNDO; + TEST(semop(id, &sm, 1)); + + if (TST_RET >= 0) { + if (use_clone == T_NONE) + tst_res(TPASS, "Plain cloned process able to unlock semaphore"); + else + tst_res(TFAIL, "%s: In namespace2 able to unlock the semaphore created in an namespace1", str_op); + } else { + if (use_clone == T_NONE) + tst_res(TFAIL, "Plain cloned process unable to unlock semaphore"); + else + tst_res(TPASS, "%s: In namespace2 unable to unlock the semaphore created in an namespace1", str_op); + } + + SAFE_SEMCTL(id, IPC_RMID, 0); } - tst_resm(TINFO, "Semaphore Namespaces Test : %s", tsttype); + TST_CHECKPOINT_WAKE(0); - /* 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"); - } + return 0; +} - 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); +static void run(void) +{ + clone_unshare_test(use_clone, CLONE_NEWIPC, check_sem1, NULL); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_sem2, NULL); +} + +static void setup(void) +{ + use_clone = get_clone_unshare_enum(str_op); + + if (use_clone != T_NONE) + check_newipc(); +} + +static void cleanup(void) +{ + int id; - 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 (id >= 0) { + tst_res(TINFO, "Destroy semaphore"); + SAFE_SEMCTL(id, IPC_RMID, 0); + } } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_root = 1, + .forks_child = 1, + .needs_checkpoints = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Mar 25 12:54:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609431 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=0SdexQuS; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=7PGILLNT; 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 (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KQ2Bw3vP3z9s07 for ; Fri, 25 Mar 2022 23:55:52 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 01C7C3C93DA for ; Fri, 25 Mar 2022 13:55:50 +0100 (CET) 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 [IPv6:2001:4b78:1:20::2]) (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 D1B833C189A for ; Fri, 25 Mar 2022 13:54:48 +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-2.smtp.seeweb.it (Postfix) with ESMTPS id 59393601AF2 for ; Fri, 25 Mar 2022 13:54:48 +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 F0F3F210FC; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212887; 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=TGFDu5Nxsp0y/nAQLBr3Jzp78/uFA30wVLjztJq3VbU=; b=0SdexQuSqGEXx2jYlZ8bp1W5ssgPOZ35ENjpDvNoPtkLaQg/U2rNzORps5Trzq9p00qra/ RSe9WLlU/ksOTia1RNhHreekfN6K1e4AGdTeWb5uJq51k1YXG53Ui2zESE2H4+3t9FciEF MKSm+VI8uG3+qn+VWj2ZYnAK7op9R2w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212887; 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=TGFDu5Nxsp0y/nAQLBr3Jzp78/uFA30wVLjztJq3VbU=; b=7PGILLNTDexVtOg2sy8STYlxz34siIQwThh/rRStsxwH06+23abNrQkSh+P34JvBKy6CJd HWwaDaRcoL9KznDg== 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 C96B31332D; Fri, 25 Mar 2022 12:54:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WKwwL5e7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:47 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:41 +0100 Message-Id: <20220325125445.11984-7-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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 v4 06/10] Rewrite shmnstest.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" Updated containers runtest file to include new shmnstest.c options. Signed-off-by: Andrea Cervesato --- runtest/containers | 6 +- .../kernel/containers/sysvipc/shmnstest.c | 180 ++++++------------ 2 files changed, 62 insertions(+), 124 deletions(-) diff --git a/runtest/containers b/runtest/containers index 3130ccfbd..b1b9b522a 100644 --- a/runtest/containers +++ b/runtest/containers @@ -43,9 +43,9 @@ netns_comm_ip_ipv4_ioctl netns_comm.sh ip ipv4 ioctl netns_comm_ip_ipv6_ioctl netns_comm.sh ip ipv6 ioctl netns_sysfs netns_sysfs.sh -shmnstest_none shmnstest none -shmnstest_clone shmnstest clone -shmnstest_unshare shmnstest unshare +shmnstest_none shmnstest -m none +shmnstest_clone shmnstest -m clone +shmnstest_unshare shmnstest -m unshare shmem_2nstest_none shmem_2nstest none shmem_2nstest_clone shmem_2nstest clone shmem_2nstest_unshare shmem_2nstest unshare diff --git a/testcases/kernel/containers/sysvipc/shmnstest.c b/testcases/kernel/containers/sysvipc/shmnstest.c index cf69cab21..bb8435a67 100644 --- a/testcases/kernel/containers/sysvipc/shmnstest.c +++ b/testcases/kernel/containers/sysvipc/shmnstest.c @@ -1,144 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* 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 -* -* Author: Serge Hallyn -* -* Create shm with key 0xEAEAEA -* clone, clone(CLONE_NEWIPC), or unshare(CLONE_NEWIPC) -* In cloned process, try to get the created shm + * Copyright (c) International Business Machines Corp., 2007 + * Serge Hallyn + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ -***************************************************************************/ +/*\ + * [Description] + * + * Test if SysV IPC shared memory with a specific key is shared between + * processes and namespaces. + */ + +#define _GNU_SOURCE -#define _GNU_SOURCE 1 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "ipcns_helper.h" -#include "test.h" +#include +#include +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" -char *TCID = "sysvipc_namespace"; -int TST_TOTAL = 1; #define TESTKEY 0xEAEAEA -int p1[2]; -int p2[2]; +static char *str_op; +static int use_clone; +static int ipc_id = -1; -int check_shmid(void *vtest) +static int check_shmid(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[3]; - int id; - - (void) vtest; - - close(p1[1]); - close(p2[0]); - - read(p1[0], buf, 3); - id = shmget(TESTKEY, 100, 0); - if (id == -1) { - write(p2[1], "notfnd", 7); + TEST(shmget(TESTKEY, 100, 0)); + if (TST_RET < 0) { + if (use_clone == T_NONE) + tst_res(TFAIL, "plain cloned process didn't find shmid"); + else + tst_res(TPASS, "%s: child process didn't find shmid", str_op); } else { - write(p2[1], "exists", 7); - shmctl(id, IPC_RMID, NULL); + if (use_clone == T_NONE) + tst_res(TPASS, "plain cloned process found shmid"); + else + tst_res(TFAIL, "%s: child process found shmid", str_op); } - tst_exit(); + return 0; } -static void setup(void) +static void run(void) { - tst_require_root(); - check_newipc(); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmid, NULL); } -#define UNSHARESTR "unshare" -#define CLONESTR "clone" -#define NONESTR "none" -int main(int argc, char *argv[]) +static void setup(void) { - int r, use_clone = T_NONE; - int id; - char *tsttype = NONESTR; - char buf[7]; - - setup(); - - if (argc != 2) { - tst_resm(TFAIL, "Usage: %s ", argv[0]); - tst_brkm(TFAIL, - NULL, - " where clone, unshare, or fork specifies unshare method."); - } - if (pipe(p1) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } - if (pipe(p2) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); - } - tsttype = NONESTR; - 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; - } + use_clone = get_clone_unshare_enum(str_op); - /* first create the key */ - id = shmget(TESTKEY, 100, IPC_CREAT); - if (id == -1) { - perror("shmget"); - tst_brkm(TFAIL, NULL, "shmget failed"); - } + if (use_clone != T_NONE) + check_newipc(); - tst_resm(TINFO, "shmid namespaces test : %s", tsttype); - /* fire off the test */ - r = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmid, NULL); - if (r < 0) { - tst_brkm(TFAIL, NULL, "%s failed", tsttype); - } + ipc_id = shmget(TESTKEY, 100, IPC_CREAT); +} - close(p1[0]); - close(p2[1]); - write(p1[1], "go", 3); - read(p2[0], buf, 7); - if (strcmp(buf, "exists") == 0) { - if (use_clone == T_NONE) - tst_resm(TPASS, "plain cloned process found shmid"); - else - tst_resm(TFAIL, "%s: child process found shmid", - tsttype); - } else { - if (use_clone == T_NONE) - tst_resm(TFAIL, - "plain cloned process didn't find shmid"); - else - tst_resm(TPASS, "%s: child process didn't find shmid", - tsttype); +static void cleanup(void) +{ + if (ipc_id != -1) { + tst_res(TINFO, "Delete shared memory"); + SAFE_SHMCTL(ipc_id, IPC_RMID, NULL); } - - /* destroy the key */ - shmctl(id, IPC_RMID, NULL); - - tst_exit(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .forks_child = 1, + .needs_root = 1, + .needs_checkpoints = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Mar 25 12:54:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609433 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=WjRoWOU6; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9J7hKuH4; 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 (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KQ2CM3dqHz9s07 for ; Fri, 25 Mar 2022 23:56:15 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6EE5C3C8C8C for ; Fri, 25 Mar 2022 13:56:13 +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 [IPv6:2001:4b78:1:20::4]) (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 566783C189A for ; Fri, 25 Mar 2022 13:54:49 +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-4.smtp.seeweb.it (Postfix) with ESMTPS id 92CCC1001144 for ; Fri, 25 Mar 2022 13:54:48 +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 36EAC210FD; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212888; 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=isXkOTPlLCPtvf/PmOXSgX01dYpvcyTY30bcH4ku4pE=; b=WjRoWOU69o/bY5+AWcn5Eqf6nq7sdQp3aE21BMyOpfHgOdEHdvpYPo5jTRQIAiBe4KAo0/ eJnR3v5T8+O6rC7xlsggPcVTPLfLCeHxmB2gWxc3QgbTLLaE5gycfJzSK9M0IdO6KaeaKr 4N4Xxe8pfkOhkxQo5bvi7DRadXTJgx0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212888; 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=isXkOTPlLCPtvf/PmOXSgX01dYpvcyTY30bcH4ku4pE=; b=9J7hKuH4jpTMppU8nFGn1AR3+T61z5Ciz1/d26c/vj++VCMKp3OZxKEs/Ax0qRsEdJXTiJ szROXhXbltrauXDA== 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 08F6F1332D; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2PE6AJi7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:48 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:42 +0100 Message-Id: <20220325125445.11984-8-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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, T_SCC_BODY_TEXT_LINE 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 v4 07/10] Rewrite shmem_2nstest.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" Updated containers runtime file to include new shmem_2nstest.c options. Signed-off-by: Andrea Cervesato --- runtest/containers | 6 +- .../kernel/containers/sysvipc/shmem_2nstest.c | 239 ++++++------------ 2 files changed, 86 insertions(+), 159 deletions(-) diff --git a/runtest/containers b/runtest/containers index b1b9b522a..591d56b18 100644 --- a/runtest/containers +++ b/runtest/containers @@ -46,9 +46,9 @@ netns_sysfs netns_sysfs.sh shmnstest_none shmnstest -m none shmnstest_clone shmnstest -m clone shmnstest_unshare shmnstest -m unshare -shmem_2nstest_none shmem_2nstest none -shmem_2nstest_clone shmem_2nstest clone -shmem_2nstest_unshare shmem_2nstest unshare +shmem_2nstest_none shmem_2nstest -m none +shmem_2nstest_clone shmem_2nstest -m clone +shmem_2nstest_unshare shmem_2nstest -m unshare shm_comm shm_comm mesgq_nstest_none mesgq_nstest -m none mesgq_nstest_clone mesgq_nstest -m clone diff --git a/testcases/kernel/containers/sysvipc/shmem_2nstest.c b/testcases/kernel/containers/sysvipc/shmem_2nstest.c index b172ee07c..e6c1a16fa 100644 --- a/testcases/kernel/containers/sysvipc/shmem_2nstest.c +++ b/testcases/kernel/containers/sysvipc/shmem_2nstest.c @@ -1,187 +1,114 @@ -/* ************************************************************************* -* 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 Shared Memory isoloation in 2 containers. -* It tries to create/access a Shared Memory 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 Shared Memory segment with key 124426L -* In Cont2, try to access the MQ created in Cont1. -* PASS : -* If flag = None and the shmem seg is accessible in Cont2. -* If flag = unshare/clone and the shmem seg is not accessible in Cont2. -* If shmem seg is not accessible in Cont2, -* creates new shmem with same key to double check isloation in IPCNS. -* -* FAIL : -* If flag = none and the shmem seg is not accessible. -* If flag = unshare/clone and shmem seg is accessible in Cont2. -* If the new shmem seg creation Fails. -***************************************************************************/ - -#define _GNU_SOURCE 1 -#include -#include -#include -#include -#include -#include -#include -#include "test.h" -#include "safe_macros.h" -#include "ipcns_helper.h" - -#define TESTKEY 124426L -#define UNSHARESTR "unshare" -#define CLONESTR "clone" -#define NONESTR "none" - -char *TCID = "shmem_2nstest"; -int TST_TOTAL = 1; -int p2[2]; -int p1[2]; - +// SPDX-License-Identifier: GPL-2.0-or-later /* - * check_shmem1() does not read -- it writes to check_shmem2() when it's done. + * Copyright (c) International Business Machines Corp., 2009 + * Veerendra C + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] + * + * Test if SysV IPC shared memory is properly used between two namespaces. + * + * [Algorithm] + * + * Create two 'containers'. + * In container1, create Shared Memory segment with a specific key. + * In container2, try to access the MQ created in container1. + * + * Test is PASS if flag = none and the shmem seg is accessible in container2. + * If flag = unshare/clone and the shmem seg is not accessible in container2. + * If shmem seg is not accessible in container2, creates new shmem with same + * key to double check isloation in IPCNS. + * + * Test is FAIL if flag = none and the shmem seg is not accessible, if + * flag = unshare/clone and shmem seg is accessible in container2 or if the new + * shmem seg creation Fails. */ -int check_shmem1(void *vtest) -{ - int id1; - (void) vtest; +#define _GNU_SOURCE - close(p1[0]); +#include +#include +#include +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" - /* first create the key */ - id1 = shmget(TESTKEY, 100, IPC_CREAT); - if (id1 == -1) - tst_brkm(TFAIL | TERRNO, NULL, "shmget failed"); +#define TESTKEY 124426L - tst_resm(TINFO, "Cont1: Able to create shared mem segment"); - write(p1[1], "done", 5); - tst_exit(); -} +static char *str_op; +static int use_clone; /* - * check_shmem2() reads from check_shmem1() and writes to main() when it's done. + * check_shmem1() does not read -- it writes to check_shmem2() when it's done. */ -int check_shmem2(void *vtest) +static int check_shmem1(LTP_ATTRIBUTE_UNUSED void *vtest) { - char buf[3]; - int id2; + SAFE_SHMGET(TESTKEY, 100, IPC_CREAT); - (void) vtest; + tst_res(TINFO, "container1: able to create shared mem segment"); - close(p1[1]); - close(p2[0]); + TST_CHECKPOINT_WAKE(0); - read(p1[0], buf, 3); - /* Trying to access shmem, if not existing create new shmem */ - id2 = shmget(TESTKEY, 100, 0); - if (id2 == -1) { - id2 = shmget(TESTKEY, 100, IPC_CREAT); - if (id2 == -1) - tst_resm(TFAIL | TERRNO, "shmget failed"); - else - tst_resm(TINFO, - "Cont2: Able to allocate shmem seg with " - "the same key"); - write(p2[1], "notfnd", 7); - } else - write(p2[1], "exists", 7); - - tst_exit(); -} - -static void setup(void) -{ - tst_require_root(); - check_newipc(); + return 0; } -int main(int argc, char *argv[]) +/* + * check_shmem2() reads from check_shmem1() and writes to main() when it's done. + */ +static int check_shmem2(LTP_ATTRIBUTE_UNUSED void *vtest) { - int ret, use_clone = T_NONE; - char *tsttype = NONESTR; - char buf[7]; int id; - setup(); + TST_CHECKPOINT_WAIT(0); - 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 containers and Parent */ - SAFE_PIPE(NULL, p1); - SAFE_PIPE(NULL, p2); - - 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; - } + TEST(shmget(TESTKEY, 100, 0)); - tst_resm(TINFO, "Shared Memory namespace test : %s", tsttype); + if (TST_RET < 0) { + SAFE_SHMGET(TESTKEY, 100, IPC_CREAT); - /* Create 2 containers */ - ret = - do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem1, NULL); - if (ret < 0) - tst_brkm(TFAIL, NULL, "clone/unshare failed"); + tst_res(TINFO, "container2: able to allocate shmem seg with the same key"); - ret = - do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem2, 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 shmem " - "segment created"); + tst_res(TFAIL, "Plain cloned process didn't find shmem segment"); else - tst_resm(TFAIL, - "%s : In namespace2 found the shmem segment " - "created in Namespace1", tsttype); + tst_res(TPASS, "%s: in namespace2 unable to access the shmem seg created in namespace1", str_op); } else { if (use_clone == T_NONE) - tst_resm(TFAIL, - "Plain cloned process didn't find shmem seg"); + tst_res(TPASS, "Plain cloned process able to access shmem segment created"); else - tst_resm(TPASS, - "%s : In namespace2 unable to access the shmem seg " - "created in Namespace1", tsttype); + tst_res(TFAIL, "%s: in namespace2 found the shmem segment created in namespace1", str_op); } - /* destroy the key */ - id = shmget(TESTKEY, 100, 0); - shmctl(id, IPC_RMID, NULL); + id = SAFE_SHMGET(TESTKEY, 100, 0); + SAFE_SHMCTL(id, IPC_RMID, NULL); - tst_exit(); + return 0; } + +static void run(void) +{ + clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem1, NULL); + clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem2, NULL); +} + +static void setup(void) +{ + use_clone = get_clone_unshare_enum(str_op); + + if (use_clone != T_NONE) + check_newipc(); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .forks_child = 1, + .needs_root = 1, + .needs_checkpoints = 1, + .options = (struct tst_option[]) { + { "m:", &str_op, "Test execution mode " }, + {}, + }, +}; From patchwork Fri Mar 25 12:54:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609434 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=t6E+Gke3; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=TNbyYUjE; 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 (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KQ2CZ3XSHz9s07 for ; Fri, 25 Mar 2022 23:56:26 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 5EFE43C91C2 for ; Fri, 25 Mar 2022 13:56:24 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (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 5BF773C1FF3 for ; Fri, 25 Mar 2022 13:54:49 +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-6.smtp.seeweb.it (Postfix) with ESMTPS id B941B1401193 for ; Fri, 25 Mar 2022 13:54:48 +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 68F9A1F38D; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212888; 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=nCwGgLBxduNGFREGs0cswOTgJzLRuo3Y8Lpd5IABBd0=; b=t6E+Gke37nDiQ2H1tmLXpxveqigBIBxvOYRbD5nRavFgsC7wbygFMCSST4iDRbMqHW8iDk MWY3QQ7FF4BZ1attOWSJISmI2Du6WoZnx8h+/jQrzsTLa4WOKi+QPEXZTvTB9LAAx6BSKG FMN68njrxHoBtE4NiTledD5RWzK3ZC0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212888; 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=nCwGgLBxduNGFREGs0cswOTgJzLRuo3Y8Lpd5IABBd0=; b=TNbyYUjEO0Qg9hS4aKZIdGzOqbaWUgZs7Lt2YB6DM7dkZnPJcpasFalWstja1FX/va83+y XrvjtN3xHtj/1jAw== 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 40C8C1332D; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WDX7DZi7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:48 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:43 +0100 Message-Id: <20220325125445.11984-9-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.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-6.smtp.seeweb.it Subject: [LTP] [PATCH v4 08/10] Rewrite shm_comm.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/shm_comm.c | 167 ++++++------------ 1 file changed, 50 insertions(+), 117 deletions(-) diff --git a/testcases/kernel/containers/sysvipc/shm_comm.c b/testcases/kernel/containers/sysvipc/shm_comm.c index 4b3bbfaa8..12ad49110 100644 --- a/testcases/kernel/containers/sysvipc/shm_comm.c +++ b/testcases/kernel/containers/sysvipc/shm_comm.c @@ -1,20 +1,17 @@ -/* Copyright (c) 2014 Red Hat, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of version 2 the GNU General Public License as - * published by the Free Software Foundation. +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2014 Red Hat, Inc. + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + */ + +/*\ + * [Description] * - * 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. + * Test if SysV IPC shared memory is properly working between two different + * namespaces. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - *********************************************************************** - * File: shm_comm.c + * [Algorithm] * - * Description: * 1. Clones two child processes with CLONE_NEWIPC flag, each child * allocates System V shared memory segment (shm) with the _identical_ * key and attaches that segment into its address space. @@ -27,141 +24,77 @@ */ #define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include "ipcns_helper.h" -#include "test.h" -#include "safe_macros.h" +#include +#include +#include +#include "tst_safe_sysv_ipc.h" +#include "tst_test.h" +#include "common.h" #define TESTKEY 124426L #define SHMSIZE 50 -char *TCID = "shm_comm"; -int TST_TOTAL = 1; - -static void cleanup(void) -{ - tst_rmdir(); -} - -static void setup(void) -{ - tst_require_root(); - check_newipc(); - tst_tmpdir(); - TST_CHECKPOINT_INIT(tst_rmdir); -} -int chld1_shm(void *arg) +static int chld1_shm(LTP_ATTRIBUTE_UNUSED void *arg) { - int id, rval = 0; + int id; char *shmem; - id = shmget(TESTKEY, SHMSIZE, IPC_CREAT); - if (id == -1) { - perror("shmget"); - return 2; - } - - if ((shmem = shmat(id, NULL, 0)) == (char *) -1) { - perror("shmat"); - shmctl(id, IPC_RMID, NULL); - return 2; - } + id = SAFE_SHMGET(TESTKEY, SHMSIZE, IPC_CREAT); + shmem = SAFE_SHMAT(id, NULL, 0); *shmem = 'A'; - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); + TST_CHECKPOINT_WAKE_AND_WAIT(0); - /* if child1 shared segment has changed (by child2) report fail */ if (*shmem != 'A') - rval = 1; + tst_res(TFAIL, "shared memory leak between namespaces"); + else + tst_res(TPASS, "shared memory didn't leak between namespaces"); + + TST_CHECKPOINT_WAKE(0); - /* tell child2 to continue */ - TST_SAFE_CHECKPOINT_WAKE(NULL, 0); + SAFE_SHMDT(shmem); + SAFE_SHMCTL(id, IPC_RMID, NULL); - shmdt(shmem); - shmctl(id, IPC_RMID, NULL); - return rval; + return 0; } -int chld2_shm(void *arg) +static int chld2_shm(LTP_ATTRIBUTE_UNUSED void *arg) { int id; char *shmem; - id = shmget(TESTKEY, SHMSIZE, IPC_CREAT); - if (id == -1) { - perror("shmget"); - return 2; - } + id = SAFE_SHMGET(TESTKEY, SHMSIZE, IPC_CREAT); - if ((shmem = shmat(id, NULL, 0)) == (char *) -1) { - perror("shmat"); - shmctl(id, IPC_RMID, NULL); - return 2; - } + shmem = SAFE_SHMAT(id, NULL, 0); - /* wait for child1 to write to his segment */ - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); + TST_CHECKPOINT_WAIT(0); *shmem = 'B'; - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); + TST_CHECKPOINT_WAKE_AND_WAIT(0); + + SAFE_SHMDT(shmem); + SAFE_SHMCTL(id, IPC_RMID, NULL); - shmdt(shmem); - shmctl(id, IPC_RMID, NULL); return 0; } -static void test(void) +static void run(void) { - int status, ret = 0; - - ret = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_shm, NULL); - if (ret == -1) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); - - ret = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_shm, NULL); - if (ret == -1) - tst_brkm(TBROK | TERRNO, cleanup, "clone failed"); - - - while (wait(&status) > 0) { - if (WIFEXITED(status) && WEXITSTATUS(status) == 1) - ret = 1; - if (WIFEXITED(status) && WEXITSTATUS(status) == 2) - tst_brkm(TBROK | TERRNO, cleanup, "error in child"); - if (WIFSIGNALED(status)) { - tst_resm(TFAIL, "child was killed with signal %s", - tst_strsig(WTERMSIG(status))); - return; - } - } - - if (ret) - tst_resm(TFAIL, "SysV shm: communication with identical keys" - " between namespaces"); - else - tst_resm(TPASS, "SysV shm: communication with identical keys" - " between namespaces"); + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_shm, NULL); + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_shm, NULL); } -int main(int argc, char *argv[]) +static void setup(void) { - int lc; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) - test(); - - cleanup(); - tst_exit(); + check_newipc(); } + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .needs_root = 1, + .needs_checkpoints = 1, +}; From patchwork Fri Mar 25 12:54:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609438 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=f9tJ6DC+; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hLtABaf8; 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 4KQ2Cn6plxz9s07 for ; Fri, 25 Mar 2022 23:56:37 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 733F83C8C8E for ; Fri, 25 Mar 2022 13:56:35 +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)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 808793C61C4 for ; Fri, 25 Mar 2022 13:54:49 +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-4.smtp.seeweb.it (Postfix) with ESMTPS id 0850E100113F for ; Fri, 25 Mar 2022 13:54:49 +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 A26B5210DD; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212888; 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=YgZZfRuNwaWkyXn1kXDvw+UKSPHvnW0AhEgQf13kXZA=; b=f9tJ6DC+ygyoZJjOR6b2TTqEb+sI5BZlrWImL9qDgcaFNRLGEB0InZHHcEShbnmUBMNIdN JU+hy7lVhAnyEgPplsfmpYm5xfHPlEMtkEXRRbPLdCjh+LAFZQWzVKZax+iOU+DQ1PbOla LR64MVkFgf27yV2jPKUfWritDuzSS10= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212888; 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=YgZZfRuNwaWkyXn1kXDvw+UKSPHvnW0AhEgQf13kXZA=; b=hLtABaf83vPR7U4+AVF5dlpM3Wymn+HQn5iBAaFOFQNCn/wKh0N1Qzv8R3ueV/rU5zU5fV ZD220NpFtSdXXMDw== 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 755D11332D; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KAmMGpi7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:48 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:44 +0100 Message-Id: <20220325125445.11984-10-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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, T_SCC_BODY_TEXT_LINE 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 v4 09/10] Remove libclone dependency from sysvipc test 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" Signed-off-by: Andrea Cervesato --- testcases/kernel/containers/sysvipc/Makefile | 26 +++----------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/testcases/kernel/containers/sysvipc/Makefile b/testcases/kernel/containers/sysvipc/Makefile index 00b537f6a..426fe5292 100644 --- a/testcases/kernel/containers/sysvipc/Makefile +++ b/testcases/kernel/containers/sysvipc/Makefile @@ -1,28 +1,8 @@ -################################################################################ -## ## -## 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 ## -## ## -################################################################################ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) International Business Machines Corp., 2007 +# Copyright (C) 2021 SUSE LLC Andrea Cervesato top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc - -LDLIBS := -lclone $(LDLIBS) - include $(top_srcdir)/include/mk/generic_leaf_target.mk From patchwork Fri Mar 25 12:54:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Cervesato X-Patchwork-Id: 1609432 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=rKUgHKyY; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=lR7g38O0; 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 4KQ2C95SqVz9s07 for ; Fri, 25 Mar 2022 23:56:05 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1CD633C88EB for ; Fri, 25 Mar 2022 13:56:03 +0100 (CET) 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)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 91F9D3C6574 for ; Fri, 25 Mar 2022 13:54:49 +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-2.smtp.seeweb.it (Postfix) with ESMTPS id 32885601A71 for ; Fri, 25 Mar 2022 13:54:49 +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 D80B31F7AE; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1648212888; 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=0w3Qyf5dcIQcXwt5zZqWtEJYXfBKD8QYgjyHujCFZe8=; b=rKUgHKyYTr4DHFcXoZ1HNtBZLsJff41zazuTH85RgMKCh/wust10n29oULzDSnoNJrmv6n Tx88bZqR0/Rwyz9g8y+Czh4mFwovUguk3GHMa75nSoA+GUn11pqfi13I2feMbRALEV6w0C E0flyw9GSc3GlELuIWGACzb3X0xL0Xk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1648212888; 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=0w3Qyf5dcIQcXwt5zZqWtEJYXfBKD8QYgjyHujCFZe8=; b=lR7g38O0IeYnWd5OtOFaUSUom7x8yI+w7pSeWSsyfO++2POsM87YR9GaHPKMp5r8qGxIAP Mz2HMiCXdO3FpTDA== 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 AD8A71332D; Fri, 25 Mar 2022 12:54:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MLd8KJi7PWKoZgAAMHmgww (envelope-from ); Fri, 25 Mar 2022 12:54:48 +0000 From: Andrea Cervesato To: ltp@lists.linux.it Date: Fri, 25 Mar 2022 13:54:45 +0100 Message-Id: <20220325125445.11984-11-andrea.cervesato@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220325125445.11984-1-andrea.cervesato@suse.de> References: <20220325125445.11984-1-andrea.cervesato@suse.de> 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 v4 10/10] Delete ipcns_helper.h in the sysvipc test 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" Signed-off-by: Andrea Cervesato --- .../kernel/containers/sysvipc/ipcns_helper.h | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 testcases/kernel/containers/sysvipc/ipcns_helper.h diff --git a/testcases/kernel/containers/sysvipc/ipcns_helper.h b/testcases/kernel/containers/sysvipc/ipcns_helper.h deleted file mode 100644 index 01ad0fff6..000000000 --- a/testcases/kernel/containers/sysvipc/ipcns_helper.h +++ /dev/null @@ -1,41 +0,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 -* -* Author: Rishikesh K Rajak -***************************************************************************/ -#include -#include "../libclone/libclone.h" -#include "test.h" -#include "safe_macros.h" - -static int dummy_child(void *v) -{ - (void) v; - return 0; -} - -static void check_newipc(void) -{ - int pid, status; - - if (tst_kvercmp(2, 6, 19) < 0) - tst_brkm(TCONF, NULL, "CLONE_NEWIPC not supported"); - - pid = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, dummy_child, NULL); - if (pid == -1) - tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWIPC not supported"); - - SAFE_WAIT(NULL, &status); -}