From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ard Biesheuvel <ardb@kernel.org>
Subject: [PULL 18/19] host/include/i386: Implement clmul.h
Date: Fri, 15 Sep 2023 09:42:30 -0700 [thread overview]
Message-ID: <20230915164231.123580-19-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230915164231.123580-1-richard.henderson@linaro.org>
Detect PCLMUL in cpuinfo; implement the accel hook.
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
host/include/i386/host/cpuinfo.h | 1 +
host/include/i386/host/crypto/clmul.h | 29 +++++++++++++++++++++++++
host/include/x86_64/host/crypto/clmul.h | 1 +
include/qemu/cpuid.h | 3 +++
util/cpuinfo-i386.c | 1 +
5 files changed, 35 insertions(+)
create mode 100644 host/include/i386/host/crypto/clmul.h
create mode 100644 host/include/x86_64/host/crypto/clmul.h
diff --git a/host/include/i386/host/cpuinfo.h b/host/include/i386/host/cpuinfo.h
index 073d0a426f..7ae21568f7 100644
--- a/host/include/i386/host/cpuinfo.h
+++ b/host/include/i386/host/cpuinfo.h
@@ -27,6 +27,7 @@
#define CPUINFO_ATOMIC_VMOVDQA (1u << 16)
#define CPUINFO_ATOMIC_VMOVDQU (1u << 17)
#define CPUINFO_AES (1u << 18)
+#define CPUINFO_PCLMUL (1u << 19)
/* Initialized with a constructor. */
extern unsigned cpuinfo;
diff --git a/host/include/i386/host/crypto/clmul.h b/host/include/i386/host/crypto/clmul.h
new file mode 100644
index 0000000000..dc3c814797
--- /dev/null
+++ b/host/include/i386/host/crypto/clmul.h
@@ -0,0 +1,29 @@
+/*
+ * x86 specific clmul acceleration.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef X86_HOST_CRYPTO_CLMUL_H
+#define X86_HOST_CRYPTO_CLMUL_H
+
+#include "host/cpuinfo.h"
+#include <immintrin.h>
+
+#if defined(__PCLMUL__)
+# define HAVE_CLMUL_ACCEL true
+# define ATTR_CLMUL_ACCEL
+#else
+# define HAVE_CLMUL_ACCEL likely(cpuinfo & CPUINFO_PCLMUL)
+# define ATTR_CLMUL_ACCEL __attribute__((target("pclmul")))
+#endif
+
+static inline Int128 ATTR_CLMUL_ACCEL
+clmul_64_accel(uint64_t n, uint64_t m)
+{
+ union { __m128i v; Int128 s; } u;
+
+ u.v = _mm_clmulepi64_si128(_mm_set_epi64x(0, n), _mm_set_epi64x(0, m), 0);
+ return u.s;
+}
+
+#endif /* X86_HOST_CRYPTO_CLMUL_H */
diff --git a/host/include/x86_64/host/crypto/clmul.h b/host/include/x86_64/host/crypto/clmul.h
new file mode 100644
index 0000000000..f25eced416
--- /dev/null
+++ b/host/include/x86_64/host/crypto/clmul.h
@@ -0,0 +1 @@
+#include "host/include/i386/host/crypto/clmul.h"
diff --git a/include/qemu/cpuid.h b/include/qemu/cpuid.h
index 35325f1995..b11161555b 100644
--- a/include/qemu/cpuid.h
+++ b/include/qemu/cpuid.h
@@ -25,6 +25,9 @@
#endif
/* Leaf 1, %ecx */
+#ifndef bit_PCLMUL
+#define bit_PCLMUL (1 << 1)
+#endif
#ifndef bit_SSE4_1
#define bit_SSE4_1 (1 << 19)
#endif
diff --git a/util/cpuinfo-i386.c b/util/cpuinfo-i386.c
index b2ed65bb10..9fddb18303 100644
--- a/util/cpuinfo-i386.c
+++ b/util/cpuinfo-i386.c
@@ -39,6 +39,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(void)
info |= (c & bit_SSE4_1 ? CPUINFO_SSE4 : 0);
info |= (c & bit_MOVBE ? CPUINFO_MOVBE : 0);
info |= (c & bit_POPCNT ? CPUINFO_POPCNT : 0);
+ info |= (c & bit_PCLMUL ? CPUINFO_PCLMUL : 0);
/* Our AES support requires PSHUFB as well. */
info |= ((c & bit_AES) && (c & bit_SSSE3) ? CPUINFO_AES : 0);
--
2.34.1
next prev parent reply other threads:[~2023-09-15 16:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 16:42 [PULL 00/19] crypto: Provide clmul.h and host accel Richard Henderson
2023-09-15 16:42 ` [PULL 01/19] crypto: Add generic 8-bit carry-less multiply routines Richard Henderson
2023-09-15 16:42 ` [PULL 02/19] target/arm: Use clmul_8* routines Richard Henderson
2023-09-15 16:42 ` [PULL 03/19] target/s390x: " Richard Henderson
2023-09-15 16:42 ` [PULL 04/19] target/ppc: " Richard Henderson
2023-09-15 16:42 ` [PULL 05/19] crypto: Add generic 16-bit carry-less multiply routines Richard Henderson
2023-09-15 16:42 ` [PULL 06/19] target/arm: Use clmul_16* routines Richard Henderson
2023-09-15 16:42 ` [PULL 07/19] target/s390x: " Richard Henderson
2023-09-15 16:42 ` [PULL 08/19] target/ppc: " Richard Henderson
2023-09-15 16:42 ` [PULL 09/19] crypto: Add generic 32-bit carry-less multiply routines Richard Henderson
2023-09-15 16:42 ` [PULL 10/19] target/arm: Use clmul_32* routines Richard Henderson
2023-09-15 16:42 ` [PULL 11/19] target/s390x: " Richard Henderson
2023-09-15 16:42 ` [PULL 12/19] target/ppc: " Richard Henderson
2023-09-15 16:42 ` [PULL 13/19] crypto: Add generic 64-bit carry-less multiply routine Richard Henderson
2023-09-15 16:42 ` [PULL 14/19] target/arm: Use clmul_64 Richard Henderson
2023-09-15 16:42 ` [PULL 15/19] target/i386: " Richard Henderson
2023-09-15 16:42 ` [PULL 16/19] target/s390x: " Richard Henderson
2023-09-15 16:42 ` [PULL 17/19] target/ppc: " Richard Henderson
2023-09-15 16:42 ` Richard Henderson [this message]
2023-09-15 16:42 ` [PULL 19/19] host/include/aarch64: Implement clmul.h Richard Henderson
2023-09-18 17:52 ` [PULL 00/19] crypto: Provide clmul.h and host accel Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230915164231.123580-19-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=ardb@kernel.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).