From: xuyang <xuyang_jy_0410@163.com>
To: QI Fuli <fukuri.sai@gmail.com>, ltp@lists.linux.it
Cc: QI Fuli <qi.fuli@fujitsu.com>
Subject: Re: [LTP] [PATCH v2 1/2] syscalls/dup3_01: Rewrite and convert to new API
Date: Mon, 20 Sep 2021 10:51:18 +0800 [thread overview]
Message-ID: <d2cb7633-47ba-b809-798e-bd2817c5d1ad@163.com> (raw)
In-Reply-To: <20210917101907.2657-2-qi.fuli@fujitsu.com>
Hi Qi
> From: QI Fuli <qi.fuli@fujitsu.com>
>
> - divide into two testcases
> - convert to new API
>
> Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
> ---
> testcases/kernel/syscalls/dup3/dup3_01.c | 159 +++++++----------------
> 1 file changed, 47 insertions(+), 112 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/dup3/dup3_01.c b/testcases/kernel/syscalls/dup3/dup3_01.c
> index 6a44ec809..3b3d9ae0d 100644
> --- a/testcases/kernel/syscalls/dup3/dup3_01.c
> +++ b/testcases/kernel/syscalls/dup3/dup3_01.c
> @@ -1,120 +1,55 @@
> -/******************************************************************************/
> -/* */
> -/* Copyright (c) Ulrich Drepper <drepper@redhat.com> */
> -/* 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 */
> -/* */
> -/******************************************************************************/
> -/******************************************************************************/
> -/* */
> -/* File: dup3_01.c */
> -/* */
> -/* Description: This Program tests the new system call introduced in 2.6.27. */
> -/* Ulrich´s comment as in: */
> -/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=336dd1f70ff62d7dd8655228caed4c5bfc818c56 */
> -/* says: */
> -/* This patch adds the new dup3 syscall. It extends the old dup2 syscall by */
> -/* one parameter which is meant to hold a flag value. Support for the */
> -/* O_CLOEXEC flag is added in this patch. The following test must be adjusted */
> -/* for architectures other than x86 and x86-64 and in case the */
> -/* syscall numbers changed. */
> -/* */
> -/* Usage: <for command-line> */
> -/* dup3_01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */
> -/* where, -c n : Run n copies concurrently. */
> -/* -e : Turn on errno logging. */
> -/* -i n : Execute test n times. */
> -/* -I x : Execute test for x seconds. */
> -/* -P x : Pause for x seconds between iterations. */
> -/* -t : Turn on syscall timing. */
> -/* */
> -/* Total Tests: 1 */
> -/* */
> -/* Test Name: dup3_01 */
> -/* */
> -/* Author: Ulrich Drepper <drepper@redhat.com> */
> -/* */
> -/* History: Created - Jan 13 2009 - Ulrich Drepper <drepper@redhat.com> */
> -/* Ported to LTP */
> -/* - Jan 13 2009 - Subrata <subrata@linux.vnet.ibm.com> */
> -/******************************************************************************/
> -#include <fcntl.h>
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) Ulrich Drepper <drepper@redhat.com>
> + * Copyright (c) International Business Machines Corp., 2009
> + * Created - Jan 13 2009 - Ulrich Drepper <drepper@redhat.com>
> + * Ported to LTP - Jan 13 2009 - Subrata <subrata@linux.vnet.ibm.com>
> + */
> +/*\
> + * [Description]
> + * Testcase to check whether dup3() supports O_CLOEXEC flag.
> + */
> +
> +#define _GNU_SOURCE
> +
> #include <stdio.h>
> -#include <time.h>
> -#include <unistd.h>
> -#include <sys/syscall.h>
> +#include <stdbool.h>
> #include <errno.h>
> -
> -#include "test.h"
> -#include "lapi/fcntl.h"
> -#include "lapi/syscalls.h"
> -
> -char *TCID = "dup3_01";
> -int TST_TOTAL = 1;
> -
> -void cleanup(void)
> -{
> - tst_rmdir();
> -}
> -
> -void setup(void)
> -{
> - TEST_PAUSE;
> - tst_tmpdir();
> -}
> -
> -int main(int argc, char *argv[])
> +#include "tst_test.h"
> +#include "tst_safe_macros.h"
> +
> +static struct tcase {
> + int o_flag;
> + bool coe_flag;
> + char *desc;
> +} tcases [] = {
> + {0, true, "dup3(1, 4, 0)"},
> + {O_CLOEXEC, false, "dup3(1, 4, O_CLOEXEC)"},
> +};
> +
> +static void run(unsigned int i)
> {
> - int fd, coe;
> + int fd, ret;
> + struct tcase *tc = tcases + i;
>
> - tst_parse_opts(argc, argv, NULL, NULL);
> + TEST(dup3(1, 4, tc->o_flag));
>
> - if ((tst_kvercmp(2, 6, 27)) < 0)
> - tst_brkm(TCONF, NULL,
> - "This test can only run on kernels that are 2.6.27 and higher");
> - setup();
> -
> - fd = ltp_syscall(__NR_dup3, 1, 4, 0);
> - if (fd == -1) {
> - tst_brkm(TFAIL | TERRNO, cleanup, "dup3(0) failed");
> - }
> - coe = fcntl(fd, F_GETFD);
> - if (coe == -1) {
> - tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
> + fd = TST_RET;
> + if (TST_RET == -1) {
> + tst_res(TFAIL | TTERRNO, "%s failed", tc->desc);
> + return;
> }
> - if (coe & FD_CLOEXEC) {
> - tst_brkm(TFAIL, cleanup, "dup3(0) set close-on-exec flag");
> - }
> - close(fd);
>
> - fd = ltp_syscall(__NR_dup3, 1, 4, O_CLOEXEC);
> - if (fd == -1) {
> - tst_brkm(TFAIL | TERRNO, cleanup, "dup3(O_CLOEXEC) failed");
> - }
> - coe = fcntl(fd, F_GETFD);
> - if (coe == -1) {
> - tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
> - }
> - if ((coe & FD_CLOEXEC) == 0) {
> - tst_brkm(TFAIL, cleanup,
> - "dup3(O_CLOEXEC) set close-on-exec flag");
> - }
> - close(fd);
> - tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");
> + ret = SAFE_FCNTL(fd, F_GETFD);
> + if ((ret & FD_CLOEXEC) == tc->coe_flag)
> + tst_res(TFAIL, "%s set close-on-exec flag", tc->desc);
> + else
> + tst_res(TPASS, "%s PASSED", tc->desc);
Here looks confusing. When unsing O_CLOEXEC flag, we should get
FD_CLOEXEC. I think we can remove a flag in tcase struct.
code maybe bleow:
static struct tcase {
int coe_flag;
char *desc;
tcases [] = {
{0, "dup3(1, 4, 0)"},
{O_CLOEXEC, "dup3(1, 4, O_CLOEXEC)"},
};
if(tc->oce_flag) {
if(ret & FD_CLOEXEC)
tst_res(TPASS, "%s sets close-on-exec flag", tc->desc);
else
tst_res(TFAIL, "%s doesn't set close-on-exec flag unexpectedly",
tc->desc);
SAFE_CLOSE(fd);
return;
}
if (ret & FD_CLOEXEC)
tst_res(TFAIL, "%s sets close-on-exec flag unexpectedly", tc->desc);
else
tst_res(TPASS, "%s doesn't set close-on-exec flag", tc->desc);
SAFE_CLOSE(fd);
How about this change?
> +
> + SAFE_CLOSE(fd);
> +};
>
> - cleanup();
> - tst_exit();
> -}
> +static struct tst_test test = {
> + .tcnt = ARRAY_SIZE(tcases),
> + .test = run,\
Add a cleanup function to close fd when safe_fcntl failed(fd leak).
Best Regards
Yang Xu
> +};
>
>
>
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2021-09-20 2:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-17 10:19 [LTP] [PATCH v2 0/2] Convert syscalls/dup3_{01,02} to new API QI Fuli
2021-09-17 10:19 ` QI Fuli
2021-09-17 10:19 ` [LTP] [PATCH v2 1/2] syscalls/dup3_01: Rewrite and convert " QI Fuli
2021-09-17 10:19 ` QI Fuli
2021-09-20 2:51 ` xuyang [this message]
2021-09-17 10:19 ` [LTP] [PATCH v2 2/2] syscalls/dup3_02: Convert " QI Fuli
2021-09-17 10:19 ` QI Fuli
2021-09-20 3:07 ` xuyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d2cb7633-47ba-b809-798e-bd2817c5d1ad@163.com \
--to=xuyang_jy_0410@163.com \
--cc=fukuri.sai@gmail.com \
--cc=ltp@lists.linux.it \
--cc=qi.fuli@fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.