From patchwork Thu Aug 13 03:29:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1343994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [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 ozlabs.org (Postfix) with ESMTPS id 4BRsWD6tJlz9sTM for ; Thu, 13 Aug 2020 13:29:28 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id C59B73C314E for ; Thu, 13 Aug 2020 05:29:23 +0200 (CEST) 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]) by picard.linux.it (Postfix) with ESMTP id 88E863C2615 for ; Thu, 13 Aug 2020 05:29:21 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-2.smtp.seeweb.it (Postfix) with ESMTP id 87B116012D1 for ; Thu, 13 Aug 2020 05:29:19 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.76,306,1592841600"; d="scan'208";a="98052059" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 13 Aug 2020 11:29:17 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id CAAD44CE34F4 for ; Thu, 13 Aug 2020 11:29:16 +0800 (CST) Received: from localhost.localdomain (10.167.220.84) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 13 Aug 2020 11:29:17 +0800 From: Yang Xu To: Date: Thu, 13 Aug 2020 11:29:37 +0800 Message-ID: <1597289377-3502-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20200812144007.GA23472@yuki.lan> References: <20200812144007.GA23472@yuki.lan> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) To G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) X-yoursite-MailScanner-ID: CAAD44CE34F4.A2BE9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.0 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.4 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v2] syscalls/msgget04: Add test for /proc/sys/kernel/msg_next_id 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: Yang Xu --- v1-v2: 1.queue_id doesn't need to init to 1 2.reset msg_next_id value to -1 in cleanup runtest/syscalls | 1 + runtest/syscalls-ipc | 1 + .../kernel/syscalls/ipc/msgget/.gitignore | 1 + .../kernel/syscalls/ipc/msgget/msgget04.c | 70 +++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 testcases/kernel/syscalls/ipc/msgget/msgget04.c diff --git a/runtest/syscalls b/runtest/syscalls index 98d79271d..41cd8a159 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -810,6 +810,7 @@ msgctl12 msgctl12 msgget01 msgget01 msgget02 msgget02 msgget03 msgget03 +msgget04 msgget04 msgrcv01 msgrcv01 msgrcv02 msgrcv02 diff --git a/runtest/syscalls-ipc b/runtest/syscalls-ipc index 41d54d939..d4baaa262 100644 --- a/runtest/syscalls-ipc +++ b/runtest/syscalls-ipc @@ -12,6 +12,7 @@ msgctl12 msgctl12 msgget01 msgget01 msgget02 msgget02 msgget03 msgget03 +msgget04 msgget04 msgrcv01 msgrcv01 msgrcv02 msgrcv02 diff --git a/testcases/kernel/syscalls/ipc/msgget/.gitignore b/testcases/kernel/syscalls/ipc/msgget/.gitignore index 3b2dfb518..7a9d5e340 100644 --- a/testcases/kernel/syscalls/ipc/msgget/.gitignore +++ b/testcases/kernel/syscalls/ipc/msgget/.gitignore @@ -1,3 +1,4 @@ /msgget01 /msgget02 /msgget03 +/msgget04 diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c new file mode 100644 index 000000000..d14aadd12 --- /dev/null +++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved. + * Author: Yang Xu + * + * It is a basic test about msg_next_id. + * msg_next_id specifies desired id for next allocated IPC message. By default + * they are equal to -1, which means generic allocation logic. Possible values + * to set are in range {0..INT_MAX}. + * Toggle with non-default value will be set back to -1 by kernel after + * successful IPC object allocation. + */ + +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "tst_safe_sysv_ipc.h" +#include "libnewipc.h" + +#define NEXT_ID_PATH "/proc/sys/kernel/msg_next_id" +static int queue_id, pid; +static key_t msgkey; + +static void verify_msgget(void) +{ + SAFE_FILE_PRINTF(NEXT_ID_PATH, "%d", pid); + + TEST(msgget(msgkey, IPC_CREAT | MSG_RW)); + if (TST_RET == -1) { + tst_res(TFAIL | TTERRNO, "msgget() failed"); + return; + } + + queue_id = TST_RET; + if (queue_id == pid) + tst_res(TPASS, "msg_next_id succeeded, queue id %d", pid); + else + tst_res(TFAIL, "msg_next_id failed, expected id %d, but got %d", pid, queue_id); + + TST_ASSERT_INT(NEXT_ID_PATH, -1); + SAFE_MSGCTL(queue_id, IPC_RMID, NULL); + pid++; +} + +static void setup(void) +{ + msgkey = GETIPCKEY(); + pid = getpid(); +} + +static void cleanup(void) +{ + if (queue_id != -1) + SAFE_MSGCTL(queue_id, IPC_RMID, NULL); + + /*avoid EINVAL error when path value has been -1*/ + SAFE_FILE_SCANF(NEXT_ID_PATH, "%d", &queue_id); + if (queue_id != -1) + SAFE_FILE_PRINTF(NEXT_ID_PATH, "-1"); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = verify_msgget, + .needs_root = 1, +};