From patchwork Wed Feb 28 17:51:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 86525 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 831E83858C52 for ; Wed, 28 Feb 2024 17:51:40 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 23AE23858D39 for ; Wed, 28 Feb 2024 17:51:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 23AE23858D39 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 23AE23858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::531 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709142681; cv=none; b=pmR7FjA6dTCDMF9xLVTR+/9+5zbKn70TX+Jp150mVbZsEDlyO9ixw/Nq03vH569wnke56kSYykiJMc5N1IZkg1ikvWhK1akiOGbTnt7+bjPYsajkAQVL6ZcbEli62jrzi5aJFGcTATIDLIDVtwVrIUCG5JYDRKzb/CFWhxVx9Kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709142681; c=relaxed/simple; bh=j2tGNXQ84zEklfwzbK511A+8ue0QQb67dSrtbgh7PHQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Tf1z7jfcPWnnN7BNJU+4n1ojxOUjI+H6JjHQPjO4RdJGrR9/7ONUIFKLdmcc8scj4iV8zUzDhTpdWLgA742I+R52rZoG2PsVqn0F09Db0zqFhfttFUJttX6eS0wk2NPBHoyWbEgDWoHqPgGA6fcwVFW6Fztsac5FriXRme1prqw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-5ce6b5e3c4eso4390789a12.2 for ; Wed, 28 Feb 2024 09:51:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709142677; x=1709747477; 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=MaSm7M9bikY/s65wBcxADgFXDYlPcWhXWj4jsnIjTbw=; b=KL8DVg7CWtTjC+O5lqelASS49GkMnJtRzAslv9RjnP5EJcONYQh3VXbR/rw/lwYzSX MG3laPuiU+R3+jecOrXOZQ3+71wiSTXU3rUED9Ewa95EuTNYpRghjLPUx1IJ2GEA2pRP qVW14Pzgd3xYvp0wgMvUYC9tYH0iGkZD2RLv+uVTLTKgkQ+sQvl30DKn46VgdRtUc9Ak f/oifElhENtbN1Je9aF3ba/KwdWuQxL2ZBw3UzP6Ya2w5E3NsnSZ3jFdFcd317BtSXym sndKcCDP3zDiN0V09dd0b/kWmleRRYU5zaYLuJuux3xWyB5Vr+aQa4pmuewrwKt3ZfWk Ma8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709142677; x=1709747477; 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=MaSm7M9bikY/s65wBcxADgFXDYlPcWhXWj4jsnIjTbw=; b=KHLG/s9ya9ARWgp9KweVPMSM5BELxQ3YLdOb0uZnR4UqH8xRPZ5Gtk+tjJ9UII68RG UaESi+Go/fWO3I5AOQDRiNTPFHWAL7jmFoVQdiD9BNzqOylrxd5LE5thQ7ETpywmvm6V KYBDHn6GOD6ZW79fgqPxk0HN53cdeR3Fi6dJ1sjoJXst2FHN8LXjy/Wmo0Yos8TdMkVP /FqAkbTNlUmyEqQ+ZBHQealJgIzIot5m6k1z/8yQp0Wc0VQi6yt6RFjpPZvOWsLNf8HZ dFKXjB7czYAEHwStfQgspSvjKkvQRyDEXVH+qxb/CVTbmQVNmDznfYs8zONMoUSnRPoc b4YA== X-Gm-Message-State: AOJu0YwQs+e7WC7ckEZqftB5trxEeAkmKdqn591aotrwtgHs0uwNaqvr 3Wj+2zy4ZYEwjAP3QQ5KkNGE2tLBefQF3ojoJKVB7iCKY2lzU9EbSa8/N0nr X-Google-Smtp-Source: AGHT+IGJxRu8BY/9QRoI4VkISqGq2AUm5+41silXaqtBtXPw9Nsy2/PuCoEIjJWMJ43b4GvYzy18qg== X-Received: by 2002:a05:6a21:1644:b0:1a0:e089:e25e with SMTP id no4-20020a056a21164400b001a0e089e25emr7394448pzb.46.1709142676937; Wed, 28 Feb 2024 09:51:16 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id t126-20020a632d84000000b005d6a0b2efb3sm7467pgt.21.2024.02.28.09.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 09:51:15 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 4F448740093; Wed, 28 Feb 2024 09:51:14 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: goldstein.w.n@gmail.com, skpgkp2@gmail.com Subject: [PATCH] x86-64: Don't use SSE resolvers for ISA level 3 or above Date: Wed, 28 Feb 2024 09:51:14 -0800 Message-ID: <20240228175114.271103-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3021.3 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, RCVD_IN_SBL_CSS, 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 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 When glibc is built with ISA level 3 or above enabled, SSE resolvers aren't available and glibc fails to build: ld: .../elf/librtld.os: in function `init_cpu_features': .../elf/../sysdeps/x86/cpu-features.c:1200:(.text+0x1445f): undefined reference to `_dl_runtime_resolve_fxsave' ld: .../elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object /usr/local/bin/ld: final link failed: bad value For ISA level 3 or above, don't use _dl_runtime_resolve_fxsave nor _dl_tlsdesc_dynamic_fxsave and also exclude _dl_tlsdesc_dynamic_fxsave. This fixes BZ #31429. Reviewed-by: Noah Goldstein --- sysdeps/x86/cpu-features.c | 17 +++++++++++------ sysdeps/x86_64/dl-tlsdesc.S | 15 +++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index d71e8d3d2e..e7c7ece462 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -1195,7 +1196,9 @@ no_cpuid: TUNABLE_CALLBACK (set_x86_shstk)); #endif +#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) +#endif { if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) { @@ -1216,22 +1219,24 @@ no_cpuid: #endif } } +#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL else { -#ifdef __x86_64__ +# ifdef __x86_64__ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; -# ifdef SHARED +# ifdef SHARED GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -# endif -#else -# ifdef SHARED +# endif +# else +# ifdef SHARED if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; else GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; +# endif # endif -#endif } +#endif #ifdef SHARED # ifdef __x86_64__ diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S index ea69f5223a..057a10862a 100644 --- a/sysdeps/x86_64/dl-tlsdesc.S +++ b/sysdeps/x86_64/dl-tlsdesc.S @@ -20,6 +20,7 @@ #include #include #include +#include #include "tlsdesc.h" #include "dl-trampoline-save.h" @@ -79,12 +80,14 @@ _dl_tlsdesc_undefweak: .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak #ifdef SHARED -# define USE_FXSAVE -# define STATE_SAVE_ALIGNMENT 16 -# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave -# include "dl-tlsdesc-dynamic.h" -# undef _dl_tlsdesc_dynamic -# undef USE_FXSAVE +# if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL +# define USE_FXSAVE +# define STATE_SAVE_ALIGNMENT 16 +# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave +# include "dl-tlsdesc-dynamic.h" +# undef _dl_tlsdesc_dynamic +# undef USE_FXSAVE +# endif # define USE_XSAVE # define STATE_SAVE_ALIGNMENT 64