From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) by sourceware.org (Postfix) with ESMTPS id 68E3D38425BD for ; Tue, 30 Aug 2022 12:08:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 68E3D38425BD Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-11dca1c9c01so16180851fac.2 for ; Tue, 30 Aug 2022 05:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=+6aTv7jGb1gwQysB2sA1aysiY+kZDTaK5sPv3RJR5V4=; b=rPszJzCbTLEuvvNqSCaHq1KnNITC7NwjLRFPyZGrIPqaIHwS77dv+saZhM93PxB+pz 0CRX/PR4rf7uv9kJ8bvrSDsRSih049vstrQuzpJSA8w0HrbWPuJ+iyME6OJazP84s9+N GKrg7wbVY8k+LQAFT5poiSeKD4v65GLwhejanQYlCzE+rJJ9N1LJkf9VCmtDJ+4XKhAY RPr8eGfY98qYFG6b5hLh07ma2GIIbWW8rtfFd3N2zvFatFJ9M9J4U1X2AnmStTdSjLZd byfP7A9fjo4WGEknv49c89H6iNdT5vgr59LqzLOblOo6apVX0MlL7OSfmELA1TAXK4dK IAkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=+6aTv7jGb1gwQysB2sA1aysiY+kZDTaK5sPv3RJR5V4=; b=xWcDRVP1PK+G0ixq6LoPDtEqM85A1F0vNNMUYaV9e7HDN+OHkvVb2aWeH8Q/nR8pGB TCBSAJERz00H7D6yu4CjBoR+ulBRMXX7o1IS5KuwyUhw2DOlpKfBxvEbTHG07WfWWkGZ DMOvAXhL3Meo6REOIgU22VilMydAiw6vXLE/IAvR64xCshDUbg3ERpH3GaxTMYHBYJpS Qk01kH4tjKcpH/Lf/YXFJYn/4MpLYZxZhTnduCrx7q88XS4l9cfuwF7Nvs/LpImtMCop Iaxz1niTbvC2KmLHneD1L/EQJzuiJrq8CDFgQsxvp8Xi7TrJsWISzBmI9oYkd54rdiCb ViYA== X-Gm-Message-State: ACgBeo28pdR5MUom8lFKYazpfRZbOS0UoaoIDQbuH19Qt7D1ll2efvhT D2wT0YvwGfcJ1iDFH3H/o9HVkXpmwsgdCg== X-Google-Smtp-Source: AA6agR7WNk+LTbG6qanJ7WcjnM71QL8ZSB051hhVVRorXBmuOuuAnJtfM/TbayUUoSiQYDOabY1ubw== X-Received: by 2002:a05:6808:1d6:b0:344:93c6:ec88 with SMTP id x22-20020a05680801d600b0034493c6ec88mr8724360oic.2.1661861285929; Tue, 30 Aug 2022 05:08:05 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:745e:31d8:f463:7d91:9d28]) by smtp.gmail.com with ESMTPSA id m4-20020a4ad504000000b00425678b9c4bsm6639557oos.0.2022.08.30.05.08.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 05:08:05 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2] linux: Avoid shifting a negative signed on POSIX timer interface Date: Tue, 30 Aug 2022 09:08:02 -0300 Message-Id: <20220830120802.1072466-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: The current macros uses pid as signed value, which triggers a compiler warning for process and thread timers. Replace MAKE_PROCESS_CPUCLOCK with static inline function that expects the pid as unsigned. These are similar to what Linux does internally. Checked on x86_64-linux-gnu. --- nptl/pthread_getcpuclockid.c | 2 +- sysdeps/unix/sysv/linux/clock_getcpuclockid.c | 2 +- sysdeps/unix/sysv/linux/clock_nanosleep.c | 2 +- .../unix/sysv/linux/kernel-posix-cpu-timers.h | 28 +++++++++++++++---- sysdeps/unix/sysv/linux/timer_create.c | 4 +-- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/nptl/pthread_getcpuclockid.c b/nptl/pthread_getcpuclockid.c index 344bd6560e..b8bf09f550 100644 --- a/nptl/pthread_getcpuclockid.c +++ b/nptl/pthread_getcpuclockid.c @@ -35,7 +35,7 @@ __pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid) /* The clockid_t value is a simple computation from the TID. */ - const clockid_t tidclock = MAKE_THREAD_CPUCLOCK (pd->tid, CPUCLOCK_SCHED); + const clockid_t tidclock = make_thread_cpuclock (pd->tid, CPUCLOCK_SCHED); *clockid = tidclock; return 0; diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c index 5534127ed7..355d3c86af 100644 --- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c +++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c @@ -29,7 +29,7 @@ __clock_getcpuclockid (pid_t pid, clockid_t *clock_id) /* The clockid_t value is a simple computation from the PID. But we do a clock_getres call to validate it. */ - const clockid_t pidclock = MAKE_PROCESS_CPUCLOCK (pid, CPUCLOCK_SCHED); + const clockid_t pidclock = make_process_cpuclock (pid, CPUCLOCK_SCHED); #ifndef __NR_clock_getres_time64 # define __NR_clock_getres_time64 __NR_clock_getres diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index befe6ecb8c..e610fd4e8d 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -34,7 +34,7 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, if (clock_id == CLOCK_THREAD_CPUTIME_ID) return EINVAL; if (clock_id == CLOCK_PROCESS_CPUTIME_ID) - clock_id = MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED); + clock_id = PROCESS_CLOCK; /* If the call is interrupted by a signal handler or encounters an error, it returns a positive value similar to errno. */ diff --git a/sysdeps/unix/sysv/linux/kernel-posix-cpu-timers.h b/sysdeps/unix/sysv/linux/kernel-posix-cpu-timers.h index 164a90ddeb..bea1e0e62d 100644 --- a/sysdeps/unix/sysv/linux/kernel-posix-cpu-timers.h +++ b/sysdeps/unix/sysv/linux/kernel-posix-cpu-timers.h @@ -1,4 +1,12 @@ -/* Parameters for the Linux kernel ABI for CPU clocks. */ +/* + Parameters for the Linux kernel ABI for CPU clocks, the bit fields within + a clockid: + + - The most significant 29 bits hold either a pid or a file descriptor. + - Bit 2 indicates whether a cpu clock refers to a thread or a process. + - Bits 1 and 0 give the type: PROF=0, VIRT=1, SCHED=2, or FD=3. + - A clockid is invalid if bits 2, 1, and 0 are all set. + */ #define CPUCLOCK_PID(clock) ((pid_t) ~((clock) >> 3)) #define CPUCLOCK_PERTHREAD(clock) \ @@ -12,7 +20,17 @@ #define CPUCLOCK_SCHED 2 #define CPUCLOCK_MAX 3 -#define MAKE_PROCESS_CPUCLOCK(pid, clock) \ - ((~(clockid_t) (pid) << 3) | (clockid_t) (clock)) -#define MAKE_THREAD_CPUCLOCK(tid, clock) \ - MAKE_PROCESS_CPUCLOCK((tid), (clock) | CPUCLOCK_PERTHREAD_MASK) +static inline clockid_t +make_process_cpuclock (unsigned int pid, clockid_t clock) +{ + return ((~pid) << 3) | clock; +} + +static inline clockid_t +make_thread_cpuclock (unsigned int tid, clockid_t clock) +{ + return make_process_cpuclock (tid, clock | CPUCLOCK_PERTHREAD_MASK); +} + +#define PROCESS_CLOCK make_process_cpuclock (0, CPUCLOCK_SCHED) +#define THREAD_CLOCK make_thread_cpuclock (0, CPUCLOCK_SCHED) diff --git a/sysdeps/unix/sysv/linux/timer_create.c b/sysdeps/unix/sysv/linux/timer_create.c index a8b2a41d9e..290324a7ea 100644 --- a/sysdeps/unix/sysv/linux/timer_create.c +++ b/sysdeps/unix/sysv/linux/timer_create.c @@ -33,9 +33,9 @@ ___timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid) { { clockid_t syscall_clockid = (clock_id == CLOCK_PROCESS_CPUTIME_ID - ? MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED) + ? PROCESS_CLOCK : clock_id == CLOCK_THREAD_CPUTIME_ID - ? MAKE_THREAD_CPUCLOCK (0, CPUCLOCK_SCHED) + ? THREAD_CLOCK : clock_id); /* If the user wants notification via a thread we need to handle -- 2.34.1