- 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>
		
	
			
		
			
				
	
	
		
			196 lines
		
	
	
		
			5.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			196 lines
		
	
	
		
			5.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Virtio PMEM device
 | 
						|
 *
 | 
						|
 * Copyright (C) 2018-2019 Red Hat, Inc.
 | 
						|
 *
 | 
						|
 * Authors:
 | 
						|
 *  Pankaj Gupta <pagupta@redhat.com>
 | 
						|
 *  David Hildenbrand <david@redhat.com>
 | 
						|
 *
 | 
						|
 * This work is licensed under the terms of the GNU GPL, version 2.
 | 
						|
 * See the COPYING file in the top-level directory.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "qemu/error-report.h"
 | 
						|
#include "qemu/iov.h"
 | 
						|
#include "qemu/main-loop.h"
 | 
						|
#include "hw/virtio/virtio-pmem.h"
 | 
						|
#include "hw/qdev-properties.h"
 | 
						|
#include "hw/virtio/virtio-access.h"
 | 
						|
#include "standard-headers/linux/virtio_ids.h"
 | 
						|
#include "standard-headers/linux/virtio_pmem.h"
 | 
						|
#include "system/hostmem.h"
 | 
						|
#include "block/aio.h"
 | 
						|
#include "block/thread-pool.h"
 | 
						|
#include "trace.h"
 | 
						|
 | 
						|
typedef struct VirtIODeviceRequest {
 | 
						|
    VirtQueueElement elem;
 | 
						|
    int fd;
 | 
						|
    VirtIOPMEM *pmem;
 | 
						|
    VirtIODevice *vdev;
 | 
						|
    struct virtio_pmem_req req;
 | 
						|
    struct virtio_pmem_resp resp;
 | 
						|
} VirtIODeviceRequest;
 | 
						|
 | 
						|
