From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 4C267386D60A for ; Thu, 15 Feb 2024 20:32:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C267386D60A 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 4C267386D60A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708029166; cv=none; b=HRB+ktNhh0Knv0880jKRI/GkPeD0bueqvyR5lCSyAp/wpjQ51+rU+323AdnjCLcMeccOxiOkL6sAccvMKctJQEenveoUk9yC45odnn9UMgre8clNa+kQcj1YqT90vUeyXM7FOsZqiylPVZ5KqOBoXgYvVEE4A69BwUK3/WwluNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708029166; c=relaxed/simple; bh=z+VcbX77GAY7Yjd68cwo+y+BcRBfIQR7XdGUI6FaZdA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IRvmq28BCoof9RI1PKSBDk6dAPzx3BN2VXEtS39J6AuIokFHaA9nb5/D5ZXOdTfq+oxjyeCIi00QD/OBd7Z+StZNWL5IziWK6IKA+en9Ozwty2KLFnAli8UT0/+MEPnUbjdcNnmULocsLpiTmt1QikwmHIcgCnM33zmYJxGJDlQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6e08dd0c7eeso939902b3a.1 for ; Thu, 15 Feb 2024 12:32:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708029163; x=1708633963; 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=nBcuP+E9T7EDyEvwcRVkFuPKniKkCkbWOdAvirBPA+c=; b=Ln3wsO7LkDTltUgGlxhUQ+XAQtoLwlgGd2QMPF55to2HkfRTO1EOAO3nKWxwLjopbX +32IHm8WbtHSxI8OpBP8FuYLO9JfZqHX5/x1JoOtpHJD1e+ulSm/XwVYThOaOVH08N7x 9ewTnCvUIum4iRZ0lWfyr+zFHowY5s0Hg2NGn83NElNapr6DS0Cf5ybBN2lYaJ2jZ9ak WYI8+rcqvcP9mFqklTfYaX6lDaBdcPhGQogvOPvBpj3dU0gKaXNnF4GYSu5D6/eQzaEc IH8KosnHjDtqUlZrNPKyaJDgTVpxorpiaBD6eD2RJkJ9QymQc3xSxcEurAPxskrJW3Qc Hzvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708029163; x=1708633963; 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=nBcuP+E9T7EDyEvwcRVkFuPKniKkCkbWOdAvirBPA+c=; b=n+QGGj2LTDsn6EOk7qrgLw+Oqv/sd0l5CxUMCbi4KpQkfIH/1VPUCITyz0wAsn1z8J ZUPHQVvlkPmWV5QYqYWq0B6b61f5Q9ABxtYRuncEPdYWGICjmmI0E8VXRybB11rg4e9m Qbhe7vWj07nf7yl4pJsZYTpGrL3APfV6CmgcO4bCUrZAOquGOKAVRds7HjL2imk2nzsi 3ZBFz+HK4NUKRsuwJe+pX9alGqoPDjAB5SKfb4CeCmgnIqi0HWNbD2A/mAwHEba9J+vb XkKUZ5bUPTra4GhUk7IRd0JmXoFIH5nO2++mFcoZvxDhlf2RS/MDYlwkhrN1zORT14H5 kc3A== X-Gm-Message-State: AOJu0YxJnzrSJuR7Hnf3B17jEoPuzUW9RcVIYHQwl8XInug9gR4oeozh LzaQ1F/Jb9hSmG9esw8/Irqg/nS1RYIXVgwQbB0SKTzPUZvkxeF0 X-Google-Smtp-Source: AGHT+IHPmHs8mDO+FJ6u+NMCbB5JBUahyyDIWgzSFf/xI4tPSGkvzeJqalVvU7ImofIpDOgeWl/Z9Q== X-Received: by 2002:a05:6a00:d54:b0:6e0:326f:30b1 with SMTP id n20-20020a056a000d5400b006e0326f30b1mr2772713pfv.27.1708029163183; Thu, 15 Feb 2024 12:32:43 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006e06aaf5e58sm1748940pfe.34.2024.02.15.12.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 12:32:42 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 617DB7403E1; Thu, 15 Feb 2024 12:32:41 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: goldstein.w.n@gmail.com, fweimer@redhat.com Subject: [PATCH v5 1/2] x86-64: Save APX and Tile registers in ld.so trampoline Date: Thu, 15 Feb 2024 12:32:40 -0800 Message-ID: <20240215203241.1938288-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240215203241.1938288-1-hjl.tools@gmail.com> References: <20240215203241.1938288-1-hjl.tools@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3019.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_ABUSEAT,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 List-Id: Add APX registers to STATE_SAVE_MASK so that APX and Tile registers are saved in ld.so trampoline. This fixes BZ #31371. Also update STATE_SAVE_OFFSET and STATE_SAVE_MASK for i386 which will be used by i386 _dl_tlsdesc_dynamic. --- sysdeps/x86/sysdep.h | 54 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h index 85d0a8c943..4da05f4b32 100644 --- a/sysdeps/x86/sysdep.h +++ b/sysdeps/x86/sysdep.h @@ -21,14 +21,56 @@ #include +/* The extended state feature IDs in the state component bitmap. */ +#define X86_XSTATE_X87_ID 0 +#define X86_XSTATE_SSE_ID 1 +#define X86_XSTATE_AVX_ID 2 +#define X86_XSTATE_BNDREGS_ID 3 +#define X86_XSTATE_BNDCFG_ID 4 +#define X86_XSTATE_K_ID 5 +#define X86_XSTATE_ZMM_H_ID 6 +#define X86_XSTATE_ZMM_ID 7 +#define X86_XSTATE_PKRU_ID 9 +#define X86_XSTATE_TILECFG_ID 17 +#define X86_XSTATE_TILEDATA_ID 18 +#define X86_XSTATE_APX_F_ID 19 + +#ifdef __x86_64__ /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be - aligned to 16 bytes for fxsave and 64 bytes for xsave. */ -#define STATE_SAVE_OFFSET (8 * 7 + 8) - -/* Save SSE, AVX, AVX512, mask and bound registers. */ -#define STATE_SAVE_MASK \ - ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | (1 << 7)) + aligned to 16 bytes for fxsave and 64 bytes for xsave. + + NB: Is is non-zero because of the 128-byte red-zone. Some registers + are saved on stack without adjusting stack pointer first. When we + update stack pointer to allocate more space, we need to take the + red-zone into account. */ +# define STATE_SAVE_OFFSET (8 * 7 + 8) + +/* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX + registers are mutually exclusive. */ +# define STATE_SAVE_MASK \ + ((1 << X86_XSTATE_SSE_ID) \ + | (1 << X86_XSTATE_AVX_ID) \ + | (1 << X86_XSTATE_BNDREGS_ID) \ + | (1 << X86_XSTATE_K_ID) \ + | (1 << X86_XSTATE_ZMM_H_ID) \ + | (1 << X86_XSTATE_ZMM_ID) \ + | (1 << X86_XSTATE_TILECFG_ID) \ + | (1 << X86_XSTATE_TILEDATA_ID) \ + | (1 << X86_XSTATE_APX_F_ID)) +#else +/* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 + doesn't have red-zone, use 0 here. */ +# define STATE_SAVE_OFFSET 0 + +/* Save SSE, AVX, AXV512, mask and bound registers. */ +# define STATE_SAVE_MASK \ + ((1 << X86_XSTATE_SSE_ID) \ + | (1 << X86_XSTATE_AVX_ID) \ + | (1 << X86_XSTATE_BNDREGS_ID) \ + | (1 << X86_XSTATE_K_ID) \ + | (1 << X86_XSTATE_ZMM_H_ID)) +#endif /* Constants for bits in __x86_string_control: */ -- 2.43.0