From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Xiao Guangrong <guangrong.xiao@linux.intel.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PULL v2 25/51] nvdimm acpi: emulate dsm method
Date: Tue, 15 Mar 2016 17:01:43 +0200 [thread overview]
Message-ID: <1458053975-2410-26-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1458053975-2410-1-git-send-email-mst@redhat.com>
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Emulate dsm method after IO VM-exit
Currently, we only introduce the framework and no function is actually
supported
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/mem/nvdimm.h | 8 +++++++
hw/acpi/nvdimm.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index 26d5b78..517de9c 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -25,6 +25,14 @@
#include "hw/mem/pc-dimm.h"
+#define NVDIMM_DEBUG 0
+#define nvdimm_debug(fmt, ...) \
+ do { \
+ if (NVDIMM_DEBUG) { \
+ fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__); \
+ } \
+ } while (0)
+
#define TYPE_NVDIMM "nvdimm"
#define NVDIMM_DSM_MEM_FILE "etc/acpi/nvdimm-mem"
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 19c2642..9531340 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -390,15 +390,71 @@ struct NvdimmDsmOut {
} QEMU_PACKED;
typedef struct NvdimmDsmOut NvdimmDsmOut;
+struct NvdimmDsmFunc0Out {
+ /* the size of buffer filled by QEMU. */
+ uint32_t len;
+ uint32_t supported_func;
+} QEMU_PACKED;
+typedef struct NvdimmDsmFunc0Out NvdimmDsmFunc0Out;
+
+struct NvdimmDsmFuncNoPayloadOut {
+ /* the size of buffer filled by QEMU. */
+ uint32_t len;
+ uint32_t func_ret_status;
+} QEMU_PACKED;
+typedef struct NvdimmDsmFuncNoPayloadOut NvdimmDsmFuncNoPayloadOut;
+
static uint64_t
nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
{
+ nvdimm_debug("BUG: we never read _DSM IO Port.\n");
return 0;
}
static void
nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
{
+ NvdimmDsmIn *in;
+ hwaddr dsm_mem_addr = val;
+
+ nvdimm_debug("dsm memory address %#" HWADDR_PRIx ".\n", dsm_mem_addr);
+
+ /*
+ * The DSM memory is mapped to guest address space so an evil guest
+ * can change its content while we are doing DSM emulation. Avoid
+ * this by copying DSM memory to QEMU local memory.
+ */
+ in = g_malloc(TARGET_PAGE_SIZE);
+ cpu_physical_memory_read(dsm_mem_addr, in, TARGET_PAGE_SIZE);
+
+ le32_to_cpus(&in->revision);
+ le32_to_cpus(&in->function);
+ le32_to_cpus(&in->handle);
+
+ nvdimm_debug("Revision %#x Handler %#x Function %#x.\n", in->revision,
+ in->handle, in->function);
+
+ /*
+ * function 0 is called to inquire which functions are supported by
+ * OSPM
+ */
+ if (in->function == 0) {
+ NvdimmDsmFunc0Out func0 = {
+ .len = cpu_to_le32(sizeof(func0)),
+ /* No function supported other than function 0 */
+ .supported_func = cpu_to_le32(0),
+ };
+ cpu_physical_memory_write(dsm_mem_addr, &func0, sizeof func0);
+ } else {
+ /* No function except function 0 is supported yet. */
+ NvdimmDsmFuncNoPayloadOut out = {
+ .len = cpu_to_le32(sizeof(out)),
+ .func_ret_status = cpu_to_le32(1) /* Not Supported */,
+ };
+ cpu_physical_memory_write(dsm_mem_addr, &out, sizeof(out));
+ }
+
+ g_free(in);
}
static const MemoryRegionOps nvdimm_dsm_ops = {
--
MST
next prev parent reply other threads:[~2016-03-15 15:01 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 15:00 [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 01/51] acpi: add aml_create_field() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 02/51] acpi: add aml_concatenate() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 03/51] acpi: allow using object as offset for OperationRegion Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 04/51] acpi: add build_append_named_dword, returning an offset in buffer Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 05/51] balloon: fix segfault and harden the stats queue Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 08/51] virtio-balloon: add 'available' counter Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 10/51] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 11/51] i386/acpi: make floppy controller object dynamic Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 13/51] fdc: add function to determine drive chs limits Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 14/51] i386: populate floppy drive information in DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 15/51] i386: update expected DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 16/51] virtio-pci: call pci reset variant when guest requests reset Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 17/51] msi_supported -> msi_nonbroken Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 18/51] ich9lpc: fix typo Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 19/51] hw/acpi: fix Q35 support for legacy Windows OS Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 20/51] acpi-test-data: add _DIS methods Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 21/51] pci-ids: add virtio 1.0 ids to spec Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 22/51] nvdimm acpi: initialize the resource used by NVDIMM ACPI Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 23/51] nvdimm acpi: introduce patched dsm memory Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 24/51] nvdimm acpi: let qemu handle _DSM method Michael S. Tsirkin
2016-03-15 15:01 ` Michael S. Tsirkin [this message]
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 26/51] vhost-user: fix use after free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 27/51] vhost-user: remove useless is_server field Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 28/51] qemu-char: avoid potential double-free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 29/51] qemu-char: remove all msgfds on disconnect Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 30/51] qemu-char: make tcp_chr_disconnect() reentrant-safe Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 31/51] pxb: cleanup Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 32/51] pc: acpi: remove NOP assignment Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 33/51] pc: init pcms->apic_id_limit once and use it throughout pc.c Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 34/51] machine: introduce MachineClass.possible_cpu_arch_ids() hook Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 35/51] pc: acpi: cleanup qdev_get_machine() calls Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 36/51] pc: acpi: SRAT: create only valid processor lapic entries Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 37/51] pc: acpi: create MADT.lapic entries only for valid lapics Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 38/51] pc: acpi: create Processor and Notify objects " Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 39/51] pc: acpi: drop cpu->found_cpus bitmap Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 40/51] pc: acpi: clarify why possible LAPIC entries must be present in MADT Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 41/51] MAINTAINERS: Add an entry for virtio header files Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 42/51] MAINTAINERS: machine core Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 43/51] ipmi: remove IPMI_CHECK_CMD_LEN() macro Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 44/51] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 45/51] ipmi: remove IPMI_CHECK_RESERVATION() macro Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 46/51] ipmi: add rsp_buffer_set_error() helper Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 47/51] ipmi: add a realize function to the device class Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 48/51] ipmi: use a function to initialize the SDR table Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 49/51] ipmi: remove the need of an ending record in " Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 51/51] hw/acpi: fix GSI links UID Michael S. Tsirkin
2016-03-15 17:09 ` [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Peter Maydell
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=1458053975-2410-26-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=ehabkost@redhat.com \
--cc=guangrong.xiao@linux.intel.com \
--cc=imammedo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).