From nobody Tue Apr 25 00:38:22 2023 X-Original-To: dev-commits-src-branches@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 4Q535B3xXwz466ch; Tue, 25 Apr 2023 00:38:22 +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 4Q535B37pBz4DJx; Tue, 25 Apr 2023 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383102; 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=L9fqInqDNySNtARkkmA6L9PHrp6n9mPGlpd0TMiyoPk=; b=yr9/0pKDDKIXvgZqo4MWKnVatJVDMndYFxgVUH9S78FL9ofyikyHTQNkrqwQVrhX0BAmjD KHVK9VNBlbY6PAK0hNzGM9add70oQTMvjnYBEVxlrt/gAw3TnLDl42shZoFocaGmYS+bLj 2/R4xbWspLCNmtMtCMtr8p5tBekkAzztNUiR+V8H5nxqG3y7ebTgPUIMf+bMLTHWW1bPE6 5epAZh9Q/yd+znLlJtKyBvGJE168Z8CsaB7mdvbSpyWADfdLTrUjUR7FsVl7pJQmuPSiEB 5Ds7xL1WqxTXEmoI9wO0Y4C57DIT9L2e/Ulo5dOUl+qdgm0lI43bavkulkW5cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383102; 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=L9fqInqDNySNtARkkmA6L9PHrp6n9mPGlpd0TMiyoPk=; b=bmstvjFRXUWqTZnQtiZ3AwsISnjw1p7mZrvmDqbEYxF8iEfm/vUqSoBnqE4vRGQq1/T155 hmqYYAJLXrhSl/G/eDsBtwgQaSbDR7MUjtgod+PU1J4Qu3+5bsmT8GnGeeCv3LaHop6/ZS Bt9Uej390zRoUDypIzj+ta74FCz53YL7B0QDh/DeBiRe3d8k1fj2TolkI4S2xnXlq/i0uz f1Hg93S6CX8QqzNllhcsKcAqgng4IRCa8apAlIXy/+cHrx9nNoqneRenLaHH3tsUpQ7dFa UX3okyqSO+uLd1NLXO623srQla5vh+6fGjK0K31IMPW3NYVgW8MQKfVDu8UJBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682383102; a=rsa-sha256; cv=none; b=bNyH1qMHZXrJzyZxY6+pMNuSnjDu7++jenGxS9rc0NTpc+bf2nnbDiQP9mbjFzJxIGJ2HU sNHoVV+fZv0s6v9dH8v76i3of4NU0i8bF+kBTMmANTkBRqFkugLc9jqJAkxfYZgYKstYnE 2lA2RyZrWS0Mm1/v6ofYc+qPFqNxJnnbXOC3nB8C+jd1KLHw+uX3AEY3dR6YorLklvWgd6 VQjF+KveSRvufYNFhrpVQgRI8yORk+eK3tHz5+b2DyBtSwZpPOljHSD09jk1XMXS3sg+t9 gH+e/e37SZkp/tH5bvD36YR1untXzDXiM8rGhdOdizfmKTiPtyz+sEmoRe2T1A== 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 4Q535B2F4tzmYx; Tue, 25 Apr 2023 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33P0cMrP057361; Tue, 25 Apr 2023 00:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P0cMQC057360; Tue, 25 Apr 2023 00:38:22 GMT (envelope-from git) Date: Tue, 25 Apr 2023 00:38:22 GMT Message-Id: <202304250038.33P0cMQC057360@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: 7f7e8fd3fe7b - stable/13 - x86: initialize use_xsave once List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 7f7e8fd3fe7b2edba5d90ed5bae25a1a5a8a3ca1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f7e8fd3fe7b2edba5d90ed5bae25a1a5a8a3ca1 commit 7f7e8fd3fe7b2edba5d90ed5bae25a1a5a8a3ca1 Author: Konstantin Belousov AuthorDate: 2023-04-18 15:50:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-25 00:27:27 +0000 x86: initialize use_xsave once (cherry picked from commit 617a11eab6337693eae9d160453adf1943ab6a37) --- sys/amd64/amd64/fpu.c | 16 ---------------- sys/amd64/amd64/machdep.c | 5 +++++ sys/i386/i386/machdep.c | 6 ++++++ sys/i386/i386/npx.c | 14 -------------- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index f51c042bf8de..38058f4d3e57 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -260,22 +260,8 @@ fpurestore_fxrstor(void *addr) fxrstor((char *)addr); } -static void -init_xsave(void) -{ - - if (use_xsave) - return; - if ((cpu_feature2 & CPUID2_XSAVE) == 0) - return; - use_xsave = 1; - TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); -} - DEFINE_IFUNC(, void, fpusave, (void *)) { - - init_xsave(); if (!use_xsave) return (fpusave_fxsave); if ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0) { @@ -288,8 +274,6 @@ DEFINE_IFUNC(, void, fpusave, (void *)) DEFINE_IFUNC(, void, fpurestore, (void *)) { - - init_xsave(); if (!use_xsave) return (fpurestore_fxrstor); return ((cpu_stdext_feature & CPUID_STDEXT_NFPUSG) != 0 ? diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index c27e15c7e1a4..0a21dba19ff0 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1353,6 +1353,11 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) &pmap_pcid_invlpg_workaround_uena); cpu_init_small_core(); + if ((cpu_feature2 & CPUID2_XSAVE) != 0) { + use_xsave = 1; + TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); + } + link_elf_ireloc(kmdp); /* diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 97b095337852..f32fba72271a 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1550,6 +1550,11 @@ init386(int first) i386_kdb_init(); } + if (cpu_fxsr && (cpu_feature2 & CPUID2_XSAVE) != 0) { + use_xsave = 1; + TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); + } + kmdp = preload_search_by_type("elf kernel"); link_elf_ireloc(kmdp); @@ -1570,6 +1575,7 @@ init386(int first) msgbufinit(msgbufp, msgbufsize); npxinit(true); + /* * Set up thread0 pcb after npxinit calculated pcb + fpu save * area size. Zero out the extended state header in fpu save diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 86291ae9b96b..d9af3f7bf965 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -341,22 +341,8 @@ fpusave_fnsave(union savefpu *addr) fnsave((char *)addr); } -static void -init_xsave(void) -{ - - if (use_xsave) - return; - if (!cpu_fxsr || (cpu_feature2 & CPUID2_XSAVE) == 0) - return; - use_xsave = 1; - TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); -} - DEFINE_IFUNC(, void, fpusave, (union savefpu *)) { - - init_xsave(); if (use_xsave) return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ? fpusave_xsaveopt : fpusave_xsave);