From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 64F8C396E067; Thu, 2 Jun 2022 14:30:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 64F8C396E067 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] Linux: Adjust struct rseq definition to current kernel version X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: c789e6e40974e2b67bd33a17f29b20dce6ae8822 X-Git-Newrev: 4b527650e0d559a5f693275c598667e06cd6455c Message-Id: <20220602143027.64F8C396E067@sourceware.org> Date: Thu, 2 Jun 2022 14:30:27 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 14:30:27 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4b527650e0d559a5f693275c598667e06cd6455c commit 4b527650e0d559a5f693275c598667e06cd6455c Author: Florian Weimer Date: Thu Jun 2 16:29:55 2022 +0200 Linux: Adjust struct rseq definition to current kernel version This definition is only used as a fallback with old kernel headers. The change follows kernel commit bfdf4e6208051ed7165b2e92035b4bf11 ("rseq: Remove broken uapi field layout on 32-bit little endian"). Reviewed-by: Carlos O'Donell Diff: --- sysdeps/unix/sysv/linux/sys/rseq.h | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sys/rseq.h b/sysdeps/unix/sysv/linux/sys/rseq.h index 8533782cf4..899d534df8 100644 --- a/sysdeps/unix/sysv/linux/sys/rseq.h +++ b/sysdeps/unix/sysv/linux/sys/rseq.h @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef __has_include # if __has_include ("linux/rseq.h") @@ -129,28 +128,13 @@ struct rseq targeted by the rseq_cs. Also needs to be set to NULL by user-space before reclaiming memory that contains the targeted struct rseq_cs. - Read and set by the kernel. Set by user-space with single-copy - atomicity semantics. This field should only be updated by the - thread which registered this data structure. Aligned on 64-bit. */ - union - { - uint64_t ptr64; -# ifdef __LP64__ - uint64_t ptr; -# else /* __LP64__ */ - struct - { -#if __BYTE_ORDER == __BIG_ENDIAN - uint32_t padding; /* Initialized to zero. */ - uint32_t ptr32; -# else /* LITTLE */ - uint32_t ptr32; - uint32_t padding; /* Initialized to zero. */ -# endif /* ENDIAN */ - } ptr; -# endif /* __LP64__ */ - } rseq_cs; + Read and set by the kernel. Set by user-space with single-copy + atomicity semantics. This field should only be updated by the + thread which registered this data structure. Aligned on 64-bit. + 32-bit architectures should update the low order bits of the + rseq_cs field, leaving the high order bits initialized to 0. */ + uint64_t rseq_cs; /* Restartable sequences flags field. This field should only be updated by the thread which