From patchwork Thu Aug 5 03:48:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1513729 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=jtNXUkZW; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GgF2g20V8z9s5R for ; Thu, 5 Aug 2021 13:48:43 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1A30E3C80BC for ; Thu, 5 Aug 2021 05:48:41 +0200 (CEST) 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 RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 43B073C808F for ; Thu, 5 Aug 2021 05:48:39 +0200 (CEST) Received: from mail1.bemta25.messagelabs.com (mail1.bemta25.messagelabs.com [195.245.230.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 5BED21A006BE for ; Thu, 5 Aug 2021 05:48:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1628135317; i=@fujitsu.com; bh=lxWY6+oImCUZYZgjewS9hXDTW36tXIb8dW3jh6lWhCQ=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=jtNXUkZWa64I6oeUXBOackTUK4rbHTpC7/Uwz66isAl9H++xZ7zRbrmidI2uUiAvr K98CWJ6CugAVef1MxQ0vOYIOFzfQFQyiNGTi3J+cWRE6pB/H0SSl34x1AkaGOLc8I0 cGbeP7fiU/DSdOP0JJhO1LOhU0R+u2SaMzynlBEcv0sbDO25OYL5i3Fv/Dw/kbMBfU Frow7l5YDgowfp8BFb36p8HGWad26pRgsv/PK3upgM7J0m1cvEj8t+e+uUeK85pNQ1 JdDTpoNIpWfULFY4LDUudYZ4YDZepf/ME7fx+6Do8ddtFScIwnipnQ6FjxYUDMgVtv 5qo51HwNzIjfw== Received: from [100.112.192.148] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-2.bemta.az-a.eu-west-1.aws.symcld.net id 0A/3E-07839-49F5B016; Thu, 05 Aug 2021 03:48:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOIsWRWlGSWpSXmKPExsViZ8MxRXdKPHe iweVdqhYrvu9gdGD02Pd7HWsAYxRrZl5SfkUCa8aHp0/YCg4IVVw+fZuxgfERfxcjF4eQQDOT xJUVU5ggnN2MEo/bH7J3MXJysAloSjzrXMAMYosISEh0NLwFizMLqEssn/SLCcQWFnCUeDh3E 5jNIqAi8eDjS7AaXgEPiQ+TloH1SggoSEx5+J4ZIi4ocXLmExaIORISB1+8gKpRlLjU8Y0Rwq 6QmDWrjWkCI+8sJC2zkLQsYGRaxWieVJSZnlGSm5iZo2toYKBraGika2hppGtiopdYpZuol1q qW55aXKJrqJdYXqxXXJmbnJOil5dasokRGF4pBQd0djD+fPVB7xCjJAeTkijvBwnuRCG+pPyU yozE4oz4otKc1OJDjDIcHEoSvBdigXKCRanpqRVpmTnAUIdJS3DwKInwhoCkeYsLEnOLM9MhU qcYFaXEeSXjgBICIImM0jy4Nlh8XWKUlRLmZWRgYBDiKUgtys0sQZV/xSjOwagkzJsCMoUnM6 8EbvoroMVMQIsvxHKCLC5JREhJNTBJx+pybfa0WNTr9vhIhMHa9TuUnadWbfK6psfPXsbVOke ujKmxl0EsWGZN6fVWtmPsUR8KFz+sqPnyd719u2yD7d9c8ayL+3kfdfPzPrm4++r2NAaLfQeX ffFWCN/W4fVhXcbrxpqF3AvOMAgvWHp50T5jey3m2IXM3Oxq/3mrjVimXbVhDDWcrvl0rr5vp fTcjtjL6pNLvZzXd5p7RU7Y2cEWZLWm4uRCp1qB5kML9pxp6v29+6prfvK6KUvlzu9bqfSzam mCz/ZFn5hu3xVs2fdqgohb4TyGRd/n3G47ns/yWzGV89ju+w/P77sfo6tksEjpuKnL4+5fe1/ sNVfUd/4qZSaYy/txZuce4TdKLMUZiYZazEXFiQAz9jy+KgMAAA== X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-11.tower-271.messagelabs.com!1628135316!233687!1 X-Originating-IP: [62.60.8.148] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.81.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9493 invoked from network); 5 Aug 2021 03:48:36 -0000 Received: from unknown (HELO mailhost1.uk.fujitsu.com) (62.60.8.148) by server-11.tower-271.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Aug 2021 03:48:36 -0000 Received: from R01UKEXCASM126.r01.fujitsu.local ([10.183.43.178]) by mailhost1.uk.fujitsu.com (8.14.5/8.14.5) with ESMTP id 1753mUfN011127 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Thu, 5 Aug 2021 04:48:36 +0100 Received: from localhost.localdomain (10.167.220.84) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 04:48:29 +0100 From: Yang Xu To: Date: Thu, 5 Aug 2021 11:48:41 +0800 Message-ID: <1628135323-3722-1-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) 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_PASS,SPF_PASS 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 v1 1/3] libs/libnewipc: Alter get_used_queues 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" Rename get_used_queues as get_used_sysvipc and add a proc file argument, so we can use GET_USED_QUEQUES() and GET_USED_SEGMENTS() to get the corresponding used sysvipc resource total. Since no new api cases used get_used_queues(), we don't need to change anything. Reviewed-by: Cyril Hrubis Reviewed-by: Petr Vorel Signed-off-by: Yang Xu Reviewed-by: Li Wang --- include/libnewipc.h | 6 ++++-- libs/libltpnewipc/libnewipc.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/libnewipc.h b/include/libnewipc.h index 075364f85..52e054c51 100644 --- a/include/libnewipc.h +++ b/include/libnewipc.h @@ -49,9 +49,11 @@ key_t getipckey(const char *file, const int lineno); #define GETIPCKEY() \ getipckey(__FILE__, __LINE__) -int get_used_queues(const char *file, const int lineno); +int get_used_sysvipc(const char *file, const int lineno, const char *sysvipc_file); #define GET_USED_QUEUES() \ - get_used_queues(__FILE__, __LINE__) + get_used_sysvipc(__FILE__, __LINE__, "/proc/sysvipc/msg") +#define GET_USED_SEGMENTS() \ + get_used_sysvipc(__FILE__, __LINE__, "/proc/sysvipc/shm") void *probe_free_addr(const char *file, const int lineno); #define PROBE_FREE_ADDR() \ diff --git a/libs/libltpnewipc/libnewipc.c b/libs/libltpnewipc/libnewipc.c index d0974bbe0..583291ee0 100644 --- a/libs/libltpnewipc/libnewipc.c +++ b/libs/libltpnewipc/libnewipc.c @@ -48,25 +48,25 @@ key_t getipckey(const char *file, const int lineno) return key; } -int get_used_queues(const char *file, const int lineno) +int get_used_sysvipc(const char *file, const int lineno, const char *sysvipc_file) { FILE *fp; - int used_queues = -1; + int used = -1; char buf[BUFSIZE]; - fp = safe_fopen(file, lineno, NULL, "/proc/sysvipc/msg", "r"); + fp = safe_fopen(file, lineno, NULL, sysvipc_file, "r"); while (fgets(buf, BUFSIZE, fp) != NULL) - used_queues++; + used++; fclose(fp); - if (used_queues < 0) { - tst_brk(TBROK, "can't read /proc/sysvipc/msg to get " - "used message queues at %s:%d", file, lineno); + if (used < 0) { + tst_brk(TBROK, "can't read %s to get used sysvipc resource total " + "at %s:%d", sysvipc_file, file, lineno); } - return used_queues; + return used; } void *probe_free_addr(const char *file, const int lineno) From patchwork Thu Aug 5 03:48:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1513730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=tkRnk3XW; dkim-atps=neutral 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GgF2z5k9lz9s5R for ; Thu, 5 Aug 2021 13:48:59 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 926503C80BC for ; Thu, 5 Aug 2021 05:48:50 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 114CF3C808F for ; Thu, 5 Aug 2021 05:48:39 +0200 (CEST) Received: from mail1.bemta26.messagelabs.com (mail1.bemta26.messagelabs.com [85.158.142.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 110BE600472 for ; Thu, 5 Aug 2021 05:48:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1628135318; i=@fujitsu.com; bh=WosL4p8mQYMieiZP1BkXnJYKyg0DN8MSmk0xwsEAUFo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tkRnk3XW9TNOREIYpsRkP3yoVYczQx8zOAmB5UdRozoCerCU57EI7O2A3By7aW5CR GqXmeX8NdlKjmD3J3N0TJBJaE96nFBVLJyXEtSr0u6EesY2WeDgjZIfnmAenbYa78m J3vKXNiIxjRLw6YzpGucYAeXeH5Fa01gLITzoN0P3tYjAmzpT5rsX7epGHk/rEjc3+ TjuD5Nu1gJ5HGb67xAEIasSHwDi3dYlP7thqRpHe6HT4A29pUSxhZGfQuOVM5xlPfd 3oZUvcd8D7kuaWHjeTKmAFqNPZj78Ls8p3i2X2YpaN7VdMs8iYWp5cy9V592bLz2GV qnXtXmjyVTD9Q== Received: from [100.113.4.199] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-4.bemta.az-b.eu-central-1.aws.symcld.net id A8/C1-07605-59F5B016; Thu, 05 Aug 2021 03:48:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRWlGSWpSXmKPExsViZ8MxRXdKPHe iwd+51hYrvu9gdGD02Pd7HWsAYxRrZl5SfkUCa8ampbIFO/krNn06zNLAOI23i5GLQ0igmUli wsJTLBDObkaJd8+fM3cxcnKwCWhKPOtcAGaLCEhIdDS8ZQexmQXUJZZP+sUEYgsLpEvsPtvPC mKzCKhIzPlwkRHE5hXwkJi3+QpYr4SAgsSUh+/BbE4BT4m2qSvAaoSAal4c3cUGUS8ocXLmEx aI+RISB1+8gOpVlLjU8Y0Rwq6QmDWrjWkCI/8sJC2zkLQsYGRaxWiZVJSZnlGSm5iZo2toYKB raGisa6prZGKol1ilm6SXWqqbnJpXUpQIlNVLLC/WK67MTc5J0ctLLdnECAzIlELWjzsYD73+ oHeIUZKDSUmU94MEd6IQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd4LsUA5waLU9NSKtMwcYHTAp CU4eJREeENA0rzFBYm5xZnpEKlTjLocO4/OW8QsxJKXn5cqJc4rGQdUJABSlFGaBzcCFqmXGG WlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzpoBM4cnMK4Hb9AroCCagIy7EcoIcUZKIkJJqYGL VyWQ72vTdXHliY5SerGSxZ6eOgj3jltojN7h25Z6+xtO+e/rPpq71NtHHPt94+PRow0SxrE2H 64KTTodfqww7zFn1/y//rdMvFr/YYMMmwfouqCv1vz/3yh9BXY8yPufH934zrTq6YvLXv5lPX fZs2r004uTuc0HfLs13uXtbSZnfZ8FHe+uEecwh7ov3LxWbaV596aKL4abyatYbe3qLvbmXSJ zcccJng87uzd5l6Y/tkjqbVt+UOtV79Oi9wIONE/7cbcgJmLlU2fTE3HW7Fie23GTOOfPju80 idlvhhDkJn1iWlnzYqPeGVVmhd+PtYN0vXOVTQi0/5b0R+pTC/p5zXa/1zMeFudVSKYlKLMUZ iYZazEXFiQDjYljNTwMAAA== X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-4.tower-245.messagelabs.com!1628135316!288269!1 X-Originating-IP: [62.60.8.148] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.81.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10028 invoked from network); 5 Aug 2021 03:48:36 -0000 Received: from unknown (HELO mailhost1.uk.fujitsu.com) (62.60.8.148) by server-4.tower-245.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Aug 2021 03:48:36 -0000 Received: from R01UKEXCASM126.r01.fujitsu.local ([10.183.43.178]) by mailhost1.uk.fujitsu.com (8.14.5/8.14.5) with ESMTP id 1753mUfO011127 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Thu, 5 Aug 2021 04:48:36 +0100 Received: from localhost.localdomain (10.167.220.84) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 04:48:33 +0100 From: Yang Xu To: Date: Thu, 5 Aug 2021 11:48:42 +0800 Message-ID: <1628135323-3722-2-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628135323-3722-1-git-send-email-xuyang2018.jy@fujitsu.com> References: <1628135323-3722-1-git-send-email-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) X-Virus-Scanned: clamav-milter 0.102.4 at in-5.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_PASS,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v1 2/3] syscalls/shmget03: Create shared memory segment dynamically instead of hardcode 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" Before this patch, we don't consider this situation that system has consumed shared memory segments. So we hit the ENOSPC error unexpectedly in setup. Use GET_USED_SEGMENTS() to get the used shared memory segments, so we can trigger the ENOSPC error correctly(just hit the limit) even current environment has consumed some shared memory segments. I don't use this api in verify function since we don't support run cases in parallel and we should assume this situation that this case is the only case to use(free or alloc) sysv ipc resource at that time. Fixes: #842 Fixes: 4dc493b44 ("syscalls/shmget*: Convert into new api") Reviewed-by: Cyril Hrubis Reviewed-by: Petr Vorel Signed-off-by: Yang Xu --- testcases/kernel/syscalls/ipc/shmget/shmget03.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget03.c b/testcases/kernel/syscalls/ipc/shmget/shmget03.c index efbc465e1..8b157e439 100644 --- a/testcases/kernel/syscalls/ipc/shmget/shmget03.c +++ b/testcases/kernel/syscalls/ipc/shmget/shmget03.c @@ -22,7 +22,7 @@ #include "libnewipc.h" static int *queues; -static int maxshms, queue_cnt; +static int maxshms, queue_cnt, used_cnt; static key_t shmkey; static void verify_shmget(void) @@ -36,11 +36,13 @@ static void setup(void) int res, num; shmkey = GETIPCKEY(); - + used_cnt = GET_USED_SEGMENTS(); + tst_res(TINFO, "Current environment %d shared memory segments are already in use", + used_cnt); SAFE_FILE_SCANF("/proc/sys/kernel/shmmni", "%i", &maxshms); - queues = SAFE_MALLOC(maxshms * sizeof(int)); - for (num = 0; num < maxshms; num++) { + queues = SAFE_MALLOC((maxshms - used_cnt) * sizeof(int)); + for (num = 0; num < maxshms - used_cnt; num++) { res = shmget(shmkey + num, SHM_SIZE, IPC_CREAT | IPC_EXCL | SHM_RW); if (res == -1) tst_brk(TBROK | TERRNO, "shmget failed unexpectedly"); From patchwork Thu Aug 5 03:48:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1513731 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=fujitsu.com header.i=@fujitsu.com header.a=rsa-sha256 header.s=170520fj header.b=AVMDE9TV; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GgF323hmrz9s5R for ; Thu, 5 Aug 2021 13:49:02 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 2519A3C8107 for ; Thu, 5 Aug 2021 05:49:00 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 2A2D13C8101 for ; Thu, 5 Aug 2021 05:48:44 +0200 (CEST) Received: from mail1.bemta25.messagelabs.com (mail1.bemta25.messagelabs.com [195.245.230.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 95B00200DB0 for ; Thu, 5 Aug 2021 05:48:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1628135322; i=@fujitsu.com; bh=A3PIGJjK3cg+7U7URYyiFoXs63TSR6onKOViNe4G3+4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AVMDE9TVmT25FPyzBV86tQkQVpgabXNVygsigZN3oQtaZOa+NGFdoQ4MCmxCq+8WR hcSVr7LChjnoNlT9yKp4thGCE6K+R/wYfDHFy3ONAsDbaGgUg7YG/7nIzk+zAS3B6w tvo5CNuMW5i4xiUJ8M9JZ2U8X5tj0HiLtcTn7UW0FjsDq78via/EJDXZcD+/hnDpdw jmEXlrA1RRg9rBgbKk7ZrRirs612zL5aQ3mNiOeZdeeZIaN/XbUU+4YqJCoyixtBwJ cYK6vu5Zu0Vb3JGqbH7XOrHSPgMvj7pUP5eJw1hHk/bL+/eFiylrSzayVeuNLLcO/u HB3XEQ1l3516g== Received: from [100.112.192.148] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-3.bemta.az-a.eu-west-1.aws.symcld.net id 6D/6D-07800-A9F5B016; Thu, 05 Aug 2021 03:48:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRWlGSWpSXmKPExsViZ8MRojsznjv RYOVKXYsV33cwOjB67Pu9jjWAMYo1My8pvyKBNWPhvd3MBW+4K1ovfWVvYJzM1cXIxSEk0Mwk Mf3IOkYIZzejxKRzd1i6GDk52AQ0JZ51LmAGsUUEJCQ6Gt6yg9jMAuoSyyf9YgKxhQUSJO7d3 QlWzyKgIrHs0DGwGl4BD4lDd3eA2RICChJTHr4Hm8Mp4CnRNnUFI4gtBFTz4uguNoh6QYmTM5 +wQMyXkDj44gUzRK+ixKWOb4wQdoXErFltTBMY+WchaZmFpGUBI9MqRoukosz0jJLcxMwcXUM DA11DQyNdQ0sjXSMDE73EKt1EvdRS3fLU4hJdQ73E8mK94src5JwUvbzUkk2MwIBMKThwZgfj qdcf9A4xSnIwKYnyfpDgThTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwXshFignWJSanlqRlpkDj A6YtAQHj5IIbwhImre4IDG3ODMdInWK0Zhj59F5i5g5mj4sWcQsxJKXn5cqJc4rGQdUKgBSml GaBzcIFrWXGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzvogBmsKTmVcCt+8V0ClMQKdciOU EOaUkESEl1cCUsYYvI+lR90cH6/zZLK3KQXYZMlMDCk1Nc2RUdrOKsXpwTbI//vpPwclr1UHr Su4XbXHKqTrvez/NS3jPiubqoztUm7apvl2UvfDxr1tHn9/hFD7gXPVqbrzDvXS3sqj5O0wfS l97tV9/24QHqf16ypGmbjYuecZeLvZ6/s9fdz2s7jx1pHhpGU/EgZccdSsVjydnKG4TFlf/8I /F7FuF4Vu/MrEkiZ+K3gWzJ51dvm/b3j8soRn7P52N/iViNzmjoqlm8YsZLLsevQ7hSxdguPA jWrdr0Xa2uX7v73O+L3e4X9H39eiNry5aShVnYwwnyMT3/yruEjocZnyszGKJ6tr5pt/Dri+q f1Tw2FKJpTgj0VCLuag4EQB7NPAsVQMAAA== X-Env-Sender: xuyang2018.jy@fujitsu.com X-Msg-Ref: server-5.tower-267.messagelabs.com!1628135321!103219!1 X-Originating-IP: [62.60.8.84] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.81.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14181 invoked from network); 5 Aug 2021 03:48:41 -0000 Received: from unknown (HELO mailhost3.uk.fujitsu.com) (62.60.8.84) by server-5.tower-267.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Aug 2021 03:48:41 -0000 Received: from R01UKEXCASM126.r01.fujitsu.local ([10.183.43.178]) by mailhost3.uk.fujitsu.com (8.14.5/8.14.5) with ESMTP id 1753mdiR020613 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Thu, 5 Aug 2021 04:48:41 +0100 Received: from localhost.localdomain (10.167.220.84) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 5 Aug 2021 04:48:36 +0100 From: Yang Xu To: Date: Thu, 5 Aug 2021 11:48:43 +0800 Message-ID: <1628135323-3722-3-git-send-email-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1628135323-3722-1-git-send-email-xuyang2018.jy@fujitsu.com> References: <1628135323-3722-1-git-send-email-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v1 3/3] syscalls/msgget03: Create message queues dynamically instead of hardcode 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" It is the same problem as shmget03. Use the same way to fix this problem that hit the ENOSPC problem unexpectedly in setup. Fixes: #842 Fixes: 19a07c445 ("ipc/msgget03: Make sure we get ENOSPC error after..") Reviewed-by: Cyril Hrubis Reviewed-by: Petr Vorel Signed-off-by: Yang Xu --- testcases/kernel/syscalls/ipc/msgget/msgget03.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget03.c b/testcases/kernel/syscalls/ipc/msgget/msgget03.c index ab5714cdc..711886e17 100644 --- a/testcases/kernel/syscalls/ipc/msgget/msgget03.c +++ b/testcases/kernel/syscalls/ipc/msgget/msgget03.c @@ -21,7 +21,7 @@ #include "tst_safe_sysv_ipc.h" #include "libnewipc.h" -static int maxmsgs, queue_cnt; +static int maxmsgs, queue_cnt, used_cnt; static int *queues; static key_t msgkey; @@ -37,11 +37,15 @@ static void setup(void) msgkey = GETIPCKEY(); + used_cnt = GET_USED_QUEUES(); + tst_res(TINFO, "Current environment %d message queues are already in use", + used_cnt); + SAFE_FILE_SCANF("/proc/sys/kernel/msgmni", "%i", &maxmsgs); - queues = SAFE_MALLOC(maxmsgs * sizeof(int)); + queues = SAFE_MALLOC((maxmsgs - used_cnt) * sizeof(int)); - for (num = 0; num < maxmsgs; num++) { + for (num = 0; num < maxmsgs - used_cnt; num++) { res = msgget(msgkey + num, IPC_CREAT | IPC_EXCL); if (res == -1) tst_brk(TBROK | TERRNO, "msgget failed unexpectedly");