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 v3 24/32] nvdimm: init the address region used by DSM method
Date: Sun, 11 Oct 2015 11:52:56 +0800	[thread overview]
Message-ID: <1444535584-18220-25-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1444535584-18220-1-git-send-email-guangrong.xiao@linux.intel.com>

Map the NVDIMM ACPI memory region to guest address space

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

diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c
index 62b1e02..1450a6a 100644
--- a/hw/mem/nvdimm/acpi.c
+++ b/hw/mem/nvdimm/acpi.c
@@ -271,8 +271,6 @@ static int build_structure_dcr(void *buf, NVDIMMDevice *nvdimm)
 
 static void build_device_structure(GSList *device_list, char *buf)
 {
-    buf += sizeof(nfit);
-
     for (; device_list; device_list = device_list->next) {
         NVDIMMDevice *nvdimm = device_list->data;
 
@@ -290,7 +288,7 @@ static void build_device_structure(GSList *device_list, char *buf)
     }
 }
 
-static void build_nfit(GSList *device_list, GArray *table_offsets,
+static void build_nfit(void *fit, GSList *device_list, GArray *table_offsets,
                        GArray *table_data, GArray *linker)
 {
     size_t total;
@@ -304,12 +302,76 @@ static void build_nfit(GSList *device_list, GArray *table_offsets,
     acpi_add_table(table_offsets, table_data);
 
     buf = acpi_data_push(table_data, total);
-    build_device_structure(device_list, buf);
+    memcpy(buf + sizeof(nfit), fit, total - sizeof(nfit));
 
     build_header(linker, table_data, (void *)(table_data->data + nfit_start),
                  "NFIT", table_data->len - nfit_start, 1);
 }
 
+static uint64_t dsm_read(void *opaque, hwaddr addr,
+                         unsigned size)
+{
+    return 0;
+}
+
+static void dsm_write(void *opaque, hwaddr addr,
+                      uint64_t val, unsigned size)
+{
+}
+
+static const MemoryRegionOps dsm_ops = {
+    .read = dsm_read,
+    .write = dsm_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
+static MemoryRegion *build_dsm_memory(NVDIMMState *state)
+{
+    MemoryRegion *dsm_ram_mr, *dsm_mmio_mr, *dsm_fit_mr;
+    uint64_t fit_size = memory_region_size(&state->mr) - state->page_size * 2;
+
+    /* DSM memory has already been built. */
+    dsm_fit_mr = memory_region_find(&state->mr, state->page_size * 2,
+                                    fit_size).mr;
+    if (dsm_fit_mr) {
+        nvdebug("DSM FIT has already been built by %s.\n", dsm_fit_mr->name);
+        memory_region_unref(dsm_fit_mr);
+        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, &dsm_ops, state,
+                          "nvdimm.dsm_mmio", state->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",
+                           state->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, state->page_size, dsm_ram_mr);
+    memory_region_add_subregion(&state->mr, state->page_size * 2, dsm_fit_mr);
+
+    return dsm_fit_mr;
+}
+
 void nvdimm_build_acpi_table(NVDIMMState *state, GArray *table_offsets,
                              GArray *table_data, GArray *linker)
 {
@@ -321,7 +383,10 @@ void nvdimm_build_acpi_table(NVDIMMState *state, GArray *table_offsets,
     }
 
     if (device_list) {
-        build_nfit(device_list, table_offsets, table_data, linker);
+        void *fit = memory_region_get_ram_ptr(build_dsm_memory(state));
+
+        build_device_structure(device_list, fit);
+        build_nfit(fit, device_list, table_offsets, table_data, linker);
         g_slist_free(device_list);
     }
 }
diff --git a/hw/mem/nvdimm/internal.h b/hw/mem/nvdimm/internal.h
index 5551448..1e95363 100644
--- a/hw/mem/nvdimm/internal.h
+++ b/hw/mem/nvdimm/internal.h
@@ -13,6 +13,14 @@
 #ifndef NVDIMM_INTERNAL_H
 #define NVDIMM_INTERNAL_H
 
+#define NVDIMM_DEBUG 0
+#define nvdebug(fmt, ...)                                     \
+    do {                                                      \
+        if (NVDIMM_DEBUG) {                                   \
+            fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__);  \
+        }                                                     \
+    } while (0)
+
 #define MIN_NAMESPACE_LABEL_SIZE    (128UL << 10)
 
 struct uuid_le {
-- 
1.8.3.1

  parent reply	other threads:[~2015-10-10 19:59 UTC|newest]

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-11  3:52 [Qemu-devel] [PATCH v3 00/32] implement vNVDIMM Xiao Guangrong
2015-10-10 21:17 ` Dan Williams
2015-10-12  4:33   ` Xiao Guangrong
2015-10-12 16:36     ` Dan Williams
2015-10-13  3:14       ` Xiao Guangrong
2015-10-13  3:38         ` Dan Williams
2015-10-13  5:49           ` Xiao Guangrong
2015-10-13  6:36             ` Dan Williams
2015-10-14  4:03               ` Xiao Guangrong
2015-10-14 19:20                 ` Dan Williams
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 01/32] acpi: add aml_derefof Xiao Guangrong
2015-10-13 12:30   ` Igor Mammedov
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 02/32] acpi: add aml_sizeof Xiao Guangrong
2015-10-13 12:33   ` Igor Mammedov
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 03/32] acpi: add aml_create_field Xiao Guangrong
2015-10-13 12:38   ` Igor Mammedov
2015-10-13 16:36     ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 04/32] acpi: add aml_mutex, aml_acquire, aml_release Xiao Guangrong
2015-10-13 13:34   ` Igor Mammedov
2015-10-13 16:44     ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 05/32] acpi: add aml_concatenate Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 06/32] acpi: add aml_object_type Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 07/32] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 08/32] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-10-12 10:08   ` Michael S. Tsirkin
2015-10-13  3:31     ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 09/32] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 10/32] hostmem-file: clean up memory allocation Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 11/32] hostmem-file: use whole file size if possible Xiao Guangrong
2015-10-13 11:50   ` Vladimir Sementsov-Ogievskiy
2015-10-13 16:53     ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 12/32] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 13/32] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 14/32] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-10-12 16:43   ` Eric Blake
2015-10-13  3:32     ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 15/32] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 16/32] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 17/32] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 18/32] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 19/32] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 20/32] dimm: introduce realize callback Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 21/32] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 22/32] nvdimm: init the address region used by NVDIMM ACPI Xiao Guangrong
2015-10-19  6:56   ` Michael S. Tsirkin
2015-10-19  7:27     ` Xiao Guangrong
2015-10-19  7:39       ` Michael S. Tsirkin
2015-10-19  7:44         ` Xiao Guangrong
2015-10-19  9:17           ` Michael S. Tsirkin
2015-10-19  9:46             ` Igor Mammedov
2015-10-19 10:01               ` Xiao Guangrong
2015-10-19 10:34                 ` Michael S. Tsirkin
2015-10-19 10:42                 ` Igor Mammedov
2015-10-19 17:56                   ` Xiao Guangrong
2015-10-20  2:27                   ` Xiao Guangrong
2015-10-19  9:18     ` Igor Mammedov
2015-10-19 10:25       ` Michael S. Tsirkin
2015-10-19 17:54         ` Xiao Guangrong
2015-10-19 21:20           ` Michael S. Tsirkin
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 23/32] nvdimm: build ACPI NFIT table Xiao Guangrong
2015-10-12 11:27   ` Michael S. Tsirkin
2015-10-13  5:13     ` Xiao Guangrong
2015-10-13  5:42       ` Michael S. Tsirkin
2015-10-13  6:06         ` Xiao Guangrong
2015-10-12 16:40   ` Dan Williams
2015-10-13  5:17     ` Xiao Guangrong
2015-10-13  6:07       ` Michael S. Tsirkin
2015-10-11  3:52 ` Xiao Guangrong [this message]
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 25/32] nvdimm: build ACPI nvdimm devices Xiao Guangrong
2015-10-13 14:39   ` Igor Mammedov
2015-10-13 17:24     ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 26/32] nvdimm: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-10-19  6:50   ` Michael S. Tsirkin
2015-10-19  7:14     ` Xiao Guangrong
2015-10-19  7:47       ` Michael S. Tsirkin
2015-10-19  7:51         ` Xiao Guangrong
2015-10-11  3:52 ` [Qemu-devel] [PATCH v3 27/32] nvdimm: support DSM_CMD_IMPLEMENTED function Xiao Guangrong
2015-10-14  9:40   ` Stefan Hajnoczi
2015-10-14 14:50     ` Xiao Guangrong
2015-10-14 17:06       ` Eduardo Habkost
2015-10-15  1:43         ` Xiao Guangrong
2015-10-15 15:07       ` Stefan Hajnoczi
2015-10-16  2:30         ` Xiao Guangrong
2015-10-14  9:41   ` Stefan Hajnoczi
2015-10-14 14:52     ` Xiao Guangrong
2015-10-15 15:01       ` Stefan Hajnoczi
2015-10-16  2:32         ` Xiao Guangrong
2015-10-11  3:53 ` [Qemu-devel] [PATCH v3 28/32] nvdimm: support DSM_CMD_NAMESPACE_LABEL_SIZE function Xiao Guangrong
2015-10-11  3:53 ` [Qemu-devel] [PATCH v3 29/32] nvdimm: support DSM_CMD_GET_NAMESPACE_LABEL_DATA Xiao Guangrong
2015-10-11  3:53 ` [Qemu-devel] [PATCH v3 30/32] nvdimm: support DSM_CMD_SET_NAMESPACE_LABEL_DATA Xiao Guangrong
2015-10-11  3:53 ` [Qemu-devel] [PATCH v3 31/32] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-10-11  3:53 ` [Qemu-devel] [PATCH v3 32/32] nvdimm: add maintain info Xiao Guangrong
2015-10-12  2:59 ` [Qemu-devel] [PATCH v3 00/32] implement vNVDIMM Bharata B Rao
2015-10-12  3:06   ` Xiao Guangrong
2015-10-12  8:20     ` Igor Mammedov
2015-10-12  8:21       ` Xiao Guangrong
2015-10-12 11:55 ` Michael S. Tsirkin
2015-10-13  5:29   ` Xiao Guangrong
2015-10-13  5:57     ` Michael S. Tsirkin
2015-10-13  5:52       ` Xiao Guangrong
2015-10-19  6:57     ` Michael S. Tsirkin
2015-10-19  6:56 ` Michael S. Tsirkin

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=1444535584-18220-25-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).