From nobody Fri Jun 2 16:19:20 2023 X-Original-To: dev-commits-src-main@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 4QXp9N6sQHz4YxSw; Fri, 2 Jun 2023 16:19:20 +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 4QXp9N6L1sz3GhD; Fri, 2 Jun 2023 16:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685722760; 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=Yl+UVKaVj1mMsOhJI2JcyCqaeoVmWMrwzEbmFsdVjpM=; b=qm9eVmMMrPYxMmpUmt1yFuEViYraJL+mdpq1r5tdleXyQiyfxprn+fZ5gCq16EuMl5apAC IYxAsLQlPJB4F+SeOPeFKzskw41YuP0OodjzjgB/XZ3IqKTIOLtjbMYw4e/gtbS+sPmh76 ZV/vMK3kOMpyrqqLYxKO67bApTmyJihfbAeTcmVRNGumlevw61lUtNqgNIjbaHR43g9gV5 ZgXLqz1AHYLLPju7OdixTRhmaA+9CpH5MegBfsxtnUVIlExHylm4AbeY2HqZlO9Mw4jc8+ zEaWysWZSlg7CJMsbtG2iruhzNRWvCprCuQ70RgvNfJIc9Z3C7y8uSbWCm+cmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685722760; 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=Yl+UVKaVj1mMsOhJI2JcyCqaeoVmWMrwzEbmFsdVjpM=; b=F8okjiBhC7Rg6sSntMi2WIryBbiljY4VpaWALbHLFOl4kGdeKfjPzOdMv/X5B/uKO2Z7Vp 2FxcLXGBxzdB3ptVvKnNwUVBTSOXXEk4I0feXalby1PA+Wz1wj0AsmEqshDDfUegWYscfB ADc0WmNZlIpmqGIed/9YvIxM2JyY97I1nVN+UYIkncHvRE74weGCEZg7tnLQJqxNf0UGlm z4RbVKvV3/4iKtJwAxQk5j+8+sV1x0kLdSu7OOjlkKf2Aw3Gj0QO4AbylNBG8dCyyVx/kH BFuSBJjr80KPdR1aI4W4EQMy/wWR0Rb9uMbeUC474t5VWDYRqJDMA3LIhRcEsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685722760; a=rsa-sha256; cv=none; b=rpXrqb36vk1BQ+cmMKGpqfWvDkHkTUwA8Z5QWV0FBKox6itsrtd2pLkgIROw3chrgmCfOV z6UeNaCDexsDiSQ8Qt1k6qOlf55H36qFC8nNvAMiKi7jB91J1fxG1yHD7RVMIf3xxJjcfb cKF2DMXw8IB42XlyFBm2w+zcDxlAQNRntVuWku/lgveO+tRwvsIrC/YvQ1cL27iuGXVryE SO0hRlXX0RrPsTD8nyFkPmKQjVI8lfuykoVWYCiN1TvLFCNrU6YX+fMjEBHI4/4nu/2ReU co7NUZz0UgptLabQP+65J2RcIPsLsJckFmxOQKNRBvrgj+HbGjIPsX5zr/A9uA== 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 4QXp9N5Mdqz151k; Fri, 2 Jun 2023 16:19:20 +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 352GJKIs059663; Fri, 2 Jun 2023 16:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352GJKd9059662; Fri, 2 Jun 2023 16:19:20 GMT (envelope-from git) Date: Fri, 2 Jun 2023 16:19:20 GMT Message-Id: <202306021619.352GJKd9059662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9ad8dc721e57 - main - ossl: Expose more CPUID bits in OPENSSL_ia32cap_P List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ad8dc721e57bdccd55532a01bde251502966a95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ad8dc721e57bdccd55532a01bde251502966a95 commit 9ad8dc721e57bdccd55532a01bde251502966a95 Author: Mark Johnston AuthorDate: 2023-06-02 15:57:38 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 16:15:01 +0000 ossl: Expose more CPUID bits in OPENSSL_ia32cap_P This is needed to let OpenSSL 3.1 routines detect VAES and VPCLMULQDQ extensions. The intent is to import ASM routines which implement AES-GCM using VEX-prefixed AES-NI instructions. No functional change intended. Sponsored by: Stormshield Sponsored by: Klara, Inc. MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D39782 --- sys/crypto/openssl/ossl_x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/crypto/openssl/ossl_x86.c b/sys/crypto/openssl/ossl_x86.c index ff7cb29d30bc..75598d821506 100644 --- a/sys/crypto/openssl/ossl_x86.c +++ b/sys/crypto/openssl/ossl_x86.c @@ -47,7 +47,7 @@ * [0] = cpu_feature but with a few custom bits * [1] = cpu_feature2 but with AMD XOP in bit 11 * [2] = cpu_stdext_feature - * [3] = 0 + * [3] = cpu_stdext_feature2 */ unsigned int OPENSSL_ia32cap_P[4]; #define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32))) @@ -117,6 +117,7 @@ ossl_cpuid(struct ossl_softc *sc) OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA); OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2; } + OPENSSL_ia32cap_P[3] = cpu_stdext_feature2; if (!AESNI_CAPABLE) { sc->has_aes = false;