- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
+kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
=cjz8
-----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
# wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
# KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
# A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
# 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
# 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
# xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
# VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
# ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
# 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
# +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
# x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
# =cjz8
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
util/qemu-timer: fix indentation
meson: Do not define CONFIG_DEVICES on user emulation
system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
system/numa: Remove unnecessary 'exec/cpu-common.h' header
hw/xen: Remove unnecessary 'exec/cpu-common.h' header
target/mips: Drop left-over comment about Jazz machine
target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
target/xtensa: Remove tswap() calls in semihosting simcall() helper
accel/tcg: Un-inline translator_is_same_page()
accel/tcg: Include missing 'exec/translation-block.h' header
accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
qemu/coroutine: Include missing 'qemu/atomic.h' header
exec/translation-block: Include missing 'qemu/atomic.h' header
accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
target/sparc: Move sparc_restore_state_to_opc() to cpu.c
target/sparc: Uninline cpu_get_tb_cpu_state()
target/loongarch: Declare loongarch_cpu_dump_state() locally
user: Move various declarations out of 'exec/exec-all.h'
...
Conflicts:
hw/char/riscv_htif.c
hw/intc/riscv_aplic.c
target/s390x/cpu.c
Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
162 lines
4.4 KiB
C
162 lines
4.4 KiB
C
/*
|
|
* QEMU sPAPR random number generator "device" for H_RANDOM hypercall
|
|
*
|
|
* Copyright 2015 Thomas Huth, Red Hat Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License,
|
|
* or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "qemu/module.h"
|
|
#include "system/device_tree.h"
|
|
#include "system/rng.h"
|
|
#include "hw/ppc/spapr.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "kvm_ppc.h"
|
|
#include "qom/object.h"
|
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(SpaprRngState, SPAPR_RNG)
|
|
|
|
struct SpaprRngState {
|
|
/*< private >*/
|
|
DeviceState ds;
|
|
RngBackend *backend;
|
|
bool use_kvm;
|
|
};
|
|
|
|
struct HRandomData {
|
|
QemuSemaphore sem;
|
|
union {
|
|
uint64_t v64;
|
|
uint8_t v8[8];
|
|
} val;
|
|
int received;
|
|
};
|
|
typedef struct HRandomData HRandomData;
|
|
|
|
/* Callback function for the RngBackend */
|
|
static void random_recv(void *dest, const void *src, size_t size)
|
|
{
|
|
HRandomData *hrdp = dest;
|
|
|
|
if (src && size > 0) {
|
|
assert(size + hrdp->received <= sizeof(hrdp->val.v8));
|
|
memcpy(&hrdp->val.v8[hrdp->received], src, size);
|
|
hrdp->received += size;
|
|
}
|
|
|
|
qemu_sem_post(&hrdp->sem);
|
|
}
|
|
|
|
/* Handler for the H_RANDOM hypercall */
|
|
static target_ulong h_random(PowerPCCPU *cpu, SpaprMachineState *spapr,
|
|
target_ulong opcode, target_ulong *args)
|
|
{
|
|
SpaprRngState *rngstate;
|
|
HRandomData hrdata;
|
|
|
|
rngstate = SPAPR_RNG(object_resolve_path_type("", TYPE_SPAPR_RNG, NULL));
|
|
|
|
if (!rngstate || !rngstate->backend) {
|
|
return H_HARDWARE;
|
|
}
|
|
|
|
qemu_sem_init(&hrdata.sem, 0);
|
|
hrdata.val.v64 = 0;
|
|
hrdata.received = 0;
|
|
|
|
while (hrdata.received < 8) {
|
|
rng_backend_request_entropy(rngstate->backend, 8 - hrdata.received,
|
|
random_recv, &hrdata);
|
|
bql_unlock();
|
|
qemu_sem_wait(&hrdata.sem);
|
|
bql_lock();
|
|
}
|
|
|
|
qemu_sem_destroy(&hrdata.sem);
|
|
args[0] = hrdata.val.v64;
|
|
|
|
return H_SUCCESS;
|
|
}
|
|
|
|
static void spapr_rng_instance_init(Object *obj)
|
|
{
|
|
if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL) != NULL) {
|
|
error_report("spapr-rng can not be instantiated twice!");
|
|
return;
|
|
}
|
|
|
|
object_property_set_description(obj, "rng",
|
|
"ID of the random number generator backend");
|
|
}
|
|
|
|
static void spapr_rng_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
|
|
SpaprRngState *rngstate = SPAPR_RNG(dev);
|
|
|
|
if (rngstate->use_kvm) {
|
|
if (kvmppc_enable_hwrng() == 0) {
|
|
return;
|
|
}
|
|
/*
|
|
* If user specified both, use-kvm and a backend, we fall back to
|
|
* the backend now. If not, provide an appropriate error message.
|
|
*/
|
|
if (!rngstate->backend) {
|
|
error_setg(errp, "Could not initialize in-kernel H_RANDOM call!");
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (rngstate->backend) {
|
|
spapr_register_hypercall(H_RANDOM, h_random);
|
|
} else {
|
|
error_setg(errp, "spapr-rng needs an RNG backend!");
|
|
}
|
|
}
|
|
|
|
static const Property spapr_rng_properties[] = {
|
|
DEFINE_PROP_BOOL("use-kvm", SpaprRngState, use_kvm, false),
|
|
DEFINE_PROP_LINK("rng", SpaprRngState, backend, TYPE_RNG_BACKEND,
|
|
RngBackend *),
|
|
};
|
|
|
|
static void spapr_rng_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = spapr_rng_realize;
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
device_class_set_props(dc, spapr_rng_properties);
|
|
dc->hotpluggable = false;
|
|
}
|
|
|
|
static const TypeInfo spapr_rng_info = {
|
|
.name = TYPE_SPAPR_RNG,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(SpaprRngState),
|
|
.instance_init = spapr_rng_instance_init,
|
|
.class_init = spapr_rng_class_init,
|
|
};
|
|
|
|
static void spapr_rng_register_type(void)
|
|
{
|
|
type_register_static(&spapr_rng_info);
|
|
}
|
|
type_init(spapr_rng_register_type)
|