From patchwork Fri Jun 9 02:23:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 690870 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp598531wru; Thu, 8 Jun 2023 19:29:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5pGWN7nuwzzocmALqyr+0dIAFyHF0ZBrNXUQDUGkhMGSD7nzQfJcIoqo18KFBfyVKXRNnV X-Received: by 2002:a05:6214:20ea:b0:626:2c93:407e with SMTP id 10-20020a05621420ea00b006262c93407emr341029qvk.38.1686277758809; Thu, 08 Jun 2023 19:29:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686277758; cv=none; d=google.com; s=arc-20160816; b=HvZAPHL+21UD05wV2/835W8CcZCfk5BxSPn4lPCo7+aX9QUNCfwE2qUYF72SC5F2MR yG+IGPJn25vq4rAEnVidMf4qQKrh7ojdgK36LCNK1e6dKTuw6FORUM/3Sf0J5g2PeytX EXZ06TvenFJcabTrzu5NxwuYTD8AKWd6O1p6RnaxuDvhRJ1A+Ap2Sr1nHdU6YzzP9DcP J55tH0gwtOJRZFHUo2exZt3CrTDdqa/ajmb4Ml7DRRmUfCvu2VMoJjiDCdkx36q7DeEx wbYtfDEe65WP/rKItV7uXUidMqCTCHjkNHOFp+jpxLJ4nKqMcHh35X8Q80OowMWHpyEY v6tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qGYhm+c+tUnjVrf/DJrmcZwZlQ1qyCVFhkVCduCzuuY=; b=qD+kJdGnKix1d514r2uVJzXxdNu5GXjf6xYA4a9YffLAcHZSCvbS5RqNlky4Op6hWV xv5Rvaa5a82SkYZ1d+89fazti1yeELBl3k7SZv7KtRCs/zmBtbgQW3Wa/1UYOk1OPvR0 NZTiKzV9d3oKa8MI3UjLmZSaTB2Cu6hP9bJ5LPHM9rs1k/owxJfLUcd0WY3jKexxqpbE nPfP4T7aI9bekq8wmo7T5QB1oaQFJe/r236iXsl73Ejbe6A9CGYaaQj8LWZtcVG94Zua 0lxSHKvs4aIQv9clWNo8xWmTTeDG4C4IWRUfhd/KCMbNnRMoSqfOaWEyhWaDxjoZN1NA A7WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xsE/SrQD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jx12-20020a0562142b0c00b00625d0d1ec2fsi1690207qvb.328.2023.06.08.19.29.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jun 2023 19:29:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xsE/SrQD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7RpJ-0006Ye-Nd; Thu, 08 Jun 2023 22:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7Rod-0003lZ-6s for qemu-devel@nongnu.org; Thu, 08 Jun 2023 22:25:27 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Rnp-0005os-ME for qemu-devel@nongnu.org; Thu, 08 Jun 2023 22:25:26 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-65131e85be4so1326564b3a.1 for ; Thu, 08 Jun 2023 19:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686277476; x=1688869476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qGYhm+c+tUnjVrf/DJrmcZwZlQ1qyCVFhkVCduCzuuY=; b=xsE/SrQDJQpszwI/XV9bgk0izK4Ys4imEwnowJBwwD5uz2IGxMOfLQRRo1RLjJ1dFi TFtx20ZgCmHqWItJsBWXub0ZElc8wCiAMcvGc7NvfX4aOWAOjf/ptg7tJGGKnanwOIaK aLBca4pbkpWcaTfBC04NNnLg5d4meBIVhMAoCFXjm7U4qWryvcH6L56lhPKbENL+IX6x HFsoqxGLCcCB7t/6OELCBvu5HrA8DHozW7MJmNffAzq6hUAORKBmux/kgtYByYffirwa 3xeaUdoTO0vm8+fN91gj1juk8U6adm9c4xMH2X3lCtgYUu5+xDbgm+65/N2m45xmvsAY IGBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686277476; x=1688869476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qGYhm+c+tUnjVrf/DJrmcZwZlQ1qyCVFhkVCduCzuuY=; b=IyBAqkIzK3WKykBT/OzBTm+4epusGxJR4w3Ofd3HHp824KsXiCSkp19+4ZD7l+m4Ke nUFGmSxNOG3A8UH5eiEbVkddInupcqK3ITVQ/6Qx7A3eneCE+++mCrl2YJPY41cWKVYX 8Uwpzsm8wsaRwejjNS6TbzKFjZTI8I1tACSiKtNugFXfxYm9Z7OT8/lQnHHLg6xtSRuq VXeiCW98JFcRqo8b2Fz4b7E8dsqLuw7TQzK2OmvKa5WRWwmr2CNe3EacgGUD0QopEp5B Ds1ZJNYQSdIr4o2LB4vYVBMvlLCZq37kUZS/VVMiYO+wmtt6nuukMeeVWTt2AOTVO0fs +hkQ== X-Gm-Message-State: AC+VfDxCUVRAai+ski7ybeg7N0E8S3bpMrLi6mU71H1qHWd9ritqgGYo OnldtCzUHi1CznXP6Cn72FJonydR0X4pVvIbTFM= X-Received: by 2002:a05:6a20:429f:b0:10a:9f55:292b with SMTP id o31-20020a056a20429f00b0010a9f55292bmr10310519pzj.57.1686277476064; Thu, 08 Jun 2023 19:24:36 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:b071:df63:5761:f449]) by smtp.gmail.com with ESMTPSA id x25-20020a62fb19000000b0063afb08afeesm1686458pfm.67.2023.06.08.19.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 19:24:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ardb@kernel.org, berrange@redhat.com, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, pbonzini@redhat.com Subject: [PATCH v2 36/38] host/include/i386: Implement aes-round.h Date: Thu, 8 Jun 2023 19:23:59 -0700 Message-Id: <20230609022401.684157-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230609022401.684157-1-richard.henderson@linaro.org> References: <20230609022401.684157-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Detect AES in cpuinfo; implement the accel hooks. Signed-off-by: Richard Henderson --- host/include/i386/host/aes-round.h | 152 +++++++++++++++++++++++++++ host/include/i386/host/cpuinfo.h | 1 + host/include/x86_64/host/aes-round.h | 1 + util/cpuinfo-i386.c | 3 + 4 files changed, 157 insertions(+) create mode 100644 host/include/i386/host/aes-round.h create mode 100644 host/include/x86_64/host/aes-round.h diff --git a/host/include/i386/host/aes-round.h b/host/include/i386/host/aes-round.h new file mode 100644 index 0000000000..f9abb7c352 --- /dev/null +++ b/host/include/i386/host/aes-round.h @@ -0,0 +1,152 @@ +/* + * x86 specific aes acceleration. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HOST_AES_ROUND_H +#define HOST_AES_ROUND_H + +#include "host/cpuinfo.h" +#include + +#if defined(__AES__) && defined(__SSSE3__) +# define HAVE_AES_ACCEL true +# define ATTR_AES_ACCEL +#else +# define HAVE_AES_ACCEL likely(cpuinfo & CPUINFO_AES) +# define ATTR_AES_ACCEL __attribute__((target("aes,ssse3"))) +#endif + +static inline __m128i ATTR_AES_ACCEL +aes_accel_bswap(__m128i x) +{ + return _mm_shuffle_epi8(x, _mm_set_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15)); +} + +static inline void ATTR_AES_ACCEL +aesenc_MC_accel(AESState *ret, const AESState *st, bool be) +{ + __m128i t = (__m128i)st->v; + __m128i z = _mm_setzero_si128(); + + if (be) { + t = aes_accel_bswap(t); + t = _mm_aesdeclast_si128(t, z); + t = _mm_aesenc_si128(t, z); + t = aes_accel_bswap(t); + } else { + t = _mm_aesdeclast_si128(t, z); + t = _mm_aesenc_si128(t, z); + } + ret->v = (AESStateVec)t; +} + +static inline void ATTR_AES_ACCEL +aesenc_SB_SR_AK_accel(AESState *ret, const AESState *st, + const AESState *rk, bool be) +{ + __m128i t = (__m128i)st->v; + __m128i k = (__m128i)rk->v; + + if (be) { + t = aes_accel_bswap(t); + k = aes_accel_bswap(k); + t = _mm_aesenclast_si128(t, k); + t = aes_accel_bswap(t); + } else { + t = _mm_aesenclast_si128(t, k); + } + ret->v = (AESStateVec)t; +} + +static inline void ATTR_AES_ACCEL +aesenc_SB_SR_MC_AK_accel(AESState *ret, const AESState *st, + const AESState *rk, bool be) +{ + __m128i t = (__m128i)st->v; + __m128i k = (__m128i)rk->v; + + if (be) { + t = aes_accel_bswap(t); + k = aes_accel_bswap(k); + t = _mm_aesenc_si128(t, k); + t = aes_accel_bswap(t); + } else { + t = _mm_aesenc_si128(t, k); + } + ret->v = (AESStateVec)t; +} + +static inline void ATTR_AES_ACCEL +aesdec_IMC_accel(AESState *ret, const AESState *st, bool be) +{ + __m128i t = (__m128i)st->v; + + if (be) { + t = aes_accel_bswap(t); + t = _mm_aesimc_si128(t); + t = aes_accel_bswap(t); + } else { + t = _mm_aesimc_si128(t); + } + ret->v = (AESStateVec)t; +} + +static inline void ATTR_AES_ACCEL +aesdec_ISB_ISR_AK_accel(AESState *ret, const AESState *st, + const AESState *rk, bool be) +{ + __m128i t = (__m128i)st->v; + __m128i k = (__m128i)rk->v; + + if (be) { + t = aes_accel_bswap(t); + k = aes_accel_bswap(k); + t = _mm_aesdeclast_si128(t, k); + t = aes_accel_bswap(t); + } else { + t = _mm_aesdeclast_si128(t, k); + } + ret->v = (AESStateVec)t; +} + +static inline void ATTR_AES_ACCEL +aesdec_ISB_ISR_AK_IMC_accel(AESState *ret, const AESState *st, + const AESState *rk, bool be) +{ + __m128i t = (__m128i)st->v; + __m128i k = (__m128i)rk->v; + + if (be) { + t = aes_accel_bswap(t); + k = aes_accel_bswap(k); + t = _mm_aesdeclast_si128(t, k); + t = _mm_aesimc_si128(t); + t = aes_accel_bswap(t); + } else { + t = _mm_aesdeclast_si128(t, k); + t = _mm_aesimc_si128(t); + } + ret->v = (AESStateVec)t; +} + +static inline void ATTR_AES_ACCEL +aesdec_ISB_ISR_IMC_AK_accel(AESState *ret, const AESState *st, + const AESState *rk, bool be) +{ + __m128i t = (__m128i)st->v; + __m128i k = (__m128i)rk->v; + + if (be) { + t = aes_accel_bswap(t); + k = aes_accel_bswap(k); + t = _mm_aesdec_si128(t, k); + t = aes_accel_bswap(t); + } else { + t = _mm_aesdec_si128(t, k); + } + ret->v = (AESStateVec)t; +} + +#endif diff --git a/host/include/i386/host/cpuinfo.h b/host/include/i386/host/cpuinfo.h index a6537123cf..073d0a426f 100644 --- a/host/include/i386/host/cpuinfo.h +++ b/host/include/i386/host/cpuinfo.h @@ -26,6 +26,7 @@ #define CPUINFO_AVX512VBMI2 (1u << 15) #define CPUINFO_ATOMIC_VMOVDQA (1u << 16) #define CPUINFO_ATOMIC_VMOVDQU (1u << 17) +#define CPUINFO_AES (1u << 18) /* Initialized with a constructor. */ extern unsigned cpuinfo; diff --git a/host/include/x86_64/host/aes-round.h b/host/include/x86_64/host/aes-round.h new file mode 100644 index 0000000000..7da13f5424 --- /dev/null +++ b/host/include/x86_64/host/aes-round.h @@ -0,0 +1 @@ +#include "host/include/i386/host/aes-round.h" diff --git a/util/cpuinfo-i386.c b/util/cpuinfo-i386.c index ab6143d9e7..3a7b7e0ad1 100644 --- a/util/cpuinfo-i386.c +++ b/util/cpuinfo-i386.c @@ -40,6 +40,9 @@ unsigned __attribute__((constructor)) cpuinfo_init(void) info |= (c & bit_MOVBE ? CPUINFO_MOVBE : 0); info |= (c & bit_POPCNT ? CPUINFO_POPCNT : 0); + /* Our AES support requires PSHUFB as well. */ + info |= ((c & bit_AES) && (c & bit_SSSE3) ? CPUINFO_AES : 0); + /* For AVX features, we must check available and usable. */ if ((c & bit_AVX) && (c & bit_OSXSAVE)) { unsigned bv = xgetbv_low(0);