From nobody Thu Mar 28 11:56:58 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 4V528C1qTyz5Fj4j; Thu, 28 Mar 2024 11:56:59 +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 4V528C1HbNz4STW; Thu, 28 Mar 2024 11:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711627019; 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=Hd8VntiloEEGmi+kwbNSii8oexml2//e58cMu46Pqtk=; b=WXWPMR/44smZYVVuMMfCGibXIfqbpvyQrCrimXH3AS32AJgzHjWvCy+BD2yJJ0kWERgniX QNSjLGmsM2C0J8jFBiDn5n4+HpifxwnKhy+XBlgjdl3/PK4atAd87eYZ/ZiiCj8MOce8k5 hxNpQHrf15p6jLknFyorjOzSuJY+iGXWxU+jGidT1nNoJjg1J8pjsNLwiN0cvOcOm3KwIE Yk83wYfKf7mvoI7eCsuTZuCUw+MzAt1q5LED8NK0HhEg5hdhd5RO9O8H+5ymRB5EyMXLOt VkXoaidrDlULD3esMigjNE6ezTE29CV2SObaP++/n+pjOM9zorbeZ8GgUTae1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711627019; a=rsa-sha256; cv=none; b=xdQXTGKxWh1AQKWNztq8AswKDJyrQlEGD3Ii0frmmFnoLdmTubfNmFjzKum0dtdQqcsfXb RzZMX5lY2cJH7wF96IsHNld6pXdRbnVhpb5HggQT7NO0dfbxhNt02YWV3cWgP9WL3q8czX VrN5KYiIdBvjoA4Mt0tFE6/q12+fRC1n9MzPXhCUS547cqrszEJqgshfWckR1Ouqp7zh3y tmgbdfKBHhhjA4mU0k4E7AcoOlIUkjZ9R9AaOLZJzVUNSHvuYBLYU1DR/YCxzAypcVStmx m9BQe4sxTSE9MvZCmU2kZzaOLIE01WV4UNub6BXymBs66La6Frg8Ms/ffLFo/g== 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=1711627019; 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=Hd8VntiloEEGmi+kwbNSii8oexml2//e58cMu46Pqtk=; b=jomYVUCOCFWZ8utZRKnucQiAYYPrNlBnLWApTv4sJM7T70jMe6+0RTnpOeEXC2H1UwvcM/ GNBwZmYQ66Qw0UGi/74xmrGAie8J/jAzVjegsZwRwzojgybJtjmbYmu+BFuL8aBuSBzr8E +hUTB30ZsxCJMVALxUMZbsEEJ/VKRm4ZFJz2Z0gEpZ8AsF2K9Icors2EKZ1FdoQujfF+wP K7sQ9vAk3uQDKoyNP40BIvTdFTdp2azk9Vi9e98UMh1BS4Y8FhXmdFjr+0h+VXX+4AZ5+d 4UlrXpe9L7BmqfZ8xns37MVAI26gozZn+z3IkdAdraVyYVCx6ZZ9lDtCCnfPWA== 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 4V528C0DnDzR2w; Thu, 28 Mar 2024 11:56:59 +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 42SBuwSL092571; Thu, 28 Mar 2024 11:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42SBuwsN092568; Thu, 28 Mar 2024 11:56:58 GMT (envelope-from git) Date: Thu, 28 Mar 2024 11:56:58 GMT Message-Id: <202403281156.42SBuwsN092568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1c091d11261a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1c091d11261a3c8cc3728b92760e65242c0f5949 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c091d11261a3c8cc3728b92760e65242c0f5949 commit 1c091d11261a3c8cc3728b92760e65242c0f5949 Author: Konstantin Belousov AuthorDate: 2024-03-27 11:01:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-28 11:56:21 +0000 x86: handle MXCSR from XSAVEOPT when x87 state was optimized PR: 275322 Reported by: Cheyenne Wills Reviewed by: emaste, jhb, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44522 --- 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 dcc6ff1a03a8..ebc8b869b368 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -850,7 +850,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(); @@ -881,10 +884,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 16ad7a96ab35..0334aedd740b 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -975,8 +975,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); @@ -1019,10 +1022,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; } }