Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5936CC4332F for ; Sat, 12 Nov 2022 04:01:29 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 747BA3CD60E for ; Sat, 12 Nov 2022 05:01:27 +0100 (CET) Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 34C7B3CACE2 for ; Sat, 12 Nov 2022 05:01:18 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 0ACF51A006E0 for ; Sat, 12 Nov 2022 05:01:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668225675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SLcgY7PTS8RohMD24C6DkO6ru+uNMFDvCUt1uA18wuw=; b=aLmdTmkwBIXCdlvbbrhU9iXcJmmPksmFEcngkYlGSkdkHr1VaZjME1srfHnHmb/cQFezPU U+6DHQIFy+E3A+DOvEz4DzUnw7U14lngW69RsZvQcqnVX5OWsLC4xJ8LpXeAjBOKq0fowI gqch5Q5wdojT2DBUeZWcyhaNIFq09Ug= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-aEFQQQbuOievevIVmCT21Q-1; Fri, 11 Nov 2022 23:01:11 -0500 X-MC-Unique: aEFQQQbuOievevIVmCT21Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74C853804074; Sat, 12 Nov 2022 04:01:11 +0000 (UTC) Received: from liwang-workstation.nay.redhat.com (unknown [10.66.81.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id D42E240C845C; Sat, 12 Nov 2022 04:01:09 +0000 (UTC) From: Li Wang To: ltp@lists.linux.it Date: Sat, 12 Nov 2022 12:01:06 +0800 Message-Id: <20221112040107.3953862-1-liwang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 1/2] setitimer01: add interval timer 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: , Cc: rpalethorpe@suse.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Split checking the return ovalue from testing the signal is delivered, so that we could use two time value for verifying. Also, adding interval timer test by handling the signal at least 10 times. After that recover the signal behavior to default and do deliver-signal checking. Signed-off-by: Li Wang --- .../kernel/syscalls/setitimer/setitimer01.c | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/testcases/kernel/syscalls/setitimer/setitimer01.c b/testcases/kernel/syscalls/setitimer/setitimer01.c index 1f631d457..260590b0e 100644 --- a/testcases/kernel/syscalls/setitimer/setitimer01.c +++ b/testcases/kernel/syscalls/setitimer/setitimer01.c @@ -22,8 +22,10 @@ #include "tst_safe_clocks.h" static struct itimerval *value, *ovalue; +static volatile unsigned long sigcnt; static long time_step; -static long time_count; +static long time_sec; +static long time_usec; static struct tcase { int which; @@ -40,54 +42,66 @@ static int sys_setitimer(int which, void *new_value, void *old_value) return tst_syscall(__NR_setitimer, which, new_value, old_value); } -static void set_setitimer_value(int usec, int o_usec) +static void sig_routine(int signo LTP_ATTRIBUTE_UNUSED) { - value->it_value.tv_sec = 0; - value->it_value.tv_usec = usec; - value->it_interval.tv_sec = 0; - value->it_interval.tv_usec = 0; + sigcnt++; +} - ovalue->it_value.tv_sec = o_usec; - ovalue->it_value.tv_usec = o_usec; - ovalue->it_interval.tv_sec = 0; - ovalue->it_interval.tv_usec = 0; +static void set_setitimer_value(int sec, int usec) +{ + value->it_value.tv_sec = sec; + value->it_value.tv_usec = usec; + value->it_interval.tv_sec = sec; + value->it_interval.tv_usec = usec; } static void verify_setitimer(unsigned int i) { pid_t pid; int status; - long margin; struct tcase *tc = &tcases[i]; + tst_res(TINFO, "tc->which = %s", tc->des); + pid = SAFE_FORK(); if (pid == 0) { - tst_res(TINFO, "tc->which = %s", tc->des); - tst_no_corefile(0); - set_setitimer_value(time_count, 0); + set_setitimer_value(time_sec, time_usec); TST_EXP_PASS(sys_setitimer(tc->which, value, NULL)); - set_setitimer_value(5 * time_step, 7 * time_step); + set_setitimer_value(2 * time_sec, 2 * time_usec); TST_EXP_PASS(sys_setitimer(tc->which, value, ovalue)); - tst_res(TINFO, "tv_sec=%ld, tv_usec=%ld", - ovalue->it_value.tv_sec, - ovalue->it_value.tv_usec); + TST_EXP_EQ_LI(ovalue->it_interval.tv_sec, time_sec); + TST_EXP_EQ_LI(ovalue->it_interval.tv_usec, time_usec); + + tst_res(TINFO, "ovalue->it_value.tv_sec=%ld, ovalue->it_value.tv_usec=%ld", + ovalue->it_value.tv_sec, ovalue->it_value.tv_usec); /* * ITIMER_VIRTUAL and ITIMER_PROF timers always expire a * time_step afterward the elapsed time to make sure that * at least counters take effect. */ - margin = tc->which == ITIMER_REAL ? 0 : time_step; + long margin = (tc->which == ITIMER_REAL) ? 0 : time_step; - if (ovalue->it_value.tv_sec != 0 || ovalue->it_value.tv_usec > time_count + margin) + if (ovalue->it_value.tv_sec > time_sec || + ovalue->it_value.tv_usec > time_usec + margin) tst_res(TFAIL, "Ending counters are out of range"); - for (;;) + SAFE_SIGNAL(tc->signo, sig_routine); + + set_setitimer_value(0, time_usec); + TST_EXP_PASS(sys_setitimer(tc->which, value, NULL)); + + while (sigcnt <= 10UL) + ; + + SAFE_SIGNAL(tc->signo, SIG_DFL); + + while (1) ; } @@ -114,10 +128,11 @@ static void setup(void) if (time_step <= 0) time_step = 1000; - time_count = 3 * time_step; + tst_res(TINFO, "clock low-resolution: %luns, time step: %luus", + time_res.tv_nsec, time_step); - tst_res(TINFO, "low-resolution: %luns, time step: %luus, time count: %luus", - time_res.tv_nsec, time_step, time_count); + time_sec = 9 + time_step / 1000; + time_usec = 3 * time_step; } static struct tst_test test = { -- 2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp