From patchwork Wed Jan 22 09:47:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1227211 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 482kns61w9z9sP6 for ; Wed, 22 Jan 2020 23:13:21 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 634453C238F for ; Wed, 22 Jan 2020 13:13:17 +0100 (CET) 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 [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id C87103C1D4A for ; Wed, 22 Jan 2020 13:13:15 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-5.smtp.seeweb.it (Postfix) with ESMTP id B18EB600C2C for ; Wed, 22 Jan 2020 13:13:11 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.70,349,1574092800"; d="scan'208";a="82468516" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 22 Jan 2020 20:13:07 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 8245749D9C14 for ; Wed, 22 Jan 2020 17:37:46 +0800 (CST) Received: from G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.83) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 22 Jan 2020 17:46:58 +0800 Received: from localhost.localdomain (10.167.220.84) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jan 2020 17:47:03 +0800 From: Yang Xu To: Date: Wed, 22 Jan 2020 17:47:21 +0800 Message-ID: <1579686442-24689-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-yoursite-MailScanner-ID: 8245749D9C14.ADA44 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.3 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/2] syscalls/fcntl30: clean up && add more range test 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" When I write pipe12 test case, I have a question about F_SETPIPE_SZ can set the min and max value. So cleanup this case and add min/max/gt_max value test. -------- v1->v2: 1. add memfree check 2. limit max shift, so pipe will not beyond 2^31 value on big page size machine(such as 64kb pg size on arm machine) -------- Signed-off-by: Yang Xu --- include/lapi/capability.h | 4 + testcases/kernel/syscalls/fcntl/fcntl30.c | 216 +++++++++++++--------- 2 files changed, 133 insertions(+), 87 deletions(-) diff --git a/include/lapi/capability.h b/include/lapi/capability.h index 8833f0605..7ade78985 100644 --- a/include/lapi/capability.h +++ b/include/lapi/capability.h @@ -28,6 +28,10 @@ # define CAP_SYS_ADMIN 21 #endif +#ifndef CAP_SYS_RESOURCE +# define CAP_SYS_RESOURCE 24 +#endif + #ifndef CAP_AUDIT_READ # define CAP_AUDIT_READ 37 #endif diff --git a/testcases/kernel/syscalls/fcntl/fcntl30.c b/testcases/kernel/syscalls/fcntl/fcntl30.c index 4a409b868..0cb42babe 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl30.c +++ b/testcases/kernel/syscalls/fcntl/fcntl30.c @@ -1,111 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (c) 2014 Fujitsu Ltd. + * Copyright (c) 2014-2020 FUJITSU LIMITED. All rights reserved. * Author: Xiaoguang Wang + * Author: Yang Xu * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* * Description: - * Verify that, - * Basic test for fcntl(2) using F_SETPIPE_SZ, F_GETPIPE_SZ argument. + * Basic test for fcntl(2) using F_SETPIPE_SZ, F_GETPIPE_SZ argument. */ - -#include -#include #include #include -#include -#include #include -#include - -#include "test.h" -#include "safe_macros.h" +#include "tst_test.h" #include "lapi/fcntl.h" - -char *TCID = "fcntl30"; -int TST_TOTAL = 1; - -static void setup(void); -static void cleanup(void); - -int main(int ac, char **av) +#include "lapi/abisize.h" +#include "lapi/capability.h" + +static int fds[2]; +static unsigned int orig_value, struct_shift, max_shift, pg_shift; + +static struct tcase { + unsigned int multi; + unsigned int exp_multi; + int hole; + int pass_flag; + char *message; +} tcases[] = { + {1, 1, 1, 1, "set a value of blew page size"}, + {2, 2, 0, 1, "set a normal value"}, + {0, 0, 0, 1, "set a max value"}, + {0, 0, -1, 0, "set a value beyond max"}, +}; + +static void verify_fcntl(unsigned int n) { - int lc; - int pipe_fds[2], test_fd; - int orig_pipe_size, new_pipe_size; - - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - - SAFE_PIPE(cleanup, pipe_fds); - test_fd = pipe_fds[1]; - - TEST(fcntl(test_fd, F_GETPIPE_SZ)); - if (TEST_RETURN < 0) { - tst_brkm(TFAIL | TTERRNO, cleanup, - "fcntl get pipe size failed"); - } - - orig_pipe_size = TEST_RETURN; - new_pipe_size = orig_pipe_size * 2; - TEST(fcntl(test_fd, F_SETPIPE_SZ, new_pipe_size)); - if (TEST_RETURN < 0) { - tst_brkm(TFAIL | TTERRNO, cleanup, - "fcntl test F_SETPIPE_SZ failed"); - } + struct tcase *tc = &tcases[n]; + unsigned int pipe_sz, exp_pipe_sz, shift; + long memfree; + + SAFE_FILE_LINES_SCANF("/proc/meminfo", "MemFree: %ld", &memfree); + + shift = max_shift - struct_shift + 2 * pg_shift; + /* + * On 64k page size machine, this will beyond 2G and trigger EINVAL error, + * so truncate it. + */ + if (shift > 31) { + tst_res(TINFO, "pipe size truncated into 2G"); + shift = 31; + } + if (tc->multi) + pipe_sz = (tc->multi << pg_shift) - tc->hole; + else + pipe_sz = (1 << shift) - tc->hole; + if (tc->exp_multi) + exp_pipe_sz = tc->exp_multi << pg_shift; + else + exp_pipe_sz = 1 << shift; + + tst_res(TINFO, "%s, size is %d", tc->message, pipe_sz); + + if (pipe_sz > memfree * 1024) { + tst_res(TCONF, "No enough free memory"); + return; + } - TEST(fcntl(test_fd, F_GETPIPE_SZ)); - if (TEST_RETURN < 0) { - tst_brkm(TFAIL | TTERRNO, cleanup, - "fcntl test F_GETPIPE_SZ failed"); - } - tst_resm(TINFO, "orig_pipe_size: %d new_pipe_size: %d", - orig_pipe_size, new_pipe_size); - if (TEST_RETURN >= new_pipe_size) { - tst_resm(TPASS, "fcntl test F_GETPIPE_SZ" - "and F_SETPIPE_SZ success"); - } else { - tst_resm(TFAIL, "fcntl test F_GETPIPE_SZ" - "and F_SETPIPE_SZ fail"); + TEST(fcntl(fds[1], F_SETPIPE_SZ, pipe_sz)); + if (tc->pass_flag && TST_RET == -1) { + tst_res(TFAIL | TTERRNO, "F_SETPIPE_SZ failed"); + return; + } + if (!tc->pass_flag) { + if (TST_RET == -1) { + if ((TST_ERR == ENOMEM && shift < 31 && tc->hole) || + (TST_ERR == EINVAL && shift == 31 && tc->hole)) + tst_res(TPASS | TTERRNO, "F_SETPIPE_SZ failed"); + else + tst_res(TFAIL | TTERRNO, + "F_SETPIPE_SZ failed with unexpected error"); + return; } - SAFE_CLOSE(cleanup, pipe_fds[0]); - SAFE_CLOSE(cleanup, pipe_fds[1]); + tst_res(TFAIL, "F_SETPIPE_SZ succeed unexpectedly"); } - cleanup(); - tst_exit(); + TEST(fcntl(fds[1], F_GETPIPE_SZ)); + if (TST_RET == -1) { + tst_res(TFAIL | TTERRNO, "F_GETPIPE_SZ failed"); + return; + } + if ((unsigned int)TST_RET == exp_pipe_sz) + tst_res(TPASS, "F_SETPIPE_SZ %u bytes F_GETPIPE_SZ %u bytes", + pipe_sz, (unsigned int)TST_RET); + else + tst_res(TFAIL, "F_SETPIPE_SZ %u bytes but F_GETPIPE_SZ %u bytes", + pipe_sz, (unsigned int)TST_RET); } static void setup(void) { - if ((tst_kvercmp(2, 6, 35)) < 0) { - tst_brkm(TCONF, NULL, "This test can only run on kernels" - "that are 2.6.35 and higher"); - } - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; + unsigned int pg_size; + + SAFE_PIPE(fds); + TEST(fcntl(fds[1], F_GETPIPE_SZ)); + if (TST_ERR == EINVAL) + tst_brk(TCONF, "kernel doesn't support F_GET/SETPIPE_SZ"); + orig_value = TST_RET; + /* + * See kernel fs/pipe.c, the size of struct pipe buffer is 40 bytes + * (round up 2^6) on 64bit system and 24 bytes(round up 2^5). kcalloc + * mallocs a memory space range stores struct pipe buffer. kcalloc can + * malloc max space depend on KMALLOC_SHIFT_MAX macro. + * #define KMALLOC_SHIFT_MAX (MAX_ORDER + PAGE_SHIFT - 1) + * the MAX_ORDER is 11. + * For example, if page size is 4k, on 64bit system. the max pipe size + * as below: + * kcalloc space(4M): 1 << (11+12-1)= 2^22 + * space can store struct pipi buffer: 2^22/2^6= 2^16 + * max pipe size: 2^16* 2^12 = 2^28 + * it should be 256M. On 32bit system, this value is 512M. + */ +#ifdef TST_ABI64 + struct_shift = 6; +#else + struct_shift = 5; +#endif + max_shift = 10; + + pg_size = getpagesize(); + tst_res(TINFO, "page size is %d bytes", pg_size); + while (pg_size >>= 1) + pg_shift++; } static void cleanup(void) { + SAFE_FCNTL(fds[1], F_SETPIPE_SZ, orig_value); + if (fds[0] > 0) + SAFE_CLOSE(fds[0]); + if (fds[1] > 0) + SAFE_CLOSE(fds[1]); } + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .tcnt = ARRAY_SIZE(tcases), + .test = verify_fcntl, + .caps = (struct tst_cap []) { + TST_CAP(TST_CAP_REQ, CAP_SYS_RESOURCE), + {} + }, +}; From patchwork Wed Jan 22 09:47:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1227210 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; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com 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 482knd5TWFz9sPJ for ; Wed, 22 Jan 2020 23:13:06 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BCC303C238E for ; Wed, 22 Jan 2020 13:12:57 +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]) by picard.linux.it (Postfix) with ESMTP id 052503C1D4A for ; Wed, 22 Jan 2020 13:12:54 +0100 (CET) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-4.smtp.seeweb.it (Postfix) with ESMTP id B20991000BDB for ; Wed, 22 Jan 2020 13:12:37 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.70,349,1574092800"; d="scan'208";a="82467890" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 22 Jan 2020 20:12:48 +0800 Received: from G08CNEXMBPEKD06.g08.fujitsu.local (unknown [10.167.33.206]) by cn.fujitsu.com (Postfix) with ESMTP id 5B87149DAEFC for ; Wed, 22 Jan 2020 17:37:49 +0800 (CST) Received: from G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.83) by G08CNEXMBPEKD06.g08.fujitsu.local (10.167.33.206) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 22 Jan 2020 17:47:02 +0800 Received: from localhost.localdomain (10.167.220.84) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jan 2020 17:47:07 +0800 From: Yang Xu To: Date: Wed, 22 Jan 2020 17:47:22 +0800 Message-ID: <1579686442-24689-2-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1579686442-24689-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> References: <1579686442-24689-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-yoursite-MailScanner-ID: 5B87149DAEFC.A261E X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.3 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v2 2/2] syscalls/fcntl37: add error test for fcntl with F_SETPIPE_SZ 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" ------------- v1->v2： code style and comment fix ----------- Signed-off-by: Yang Xu --- runtest/syscalls | 2 + testcases/kernel/syscalls/fcntl/.gitignore | 2 + testcases/kernel/syscalls/fcntl/fcntl37.c | 101 +++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 testcases/kernel/syscalls/fcntl/fcntl37.c diff --git a/runtest/syscalls b/runtest/syscalls index f58fefe17..ca53e5745 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -301,6 +301,8 @@ fcntl35 fcntl35 fcntl35_64 fcntl35_64 fcntl36 fcntl36 fcntl36_64 fcntl36_64 +fcntl37 fcntl37 +fcntl37_64 fcntl37_64 fdatasync01 fdatasync01 fdatasync02 fdatasync02 diff --git a/testcases/kernel/syscalls/fcntl/.gitignore b/testcases/kernel/syscalls/fcntl/.gitignore index 8d5738f97..be8d9739e 100644 --- a/testcases/kernel/syscalls/fcntl/.gitignore +++ b/testcases/kernel/syscalls/fcntl/.gitignore @@ -70,3 +70,5 @@ /fcntl35_64 /fcntl36 /fcntl36_64 +/fcntl37 +/fcntl37_64 diff --git a/testcases/kernel/syscalls/fcntl/fcntl37.c b/testcases/kernel/syscalls/fcntl/fcntl37.c new file mode 100644 index 000000000..757d670a0 --- /dev/null +++ b/testcases/kernel/syscalls/fcntl/fcntl37.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved. + * Author: Yang Xu + * + * Test basic error handling for fcntl(2) using F_SETPIPE_SZ, F_GETPIPE_SZ + * argument. + * 1)fcntl fails with EINVAL when cmd is F_SETPIPE_SZ and the arg is + * beyond 1<<31. + * 2)fcntl fails with EBUSY when cmd is F_SETPIPE_SZ and the arg is smaller + * than the amount of the current used buffer space. + * 3)fcntl fails with EPERM when cmd is F_SETPIPE_SZ and the arg is over + * /proc/sys/fs/pipe-max-size limit under unprivileged users. + */ + +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "lapi/fcntl.h" +#include "lapi/capability.h" + +static int fds[2]; +static unsigned int orig_value, invalid_value, half_value, sys_value; +static char *wrbuf; + +static struct tcase { + unsigned int *setvalue; + int exp_err; + char *message; +} tcases[] = { + {&invalid_value, EINVAL, + "cmd is F_SETPIPE_SZ and the arg is beyond 1<<31"}, + + {&half_value, EBUSY, + "cmd is F_SETPIPE_SZ and the arg is smaller than the amount of the current used buffer space"}, + + {&sys_value, EPERM, + "cmd is F_SETPIPE_SZ and the arg is over /proc/sys/fs/pipe-max-size limit under unprivileged users"}, +}; + +static void verify_fcntl(unsigned int n) +{ + struct tcase *tc = &tcases[n]; + + tst_res(TINFO, "%s", tc->message); + + TEST(fcntl(fds[1], F_SETPIPE_SZ, *(tc->setvalue))); + if (TST_RET != -1) + tst_res(TFAIL, "F_SETPIPE_SZ succeed"); + if (TST_ERR == tc->exp_err) + tst_res(TPASS | TTERRNO, "F_SETPIPE_SZ failed as expected"); + else + tst_res(TFAIL | TTERRNO, "F_SETPIPE_SZ failed expected %s bu got", + tst_strerrno(tc->exp_err)); +} + +static void setup(void) +{ + SAFE_PIPE(fds); + + TEST(fcntl(fds[1], F_GETPIPE_SZ)); + if (TST_ERR == EINVAL) + tst_brk(TCONF, "kernel doesn't support F_GET/SETPIPE_SZ"); + + orig_value = TST_RET; + + wrbuf = SAFE_MALLOC(orig_value); + memset(wrbuf, 'x', orig_value); + SAFE_WRITE(1, fds[1], wrbuf, orig_value); + + SAFE_FILE_SCANF("/proc/sys/fs/pipe-max-size", "%d", &sys_value); + sys_value++; + + half_value = orig_value / 2; + invalid_value = (1U << 31) + 1; +} + +static void cleanup(void) +{ + SAFE_FCNTL(fds[1], F_SETPIPE_SZ, orig_value); + if (fds[0] > 0) + SAFE_CLOSE(fds[0]); + if (fds[1] > 0) + SAFE_CLOSE(fds[1]); + if (wrbuf) + free(wrbuf); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .tcnt = ARRAY_SIZE(tcases), + .test = verify_fcntl, + .caps = (struct tst_cap []) { + TST_CAP(TST_CAP_DROP, CAP_SYS_RESOURCE), + {} + }, +};