From patchwork Tue Jun 6 14:37:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 103872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3444047vqr; Tue, 6 Jun 2023 07:39:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4vnAgGhSLUsXHjlffRixvQT8ip+0ftqjTukv3G3xWB7vbKAbY9biXZmfe9yEqPWoKtWv9L X-Received: by 2002:a05:620a:488e:b0:75d:54fc:47b1 with SMTP id ea14-20020a05620a488e00b0075d54fc47b1mr2335118qkb.54.1686062363894; Tue, 06 Jun 2023 07:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686062363; cv=none; d=google.com; s=arc-20160816; b=mXyjkjA9ISmY/H4CNW4ZqepBmLuEIKluR42rbpPfipDhs1Vr9mWBxiIKa4AyPdYaCe I4iVmWoBLL0aJExLQmVFGt3r975lJWn+JrhwqQpTcWeYSFvty/dVRpM+amYedVsJdGuV +guT3Ilu4U0syaQDSSxWQ8mHCxGT+fzwmVyQDCgAkrXdcn/B02l7aZBAGQzEspfnp4EM exr/7TZScizsLPxDsO+DzmNVd/L3ZTwH1/zYXu5nUgZBqJVQDk4I+UETWNZFmcqbw1uw dDrTSix6Apa4J5QrYS1vGRPwTMesY2kGrma0d+s6HDT67shLygnTFuukMax3tSv8JDKi 6qCA== 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=iBZbrM8aXg0lrMpkqk/B9ueGbYMxSh3wWbEDiu0Wh1o=; b=t+MpGpzvTekigeEouMsgJF38C9rm1rsJQo5b2gcXuzodl80ofaYIbMMa5B5eOP66Mf nrkO1a/Xfrx1Bx91FKVSLcZ2Jf2vu7GsrlSX1vO1fei1m0Ixn435tGTlJaT2apA1Ymw+ jYL9rykmB1WJua+u22XEYLrfaBj/V/uZWynNwMWMpjpetBlz8u0xfXF08YuEIFq2wjMF RAccEB0txmyRkFBmZSoTA4oM5AnwHkQdMXDo50tqjCu9vrV7S4i+Kc8hFCx9Tq+3jpa7 TspTmuJAOcCf4LTsT4TErGbB/xbS8Dtm3bLPpeSGKGWgePT463kXd/lzXkwhGj9QMZ7l IsAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zAvCHooV; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=9VqH++YV; 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 g24-20020a37e218000000b007577edeeefcsi6113960qki.576.2023.06.06.07.39.09; Tue, 06 Jun 2023 07:39:23 -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=zAvCHooV; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=9VqH++YV; 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 S237982AbjFFOhf (ORCPT + 99 others); Tue, 6 Jun 2023 10:37:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236520AbjFFOh0 (ORCPT ); Tue, 6 Jun 2023 10:37:26 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDB7010C3 for ; Tue, 6 Jun 2023 07:37:21 -0700 (PDT) Message-ID: <20230606142031.071059989@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686062240; 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=iBZbrM8aXg0lrMpkqk/B9ueGbYMxSh3wWbEDiu0Wh1o=; b=zAvCHooVXCehbvvBRL4bEjYh9UjlT1Dg5/wlaOn2FjT9/Q6BaQ0j7jdRCyE+KtygLsHVZx olQCqmJVAu4L20tAv2dh63LCsSboF8YM+3vOsTbdbS+KvI7ZXf83UVCgJuum6THOr4jdjm NHbW8bWPt8dzatd4cDAUNw0RYnKZeNEXal/Zmoz0h1fuVzFFiHeaBO6XD/QCIKBI5VrrQl 0DipQL9zXTv/BCAKUZnQVWrWXJFtGfOWBMqWeR8zSgnF6jQfjTDuyHY+1cGAcJE62SUrj0 JHE6gdfaFFsLE5cjvBxFkPT7lK1xbaE9MxUp8l5Xqtyp3GzHC3xKpO64kBb10g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686062240; 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=iBZbrM8aXg0lrMpkqk/B9ueGbYMxSh3wWbEDiu0Wh1o=; b=9VqH++YV0s3KDheDw0FwKjW9k1vXOoHmjwK4BwJVHg7Foj9ibE8CzUrGhhrJerU4EL5OZ3 NqBkukSrCqmHTQBw== 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 01/45] selftests/timers/posix_timers: Make signal distribution test less fragile References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Date: Tue, 6 Jun 2023 16:37:19 +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?1767964529225873870?= X-GMAIL-MSGID: =?utf-8?q?1767964529225873870?= The signal distribution test has a tendency to hang for a long time as the signal delivery is not really evenly distributed. Increasing the timer interval to 10ms makes this less likely. Add a timeout to catch the case where it hangs and terminate the test gracefully. While at it get rid of the pointless atomic operation on a the thread local variable in the signal handler. Signed-off-by: Thomas Gleixner --- tools/testing/selftests/timers/posix_timers.c | 42 ++++++++++++++++---------- 1 file changed, 27 insertions(+), 15 deletions(-) --- a/tools/testing/selftests/timers/posix_timers.c +++ b/tools/testing/selftests/timers/posix_timers.c @@ -188,18 +188,19 @@ static int check_timer_create(int which) return 0; } -int remain; -__thread int got_signal; +static int remain; +static __thread int got_signal; static void *distribution_thread(void *arg) { - while (__atomic_load_n(&remain, __ATOMIC_RELAXED)); + while (__atomic_load_n(&remain, __ATOMIC_RELAXED) && !done); + return NULL; } static void distribution_handler(int nr) { - if (!__atomic_exchange_n(&got_signal, 1, __ATOMIC_RELAXED)) + if (++got_signal == 1) __atomic_fetch_sub(&remain, 1, __ATOMIC_RELAXED); } @@ -209,20 +210,22 @@ static void distribution_handler(int nr) */ static int check_timer_distribution(void) { - int err, i; - timer_t id; const int nthreads = 10; pthread_t threads[nthreads]; struct itimerspec val = { .it_value.tv_sec = 0, - .it_value.tv_nsec = 1000 * 1000, + .it_value.tv_nsec = 20 * 1000 * 1000, .it_interval.tv_sec = 0, - .it_interval.tv_nsec = 1000 * 1000, + .it_interval.tv_nsec = 20 * 1000 * 1000, }; + time_t start, now; + int err, i; + timer_t id; printf("Check timer_create() per process signal distribution... "); fflush(stdout); + done = 0; remain = nthreads + 1; /* worker threads + this thread */ signal(SIGALRM, distribution_handler); err = timer_create(CLOCK_PROCESS_CPUTIME_ID, NULL, &id); @@ -244,7 +247,18 @@ static int check_timer_distribution(void } /* Wait for all threads to receive the signal. */ - while (__atomic_load_n(&remain, __ATOMIC_RELAXED)); + now = start = time(NULL); + while (__atomic_load_n(&remain, __ATOMIC_RELAXED)) { + now = time(NULL); + if (now - start > 5) + break; + } + done = 1; + + if (timer_delete(id)) { + perror("Can't delete timer\n"); + return -1; + } for (i = 0; i < nthreads; i++) { if (pthread_join(threads[i], NULL)) { @@ -253,12 +267,10 @@ static int check_timer_distribution(void } } - if (timer_delete(id)) { - perror("Can't delete timer\n"); - return -1; - } - - printf("[OK]\n"); + if (now - start <= 5) + printf("[OK]\n"); + else + printf("%d [FAIL]\n", got_signal); return 0; }