From patchwork Thu Feb 15 22:09:47 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: 85845 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 3360D386D63B for ; Thu, 15 Feb 2024 22:10:25 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by sourceware.org (Postfix) with ESMTPS id 5DD54386D63C for ; Thu, 15 Feb 2024 22:09:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5DD54386D63C 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 5DD54386D63C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1032 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708034994; cv=none; b=T2bQi/dQpsB+zo/k/9DbFg8OF4eg3ngmamrzYyaviSkR+welMC4CNszlMK62mrS2FDYO15KVikp5uzlZ036fS40JKm25218n2hiZQs/Wgx1XbRK4QIBg1ulznCxPL7Z1cYdL+d8yFiMmq8V1BVlU7xslD3P0cv4+HcfmclwnnzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708034994; c=relaxed/simple; bh=AmaP4NBSXAjWXAYjyDLvotKTsvmbnDa8aVZcFGCSD0g=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cneJsRRCHspnej5elXenf4FT3X7huhN1DJBmWY1BR12jr7B9i4QLT0fmIoryg+SuROHT+BmMN+7DHD5QezfL2EOffq+LIc9FPt/DnkIaGAr2XGEiBPF4JN/pypciD8hzHMVI13gajn7zeIhsFqXTXcxX1JEoULMdLcvknYzXE78= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2971562c3ceso1081909a91.1 for ; Thu, 15 Feb 2024 14:09:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708034990; x=1708639790; 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=IFv6teZ6H/OJP5DU8POwM4h+WqkzO/3BTNGGL2IqGjo=; b=TLhruI1WU12dgF3z+fTfbHj3ZDBKLSaU1OyIappv/lBKacQ6KzI6JTZq6E2vhDp7NK s+DJbIvTyH/j0IY8P6zT1gzBSt4OIL07AWyVDYp5acJogZvMwzsvNdPqpYez0evVLxR7 l1J6yTStyWZSBFUrOy318q2FTr9DMner2lS6v5zMCZrSEfaVHJH9SE1prGmEA5jFja2B bdqBEgblgmxrDmFsBB7dEdNOKZKz4+liIncz0WCzmVPh7W1x0bqhMEJk2tTRtUyxeCVF 75ls+BAFOC7EwvddguGOF4/9gzmCz/v49gFV0yOQxL8KymkjaaRJpRn8J/8yWF8JPtk6 7Q9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708034990; x=1708639790; 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=IFv6teZ6H/OJP5DU8POwM4h+WqkzO/3BTNGGL2IqGjo=; b=rImOghcNZZMTPEghScl5DxU/C/CkXo4odjP8lCL7ftxUjqoNHPrkr5BmEbc41AslzQ sKixDYiHYlRDbokiOQYiWcfXtPRXiPPQNRW8gD+1Wt/PYOstWL2tF7wPZYtdufK/jyfQ C9FtXYp4Hq2kNFWDjtUa7GIsqDHdFjFrto7nSTQbb+wpbCvHxzhaePp8ftt1DOwI2mXS vbNCP3bKRYyVEK+9ZFSGIN1sK0F6ASSHs1Snv9qGhzaVhWLx/RQXT/sHQDCu4axoqF5r JDvyCQ4pHHTV6PTODCBGmy4qzcpunspPuHlgCJWOlsjgAGMaYpIHVldfKxZ8uZiEl4oX ISeA== X-Gm-Message-State: AOJu0Yym4cuvWnoO12dkv35B7orLZ9kYxkNfeORJaLJmZYGwtsLvJLco 8kWxn67T8p3ujQ4+IqDUZtxiR9NmTjoqe0++Sh5UqHZtl5Wt2nOEUcjOn96Q X-Google-Smtp-Source: AGHT+IHrFXslyuFTqP5E9RE08hZd5CIgmeUAeggY8pMQQt4lKoeThviegN7p6JmdowoW/okirSt6Sw== X-Received: by 2002:a17:90a:dd41:b0:296:18cb:b717 with SMTP id u1-20020a17090add4100b0029618cbb717mr2928933pjv.25.1708034990053; Thu, 15 Feb 2024 14:09:50 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.58.89.72]) by smtp.gmail.com with ESMTPSA id sy12-20020a17090b2d0c00b002963cab9e2asm3955263pjb.2.2024.02.15.14.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 14:09:49 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id CDB1474064A; Thu, 15 Feb 2024 14:09:48 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: goldstein.w.n@gmail.com, fweimer@redhat.com Subject: [PATCH v6 1/2] x86-64: Save APX registers in ld.so trampoline Date: Thu, 15 Feb 2024 14:09:47 -0800 Message-ID: <20240215220948.1939297-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240215220948.1939297-1-hjl.tools@gmail.com> References: <20240215220948.1939297-1-hjl.tools@gmail.com> MIME-Version: 1.0 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 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 Add APX registers to STATE_SAVE_MASK so that APX 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 | 52 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h index 85d0a8c943..837fd28734 100644 --- a/sysdeps/x86/sysdep.h +++ b/sysdeps/x86/sysdep.h @@ -21,14 +21,54 @@ #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_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: */