From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id 4A06B385840D for ; Tue, 23 Apr 2024 19:03:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A06B385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4A06B385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713899038; cv=none; b=CB6sk2ZdjG75hFbE7vkmQ5ycKumJAUA3xHQl0gl6kHwGOAGc1tD3KYgCi965J4VUosGHuR9tkeADibfepGg1YAC6OaqJzh9QgH9SkQhlH3CMvaa5c/H6Axl+tU7j5EJftsrWxsaFGBbItKD09sHqZPlW2Nr4d6WTOxUksQK1GrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713899038; c=relaxed/simple; bh=C9WxBYWLTeY/s/0WeS1COZv2DyhnijdDTco1xUIOMRs=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=fBJDql3OKAHHhtU1G9ebVLz5feZO74BE8lSszrkPiHBUhba1tllGqzBdEJM5R8B13f2NdhmPQ4GPuv3na+DxpFmD/uIUXtWIi54wCqxxh/n9u99xh2XhjTrZNk8abPs5KuJB6j+Q0acoM3bnMwHJXhSkDxFxS2LQ7a6xVx8hv30= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1e834159f40so44781615ad.2 for ; Tue, 23 Apr 2024 12:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713899026; x=1714503826; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=33YOxBfM/29zO1BDsprAi92tkYIJOj4zb++R7vO4EME=; b=zUdLgCupgHxtTeUv00KdwFQImdsaLttcE/hEw/vo/e02RcO4a9Rv2ybs44QgXw0XBW 2w12NDqHfwfV+F/XbnItqxvbpcHZBYh/sd4LTSG80z/aKs78/dsrA6f3ouFOt/4uJqjD U5vlAvUAHUn+nIBTpQWTm6tKWcyDzljn5YIJJzjnwXjt7EV4keKDrPdmBO5yoKPoQK53 ActU1WThkjPiETxLPeu2cXdLqhVTIPULMwZwBPTQqV8Qo6GDQf65Mfof5TuyXJZP6R1k lmorBx5o6PHgwzqEiDrQ595xRv7GwHo8bVCysylB++1d81+t6VoxGJbmWFUGUgEVm/69 WDEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713899026; x=1714503826; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=33YOxBfM/29zO1BDsprAi92tkYIJOj4zb++R7vO4EME=; b=WqDXWs9qSxp4b6GP04jEiF/ukPPN2hXE9TJWZAwcIaXHWRJts0A5eZnmP/zW4kRr1O O+kFXPnWqw132SkYwLMNcz1hVC3DKuRtuWAmI0kQTyAmAkPpYpp7Ga2pGU9znvvR/AgL nO6xBtaN0s2d3zcH5L9GD4uz4ifOaPBlxC0ETuh/SPvBg0n6PzvV2ROzMVlPuEno86S0 F3VCvxkuJCIfmakGtafrl3Z8/seVRAhzp6g28ZcjXxoAySXGFk0AMWZAOFqMRuJWAN2c DUZctgFnrQhOg8MAx8ZywM+gKTyjDzUyN1rGuIFZExl8KJVXrgiiwbn4yNMwyoXHlvwX QciA== X-Forwarded-Encrypted: i=1; AJvYcCW5+m2pB0LFa6KdojfLxx0giSlgNFKQNB1k1peSS5UO3XUcW+o9VzoyTplzzNQhXWU5Hm6DY/p6zBmS5DCAvBMzTk8SyN6SDBXB X-Gm-Message-State: AOJu0YysD+2Ng67arxz0UbBSObK0W++lVAmguztIjvq1ZapL/vYbSkzM lB0oEch5mUT8XkXVQsPwLb/8w1DgVcyKmg2aDohBTsOS3T8u5gBc9cicOV8jg7M= X-Google-Smtp-Source: AGHT+IHs295BEZ8twsQRrIeCAnUlNH9SnskHYG9ovkYQ765fNG/opCOqbbFU8rEQgVx7yKglb2HfjQ== X-Received: by 2002:a17:903:4284:b0:1e4:1873:843c with SMTP id ju4-20020a170903428400b001e41873843cmr312681plb.62.1713899026174; Tue, 23 Apr 2024 12:03:46 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c1:6157:e8dc:fc2f:3a83:26ff? ([2804:1b3:a7c1:6157:e8dc:fc2f:3a83:26ff]) by smtp.gmail.com with ESMTPSA id n10-20020a170902d2ca00b001e27dcfdf15sm10347342plc.145.2024.04.23.12.03.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Apr 2024 12:03:45 -0700 (PDT) Message-ID: <8032d246-70d7-4dc6-a192-6e2897cd6818@linaro.org> Date: Tue, 23 Apr 2024 16:03:43 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] nptl: Fix tst-cancel30 on kernels without ppoll_time64 support To: Florian Weimer , libc-alpha@sourceware.org References: <877cgt8tge.fsf@oldenburg.str.redhat.com> Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <877cgt8tge.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 19/04/24 08:47, Florian Weimer wrote: > Fall back to ppoll if ppoll_time64 fails with ENOSYS. > Fixes commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25 ("nptl: Fix > tst-cancel30 on sparc64"). LGTM, thanks. Reviewed-by: Adhemerval Zanella > > --- > v2: Fix build failure on 32-bit RISC-V. > sysdeps/pthread/tst-cancel30.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c > index 3030660e5f..94ad6281bc 100644 > --- a/sysdeps/pthread/tst-cancel30.c > +++ b/sysdeps/pthread/tst-cancel30.c > @@ -18,6 +18,7 @@ > License along with the GNU C Library; if not, see > . */ > > +#include > #include > #include > #include > @@ -46,13 +47,19 @@ tf (void *arg) > > /* Wait indefinitely for cancellation, which only works if asynchronous > cancellation is enabled. */ > -#if defined SYS_ppoll || defined SYS_ppoll_time64 > -# ifndef SYS_ppoll_time64 > -# define SYS_ppoll_time64 SYS_ppoll > +#ifdef SYS_ppoll_time64 > + long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL); > + (void) ret; > +# ifdef SYS_ppoll > + if (ret == -1 && errno == ENOSYS) > + syscall (SYS_ppoll, NULL, 0, NULL, NULL); > # endif > - syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL); > #else > +# ifdef SYS_ppoll > + syscall (SYS_ppoll, NULL, 0, NULL, NULL); > +# else > for (;;); > +# endif > #endif > > return 0; > > base-commit: 0997c3d0c87433ac8c78043aaa9b6b7e91df2882 >