Linux Test Project
 help / color / mirror / Atom feed
From: Cyril Hrubis <chrubis@suse.cz>
To: Martin Doucha <mdoucha@suse.cz>
Cc: ltp@lists.linux.it
Subject: Re: [LTP] [PATCH 06/10] copy_file_range01: Add max_runtime
Date: Wed, 31 Aug 2022 11:22:45 +0200	[thread overview]
Message-ID: <Yw8oZYwebeVBPC0P@yuki> (raw)
In-Reply-To: <20220830135007.16818-7-mdoucha@suse.cz>

Hi!
> Signed-off-by: Martin Doucha <mdoucha@suse.cz>
> ---
>  testcases/kernel/syscalls/copy_file_range/copy_file_range01.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c
> index 7d27007a3..23a5ec501 100644
> --- a/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c
> +++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c
> @@ -232,4 +232,5 @@ static struct tst_test test = {
>  	.all_filesystems = 1,
>  	.test = copy_file_range_verify,
>  	.test_variants = TEST_VARIANTS,
> +	.max_runtime = 20
>  };

I would still make the loops that copy and read the data runtime aware
to make the error messages more obvious. In the case that you want to
keep TBROK return value it would be:

diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c
index 7d27007a3..9b39554d6 100644
--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c
+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range01.c
@@ -52,6 +52,10 @@ static int check_file_content(const char *fname1, const char *fname2,
                ch1 = getc(fp1);
                ch2 = getc(fp2);
                count++;
+
+               if (!(count%100) && !tst_remaining_runtime())
+                       tst_brk(TBROK, "Out of runtime, exiting");
+
        } while ((count < len) && (ch1 == ch2));

        SAFE_FCLOSE(fp1);
@@ -135,6 +139,9 @@ static void test_one(size_t len, loff_t *off_in, loff_t *off_out, char *path)
                        return;
                }

+               if (!tst_remaining_runtime())
+                       tst_brk(TBROK, "Out of runtime, exiting");
+
                to_copy -= TST_RET;
        } while (to_copy > 0);

@@ -230,6 +237,7 @@ static struct tst_test test = {
        .mount_device = 1,
        .mntpoint = MNTPOINT,
        .all_filesystems = 1,
+       .max_runtime = 20,
        .test = copy_file_range_verify,
        .test_variants = TEST_VARIANTS,
 };

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

  parent reply	other threads:[~2022-08-31  9:21 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-30 13:49 [LTP] [PATCH 00/10] Max_runtime and other minor fixes Martin Doucha
2022-08-30 13:49 ` [LTP] [PATCH 01/10] syscalls/pty06: Add CVE reference Martin Doucha
2022-08-30 14:40   ` Cyril Hrubis
2022-08-30 13:49 ` [LTP] [PATCH 02/10] cve-2017-2671: Increase max_runtime Martin Doucha
2022-08-30 14:40   ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 03/10] ksm: Add max_runtime to tests Martin Doucha
2022-08-30 14:49   ` Cyril Hrubis
2022-08-31 12:45     ` Martin Doucha
2022-08-31 12:50       ` Cyril Hrubis
2022-08-31 12:54         ` Martin Doucha
2022-09-05 16:14           ` Petr Vorel
2022-09-09  8:28             ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 04/10] ioctl_sg01: Set unlimited max_runtime Martin Doucha
2022-08-30 15:16   ` Cyril Hrubis
2022-08-30 15:23     ` Martin Doucha
2022-08-30 18:38       ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 05/10] csf_bandwidth01: Add max_runtime Martin Doucha
2022-08-30 15:30   ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 06/10] copy_file_range01: " Martin Doucha
2022-08-31  8:21   ` Petr Vorel
2022-08-31  9:06     ` Martin Doucha
2022-08-31  9:25       ` Cyril Hrubis
2022-08-31 12:19         ` Petr Vorel
2022-08-31  9:06     ` Cyril Hrubis
2022-08-31 12:18       ` Petr Vorel
2022-08-31  9:22   ` Cyril Hrubis [this message]
2022-08-30 13:50 ` [LTP] [PATCH 07/10] perf_event_open02: " Martin Doucha
2022-08-31  8:23   ` Petr Vorel
2022-08-31 10:07   ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 08/10] readahead02: " Martin Doucha
2022-08-31  9:29   ` Petr Vorel
2022-08-31 11:29   ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 09/10] request_key03: " Martin Doucha
2022-08-31  9:45   ` Petr Vorel
2022-08-31  9:47   ` Petr Vorel
2022-08-31 12:24   ` Cyril Hrubis
2022-08-30 13:50 ` [LTP] [PATCH 10/10] sendfile09: " Martin Doucha
2022-08-31  9:48   ` Petr Vorel
2022-08-31 12:59   ` Jan Stancek

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=Yw8oZYwebeVBPC0P@yuki \
    --to=chrubis@suse.cz \
    --cc=ltp@lists.linux.it \
    --cc=mdoucha@suse.cz \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox