From patchwork Tue Jun 6 14:37:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 103891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3452319vqr; Tue, 6 Jun 2023 07:53:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4mahdc2d7HlfLwAdNUTa3xDMAGtAzXOjHPWXOw3N6abb+xn6EPv9DMoF5dsJvbS2QLGbO8 X-Received: by 2002:a05:620a:4116:b0:75e:8f18:6fe4 with SMTP id j22-20020a05620a411600b0075e8f186fe4mr2585024qko.44.1686063208072; Tue, 06 Jun 2023 07:53:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686063208; cv=none; d=google.com; s=arc-20160816; b=EyNILNl+aCPh9d7RYk4Ypseo1ce9XYOpduQv56koydKzlbfpRHLodP36N7rs/Ib4EZ rBAtNDSUbAZDT6AlspeKIeq4BXX0PoMPZU0fucoQeqtYIa+1D3TJI66+4CMkqFbkW9Z2 34jFxqDc7QYMTwVFLbjhiEf3e0u7iazbmAydhmFsxFb4/Jm6RjokAqime3NHHhAJYOFP UHimNfWzuxG+wAvJ47ea4jiV4qoGR+GjCFfzZUkwNedc/ftM2F67y9GlysuMwgUFUzPL OaU4/1OVjLev9nIh1m3QRrP42unzKGyX/mpPyPR8D8brtbdhBvRq/JK/rAont6Mc0vyn zNHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=vEpeXsIrZe+OvjERrC+2BpJZspHhIovUmZBUn14588o=; b=qBsynkwrFgfQN6RrrHLbR0NTVKUvsND0Rn9jiqSrKyKaIH2TmnkAzf9HZEYt7B8r3Y ZrW1lsyxqnFc3sSysY0M3atCuJ/iaRzlrIWy3Jl2HLHQrK6sjXm0NaqAmE51hs+4tXJR p5boADaD1gbJcK7tEjZVwYzYpkCc/UGYavKllRF8gOBIxtamjn0oChyjnNu71pXEKRZw 67VNTdzvPmTeRYbYBzZU53OW7soclcX0guUEyPAgO2lMC75BdZ+wDiqIaFecIXKlLu6h 0BWPx/tMm1uS9SCrdzAzpmxn6VZIJGEbcCP/EYkgu3ZJTk/ORZOpwVYSb8wXYZg3nBkn Y6Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MFxYngCM; dkim=neutral (no key) header.i=@linutronix.de header.b=0KZ505Aw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f6-20020a05620a12e600b0075cbf587db1si5773718qkl.79.2023.06.06.07.53.13; Tue, 06 Jun 2023 07:53:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MFxYngCM; dkim=neutral (no key) header.i=@linutronix.de header.b=0KZ505Aw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232951AbjFFOhv (ORCPT + 99 others); Tue, 6 Jun 2023 10:37:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237969AbjFFOhe (ORCPT ); Tue, 6 Jun 2023 10:37:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 113FCE6E for ; Tue, 6 Jun 2023 07:37:30 -0700 (PDT) Message-ID: <20230606142031.361364275@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686062248; 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: references:references; bh=vEpeXsIrZe+OvjERrC+2BpJZspHhIovUmZBUn14588o=; b=MFxYngCMvgFGbZ+qeTOM2WVe2omVI9vCB0KU5kPN8qjGKnGt0ttOHj9DjYtH8UPEe6vSe/ SgYgJrhjyWbHDxrwa8vngQ7l/MqwIYGAHyHvS4w1wS4W8A8QYC4L9MlPRHVypqGCfwjp7s FAT7Wy+ZQghzVPaNqnZMN43gDUXrDxKtjPbFcebAmmad7ohKC4Jgqo6UV6bmcoAwyHL0AX 7ExdTVqndCXYfLUHSJlpQ+uHfZY/s9cNtDHkU/mhxpgPzzABT1ACoAdHzWdG7Kzgo5pzvd 0pPI5wJ01zomBYaoD3u4BxHpsBQAA0CHWvLRb9FmcIKTGWgS6u44Fup8Tcqb4A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686062248; 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: references:references; bh=vEpeXsIrZe+OvjERrC+2BpJZspHhIovUmZBUn14588o=; b=0KZ505Aw8WKTp7bXANs+TTFcUIQxHVvXogT58oey98b195Yyc7+kJIcfaqn6Aw3wycatnY /Df4udSlqHwuMeDw== From: Thomas Gleixner To: LKML Cc: Frederic Weisbecker , Anna-Maria Behnsen , John Stultz , Peter Zijlstra , Ingo Molnar , Stephen Boyd , Eric Biederman , Oleg Nesterov Subject: [patch 06/45] selftests/timers/posix-timers: Validate timer_gettime() References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Date: Tue, 6 Jun 2023 16:37:28 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767965414392337970?= X-GMAIL-MSGID: =?utf-8?q?1767965414392337970?= timer_gettime() must return the correct expiry time for interval timers even when the timer is not armed, which is the case when a signal is pending but blocked. Works correctly for regular posix timers, but not for posix CPU timers. Add a selftest to validate the fixes. Signed-off-by: Thomas Gleixner --- tools/testing/selftests/timers/posix_timers.c | 60 +++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) --- a/tools/testing/selftests/timers/posix_timers.c +++ b/tools/testing/selftests/timers/posix_timers.c @@ -523,10 +523,65 @@ static void check_sigev_none(int which, ksft_test_result_fail("check_sigev_none %s\n", name); } +static void check_gettime(int which, const char *name) +{ + struct itimerspec its, prev; + struct timespec start, now; + struct sigevent sev; + timer_t timerid; + int wraps = 0; + sigset_t set; + + /* Block the signal */ + sigemptyset(&set); + sigaddset(&set, SIGUSR1); + if (sigprocmask(SIG_BLOCK, &set, NULL)) + fatal_error(name, "sigprocmask(SIG_BLOCK)"); + + memset(&sev, 0, sizeof(sev)); + sev.sigev_notify = SIGEV_SIGNAL; + sev.sigev_signo = SIGUSR1; + + if (timer_create(which, &sev, &timerid)) + fatal_error(name, "timer_create()"); + + /* Start the timer to expire in 100ms and 100ms intervals */ + its.it_value.tv_sec = 0; + its.it_value.tv_nsec = 100000000; + its.it_interval.tv_sec = 0; + its.it_interval.tv_nsec = 100000000; + timer_settime(timerid, 0, &its, NULL); + + if (timer_gettime(timerid, &prev)) + fatal_error(name, "timer_gettime()"); + + if (clock_gettime(which, &start)) + fatal_error(name, "clock_gettime()"); + + do { + if (clock_gettime(which, &now)) + fatal_error(name, "clock_gettime()"); + if (timer_gettime(timerid, &its)) + fatal_error(name, "timer_gettime()"); + if (its.it_value.tv_nsec > prev.it_value.tv_nsec) + wraps++; + prev = its; + + } while (calcdiff_ns(now, start) < NSECS_PER_SEC); + + if (timer_delete(timerid)) + fatal_error(name, "timer_delete()"); + + if (wraps > 1) + ksft_test_result_pass("check_gettime %s\n", name); + else + ksft_test_result_fail("check_gettime %s\n", name); +} + int main(int argc, char **argv) { ksft_print_header(); - ksft_set_plan(12); + ksft_set_plan(15); check_itimer(ITIMER_VIRTUAL, "ITIMER_VIRTUAL"); check_itimer(ITIMER_PROF, "ITIMER_PROF"); @@ -550,6 +605,9 @@ int main(int argc, char **argv) check_delete(); check_sigev_none(CLOCK_MONOTONIC, "CLOCK_MONOTONIC"); check_sigev_none(CLOCK_PROCESS_CPUTIME_ID, "CLOCK_PROCESS_CPUTIME_ID"); + check_gettime(CLOCK_MONOTONIC, "CLOCK_MONOTONIC"); + check_gettime(CLOCK_PROCESS_CPUTIME_ID, "CLOCK_PROCESS_CPUTIME_ID"); + check_gettime(CLOCK_THREAD_CPUTIME_ID, "CLOCK_THREAD_CPUTIME_ID"); ksft_finished(); }