From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD28EC433EF for ; Tue, 8 Mar 2022 14:45:40 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 9CE3B3C21D8 for ; Tue, 8 Mar 2022 15:45:38 +0100 (CET) Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.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 C2ED43C0FA8 for ; Tue, 8 Mar 2022 15:45:28 +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 095301400444 for ; Tue, 8 Mar 2022 15:45:27 +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 62DBC210EF; Tue, 8 Mar 2022 14:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1646750727; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LAMnphrR7kbdtlY6JowImLWpvytBPss4M0g1e9ZWiNM=; b=kqrxHOrxT3ROZI06cPAED++MyN6zsUSuCADqWtk0bR5ZrRYO9bHrV8NqQqi+HKHQ+qxWFA nNZyfV+Ia6qfg3R5ZAjVA+L32aV2XazGGuaSP0A6JH+PkrJDWFQuqenoSjdnBuq4op82t6 eJ/i7R2xa1g+AVF/zwVZ0jFZgI5c3LE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1646750727; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LAMnphrR7kbdtlY6JowImLWpvytBPss4M0g1e9ZWiNM=; b=XBPFx2/qCU0bOcUOlOSCntPB+tdI3b+TP/H7lwgqQSQdplZh8m4574jbOlTPPi51hYT4qI 7/7pcgRgQB8IXoAg== 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 4926013CC6; Tue, 8 Mar 2022 14:45:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gdQDEAdsJ2JXQgAAMHmgww (envelope-from ); Tue, 08 Mar 2022 14:45:27 +0000 Date: Tue, 8 Mar 2022 15:47:46 +0100 From: Cyril Hrubis To: Andrea Cervesato Message-ID: References: <20220208100948.22913-1-andrea.cervesato@suse.de> <20220208100948.22913-4-andrea.cervesato@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220208100948.22913-4-andrea.cervesato@suse.de> X-Virus-Scanned: clamav-milter 0.102.4 at in-6.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v1 3/9] 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: , Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi! Similar here. > #define _GNU_SOURCE > + > #include > +#include > #include > #include > -#include > -#include > -#include > -#include "ipcns_helper.h" > -#include "test.h" > -#include "safe_macros.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]; > }; > > -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, ret, rval = 0; > struct sysv_msg m; > struct sysv_msg rec; > > id = msgget(TESTKEY, IPC_CREAT | 0600); > - if (id == -1) { > - perror("msgget"); > - return 2; > - } > + if (id < 0) > + tst_brk(TBROK, "msgget: %s", tst_strerrno(-id)); > > m.mtype = 1; > m.mtext[0] = 'A'; > - if (msgsnd(id, &m, sizeof(struct sysv_msg) - sizeof(long), 0) == -1) { > - perror("msgsnd"); > + > + ret = msgsnd(id, &m, sizeof(struct sysv_msg) - sizeof(long), 0); > + if (ret < 0) { > msgctl(id, IPC_RMID, NULL); > - return 2; > + tst_brk(TBROK, "msgsnd: %s", tst_strerrno(-ret)); > } > > /* wait for child2 to write into the message queue */ > - TST_SAFE_CHECKPOINT_WAIT(NULL, 0); > + TST_CHECKPOINT_WAIT(0); > > /* 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"); > + ret = msgrcv(id, &rec, sizeof(struct sysv_msg) - sizeof(long), 2, > + IPC_NOWAIT); > + if (ret < 0 && errno != ENOMSG) { > msgctl(id, IPC_RMID, NULL); > - return 2; > + tst_brk(TBROK, "msgrcv: %s", tst_strerrno(-ret)); This is wrong in many places, the msg*() calls return -1 and set errno so you really just need to pass TERRNO along with the TBROK. > } > + > /* if mtype #2 was found in the message queue, it is fail */ > - if (n > 0) { > + if (ret > 0) > rval = 1; > - } > > /* tell child2 to continue */ > - TST_SAFE_CHECKPOINT_WAKE(NULL, 0); > + TST_CHECKPOINT_WAKE(0); > > msgctl(id, IPC_RMID, NULL); > + > return rval; > } > > -int chld2_msg(void *arg) > +static int chld2_msg(LTP_ATTRIBUTE_UNUSED void *arg) > { > - int id; > + int id, ret; > struct sysv_msg m; > > id = msgget(TESTKEY, IPC_CREAT | 0600); > - if (id == -1) { > - perror("msgget"); > - return 2; > - } > + if (id < 0) > + tst_brk(TBROK, "msgget: %s", tst_strerrno(-id)); > > m.mtype = 2; > m.mtext[0] = 'B'; > - if (msgsnd(id, &m, sizeof(struct sysv_msg) - sizeof(long), 0) == -1) { > - perror("msgsnd"); > + > + ret = msgsnd(id, &m, sizeof(struct sysv_msg) - sizeof(long), 0); > + if (ret < 0) { > msgctl(id, IPC_RMID, NULL); > - return 2; > + tst_brk(TBROK, "msgsnd: %s", tst_strerrno(-ret)); > } > > /* tell child1 to continue and wait for it */ > - TST_SAFE_CHECKPOINT_WAKE_AND_WAIT(NULL, 0); > + TST_CHECKPOINT_WAKE_AND_WAIT(0); > > 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"); > - > + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld1_msg, NULL); > + clone_unshare_test(T_CLONE, CLONE_NEWIPC, chld2_msg, NULL); > > 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"); > + tst_brk(TBROK, "error in child"); > + > if (WIFSIGNALED(status)) { > - tst_resm(TFAIL, "child was killed with signal %s", > - tst_strsig(WTERMSIG(status))); > - return; > + tst_brk(TBROK, "child was killed with signal %s", > + tst_strsig(WTERMSIG(status))); > } > } > > - 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"); > + if (ret) { > + tst_res(TFAIL, "SysV msg: communication with identical keys" > + " between namespaces"); > + } else { > + tst_res(TPASS, "SysV msg: communication with identical keys" > + " between namespaces"); > + } No need to propagate anything at all, just do the PASS/FAIL in the respective tests. > } > > -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, > +}; > -- > 2.35.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp -- Cyril Hrubis chrubis@suse.cz -- Mailing list info: https://lists.linux.it/listinfo/ltp