qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
To: pbonzini@redhat.com, imammedo@redhat.com
Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>,
	ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com,
	gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org,
	stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v4 25/33] nvdimm acpi: init the address region used by DSM
Date: Mon, 19 Oct 2015 08:54:11 +0800	[thread overview]
Message-ID: <1445216059-88521-26-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1445216059-88521-1-git-send-email-guangrong.xiao@linux.intel.com>

Map the NVDIMM ACPI memory region to guest address space

Detailed DSM design please refer to docs/specs/acpi_nvdimm.txt

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
 hw/acpi/nvdimm.c        | 87 ++++++++++++++++++++++++++++++++++++++++++++++---
 include/hw/mem/nvdimm.h |  8 +++++
 2 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 8d8376c..bc28828 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -391,10 +391,9 @@ static GArray *nvdimm_build_device_structure(GSList *device_list)
     return structures;
 }
 
-static void nvdimm_build_nfit(GSList *device_list, GArray *table_offsets,
+static void nvdimm_build_nfit(GArray *structures, GArray *table_offsets,
                               GArray *table_data, GArray *linker)
 {
-    GArray *structures = nvdimm_build_device_structure(device_list);
     void *header;
 
     acpi_add_table(table_offsets, table_data);
@@ -407,12 +406,80 @@ static void nvdimm_build_nfit(GSList *device_list, GArray *table_offsets,
 
     build_header(linker, table_data, header, "NFIT",
                  sizeof(nfit) + structures->len, 1);
-    g_array_free(structures, true);
+}
+
+static uint64_t
+nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
+{
+    return 0;
+}
+
+static void
+nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
+{
+}
+
+static const MemoryRegionOps nvdimm_dsm_ops = {
+    .read = nvdimm_dsm_read,
+    .write = nvdimm_dsm_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
+static MemoryRegion *nvdimm_build_dsm_memory(NVDIMMState *state)
+{
+    MemoryRegion *dsm_ram_mr, *dsm_mmio_mr, *dsm_fit_mr;
+    uint64_t page_size = getpagesize();
+    uint64_t fit_size = memory_region_size(&state->mr) - page_size * 2;
+
+    /* DSM memory has already been built. */
+    dsm_fit_mr = memory_region_find(&state->mr, page_size * 2,
+                                    fit_size).mr;
+    if (dsm_fit_mr) {
+        nvdimm_debug("DSM FIT has already been built by %s.\n",
+                     dsm_fit_mr->name);
+        return dsm_fit_mr;
+    }
+
+    /*
+     * the first page is MMIO-based used to transfer control from guest
+     * ACPI to QEMU.
+     */
+    dsm_mmio_mr = g_new(MemoryRegion, 1);
+    memory_region_init_io(dsm_mmio_mr, NULL, &nvdimm_dsm_ops, state,
+                          "nvdimm.dsm_mmio", page_size);
+
+    /*
+     * the second page is RAM-based used to transfer data between guest
+     * ACPI and QEMU.
+     */
+    dsm_ram_mr = g_new(MemoryRegion, 1);
+    memory_region_init_ram(dsm_ram_mr, NULL, "nvdimm.dsm_ram",
+                           page_size, &error_abort);
+    vmstate_register_ram_global(dsm_ram_mr);
+
+    /*
+     * the left is RAM-based which is _FIT buffer returned by _FIT
+     * method.
+     */
+    dsm_fit_mr = g_new(MemoryRegion, 1);
+    memory_region_init_ram(dsm_fit_mr, NULL, "nvdimm.fit", fit_size,
+                           &error_abort);
+    vmstate_register_ram_global(dsm_fit_mr);
+
+    memory_region_add_subregion(&state->mr, 0, dsm_mmio_mr);
+    memory_region_add_subregion(&state->mr, page_size, dsm_ram_mr);
+    memory_region_add_subregion(&state->mr, page_size * 2, dsm_fit_mr);
+
+    /* the caller will unref it. */
+    memory_region_ref(dsm_fit_mr);
+    return dsm_fit_mr;
 }
 
 void nvdimm_build_acpi(NVDIMMState *state, GArray *table_offsets,
                        GArray *table_data, GArray *linker)
 {
+    MemoryRegion *fit_mr;
+    GArray *structures;
     GSList *device_list = nvdimm_get_plugged_device_list();
 
     if (!memory_region_size(&state->mr)) {
@@ -424,6 +491,18 @@ void nvdimm_build_acpi(NVDIMMState *state, GArray *table_offsets,
         return;
     }
 
-    nvdimm_build_nfit(device_list, table_offsets, table_data, linker);
+    fit_mr = nvdimm_build_dsm_memory(state);
+
+    structures = nvdimm_build_device_structure(device_list);
+
+    /* Build fit memory which is presented to guest via _FIT method. */
+    assert(memory_region_size(fit_mr) >= structures->len);
+    memcpy(memory_region_get_ram_ptr(fit_mr), structures->data,
+           structures->len);
+
+    nvdimm_build_nfit(structures, table_offsets, table_data, linker);
+
+    memory_region_unref(fit_mr);
     g_slist_free(device_list);
+    g_array_free(structures, true);
 }
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index dc77a1f..c2dc635 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -25,6 +25,14 @@
 
 #include "hw/mem/dimm.h"
 
+#define NVDIMM_DEBUG 0
+#define nvdimm_debug(fmt, ...)                                \
+    do {                                                      \
+        if (NVDIMM_DEBUG) {                                   \
+            fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__);  \
+        }                                                     \
+    } while (0)
+
 /*
  * The minimum label data size is required by NVDIMM Namespace
  * specification, please refer to chapter 2 Namespaces:
-- 
1.8.3.1

  parent reply	other threads:[~2015-10-18 17:00 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-19  0:53 [Qemu-devel] [PATCH v4 00/33] implement vNVDIMM Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 01/33] acpi: add aml_derefof Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 02/33] acpi: add aml_sizeof Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 03/33] acpi: add aml_create_field Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 04/33] acpi: add aml_concatenate Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 05/33] acpi: add aml_object_type Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 06/33] acpi: add aml_method_serialized Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 07/33] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 08/33] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 09/33] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 10/33] hostmem-file: clean up memory allocation Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 11/33] hostmem-file: use whole file size if possible Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 12/33] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-10-19  0:53 ` [Qemu-devel] [PATCH v4 13/33] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 14/33] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 15/33] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 16/33] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 17/33] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-10-24  3:20   ` Bharata B Rao
2015-10-28 14:31     ` Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 18/33] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 19/33] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 20/33] dimm: introduce realize callback Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 21/33] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 22/33] docs: add NVDIMM ACPI documentation Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 23/33] nvdimm acpi: init the address region used by NVDIMM ACPI Xiao Guangrong
2015-10-18 17:15   ` Michael S. Tsirkin
2015-10-19  3:58     ` Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 24/33] nvdimm acpi: build ACPI NFIT table Xiao Guangrong
2015-10-19  0:54 ` Xiao Guangrong [this message]
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 26/33] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 27/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-10-18 17:16   ` Michael S. Tsirkin
2015-10-19  4:04     ` Xiao Guangrong
2015-10-19  6:57       ` Michael S. Tsirkin
2015-10-19  7:09       ` Michael S. Tsirkin
2015-10-19 17:29         ` Dan Williams
2015-10-19 21:19           ` Michael S. Tsirkin
2015-10-19 21:29             ` Dan Williams
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 28/33] nvdimm acpi: support DSM_FUN_IMPLEMENTED function Xiao Guangrong
2015-10-18 18:05   ` Michael S. Tsirkin
2015-10-19  4:39     ` Xiao Guangrong
2015-10-19  7:06       ` Michael S. Tsirkin
2015-10-19  7:39         ` Xiao Guangrong
2015-10-20 15:51   ` Stefan Hajnoczi
2015-10-20 16:05     ` Michael S. Tsirkin
2015-10-20 16:26     ` Xiao Guangrong
2015-10-20 16:29       ` Xiao Guangrong
2015-10-21 10:49       ` Stefan Hajnoczi
2015-10-21 13:32         ` Xiao Guangrong
2015-10-29 14:36           ` Igor Mammedov
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 29/33] nvdimm acpi: support DSM_DEV_FUN_NAMESPACE_LABEL_SIZE function Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 30/33] nvdimm acpi: support DSM_DEV_FUN_GET_NAMESPACE_LABEL_DATA Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 31/33] nvdimm acpi: support DSM_DEV_FUN_SET_NAMESPACE_LABEL_DATA Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 32/33] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-10-19  0:54 ` [Qemu-devel] [PATCH v4 33/33] nvdimm: add maintain info Xiao Guangrong

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=1445216059-88521-26-git-send-email-guangrong.xiao@linux.intel.com \
    --to=guangrong.xiao@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=ehabkost@redhat.com \
    --cc=gleb@kernel.org \
    --cc=imammedo@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@redhat.com \
    /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).