From nobody Mon Jul 11 21:30:16 2022 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 C34641CFF5D1; Mon, 11 Jul 2022 21:30:16 +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 4LhcVc4jJxz3x8P; Mon, 11 Jul 2022 21:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657575016; 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=B6hsy3z6DQ+YTV80kyooHn0DlVOmbqycN2AUFQk/DdU=; b=pxZsRG/Q9Pa3XPgWVQ5zCihcQZxw9qOKv7qjEWJCxrTpJolWSfVnjr47hS+5mk0isdsQFf 18xwnWw9zgxgx2RXiBROBdpvfhtb88TzQ04rbtau2q9yBRE69nS3qqgsk34w8I8TipX27H nnXsmuX99c/ugYDBXvBxOOjgpG69doKa/XUoYKFvMgAWRxEBP6o/8u9L/ahAdtxBAD8tLH vS37sUYU0mGncOl9h/SaWSdKaJCxj/g6SjhDkEhUQ6iOMJosyHoJxQMq+UAVjQQgtNeBRc 1q1QD3bUBcMrZ/G1mIlLbYy5i4PGaukIAJch3CK1ADum0DXNFa7Fvt02rTUISg== 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 4LhcVc3bv5zJpq; Mon, 11 Jul 2022 21:30:16 +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 26BLUGUs030760; Mon, 11 Jul 2022 21:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26BLUGKA030753; Mon, 11 Jul 2022 21:30:16 GMT (envelope-from git) Date: Mon, 11 Jul 2022 21:30:16 GMT Message-Id: <202207112130.26BLUGKA030753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 00c933e9254c - stable/13 - linux(4): Use saved cpu feature bits 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00c933e9254c0890f6f7cf695f82dcf6ba2a6c51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657575016; 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=B6hsy3z6DQ+YTV80kyooHn0DlVOmbqycN2AUFQk/DdU=; b=rn3tnUqd3gjbdhXW4rszdM6PK5f0kUoFBKwXaJTsK51+SB8aavVvxliTmgo59m5a2dLtgm DBzRaOcWdTQH9lSXnkgX7ikM6bP+0H7WyPVZ8LnqDyLBeI0fS+LpoZK4yphrK4w/Km/TPO TDWaCQmPGEmWdXglkocasM6dbhw95D5Lb4LBWjFxyS8mb8nNyzX35Me5VLXU/WcaKUC6Ig XrPvte+Ybabo8uuFQ/li7Ym9hofjc+rldUjMi6huuMZ855X9WM/seCf8ubE4hJSYQMJsqQ zWGk9GSHwkTaMNL9fbf7QQdbHUhJXgunIwI05qiYWXLo2XpxNuh2QT13PF5E+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657575016; a=rsa-sha256; cv=none; b=vzvtjA53r31BY0nb8IvFiUgfzzpFDEdP4DLOWiTNLyUa25PNCDNX3XXk6b2QAiLgsiYRmQ RJpgO2lp3VGaJqa+cxOluc2zkyHovXRXz5YD9QzCmAZ+MR0n6Q0i3E9o3ondsP+bxa14Yp fUDF/faghmojPFSe32wC0gerGThunHSPB0KdcP/BxXJjsqB2h0BGyqxIYzqcWWOjqGM0aF 9hEYXb3BniBl5eTyJ1bKL4m54o/GDO6MQvhL75j49Na3C8wZWoTO8UDfS59zpcupOkFxMK OntqdHnwvB1tXfzRp34K0/dTJegRiKwBqJECGTKrPDPvRea2Y5V6XHChzkexRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=00c933e9254c0890f6f7cf695f82dcf6ba2a6c51 commit 00c933e9254c0890f6f7cf695f82dcf6ba2a6c51 Author: Dmitry Chagin AuthorDate: 2022-07-04 20:42:07 +0000 Commit: Dmitry Chagin CommitDate: 2022-07-11 21:28:11 +0000 linux(4): Use saved cpu feature bits MFC after: 3 days (cherry picked from commit 03473e8ec8fa8d0f1ea30f85d8796ea9bf94bf29) --- sys/x86/linux/linux_vdso_selector_x86.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/x86/linux/linux_vdso_selector_x86.c b/sys/x86/linux/linux_vdso_selector_x86.c index d93b26ed44df..bd8ae333801b 100644 --- a/sys/x86/linux/linux_vdso_selector_x86.c +++ b/sys/x86/linux/linux_vdso_selector_x86.c @@ -61,21 +61,10 @@ linux_vdso_tsc_selector_idx() int linux_vdso_cpu_selector_idx() { - u_int amd_feature, cpu_exthigh, p[4]; if ((cpu_stdext_feature2 & CPUID_STDEXT2_RDPID) != 0) return (LINUX_VDSO_CPU_RDPID); - amd_feature = 0; - if (cpu_feature != 0) { - do_cpuid(0x80000000, p); - cpu_exthigh = p[0]; - if (cpu_exthigh >= 0x80000001) { - do_cpuid(0x80000001, p); - amd_feature = p[3]; - } - } - return ((amd_feature & AMDID_RDTSCP) == 0 ? LINUX_VDSO_CPU_DEFAULT : LINUX_VDSO_CPU_RDTSCP); }