static int worker_cb(void *opaque)
 | 
						|
{
 | 
						|
    VirtIODeviceRequest *req_data = opaque;
 | 
						|
    int err = 0;
 | 
						|
 | 
						|
    /* flush raw backing image */
 | 
						|
    err = fsync(req_data->fd);
 | 
						|
    trace_virtio_pmem_flush_done(err);
 | 
						|
    if (err != 0) {
 | 
						|
        err = 1;
 | 
						|
    }
 | 
						|
 | 
						|
    virtio_stl_p(req_data->vdev, &req_data->resp.ret, err);
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void done_cb(void *opaque, int ret)
 | 
						|
{
 | 
						|
    VirtIODeviceRequest *req_data = opaque;
 | 
						|
    int len = iov_from_buf(req_data->elem.in_sg, req_data->elem.in_num, 0,
 | 
						|
                              &req_data->resp, sizeof(struct virtio_pmem_resp));
 | 
						|
 | 
						|
    /* Callbacks are serialized, so no need to use atomic ops. */
 | 
						|
    virtqueue_push(req_data->pmem->rq_vq, &req_data->elem, len);
 | 
						|
    virtio_notify((VirtIODevice *)req_data->pmem, req_data->pmem->rq_vq);
 | 
						|
    trace_virtio_pmem_response();
 | 
						|
    g_free(req_data);
 | 
						|
}
 | 
						|
 | 
						|
static void virtio_pmem_flush(VirtIODevice *vdev, VirtQueue *vq)
 | 
						|
{
 | 
						|
    VirtIODeviceRequest *req_data;
 | 
						|
    VirtIOPMEM *pmem = VIRTIO_PMEM(vdev);
 | 
						|
    HostMemoryBackend *backend = MEMORY_BACKEND(pmem->memdev);
 | 
						|
 | 
						|
    trace_virtio_pmem_flush_request();
 | 
						|
    req_data = virtqueue_pop(vq, sizeof(VirtIODeviceRequest));
 | 
						|
    if (!req_data) {
 | 
						|
        virtio_error(vdev, "virtio-pmem missing request data");
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    if (req_data->elem.out_num < 1 || req_data->elem.in_num < 1) {
 | 
						|
        virtio_error(vdev, "virtio-pmem request not proper");
 | 
						|
        virtqueue_detach_element(vq, (VirtQueueElement *)req_data, 0);
 | 
						|
        g_free(req_data);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    req_data->fd   = memory_region_get_fd(&backend->mr);
 | 
						|
    req_data->pmem = pmem;
 | 
						|
    req_data->vdev = vdev;
 | 
						|
    thread_pool_submit_aio(worker_cb, req_data, done_cb, req_data);
 | 
						|
}
 | 
						|
 | 
						|
static void virtio_pmem_get_config(VirtIODevice *vdev, uint8_t *config)
 | 
						|
{
 | 
						|
    VirtIOPMEM *pmem = VIRTIO_PMEM(vdev);
 | 
						|
    struct virtio_pmem_config *pmemcfg = (struct virtio_pmem_config *) config;
 | 
						|
 | 
						|
    virtio_stq_p(vdev, &pmemcfg->start, pmem->start);
 | 
						|
    virtio_stq_p(vdev, &pmemcfg->size, memory_region_size(&pmem->memdev->mr));
 | 
						|
}
 | 
						|
 | 
						|
static uint64_t virtio_pmem_get_features(VirtIODevice *vdev, uint64_t features,
 | 
						|
                                        Error **errp)
 | 
						|
{
 | 
						|
    return features;
 | 
						|
}
 | 
						|
 | 
						|
static void virtio_pmem_realize(DeviceState *dev, Error **errp)
 | 
						|
{
 | 
						|
    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
 | 
						|
    VirtIOPMEM *pmem = VIRTIO_PMEM(dev);
 | 
						|
 | 
						|
    if (!pmem->memdev) {
 | 
						|
        error_setg(errp, "virtio-pmem memdev not set");
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    if (host_memory_backend_is_mapped(pmem->memdev)) {
 | 
						|
        error_setg(errp, "can't use already busy memdev: %s",
 | 
						|
                   object_get_canonical_path_component(OBJECT(pmem->memdev)));
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    host_memory_backend_set_mapped(pmem->memdev, true);
 | 
						|
    virtio_init(vdev, VIRTIO_ID_PMEM, sizeof(struct virtio_pmem_config));
 | 
						|
    pmem->rq_vq = virtio_add_queue(vdev, 128, virtio_pmem_flush);
 | 
						|
}
 | 
						|
 | 
						|
static void virtio_pmem_unrealize(DeviceState *dev)
 | 
						|
{
 | 
						|
    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
 | 
						|
    VirtIOPMEM *pmem = VIRTIO_PMEM(dev);
 | 
						|
 | 
						|
    host_memory_backend_set_mapped(pmem->memdev, false);
 | 
						|
    virtio_delete_queue(pmem->rq_vq);
 | 
						|
    virtio_cleanup(vdev);
 | 
						|
}
 | 
						|
 | 
						|
static void virtio_pmem_fill_device_info(const VirtIOPMEM *pmem,
 | 
						|
                                         VirtioPMEMDeviceInfo *vi)
 | 
						|
{
 | 
						|
    vi->memaddr = pmem->start;
 | 
						|
    vi->size    = memory_region_size(&pmem->memdev->mr);
 | 
						|
    vi->memdev  = object_get_canonical_path(OBJECT(pmem->memdev));
 | 
						|
}
 | 
						|
 | 
						|
static MemoryRegion *virtio_pmem_get_memory_region(VirtIOPMEM *pmem,
 | 
						|
                                                   Error **errp)
 | 
						|
{
 | 
						|
    if (!pmem->memdev) {
 | 
						|
        error_setg(errp, "'%s' property must be set", VIRTIO_PMEM_MEMDEV_PROP);
 | 
						|
        return NULL;
 | 
						|
    }
 | 
						|
 | 
						|
    return &pmem->memdev->mr;
 | 
						|
}
 | 
						|
 | 
						|
static const Property virtio_pmem_properties[] = {
 | 
						|
    DEFINE_PROP_UINT64(VIRTIO_PMEM_ADDR_PROP, VirtIOPMEM, start, 0),
 | 
						|
    DEFINE_PROP_LINK(VIRTIO_PMEM_MEMDEV_PROP, VirtIOPMEM, memdev,
 | 
						|
                     TYPE_MEMORY_BACKEND, HostMemoryBackend *),
 | 
						|
};
 | 
						|
 | 
						|
static void virtio_pmem_class_init(ObjectClass *klass, void *data)
 | 
						|
{
 | 
						|
    DeviceClass *dc = DEVICE_CLASS(klass);
 | 
						|
    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
 | 
						|
    VirtIOPMEMClass *vpc = VIRTIO_PMEM_CLASS(klass);
 | 
						|
 | 
						|
    device_class_set_props(dc, virtio_pmem_properties);
 | 
						|
 | 
						|
    vdc->realize = virtio_pmem_realize;
 | 
						|
    vdc->unrealize = virtio_pmem_unrealize;
 | 
						|
    vdc->get_config = virtio_pmem_get_config;
 | 
						|
    vdc->get_features = virtio_pmem_get_features;
 | 
						|
 | 
						|
    vpc->fill_device_info = virtio_pmem_fill_device_info;
 | 
						|
    vpc->get_memory_region = virtio_pmem_get_memory_region;
 | 
						|
    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo virtio_pmem_info = {
 | 
						|
    .name          = TYPE_VIRTIO_PMEM,
 | 
						|
    .parent        = TYPE_VIRTIO_DEVICE,
 | 
						|
    .class_size    = sizeof(VirtIOPMEMClass),
 | 
						|
    .class_init    = virtio_pmem_class_init,
 | 
						|
    .instance_size = sizeof(VirtIOPMEM),
 | 
						|
};
 | 
						|
 | 
						|
static void virtio_register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&virtio_pmem_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(virtio_register_types)
 |