From patchwork Sun Aug 17 15:49:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 118485 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 530323858D26 for ; Sun, 17 Aug 2025 15:52:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 530323858D26 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ndNeKu5d X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id C39D73858D26 for ; Sun, 17 Aug 2025 15:50:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C39D73858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C39D73858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::632 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755445842; cv=none; b=x0hY6gTojPA2lv7y9uKdVovaZB6UoXh7PunYuheI187RaDaiKj3MYrNSvS2QbHMm6E+7hfqr/MxQtEvxEZ87HXO+g318ohT4vkzlw9nuUcUaCdSx1gzzYtnxduocdYOHKH9LF3mhLI8RHGu4MyAaWfDAUssMGRTmkN23whALxSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755445842; c=relaxed/simple; bh=pupVFPGr67tvhK9GwzcCsnjP68YwH7tGi5Z8lF9pMvQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=q8y10PhZP1dZCjKLP4Oz33gi2oynjUZ8kAs67zMntPwtB5/Y7bVK/4gjUiQiwym9tw9zskUAWk0WPjkPMFlcaMcN3PEX8pr5TTqg/koYHv61b0hmRTmHuHoglm9RYhOakKenYWwXxqc7gAjauncJExUUvrcR4US4KP1BO5mbQm4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C39D73858D26 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-afcb7a3b3a9so495496266b.2 for ; Sun, 17 Aug 2025 08:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755445840; x=1756050640; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/LaOHfjsm6LajE0t9+A/Sue3xmH+qCn70KE9Nk0oztw=; b=ndNeKu5dzDePc/yEBSPesvkZ0Ko3NY0TgYxthlmoAaMsu0UagDMHRdwcN0ARTe/Szl RfCislWQz/ikVJXoZX6HgkhcynJ+/mCI2byiVQ6QcHnnzckYjmo0dDtZpUuZUPBeZlYP QH2w9R/MU7k9k45bvFUqsNb2O6hKK2xKoDumYkrXXQn3OZWaMRgHY8IttKrHyRml3zhn 976LM5jGu+bQLyKTwqZnFo2mCZTCiI0n1SwbFUzEhdBaDANyAM3d5coCu1Ew+Gaqh3Ho ze63xw6vw3LuuByTj8JCmn05nZlNwv7eUtdE/BicyVKhhj88hIWwMvpKPJXl+Lo/RV5y LpGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755445840; x=1756050640; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/LaOHfjsm6LajE0t9+A/Sue3xmH+qCn70KE9Nk0oztw=; b=VzH+mXTTr6NFHUdMDfC0wvAEpkBpa5tux3Zhm10zKrV7SY8FY0ZRHVuIUnxFGFfZ+i DtYw0V2HPnfGl6gjPFb+GxzqczWyoTdIBSUX6hIULtEBxxTnOXW7/OmMjKOI712PqWST Odm7i8FRRgi2wzjeuQbMFF3QowCqS81WyJx4Lx8oZg1ZyyszF8s+wBn7jeJ7J7gmZCVL muITxQaHXVusLpIduMQMoK1MxW3WC8LB2lui5u4x1RGtL4NUSjnvwdzq+rpxMXJGVBDs RDXNbQE6RvatP/ByozWki6IAukVLbi141A3eYMjZkwbGUk5g2yhV8IlogzZkgLflg3k4 DyDQ== X-Gm-Message-State: AOJu0Yw1KJvVimhpddn75BOhIkXUJnR9iaU0wJairYQ9SPSX7Gifdemd TNdj1SuEAtKjUfrV0aNOAp0k7vT5K7B9kCXEgvG3hd+8OL4h97c61d7eUY5pJA== X-Gm-Gg: ASbGncsjGu8UNTCNIFQZuM0uSU2IcMyNShPSaFSqmDHXoKTQz6ye28pMNyeqfWm6uqR dTldKLUaCJzz+M/t/mCDBfkIOtGwnVvgEsolD6lXXBV4e/ktUswqo7ARBIGAUiHaXflfteBqIp4 BIXqOPlkvuEL90j1dNYxtPpskh5I3iJt6ygsf7P5cWIeYrwd/rSoPFaogrGj6z3NKJfbRX7h+vT WdyBtwL69MQR7uwjHypclO9b7mUMd2imokWU8I1sRXRxwhsk9Jv44ui3MVnSRnYY8AXoGWUHZO9 Ycl7MIF/RYQKPUZdiIN+ILyp4HE6qi9TgiQvWJoJw4zicJE4w4vlVUJZW4BWIGQK8p/FU06WhiX VmkJz3G3q41Q669qGElGSrg== X-Google-Smtp-Source: AGHT+IE5WzaG2stws9BrbtrT/xQQGGh1Eq/jq3Ykq4LAlUDkl5CY5oihwNRInmbgIGprxNra1ZLr2w== X-Received: by 2002:a17:907:7f90:b0:ae0:de30:8569 with SMTP id a640c23a62f3a-afcdc047984mr810061766b.1.1755445839760; Sun, 17 Aug 2025 08:50:39 -0700 (PDT) Received: from fedora ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afcdd010d4csm603497666b.85.2025.08.17.08.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 08:50:39 -0700 (PDT) From: Uros Bizjak To: libc-alpha@sourceware.org Cc: Uros Bizjak , "H.J.Lu" , Florian Weimer , Carlos O'Donell Subject: [PATCH 1/2] x86_64: Remove stalled __GNUC_PREREQ (6, 0) test in THREAD_SELF() Date: Sun, 17 Aug 2025 17:49:54 +0200 Message-ID: <20250817155027.1281909-1-ubizjak@gmail.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Currenty GCC-12 is required as the minimum supported compiler version. Remove stalled __GNUC_PREREQ (6, 0) test for GCC compiler version in THREAD_SELF() macro definition. Signed-off-by: Uros Bizjak Cc: H.J.Lu Cc: Florian Weimer Cc: Carlos O'Donell --- v2: Split from v1 patch. --- sysdeps/x86_64/nptl/tls.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h index 551d342d52..29b028cdcd 100644 --- a/sysdeps/x86_64/nptl/tls.h +++ b/sysdeps/x86_64/nptl/tls.h @@ -168,22 +168,9 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80, THREAD_GETMEM (__pd, header.dtv); }) -/* Return the thread descriptor for the current thread. - - The contained asm must *not* be marked volatile since otherwise - assignments like - pthread_descr self = thread_self(); - do not get optimized away. */ -# if __GNUC_PREREQ (6, 0) +/* Return the thread descriptor for the current thread. */ # define THREAD_SELF \ (*(struct pthread *__seg_fs *) offsetof (struct pthread, header.self)) -# else -# define THREAD_SELF \ - ({ struct pthread *__self; \ - asm ("mov %%fs:%c1,%0" : "=r" (__self) \ - : "i" (offsetof (struct pthread, header.self))); \ - __self;}) -# endif /* Magic for libthread_db to know how to do THREAD_SELF. */ # define DB_THREAD_SELF_INCLUDE /* For the FS constant. */ From patchwork Sun Aug 17 15:49:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 118484 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 06F8D3858418 for ; Sun, 17 Aug 2025 15:51:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 06F8D3858418 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=S3UaeLyF X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 8C5B23858D35 for ; Sun, 17 Aug 2025 15:50:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C5B23858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8C5B23858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755445842; cv=none; b=UoR7WcmvwEBoENPn8uzPJVcS/sN/lEV8I1uTgX4+RD81Ghd3myxHt4FSK8+5YPbPP7QZ7ZRsQZeS19gaqwV6p7Hsn21y8Zch3p6S3JwLgRXHcy0b2ONVHDOmEt9r7H8IISqrsoaTesocLyTvypUf2mtoNefN/7+Ilu+T3MmIivk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755445842; c=relaxed/simple; bh=Z29x0t791jlHmDjDppFr7qOObeh8aIpIgr1Qupt9uxU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XEcraUvdBkGFLOyQG2PAxetdMrSETECTjtz/op0mco8mQhinE7rMCrOoXg75e/B3m3jQeCChBayEzRVBKaqfnB6jVNa3U3cS1JaQpf0AR+fM9/KlGFj49RiP6/yALvpuMZH70mrbgFF3Ygix+o++nzWNhn3uv/I1YGaxu+o1USo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8C5B23858D35 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-afcb78e70c5so535091866b.1 for ; Sun, 17 Aug 2025 08:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755445841; x=1756050641; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WFtAxYAnu50d/l9ctHgMWjK3TLG9OlGq/gpF9Vz7M80=; b=S3UaeLyFGV3lmf+7cFWB4r9oOeRTamGw1Ii4ihN81h/ucqI/iQ+9ePjLrrTrdo9xJX 0G65TNrDRmNj083pvUVHMTdffm13rMJgynO+dhv0Fri7vkvLEu86Jf0oGDbKT5K65TZB 6RJRnqMy+O7oHR4v4DhQrvwlC15e847ZiCu59wHKei8zPfROOVVWeHb3rd0dRz4LXh15 iNiILCAEinO7NjI6MxN4ZFsw8hMTtGleQsYhd8genWFLmmEOB51FsliLL5lxOmKw99RV kQ04RTtUPFuMRjsXLLZ2IM2KaOSVU2Il1Q0CgLfuFm0xQK63P4v+UboOI3CjsBU+KBLZ gHQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755445841; x=1756050641; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WFtAxYAnu50d/l9ctHgMWjK3TLG9OlGq/gpF9Vz7M80=; b=pm9wUliDMufA4KEPXLQza6Wfm4pKjNVBweZaAiTsm0qD7T9G/cSMENwmqHKT4nt2xY h8lVN7+d4XUM7jp4jCWqLIqfGnygOADjiwyVK8nZm8+Be+2pL8DmIXdckvRKzej60dQU /pqBPtAETRJwOM6+pD2pqUNxHcUtbdS3X2nkPzmoh20TETW24aa124Ao7mQ/f07oEzvQ e2wJHiMMo005k5SemEYOK6jO5f82NekkoF9H+5DjRt504E7XaynDogDRkjDKQro4mL71 gPy/FJem4vP06wtpbYx4DiQ0j2/n3i2VMF5W29g8JoYRKufteSk5Vdiup+UtXrVRKzHO W2JA== X-Gm-Message-State: AOJu0YyDqKG0cmn1pk+EPc47/v8LP8N4F8XJu8kcTQxulzdVTns+eI3W dtkFrcBlVUtPEafqD9VqHhsBME/MK4xRRDr0WZ1zxyEscMQaPgyAyNUcCOUM+A== X-Gm-Gg: ASbGncsvXQUM4LsIo1eu+4yT3+rqe/G2kb7Qgt2V+FZ/6GabaLyoYc9mwXf4HoNXyuz raBw90IMg9t6gD9jWTn+Nu/sWPhP/UJ2sjxjHsUUTytYCkXicekRefmIHqzWcc9/Kse4+scba85 OmvWp4ixRqn4oKQiiY0IK3/5bauSEWs+VXSjjzO5Auxg8HvCP8nA3ILwbN/pmchopupM0G7bGia zhfVf5jRv5FzGSZ5R2bcLBvuR/vPMA/Dz2OgoQpE7dhnGZOtkc/9T7FEs151H6eDmvFZVWnDubh Bm2l09XmmOV26Y8RjiwiPIn/oann3ERPW4syCVy5zohsprFzFvr23PuDYIWOzCUMLYxm6li4ETP HcE6Mwww6I6fnRpimAzPHlEwut1FEuACB X-Google-Smtp-Source: AGHT+IEPQokS5p8rDhONVsAsKQqqETKQpRfuEUOp4u+ISL+8HEORtJSdrly9Sh66eotL79fajp5txg== X-Received: by 2002:a17:907:7e8d:b0:af9:495b:99e4 with SMTP id a640c23a62f3a-afceae4c6afmr552250466b.60.1755445840502; Sun, 17 Aug 2025 08:50:40 -0700 (PDT) Received: from fedora ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-afcdd010d4csm603497666b.85.2025.08.17.08.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 08:50:40 -0700 (PDT) From: Uros Bizjak To: libc-alpha@sourceware.org Cc: Uros Bizjak , "H.J.Lu" , Florian Weimer , Carlos O'Donell Subject: [PATCH 2/2] x86_64: Use __seg_fs qualifiers in NPTL accessors Date: Sun, 17 Aug 2025 17:49:55 +0200 Message-ID: <20250817155027.1281909-2-ubizjak@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817155027.1281909-1-ubizjak@gmail.com> References: <20250817155027.1281909-1-ubizjak@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Use __seg_fs named address space qualifiers to cast NPTL accessors to %fs: prefixed addresses. Use volatile access only where strictly necessary. Signed-off-by: Uros Bizjak Cc: H.J.Lu Cc: Florian Weimer Cc: Carlos O'Donell --- sysdeps/x86_64/nptl/rseq-access.h | 82 ++++++++----------- sysdeps/x86_64/nptl/tcb-access.h | 127 ++++++++---------------------- 2 files changed, 66 insertions(+), 143 deletions(-) diff --git a/sysdeps/x86_64/nptl/rseq-access.h b/sysdeps/x86_64/nptl/rseq-access.h index bc966b2972..214cb96797 100644 --- a/sysdeps/x86_64/nptl/rseq-access.h +++ b/sysdeps/x86_64/nptl/rseq-access.h @@ -16,34 +16,38 @@ License along with the GNU C Library; if not, see . */ +/* Read member of the RSEQ area directly. */ +#define RSEQ_GETMEM(member) \ + ({ \ + _Static_assert (sizeof (RSEQ_SELF()->member) == 1 \ + || sizeof (RSEQ_SELF()->member) == 4 \ + || sizeof (RSEQ_SELF()->member) == 8, \ + "size of rseq data"); \ + (*(__typeof (RSEQ_SELF()->member) __seg_fs *) \ + (__rseq_offset + offsetof (struct rseq_area, member))); \ + }) + /* Read member of the RSEQ area directly, with single-copy atomicity semantics. */ #define RSEQ_GETMEM_ONCE(member) \ - ({ __typeof (RSEQ_SELF()->member) __value; \ - _Static_assert (sizeof (__value) == 1 \ - || sizeof (__value) == 4 \ - || sizeof (__value) == 8, \ - "size of rseq data"); \ - if (sizeof (__value) == 1) \ - asm volatile ("movb %%fs:%P2(%q3),%b0" \ - : "=q" (__value) \ - : "0" (0), "i" (offsetof (struct rseq_area, member)), \ - "r" ((long long int) __rseq_offset)); \ - else if (sizeof (__value) == 4) \ - asm volatile ("movl %%fs:%P1(%q2),%0" \ - : "=r" (__value) \ - : "i" (offsetof (struct rseq_area, member)), \ - "r" ((long long int) __rseq_offset)); \ - else /* 8 */ \ - { \ - asm volatile ("movq %%fs:%P1(%q2),%q0" \ - : "=r" (__value) \ - : "i" (offsetof (struct rseq_area, member)), \ - "r" ((long long int) __rseq_offset)); \ - } \ - __value; }) + ({ \ + _Static_assert (sizeof (RSEQ_SELF()->member) == 1 \ + || sizeof (RSEQ_SELF()->member) == 4 \ + || sizeof (RSEQ_SELF()->member) == 8, \ + "size of rseq data"); \ + (*(volatile __typeof (RSEQ_SELF()->member) __seg_fs *) \ + (__rseq_offset + offsetof (struct rseq_area, member))); \ + }) -/* Read member of the RSEQ area directly. */ -#define RSEQ_GETMEM(member) RSEQ_GETMEM_ONCE(member) +/* Set member of the RSEQ area directly. */ +#define RSEQ_SETMEM(member, value) \ + ({ \ + _Static_assert (sizeof (RSEQ_SELF()->member) == 1 \ + || sizeof (RSEQ_SELF()->member) == 4 \ + || sizeof (RSEQ_SELF()->member) == 8, \ + "size of rseq data"); \ + (*(__typeof (RSEQ_SELF()->member) __seg_fs *) \ + (__rseq_offset + offsetof (struct rseq_area, member)) = (value)); \ + }) /* Set member of the RSEQ area directly, with single-copy atomicity semantics. */ #define RSEQ_SETMEM_ONCE(member, value) \ @@ -51,27 +55,7 @@ _Static_assert (sizeof (RSEQ_SELF()->member) == 1 \ || sizeof (RSEQ_SELF()->member) == 4 \ || sizeof (RSEQ_SELF()->member) == 8, \ - "size of rseq data"); \ - if (sizeof (RSEQ_SELF()->member) == 1) \ - asm volatile ("movb %b0,%%fs:%P1(%q2)" : \ - : "iq" (value), \ - "i" (offsetof (struct rseq_area, member)), \ - "r" ((long long int) __rseq_offset)); \ - else if (sizeof (RSEQ_SELF()->member) == 4) \ - asm volatile ("movl %0,%%fs:%P1(%q2)" : \ - : IMM_MODE (value), \ - "i" (offsetof (struct rseq_area, member)), \ - "r" ((long long int) __rseq_offset)); \ - else /* 8 */ \ - { \ - /* Since movq takes a signed 32-bit immediate or a register source \ - operand, use "er" constraint for 32-bit signed integer constant \ - or register. */ \ - asm volatile ("movq %q0,%%fs:%P1(%q2)" : \ - : "er" ((uint64_t) cast_to_integer (value)), \ - "i" (offsetof (struct rseq_area, member)), \ - "r" ((long long int) __rseq_offset)); \ - }}) - -/* Set member of the RSEQ area directly. */ -#define RSEQ_SETMEM(member, value) RSEQ_SETMEM_ONCE(member, value) + "size of rseq data"); \ + (*(volatile __typeof (RSEQ_SELF()->member) __seg_fs *) \ + (__rseq_offset + offsetof (struct rseq_area, member)) = (value)); \ + }) diff --git a/sysdeps/x86_64/nptl/tcb-access.h b/sysdeps/x86_64/nptl/tcb-access.h index defd76f54f..445f328ac2 100644 --- a/sysdeps/x86_64/nptl/tcb-access.h +++ b/sysdeps/x86_64/nptl/tcb-access.h @@ -17,116 +17,55 @@ . */ /* Read member of the thread descriptor directly. */ -# define THREAD_GETMEM(descr, member) \ - ({ __typeof (descr->member) __value; \ - _Static_assert (sizeof (__value) == 1 \ - || sizeof (__value) == 4 \ - || sizeof (__value) == 8, \ +#define THREAD_GETMEM(descr, member) \ + ({ \ + _Static_assert (sizeof (descr->member) == 1 \ + || sizeof (descr->member) == 4 \ + || sizeof (descr->member) == 8, \ "size of per-thread data"); \ - if (sizeof (__value) == 1) \ - asm volatile ("movb %%fs:%P2,%b0" \ - : "=q" (__value) \ - : "0" (0), "i" (offsetof (struct pthread, member))); \ - else if (sizeof (__value) == 4) \ - asm volatile ("movl %%fs:%P1,%0" \ - : "=r" (__value) \ - : "i" (offsetof (struct pthread, member))); \ - else /* 8 */ \ - { \ - asm volatile ("movq %%fs:%P1,%q0" \ - : "=r" (__value) \ - : "i" (offsetof (struct pthread, member))); \ - } \ - __value; }) + (*(__typeof (descr->member) __seg_fs *) \ + offsetof (struct pthread, member)); \ + }) -/* THREAD_GETMEM already forces a read. */ -#define THREAD_GETMEM_VOLATILE(descr, member) THREAD_GETMEM (descr, member) +#define THREAD_GETMEM_VOLATILE(descr, member) \ + ({ \ + _Static_assert (sizeof (descr->member) == 1 \ + || sizeof (descr->member) == 4 \ + || sizeof (descr->member) == 8, \ + "size of per-thread data"); \ + (*(volatile __typeof (descr->member) __seg_fs *) \ + offsetof (struct pthread, member)); \ + }) /* Same as THREAD_GETMEM, but the member offset can be non-constant. */ -# define THREAD_GETMEM_NC(descr, member, idx) \ - ({ __typeof (descr->member[0]) __value; \ - _Static_assert (sizeof (__value) == 1 \ - || sizeof (__value) == 4 \ - || sizeof (__value) == 8, \ +#define THREAD_GETMEM_NC(descr, member, idx) \ + ({ \ + _Static_assert (sizeof (descr->member[0]) == 1 \ + || sizeof (descr->member[0]) == 4 \ + || sizeof (descr->member[0]) == 8, \ "size of per-thread data"); \ - if (sizeof (__value) == 1) \ - asm volatile ("movb %%fs:%P2(%q3),%b0" \ - : "=q" (__value) \ - : "0" (0), "i" (offsetof (struct pthread, member[0])), \ - "r" (idx)); \ - else if (sizeof (__value) == 4) \ - asm volatile ("movl %%fs:%P1(,%q2,4),%0" \ - : "=r" (__value) \ - : "i" (offsetof (struct pthread, member[0])), "r" (idx));\ - else /* 8 */ \ - { \ - asm volatile ("movq %%fs:%P1(,%q2,8),%q0" \ - : "=r" (__value) \ - : "i" (offsetof (struct pthread, member[0])), \ - "r" (idx)); \ - } \ - __value; }) - - -/* Loading addresses of objects on x86-64 needs to be treated special - when generating PIC code. */ -#ifdef __pic__ -# define IMM_MODE "nr" -#else -# define IMM_MODE "ir" -#endif - + (*(__typeof (descr->member[0]) __seg_fs *) \ + offsetof (struct pthread, member[idx])); \ + }) /* Set member of the thread descriptor directly. */ -# define THREAD_SETMEM(descr, member, value) \ +#define THREAD_SETMEM(descr, member, value) \ ({ \ _Static_assert (sizeof (descr->member) == 1 \ || sizeof (descr->member) == 4 \ || sizeof (descr->member) == 8, \ "size of per-thread data"); \ - if (sizeof (descr->member) == 1) \ - asm volatile ("movb %b0,%%fs:%P1" : \ - : "iq" (value), \ - "i" (offsetof (struct pthread, member))); \ - else if (sizeof (descr->member) == 4) \ - asm volatile ("movl %0,%%fs:%P1" : \ - : IMM_MODE (value), \ - "i" (offsetof (struct pthread, member))); \ - else /* 8 */ \ - { \ - /* Since movq takes a signed 32-bit immediate or a register source \ - operand, use "er" constraint for 32-bit signed integer constant \ - or register. */ \ - asm volatile ("movq %q0,%%fs:%P1" : \ - : "er" ((uint64_t) cast_to_integer (value)), \ - "i" (offsetof (struct pthread, member))); \ - }}) - + (*(__typeof (descr->member) __seg_fs *) \ + offsetof (struct pthread, member) = (value)); \ + }) /* Same as THREAD_SETMEM, but the member offset can be non-constant. */ -# define THREAD_SETMEM_NC(descr, member, idx, value) \ +#define THREAD_SETMEM_NC(descr, member, idx, value) \ ({ \ _Static_assert (sizeof (descr->member[0]) == 1 \ || sizeof (descr->member[0]) == 4 \ || sizeof (descr->member[0]) == 8, \ "size of per-thread data"); \ - if (sizeof (descr->member[0]) == 1) \ - asm volatile ("movb %b0,%%fs:%P1(%q2)" : \ - : "iq" (value), \ - "i" (offsetof (struct pthread, member[0])), \ - "r" (idx)); \ - else if (sizeof (descr->member[0]) == 4) \ - asm volatile ("movl %0,%%fs:%P1(,%q2,4)" : \ - : IMM_MODE (value), \ - "i" (offsetof (struct pthread, member[0])), \ - "r" (idx)); \ - else /* 8 */ \ - { \ - /* Since movq takes a signed 32-bit immediate or a register source \ - operand, use "er" constraint for 32-bit signed integer constant \ - or register. */ \ - asm volatile ("movq %q0,%%fs:%P1(,%q2,8)" : \ - : "er" ((uint64_t) cast_to_integer (value)), \ - "i" (offsetof (struct pthread, member[0])), \ - "r" (idx)); \ - }}) + (*(__typeof (descr->member[0]) __seg_fs *) \ + offsetof (struct pthread, member[idx]) = (value)); \ + })