From patchwork Sat Aug 19 01:02:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 715010 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp801238wrs; Fri, 18 Aug 2023 18:04:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGA/Bk6GGWKBnRoVrAHqkxlCpXCxAZCdS9ZXpG4uhsNSR+BX3pe3s9BYSCMXGObc8CIRF4y X-Received: by 2002:a05:622a:24a:b0:403:e3ce:565b with SMTP id c10-20020a05622a024a00b00403e3ce565bmr1033754qtx.4.1692407089678; Fri, 18 Aug 2023 18:04:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692407089; cv=none; d=google.com; s=arc-20160816; b=0KpVbZVc8R4485Qaxd4Lw10GLTypwPMSuXb1itZb+pMrkIWeFEFNBKI3oWzlBOngGZ otLRSfjHpr0IC6P3HgLQsEVY3lbU3H/VXP2hpQv8xTc3OY93mDAAY2z9l5H0GVMCasle fr4lVfFddY/RFEke6CtH3H9x1hXU0z4bfSK1znPugLZplzmevcUznwBgUFE1w1QLgrWo soaQJNXKI0h64kfLPguU7PO3HZn1w5q/eepkymk2YhPiYxlsk98ti9CLWvdZxg/rEhog atc2SRgbndw7VxTrll1aEDeL4mZpA//mK6I6S5iqwPRMDj1GsEjjN2w14236zHr5rIXg 6ZqQ== 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=GXTBIttRUHw7smngsq4Ik28aPo1QFTm9JIek17XN5Es=; fh=4xNVIrgzKzsUJFZ/LK5iWzslbipp0obh3zmyxXTMM5Q=; b=kHo4f52wmF5aBK+NLe7IC4dn7hl5bFG5UaNYWG/yNDNgodO/EuNoUHA2dcogBJ/I6e DjinDcQgRfQIP5YTyt33L2T4AMqDa6CM0KZ/TcAqOmRSXbJ0c/udjnVdSN7aM9tjb8A/ 2w8KDAE9Iz/aesCoUPniSkWcsLnC16KPVmZPDyPCVGbdItvWRjpcJEnuZX4B4er907b6 1X4WdaJKuAHF/YXkVRKocV64+Xs6PhdLF8XuRqj7ga9qDe3PToMaOdHAAVUvP3DO7dAi JGAf5Gs92mHpQbph7IrbGAuabeTluclQxc7ecR5AqHDr6m+TLKRAIAJaQA4axgKylFVF FOog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cDEv3xVg; 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 n15-20020ac85b4f000000b0040fdbe81133si1988990qtw.233.2023.08.18.18.04.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 18:04:49 -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=cDEv3xVg; 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 1qXAMT-00008V-Rk; Fri, 18 Aug 2023 21:02:41 -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 1qXAMS-00006l-BL for qemu-devel@nongnu.org; Fri, 18 Aug 2023 21:02:40 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXAMQ-0007OW-1B for qemu-devel@nongnu.org; Fri, 18 Aug 2023 21:02:40 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-688779ffc0aso1250878b3a.3 for ; Fri, 18 Aug 2023 18:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692406957; x=1693011757; 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=GXTBIttRUHw7smngsq4Ik28aPo1QFTm9JIek17XN5Es=; b=cDEv3xVgKJ+kMldXKVSpiuhZZNvEcubmf18ANleRJMRLEl0id+Tut1MFrkJtmSBxEA CGRVOaY8oJe9gi9uE06KAQgVjDxx/lchh9kp1VUIueinrT/0Pc3j52FumcUhre3Xh+Tq fpcDfTcBp8dXWT7QAkYbUmt2hR+Ipsu9ZiQn2O2SM8fhHkkLW/WE8vxW0HUj+Ub93JVf ciJZQYNiCUN1IMzFgcDfjKo/xYBf85ljzLNF3XoQ9AdoNre0lqbbyN94yt0R7mNlymyZ KmnJ5811mgXkQtNfd6lGuCsGLuUL9Z1FSoFD9ftT1IcOg2PYRQ0HN10CaDEpKOXMnsio qoCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692406957; x=1693011757; 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=GXTBIttRUHw7smngsq4Ik28aPo1QFTm9JIek17XN5Es=; b=hKdbyjji50nl008/dQkKzJ4W1b3GRcdC53KHWEnb58YpKqumYQF05ZRLuuyEnrHJ8J s3pNdYIOVRAXgpiLqqIFc4GLwH1rvUcdpdiLmDaIIrt5/ZUwuNgnC2kbjwcgmRE79EzK 0ZdWAs+A6djPgmVQcZF5NXY+w9VBgdSQXwf9Y1Y+uKie2kL6HT/cepMjJI1K0mloEPJw Jojlu4fueoq+Uyqmj872KRyNFM/fXuwJXRhQHe/+Sj1cpX92bgZMrqHuQr00nIQJ2hyn 5X0DouJiDSN5z5wASdCjoZlUt4sdpo8AHScB1aDxWtdEceNGvoAEA56I1ji0WnMulbuf 6tgQ== X-Gm-Message-State: AOJu0Yy4tBa7QQ6ozd4j4Da643nmMozZCUjSqqKsz4RhUfSTnbY1MB5z 09/mSeKilKLeJSCq5IIi+lerKY9f6sgazAKMeGY= X-Received: by 2002:a05:6a20:1006:b0:13f:83a2:df54 with SMTP id gs6-20020a056a20100600b0013f83a2df54mr712551pzc.34.1692406956741; Fri, 18 Aug 2023 18:02:36 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:cf24:6daf:2b9e:7972]) by smtp.gmail.com with ESMTPSA id b13-20020a170902d50d00b001b87bedcc6fsm2372019plg.93.2023.08.18.18.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 18:02:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: berrange@redhat.com, ardb@kernel.org Subject: [PATCH v2 18/18] host/include/aarch64: Implement clmul.h Date: Fri, 18 Aug 2023 18:02:18 -0700 Message-Id: <20230819010218.192706-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230819010218.192706-1-richard.henderson@linaro.org> References: <20230819010218.192706-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.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 autolearn=ham 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 PMULL in cpuinfo; implement the accel hook. Signed-off-by: Richard Henderson --- host/include/aarch64/host/cpuinfo.h | 1 + host/include/aarch64/host/crypto/clmul.h | 41 ++++++++++++++++++++++++ util/cpuinfo-aarch64.c | 4 ++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 host/include/aarch64/host/crypto/clmul.h diff --git a/host/include/aarch64/host/cpuinfo.h b/host/include/aarch64/host/cpuinfo.h index 769626b098..fe8c3b3fd1 100644 --- a/host/include/aarch64/host/cpuinfo.h +++ b/host/include/aarch64/host/cpuinfo.h @@ -10,6 +10,7 @@ #define CPUINFO_LSE (1u << 1) #define CPUINFO_LSE2 (1u << 2) #define CPUINFO_AES (1u << 3) +#define CPUINFO_PMULL (1u << 4) /* Initialized with a constructor. */ extern unsigned cpuinfo; diff --git a/host/include/aarch64/host/crypto/clmul.h b/host/include/aarch64/host/crypto/clmul.h new file mode 100644 index 0000000000..bb516d8b2f --- /dev/null +++ b/host/include/aarch64/host/crypto/clmul.h @@ -0,0 +1,41 @@ +/* + * AArch64 specific clmul acceleration. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef AARCH64_HOST_CRYPTO_CLMUL_H +#define AARCH64_HOST_CRYPTO_CLMUL_H + +#include "host/cpuinfo.h" +#include + +/* + * 64x64->128 pmull is available with FEAT_PMULL. + * Both FEAT_AES and FEAT_PMULL are covered under the same macro. + */ +#ifdef __ARM_FEATURE_AES +# define HAVE_CLMUL_ACCEL true +#else +# define HAVE_CLMUL_ACCEL likely(cpuinfo & CPUINFO_PMULL) +#endif +#if !defined(__ARM_FEATURE_AES) && defined(CONFIG_ARM_AES_BUILTIN) +# define ATTR_CLMUL_ACCEL __attribute__((target("+crypto"))) +#else +# define ATTR_CLMUL_ACCEL +#endif + +static inline Int128 ATTR_CLMUL_ACCEL +clmul_64_accel(uint64_t n, uint64_t m) +{ + union { poly128_t v; Int128 s; } u; + +#ifdef CONFIG_ARM_AES_BUILTIN + u.v = vmull_p64((poly64_t)n, (poly64_t)m); +#else + asm(".arch_extension aes\n\t" + "pmull %0.1q, %1.1d, %2.1d" : "=w"(u.v) : "w"(n), "w"(m)); +#endif + return u.s; +} + +#endif /* AARCH64_HOST_CRYPTO_CLMUL_H */ diff --git a/util/cpuinfo-aarch64.c b/util/cpuinfo-aarch64.c index ababc39550..1d565b8420 100644 --- a/util/cpuinfo-aarch64.c +++ b/util/cpuinfo-aarch64.c @@ -56,12 +56,14 @@ unsigned __attribute__((constructor)) cpuinfo_init(void) unsigned long hwcap = qemu_getauxval(AT_HWCAP); info |= (hwcap & HWCAP_ATOMICS ? CPUINFO_LSE : 0); info |= (hwcap & HWCAP_USCAT ? CPUINFO_LSE2 : 0); - info |= (hwcap & HWCAP_AES ? CPUINFO_AES: 0); + info |= (hwcap & HWCAP_AES ? CPUINFO_AES : 0); + info |= (hwcap & HWCAP_PMULL ? CPUINFO_PMULL : 0); #endif #ifdef CONFIG_DARWIN info |= sysctl_for_bool("hw.optional.arm.FEAT_LSE") * CPUINFO_LSE; info |= sysctl_for_bool("hw.optional.arm.FEAT_LSE2") * CPUINFO_LSE2; info |= sysctl_for_bool("hw.optional.arm.FEAT_AES") * CPUINFO_AES; + info |= sysctl_for_bool("hw.optional.arm.FEAT_PMULL") * CPUINFO_PMULL; #endif cpuinfo = info;