From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: David Hildenbrand <david@redhat.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>,
Thomas Huth <thuth@redhat.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Richard Henderson <richard.henderson@linaro.org>,
Cornelia Huck <cohuck@redhat.com>,
Harald Freudenberger <freude@linux.ibm.com>,
Holger Dengler <dengler@linux.ibm.com>
Subject: [PATCH v7 2/2] target/s390x: support PRNO_TRNG instruction
Date: Tue, 9 Aug 2022 17:03:31 +0200 [thread overview]
Message-ID: <20220809150331.84296-2-Jason@zx2c4.com> (raw)
In-Reply-To: <20220809150331.84296-1-Jason@zx2c4.com>
In order for hosts running inside of TCG to initialize the kernel's
random number generator, we should support the PRNO_TRNG instruction,
backed in the usual way with the qemu_guest_getrandom helper. This is
confirmed working on Linux 5.19.
Cc: Thomas Huth <thuth@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Harald Freudenberger <freude@linux.ibm.com>
Cc: Holger Dengler <dengler@linux.ibm.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
target/s390x/gen-features.c | 1 +
target/s390x/tcg/crypto_helper.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 85ab69d04e..423ae44315 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -752,6 +752,7 @@ static uint16_t qemu_MAX[] = {
S390_FEAT_MSA_EXT_5,
S390_FEAT_KIMD_SHA_512,
S390_FEAT_KLMD_SHA_512,
+ S390_FEAT_PRNO_TRNG,
};
/****** END FEATURE DEFS ******/
diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_helper.c
index 4d45de8faa..e155ae1f54 100644
--- a/target/s390x/tcg/crypto_helper.c
+++ b/target/s390x/tcg/crypto_helper.c
@@ -14,6 +14,7 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
+#include "qemu/guest-random.h"
#include "s390x-internal.h"
#include "tcg_s390x.h"
#include "exec/helper-proto.h"
@@ -167,6 +168,31 @@ static int klmd_sha512(CPUS390XState *env, uintptr_t ra, uint64_t parameter_bloc
return 0;
}
+static void fill_buf_random(CPUS390XState *env, uintptr_t ra,
+ uint64_t *buf_reg, uint64_t *len_reg)
+{
+ uint8_t tmp[256];
+ uint64_t len = *len_reg;
+ int message_reg_len = 64;
+
+ if (!(env->psw.mask & PSW_MASK_64)) {
+ len = (uint32_t)len;
+ message_reg_len = (env->psw.mask & PSW_MASK_32) ? 32 : 24;
+ }
+
+ while (len) {
+ size_t block = MIN(len, sizeof(tmp));
+
+ qemu_guest_getrandom_nofail(tmp, block);
+ for (size_t i = 0; i < block; ++i) {
+ cpu_stb_data_ra(env, wrap_address(env, *buf_reg), tmp[i], ra);
+ *buf_reg = deposit64(*buf_reg, 0, message_reg_len, *buf_reg + 1);
+ --*len_reg;
+ }
+ len -= block;
+ }
+}
+
uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,
uint32_t type)
{
@@ -209,6 +235,10 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,
return klmd_sha512(env, ra, env->regs[1], &env->regs[r2], &env->regs[r2 + 1]);
}
break;
+ case 114: /* CPACF_PRNO_TRNG */
+ fill_buf_random(env, ra, &env->regs[r1], &env->regs[r1 + 1]);
+ fill_buf_random(env, ra, &env->regs[r2], &env->regs[r2 + 1]);
+ break;
default:
/* we don't implement any other subfunction yet */
g_assert_not_reached();
--
2.35.1
next prev parent reply other threads:[~2022-08-09 15:06 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 16:46 [PATCH qemu] target/s390x: support PRNO_TRNG instruction Jason A. Donenfeld
2022-07-19 9:54 ` David Hildenbrand
2022-07-19 11:23 ` Jason A. Donenfeld
2022-07-19 11:43 ` [PATCH v2] " Jason A. Donenfeld
2022-07-20 11:43 ` David Hildenbrand
2022-07-20 11:58 ` Jason A. Donenfeld
2022-07-20 12:08 ` [PATCH v3] " Jason A. Donenfeld
2022-07-20 18:41 ` David Hildenbrand
2022-07-20 19:44 ` Jason A. Donenfeld
2022-07-27 1:35 ` Jason A. Donenfeld
2022-07-27 6:32 ` Thomas Huth
2022-07-27 11:58 ` Jason A. Donenfeld
2022-08-02 13:26 ` Christian Borntraeger
2022-08-02 13:54 ` David Hildenbrand
2022-08-02 14:01 ` Christian Borntraeger
2022-08-02 14:53 ` David Hildenbrand
2022-08-02 15:15 ` Christian Borntraeger
2022-08-02 15:16 ` David Hildenbrand
2022-08-02 15:28 ` Jason A. Donenfeld
2022-08-02 15:32 ` David Hildenbrand
2022-08-02 18:59 ` Jason A. Donenfeld
2022-08-02 19:00 ` [PATCH v4 0/2] MSA EXT 5 for s390x Jason A. Donenfeld
2022-08-02 19:00 ` [PATCH v4 1/2] target/s390x: support PRNO_TRNG instruction Jason A. Donenfeld
2022-08-02 19:00 ` [PATCH v4 2/2] target/s390x: support SHA-512 extensions Jason A. Donenfeld
2022-08-03 11:55 ` David Hildenbrand
2022-08-03 12:14 ` Jason A. Donenfeld
2022-08-03 12:47 ` Jason A. Donenfeld
2022-08-03 12:51 ` [PATCH v5 1/2] target/s390x: support PRNO_TRNG instruction Jason A. Donenfeld
2022-08-03 12:51 ` [PATCH v5 2/2] target/s390x: support SHA-512 extensions Jason A. Donenfeld
2022-08-03 17:15 ` [PATCH 1/2] target/s390x: support PRNO_TRNG instruction Jason A. Donenfeld
2022-08-03 17:15 ` [PATCH 2/2] target/s390x: support SHA-512 extensions Jason A. Donenfeld
2022-08-03 17:15 ` [PATCH v6 1/2] target/s390x: support PRNO_TRNG instruction Jason A. Donenfeld
2022-08-03 17:15 ` [PATCH v6 2/2] target/s390x: support SHA-512 extensions Jason A. Donenfeld
2022-08-05 11:28 ` David Hildenbrand
2022-08-05 13:01 ` Jason A. Donenfeld
2022-08-09 15:03 ` [PATCH v7 1/2] " Jason A. Donenfeld
2022-08-09 15:03 ` Jason A. Donenfeld [this message]
2022-08-26 11:28 ` [PATCH v7 2/2] target/s390x: support PRNO_TRNG instruction Thomas Huth
2022-08-29 16:29 ` Jason A. Donenfeld
2022-09-21 10:59 ` Thomas Huth
2022-08-26 10:21 ` [PATCH v7 1/2] target/s390x: support SHA-512 extensions Thomas Huth
2022-08-29 16:27 ` Jason A. Donenfeld
2022-08-11 16:37 ` [PATCH v6 2/2] " David Hildenbrand
2022-08-04 6:51 ` [PATCH v4 " Harald Freudenberger
2022-08-04 6:56 ` Christian Borntraeger
2022-08-04 12:09 ` Jason A. Donenfeld
2022-08-04 8:10 ` David Hildenbrand
2022-08-04 12:07 ` Jason A. Donenfeld
2022-08-02 17:55 ` [PATCH v3] target/s390x: support PRNO_TRNG instruction Jason A. Donenfeld
2022-07-20 18:01 ` [PATCH v2] " David Hildenbrand
2022-08-02 11:54 ` Harald Freudenberger
2022-07-19 10:00 ` [PATCH qemu] " Thomas Huth
2022-07-19 11:27 ` Jason A. Donenfeld
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=20220809150331.84296-2-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=dengler@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).