| Message ID | 20190517023924.1686-1-richard.henderson@linaro.org |
|---|---|
| Headers | show |
| Series | Add qemu_getrandom and ARMv8.5-RNG etc | expand |
On Thu, May 16, 2019 at 07:38:59PM -0700, Richard Henderson wrote: > The change in v8 is to which objects are linked in to user-only > from the crypto directory. Daniel asked for all of crypto-obj-y > to be added, but I have been unable to find a solution that works. > > If I add crypto-obj-y, then authz-obj-y must be included to resolve > dependencies. Daniel suggested splitting authz-obj-y into two, so > that linux-user plus some of the tools need not link against libpam. > > However, I tried that, and in the process managed to break testing. > I'm not really sure what I did wrong: > > TEST check-speed: tests/benchmark-crypto-cipher > ERROR - too few tests run (expected 32, got 0) > > Or maybe it was broken before, but at least this way I'm not touching > any of the variables that affect tests/Makefile.include. > > Given that user-only *is* being linked against the enabled crypto libs, > the behaviour between static and non-static is identical, which is I > believe the major portion of Daniel's request. I think further cleanup > to the makefiles can be done separately. > For avoidance of any doubt Acked-by: Daniel P. Berrangé <berrange@redhat.com> for Richard to send a pull request with any of the crypto related patches I'm tagged as maintainer for. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 22/05/2019 12:58, Daniel P. Berrangé wrote: > On Thu, May 16, 2019 at 07:38:59PM -0700, Richard Henderson wrote: >> The change in v8 is to which objects are linked in to user-only >> from the crypto directory. Daniel asked for all of crypto-obj-y >> to be added, but I have been unable to find a solution that works. >> >> If I add crypto-obj-y, then authz-obj-y must be included to resolve >> dependencies. Daniel suggested splitting authz-obj-y into two, so >> that linux-user plus some of the tools need not link against libpam. >> >> However, I tried that, and in the process managed to break testing. >> I'm not really sure what I did wrong: >> >> TEST check-speed: tests/benchmark-crypto-cipher >> ERROR - too few tests run (expected 32, got 0) >> >> Or maybe it was broken before, but at least this way I'm not touching >> any of the variables that affect tests/Makefile.include. >> >> Given that user-only *is* being linked against the enabled crypto libs, >> the behaviour between static and non-static is identical, which is I >> believe the major portion of Daniel's request. I think further cleanup >> to the makefiles can be done separately. >> > > For avoidance of any doubt > > Acked-by: Daniel P. Berrangé <berrange@redhat.com> > > for Richard to send a pull request with any of the crypto related patches > I'm tagged as maintainer for. The same for linux-user part: Acked-by: Laurent Vivier <laurent@vivier.eu> Thanks, Laurent
The change in v8 is to which objects are linked in to user-only from the crypto directory. Daniel asked for all of crypto-obj-y to be added, but I have been unable to find a solution that works. If I add crypto-obj-y, then authz-obj-y must be included to resolve dependencies. Daniel suggested splitting authz-obj-y into two, so that linux-user plus some of the tools need not link against libpam. However, I tried that, and in the process managed to break testing. I'm not really sure what I did wrong: TEST check-speed: tests/benchmark-crypto-cipher ERROR - too few tests run (expected 32, got 0) Or maybe it was broken before, but at least this way I'm not touching any of the variables that affect tests/Makefile.include. Given that user-only *is* being linked against the enabled crypto libs, the behaviour between static and non-static is identical, which is I believe the major portion of Daniel's request. I think further cleanup to the makefiles can be done separately. r~ Changes since v7: * Re-instate the configure probe for --static from v5. * Revert the changes to crypto-obj-y. * Rename crypto-aes-obj-y to crypto-user-obj-y. * Add crypto random number objects to crypto-user-obj-y. Changes since v6: * Drop the crypto-obj-y, crypto-aes-obj-y, and configure changes. This fixes the regression visible in make check-unit, due to objects not being pulled in from libqemuutil.a. * Add a crypto-rng-obj-y, and force it to be random-platform.o. This avoids attempting to link the crypto libraries into the user-only binaries. Which in turn means we can drop all of the configure changes to cope with the crypto libraries not having the static libraries packaged by recent distros. Changes since v5: * Merge crypto-obj-y into util-obj-y (patch 2). * Fix leftover crypto-obj-aes-y reference (patch 2). * Add ARM_CP_IO to the RNG registers (patch 22). * Issue gen_io_start/end around ppc DARN (new patch 24). * Issue gen_io_start/end around x86 rdrand (patch 25). Changes since v4: * Do not autoenable nettle or gcrypt if linking is broken. Fixes --static on fedora 30. * Delay removal of srand() for -seed. * Do not loop for -1 result for ppc64 DARN. Changes since v3: * Do not autoenable gnutls if linking is broken. Fixes --static on ubuntu 18.04. Changes since v2: * Changes from review. - getrandom is not exclusive of /dev/urandom fallback. - vnc fails gracefully on crypto failure. - a great renaming. * Drop the "nonblock" argument, as it's not deliverable from the backend. * Propagate Error back through qemu_guest_getrandom. * Add qemu_guest_getrandom_nofail to centralize "Argh! Death!". * Convert hw/misc/ * Implement ppc darn. * Implement x86 rdrand. Changes since v1: * Build crypto-obj-y for linux-user as well. * Several patches to tidy crypto/random-platform.c. * Use getrandom(2) in crypto/random-platform.c. * Use qcrypto_random_bytes in ui/vnc.c. * In qemu_getrandom: - Use g_rand_int instead of srand48. - Use qcrypto_random_bytes instead of getrandom directly. Richard Henderson (25): configure: Link test before auto-enabling crypto libraries build: Link user-only with crypto random number objects crypto: Reverse code blocks in random-platform.c crypto: Do not fail for EINTR during qcrypto_random_bytes crypto: Use O_CLOEXEC in qcrypto_random_init crypto: Use getrandom for qcrypto_random_bytes crypto: Change the qcrypto_random_bytes buffer type to void* ui/vnc: Split out authentication_failed ui/vnc: Use gcrypto_random_bytes for start_auth_vnc util: Add qemu_guest_getrandom and associated routines cpus: Initialize pseudo-random seeds for all guest cpus linux-user: Initialize pseudo-random seeds for all guest cpus linux-user: Call qcrypto_init if not using -seed linux-user: Use qemu_guest_getrandom_nofail for AT_RANDOM linux-user/aarch64: Use qemu_guest_getrandom for PAUTH keys linux-user: Remove srand call aspeed/scu: Use qemu_guest_getrandom_nofail hw/misc/nrf51_rng: Use qemu_guest_getrandom_nofail hw/misc/bcm2835_rng: Use qemu_guest_getrandom_nofail hw/misc/exynos4210_rng: Use qemu_guest_getrandom target/arm: Put all PAC keys into a structure target/arm: Implement ARMv8.5-RNG target/ppc: Use gen_io_start/end around DARN target/ppc: Use qemu_guest_getrandom for DARN target/i386: Implement CPUID_EXT_RDRAND Makefile | 4 +- Makefile.objs | 2 +- Makefile.target | 4 +- include/crypto/random.h | 2 +- include/qemu/guest-random.h | 68 ++++++++++++++++++ include/qom/cpu.h | 1 + linux-user/aarch64/target_syscall.h | 2 - target/arm/cpu.h | 17 +++-- target/i386/helper.h | 2 + cpus.c | 9 +++ crypto/random-gcrypt.c | 2 +- crypto/random-gnutls.c | 2 +- crypto/random-platform.c | 104 +++++++++++++++++----------- hw/misc/aspeed_scu.c | 10 +-- hw/misc/bcm2835_rng.c | 32 ++++----- hw/misc/exynos4210_rng.c | 11 ++- hw/misc/nrf51_rng.c | 4 +- linux-user/aarch64/cpu_loop.c | 25 +------ linux-user/elfload.c | 8 +-- linux-user/main.c | 33 +++++---- linux-user/syscall.c | 34 +++++++-- target/arm/cpu64.c | 1 + target/arm/helper.c | 64 ++++++++++++++--- target/arm/pauth_helper.c | 18 ++--- target/i386/cpu.c | 5 +- target/i386/int_helper.c | 21 ++++++ target/i386/translate.c | 62 +++++++++++++---- target/ppc/int_helper.c | 39 +++++++---- target/ppc/translate.c | 21 ++++-- ui/vnc.c | 53 ++++++-------- util/guest-random.c | 93 +++++++++++++++++++++++++ vl.c | 4 ++ configure | 87 +++++++++++++++-------- crypto/Makefile.objs | 11 +-- qemu-options.hx | 10 +++ util/Makefile.objs | 1 + 36 files changed, 610 insertions(+), 256 deletions(-) create mode 100644 include/qemu/guest-random.h create mode 100644 util/guest-random.c -- 2.17.1