From nobody Tue Apr 02 15:18:15 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 4V8BN74MBrz5GpYf; Tue, 2 Apr 2024 15:18:15 +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 4V8BN73jTMz4KYm; Tue, 2 Apr 2024 15:18:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071095; 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=ivro18lXASLYjoOW3EbERQ0ktkhw6U3Y2Q5qWU5cyZI=; b=kCrmV9FxXp9u30R/6+zXCoRZQ+RW/WkC2/zLEeKHsSiatHfbHkwYqVnj+pbVHX/p+HOY3R MimbUZ4zD+J36ZwCkfjZ0dXStb9emzgtTbt33Ng/Mm2RlpsmNBbEPaQkgt6vfJAd6UJ0oT Ht9akeuNQcNqugmr9twQ6XQ4XoofNzNF+U4+YKFX8tC2a/l3NaWYMZ/shVl3CfG2TdmuD+ THGhq8rRSaFd69BZ+rbT0WyHNEr/hRNm3ySkQHiBajQCiPdx81wMvU/PUne6BSpxmzZtRf tR3NnB3OzveXNqPcoItmk/CdLECkM726vMH3tk7eyZy1eqOyL7NHB2u5ui+kpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712071095; a=rsa-sha256; cv=none; b=LtyywJLGRXE+AOeYaObyIwUj4RnRO0z6eJAJjun/FsR/D6K+632t+7Xc2ItkYrxPBe+kaT IVx+Z1ka8dkIGonb9QO0RhLBwuRQofSwVEr9pc4URpL4u9w2QKBmFwSUjFbrk3uIX2naSW EeiLy8unBuCuKiNeVkZfOtXjyGs1PzVWXNL/ho2MBGzExMeqwzLchRlv2vaAdOsLe5y8H0 2m3tu/xIEEVWtsmgH/rsWlH9pD/pNXD8ucEnUHE/CnFz4UCifQq4zZBTPnlDzQZ8kHfcXd JVS3EtpiXI2JptHQ0XqbirZ368d5n166hQGAL7ZwkVQQeNiAM8+19FXXPvZ9SA== 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=1712071095; 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=ivro18lXASLYjoOW3EbERQ0ktkhw6U3Y2Q5qWU5cyZI=; b=okRemvomIpoh6rd5vnE+l8HXFeLsXg2n+NmpNVPYE2HQUbVQ2/O+QDBP8PgzSPhIOGr0Eq ypQdf6rmJ7KwoXMx9AkmIQq+Gk4KtQdq+DM1Q68EiIEhJhCF0gOLS+6bfZWK4M4b1ApATj x70Pf1lpGRJMLBcNFQV4NtnJhsPtxvxgB9UYGcxKTBjgvQweS07RLtU1tX5LbKsfDFnSkf 1FAb8sG2Iv7JgroyhfHEtFCe7nF0dIQz/Uj6mx/M8lC3ut/sM1ZvZRhFkzpvb059CGFFJj UaMfJ6kjwJLQt8TYf+Z9OwmoJqIRlmK7ObSbPz73s2eHow/5QKqetCm+ivyJ0w== 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 4V8BN73KY7zv28; Tue, 2 Apr 2024 15:18:15 +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 432FIFvR057677; Tue, 2 Apr 2024 15:18:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432FIFDL057674; Tue, 2 Apr 2024 15:18:15 GMT (envelope-from git) Date: Tue, 2 Apr 2024 15:18:15 GMT Message-Id: <202404021518.432FIFDL057674@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: d4676f565d9a - stable/13 - x86: test the right CPUID bit when checking for XSAVEOPT support 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: d4676f565d9ad0ec76acb50a930d26dc27dd8ce7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4676f565d9ad0ec76acb50a930d26dc27dd8ce7 commit d4676f565d9ad0ec76acb50a930d26dc27dd8ce7 Author: Konstantin Belousov AuthorDate: 2024-03-25 10:34:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 15:18:00 +0000 x86: test the right CPUID bit when checking for XSAVEOPT support (cherry picked from commit 960d151eaa1ecde109accc30ca0c3306551d8e58) --- sys/amd64/amd64/fpu.c | 5 ++++- sys/i386/i386/npx.c | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 073c56e4902d..18330cb58d3c 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -260,9 +260,12 @@ fpurestore_fxrstor(void *addr) DEFINE_IFUNC(, void, fpusave, (void *)) { + u_int cp[4]; + if (!use_xsave) return (fpusave_fxsave); - if ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0) { + cpuid_count(0xd, 0x1, cp); + if ((cp[0] & CPUID_EXTSTATE_XSAVEOPT) != 0) { return ((cpu_stdext_feature & CPUID_STDEXT_NFPUSG) != 0 ? fpusave_xsaveopt64 : fpusave_xsaveopt3264); } diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 628fab71499f..e7e8fc01fa6b 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -341,9 +341,13 @@ fpusave_fnsave(union savefpu *addr) DEFINE_IFUNC(, void, fpusave, (union savefpu *)) { - if (use_xsave) - return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ? + u_int cp[4]; + + if (use_xsave) { + cpuid_count(0xd, 0x1, cp); + return ((cp[0] & CPUID_EXTSTATE_XSAVEOPT) != 0 ? fpusave_xsaveopt : fpusave_xsave); + } if (cpu_fxsr) return (fpusave_fxsave); return (fpusave_fnsave);