From nobody Tue Apr 2 15:18:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8BNB1RKnz5GpYh; Tue, 2 Apr 2024 15:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8BN95X9Tz4KhN; Tue, 2 Apr 2024 15:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTbXvDUZl4jstp5J67XiJGTlmaI9H1Y0c4NR4q+rZL0=; b=AWOHkupnOYuTmwio+DuNRnMou5daxkeB3f48XGYBFqzpoG6NuQefu+K+wDMeb/mPDDpC6r mx9k9zqWHrfg3xozNg3RQ5O2nXbI6F5ROoE3Pgc6RcPJHdUXLe5HIFgSSUK001unS6NRPK terpmwWg2KfCmH2zL7ddlq97Wrp3OD77Dn1MwzmmedC2PRN8u6/sa9dtoz27hBe9lp06Ng X9DL91F84sev3LtmJRzJhA1P8kjTxL6vKPwNd+huINgU4Y5ut3uLGMKTu0JbK4E3k4wstp 5XzUfhe/tmrmOdmwDt5ksHmeKtw6oGSpDbq6lQaCoyDmnXldXlOKk/t9//kjUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712071097; a=rsa-sha256; cv=none; b=RoB8k/CIoChB/UBvKdJQc1bpmKlXudJ/iotwefCU+nAxcF1qIP3k782JfJ98lF5BtD3xp8 GoC8vEfalN12sDgV1OnEtRV2zfk8EKk7ZlFy8Byf1x5dzSVZR24WJU2a/Xp763+pVaPvrc r8iTCU99AXbDOQFwR/lJQ2rez4Y1qIJX2a/NSSfjUHk4CkIEDVI3rrwnKHVHKEwLTQaRpi EiciXRuQBRpelMLyfDNuJJVGgKMhJRGlj39ocT677wrMMRJQ+SbNyKE+qWMuKOv0C8cr9w bbHQFeJBy+FxPAUGIz7VTXv48CnaQNe0TGHJfyCiiLeyjwdW2ZTrwsUgieqekw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTbXvDUZl4jstp5J67XiJGTlmaI9H1Y0c4NR4q+rZL0=; b=IAkboDKj2Qb4BghZCCYFFzBFElpC2yumKUwTAIybaddGFh1Ldgdbwm4P3WI7LdOEJ+Eno8 1BQTSa7YBERZ8nWtq+jlrFzqhqw1ROUgAixJQtElEZxSuRztDucvf0f9r2xTSZbcw8/UbM bNAIjQ2dptBKr+rUvdsb69gwW6Lho8X+VVABUMJeZjr/l1O9MnsNrtWedVkCPqbup6pBLD iZQQNZpfBA8xU8l1G40JgAEpyqbVdzgu1JORLe11P6NIcX19838lUbFKP72ZpnCJFV5Vr5 mokCNP94aAnWjK7h5270J5BzySkYcmynKGBu17Wj6c0oNtNJV+oHgEeC1E3Ong== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8BN958FWzvN8; Tue, 2 Apr 2024 15:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432FIHJU057793; Tue, 2 Apr 2024 15:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432FIH1U057790; Tue, 2 Apr 2024 15:18:17 GMT (envelope-from git) Date: Tue, 2 Apr 2024 15:18:17 GMT Message-Id: <202404021518.432FIH1U057790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b79fb02b32d9 - stable/13 - x86: handle MXCSR from XSAVEOPT when x87 state was optimized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b79fb02b32d930b1940ad7a21cb17896c848d432 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b79fb02b32d930b1940ad7a21cb17896c848d432 commit b79fb02b32d930b1940ad7a21cb17896c848d432 Author: Konstantin Belousov AuthorDate: 2024-03-27 11:01:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 15:18:00 +0000 x86: handle MXCSR from XSAVEOPT when x87 state was optimized PR: 275322 (cherry picked from commit 1c091d11261a3c8cc3728b92760e65242c0f5949) --- sys/amd64/amd64/fpu.c | 21 +++++++++++++++++++++ sys/i386/i386/npx.c | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 18330cb58d3c..3f06033ae89a 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -875,7 +875,10 @@ fpugetregs(struct thread *td) struct pcb *pcb; uint64_t *xstate_bv, bit; char *sa; + struct savefpu *s; + uint32_t mxcsr, mxcsr_mask; int max_ext_n, i, owned; + bool do_mxcsr; pcb = td->td_pcb; critical_enter(); @@ -906,10 +909,28 @@ fpugetregs(struct thread *td) bit = 1ULL << i; if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; + do_mxcsr = false; + if (i == 0 && (*xstate_bv & (XFEATURE_ENABLED_SSE | + XFEATURE_ENABLED_AVX)) != 0) { + /* + * x87 area was not saved by XSAVEOPT, + * but one of XMM or AVX was. Then we need + * to preserve MXCSR from being overwritten + * with the default value. + */ + s = (struct savefpu *)sa; + mxcsr = s->sv_env.en_mxcsr; + mxcsr_mask = s->sv_env.en_mxcsr_mask; + do_mxcsr = true; + } bcopy((char *)fpu_initialstate + xsave_area_desc[i].offset, sa + xsave_area_desc[i].offset, xsave_area_desc[i].size); + if (do_mxcsr) { + s->sv_env.en_mxcsr = mxcsr; + s->sv_env.en_mxcsr_mask = mxcsr_mask; + } *xstate_bv |= bit; } } diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index e7e8fc01fa6b..09abf7c17438 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -1001,8 +1001,11 @@ npxgetregs(struct thread *td) struct pcb *pcb; uint64_t *xstate_bv, bit; char *sa; + union savefpu *s; + uint32_t mxcsr, mxcsr_mask; int max_ext_n, i; int owned; + bool do_mxcsr; if (!hw_float) return (_MC_FPOWNED_NONE); @@ -1045,10 +1048,28 @@ npxgetregs(struct thread *td) bit = 1ULL << i; if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; + do_mxcsr = false; + if (i == 0 && (*xstate_bv & (XFEATURE_ENABLED_SSE | + XFEATURE_ENABLED_AVX)) != 0) { + /* + * x87 area was not saved by XSAVEOPT, + * but one of XMM or AVX was. Then we need + * to preserve MXCSR from being overwritten + * with the default value. + */ + s = (union savefpu *)sa; + mxcsr = s->sv_xmm.sv_env.en_mxcsr; + mxcsr_mask = s->sv_xmm.sv_env.en_mxcsr_mask; + do_mxcsr = true; + } bcopy((char *)npx_initialstate + xsave_area_desc[i].offset, sa + xsave_area_desc[i].offset, xsave_area_desc[i].size); + if (do_mxcsr) { + s->sv_xmm.sv_env.en_mxcsr = mxcsr; + s->sv_xmm.sv_env.en_mxcsr_mask = mxcsr_mask; + } *xstate_bv |= bit; } }