mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 04:13:53 -06:00

- 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>
161 lines
4.5 KiB
C
161 lines
4.5 KiB
C
/*
|
|
* A sparse memory device. Useful for fuzzing
|
|
*
|
|
* Copyright Red Hat Inc., 2021
|
|
*
|
|
* Authors:
|
|
* Alexander Bulekov <alxndr@bu.edu>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/sysbus.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/units.h"
|
|
#include "system/qtest.h"
|
|
#include "hw/mem/sparse-mem.h"
|
|
|
|
#define SPARSE_MEM(obj) OBJECT_CHECK(SparseMemState, (obj), TYPE_SPARSE_MEM)
|
|
#define SPARSE_BLOCK_SIZE 0x1000
|
|
|
|
typedef struct SparseMemState {
|
|
SysBusDevice parent_obj;
|
|
MemoryRegion mmio;
|
|
uint64_t baseaddr;
|
|
uint64_t length;
|
|
uint64_t size_used;
|
|
uint64_t maxsize;
|
|
GHashTable *mapped;
|
|
} SparseMemState;
|
|
|
|
typedef struct sparse_mem_block {
|
|
uint8_t data[SPARSE_BLOCK_SIZE];
|
|
} sparse_mem_block;
|
|
|
|
static uint64_t sparse_mem_read(void *opaque, hwaddr addr, unsigned int size)
|
|
{
|
|
SparseMemState *s = opaque;
|
|
uint64_t ret = 0;
|
|
size_t pfn = addr / SPARSE_BLOCK_SIZE;
|
|
size_t offset = addr % SPARSE_BLOCK_SIZE;
|
|
sparse_mem_block *block;
|
|
|
|
block = g_hash_table_lookup(s->mapped, (void *)pfn);
|
|
if (block) {
|
|
assert(offset + size <= sizeof(block->data));
|
|
memcpy(&ret, block->data + offset, size);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static void sparse_mem_write(void *opaque, hwaddr addr, uint64_t v,
|
|
unsigned int size)
|
|
{
|
|
SparseMemState *s = opaque;
|
|
size_t pfn = addr / SPARSE_BLOCK_SIZE;
|
|
size_t offset = addr % SPARSE_BLOCK_SIZE;
|
|
sparse_mem_block *block;
|
|
|
|
if (!g_hash_table_lookup(s->mapped, (void *)pfn) &&
|
|
s->size_used + SPARSE_BLOCK_SIZE < s->maxsize && v) {
|
|
g_hash_table_insert(s->mapped, (void *)pfn,
|
|
g_new0(sparse_mem_block, 1));
|
|
s->size_used += sizeof(block->data);
|
|
}
|
|
block = g_hash_table_lookup(s->mapped, (void *)pfn);
|
|
if (!block) {
|
|
return;
|
|
}
|
|
|
|
assert(offset + size <= sizeof(block->data));
|
|
|
|
memcpy(block->data + offset, &v, size);
|
|
|
|
}
|
|
|
|
static void sparse_mem_enter_reset(Object *obj, ResetType type)
|
|
{
|
|
SparseMemState *s = SPARSE_MEM(obj);
|
|
g_hash_table_remove_all(s->mapped);
|
|
return;
|
|
}
|
|
|
|
static const MemoryRegionOps sparse_mem_ops = {
|
|
.read = sparse_mem_read,
|
|
.write = sparse_mem_write,
|
|
.endianness = DEVICE_LITTLE_ENDIAN,
|
|
.valid = {
|
|
.min_access_size = 1,
|
|
.max_access_size = 8,
|
|
.unaligned = false,
|
|
},
|
|
};
|
|
|
|
static const Property sparse_mem_properties[] = {
|
|
/* The base address of the memory */
|
|
DEFINE_PROP_UINT64("baseaddr", SparseMemState, baseaddr, 0x0),
|
|
/* The length of the sparse memory region */
|
|
DEFINE_PROP_UINT64("length", SparseMemState, length, UINT64_MAX),
|
|
/* Max amount of actual memory that can be used to back the sparse memory */
|
|
DEFINE_PROP_UINT64("maxsize", SparseMemState, maxsize, 10 * MiB),
|
|
};
|
|
|
|
MemoryRegion *sparse_mem_init(uint64_t addr, uint64_t length)
|
|
{
|
|
DeviceState *dev;
|
|
|
|
dev = qdev_new(TYPE_SPARSE_MEM);
|
|
qdev_prop_set_uint64(dev, "baseaddr", addr);
|
|
qdev_prop_set_uint64(dev, "length", length);
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
|
sysbus_mmio_map_overlap(SYS_BUS_DEVICE(dev), 0, addr, -10000);
|
|
return &SPARSE_MEM(dev)->mmio;
|
|
}
|
|
|
|
static void sparse_mem_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
SparseMemState *s = SPARSE_MEM(dev);
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
|
|
if (!qtest_enabled()) {
|
|
error_setg(errp, "sparse_mem device should only be used "
|
|
"for testing with QTest");
|
|
return;
|
|
}
|
|
|
|
assert(s->baseaddr + s->length > s->baseaddr);
|
|
|
|
s->mapped = g_hash_table_new_full(NULL, NULL, NULL,
|
|
(GDestroyNotify)g_free);
|
|
memory_region_init_io(&s->mmio, OBJECT(s), &sparse_mem_ops, s,
|
|
"sparse-mem", s->length);
|
|
sysbus_init_mmio(sbd, &s->mmio);
|
|
}
|
|
|
|
static void sparse_mem_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
ResettableClass *rc = RESETTABLE_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
device_class_set_props(dc, sparse_mem_properties);
|
|
|
|
dc->desc = "Sparse Memory Device";
|
|
dc->realize = sparse_mem_realize;
|
|
|
|
rc->phases.enter = sparse_mem_enter_reset;
|
|
}
|
|
|
|
static const TypeInfo sparse_mem_types[] = {
|
|
{
|
|
.name = TYPE_SPARSE_MEM,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(SparseMemState),
|
|
.class_init = sparse_mem_class_init,
|
|
},
|
|
};
|
|
DEFINE_TYPES(sparse_mem_types);
|