Skip to contentSkip to conversation

nvdimm: fix typo in label-size definition

PATCH Superseded Ross Zwisler 3 participants 13 messages Apr 27, 2018 – May 16, 2018 libnvdimm: non-volatile memory device

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 nvdimm: fix typo in label-size definition

Fixes commit da6789c27c2e ("nvdimm: add a macro for property "label-size"")
Cc Haozhong Zhang <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
Cc Stefan Hajnoczi <[email protected]>
---
 hw/mem/nvdimm.c         | 2 +-
 include/hw/mem/nvdimm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/mem/nvdimm.c +1 -1
index acb656b672..4087aca25e 100644
@@ -89,7 +89,7 @@ static void nvdimm_set_unarmed(Object *obj, bool value, Error **errp)
 
 static void nvdimm_init(Object *obj)
 {
-    object_property_add(obj, NVDIMM_LABLE_SIZE_PROP, "int",
+    object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int",
                         nvdimm_get_label_size, nvdimm_set_label_size, NULL,
                         NULL, NULL);
     object_property_add_bool(obj, NVDIMM_UNARMED_PROP,
include/hw/mem/nvdimm.h +1 -1
index 7fd87c4e1c..74c60332e1 100644
@@ -48,7 +48,7 @@
 #define NVDIMM_GET_CLASS(obj) OBJECT_GET_CLASS(NVDIMMClass, (obj), \
                                                TYPE_NVDIMM)
 
-#define NVDIMM_LABLE_SIZE_PROP "label-size"
+#define NVDIMM_LABEL_SIZE_PROP "label-size"
 #define NVDIMM_UNARMED_PROP    "unarmed"
 
 struct NVDIMMDevice {
Signature · 6 lines
2.14.3

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
#1 lore raw

PATCH 2/3 nvdimm, acpi: add NFIT platform capabilities

Add support for the NFIT Platform Capabilities Structure, newly added in ACPI 6.2 Errata A.

---
 hw/acpi/nvdimm.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
hw/acpi/nvdimm.c +32 -0
index 59d6e4254c..859b390e07 100644
@@ -169,6 +169,21 @@ struct NvdimmNfitControlRegion {
 } QEMU_PACKED;
 typedef struct NvdimmNfitControlRegion NvdimmNfitControlRegion;
 
+/*
+ * NVDIMM Platform Capabilities Structure
+ *
+ * Defined in section 5.2.25.9 of ACPI 6.2 Errata A, September 2017
+ */
+struct NvdimmNfitPlatformCaps {
+    uint16_t type;
+    uint16_t length;
+    uint8_t highest_cap;
+    uint8_t reserved[3];
+    uint32_t capabilities;
+    uint8_t reserved2[4];
+} QEMU_PACKED;
+typedef struct NvdimmNfitPlatformCaps NvdimmNfitPlatformCaps;
+
 /*
  * Module serial number is a unique number for each device. We use the
  * slot id of NVDIMM device to generate this number so that each device
@@ -351,6 +366,21 @@ static void nvdimm_build_structure_dcr(GArray *structures, DeviceState *dev)
                                          JEDEC Annex L Release 3. */);
 }
 
+/*
+ * ACPI 6.2 Errata A: 5.2.25.9 NVDIMM Platform Capabilities Structure
+ */
+static void
+nvdimm_build_structure_caps(GArray *structures)
+{
+    NvdimmNfitPlatformCaps *nfit_caps;
+
+    nfit_caps = acpi_data_push(structures, sizeof(*nfit_caps));
+
+    nfit_caps->type = cpu_to_le16(7 /* NVDIMM Platform Capabilities */);
+    nfit_caps->length = cpu_to_le16(sizeof(*nfit_caps));
+    nfit_caps->highest_cap = 1;
+    nfit_caps->capabilities = cpu_to_le32(2 /* memory controller */);
+}
 static GArray *nvdimm_build_device_structure(void)
 {
     GSList *device_list = nvdimm_get_device_list();
@@ -373,6 +403,8 @@ static GArray *nvdimm_build_device_structure(void)
     }
     g_slist_free(device_list);
 
+    nvdimm_build_structure_caps(structures);
+
     return structures;
 }
 
Signature · 6 lines
2.14.3

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
#3 lore raw

Re: [Qemu-devel] [PATCH 2/3] nvdimm, acpi: add NFIT platform capabilities

In reply to Ross Zwisler
Quoted 2 lines · On Fri, 27 Apr 2018 15:53:13 -0600 Ross Zwisler <[email protected]>…

Add support for the NFIT Platform Capabilities Structure, newly added in ACPI 6.2 Errata A.

Look fine but I'd squash it into the next 3/3 patch.

Quoted 54 lines
---
 hw/acpi/nvdimm.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
hw/acpi/nvdimm.c +30 -0
index 59d6e4254c..859b390e07 100644
@@ -169,6 +169,21 @@ struct NvdimmNfitControlRegion {
 } QEMU_PACKED;
 typedef struct NvdimmNfitControlRegion NvdimmNfitControlRegion;
 
+/*
+ * NVDIMM Platform Capabilities Structure
+ *
+ * Defined in section 5.2.25.9 of ACPI 6.2 Errata A, September 2017
+ */
+struct NvdimmNfitPlatformCaps {
+    uint16_t type;
+    uint16_t length;
+    uint8_t highest_cap;
+    uint8_t reserved[3];
+    uint32_t capabilities;
+    uint8_t reserved2[4];
+} QEMU_PACKED;
+typedef struct NvdimmNfitPlatformCaps NvdimmNfitPlatformCaps;
+
 /*
  * Module serial number is a unique number for each device. We use the
  * slot id of NVDIMM device to generate this number so that each device
@@ -351,6 +366,21 @@ static void nvdimm_build_structure_dcr(GArray *structures, DeviceState *dev)
                                          JEDEC Annex L Release 3. */);
 }
 
+/*
+ * ACPI 6.2 Errata A: 5.2.25.9 NVDIMM Platform Capabilities Structure
+ */
+static void
+nvdimm_build_structure_caps(GArray *structures)
+{
+    NvdimmNfitPlatformCaps *nfit_caps;
+
+    nfit_caps = acpi_data_push(structures, sizeof(*nfit_caps));
+
+    nfit_caps->type = cpu_to_le16(7 /* NVDIMM Platform Capabilities */);
+    nfit_caps->length = cpu_to_le16(sizeof(*nfit_caps));
+    nfit_caps->highest_cap = 1;
+    nfit_caps->capabilities = cpu_to_le32(2 /* memory controller */);
+}
 static GArray *nvdimm_build_device_structure(void)
 {
     GSList *device_list = nvdimm_get_device_list();

hw/acpi/nvdimm.c static GArray *nvdimm_build_device_structure(void) · line 410

Quoted 8 lines
hw/acpi/nvdimm.c +2 -0
@@ -373,6 +403,8 @@ static GArray *nvdimm_build_device_structure(void)
     }
     g_slist_free(device_list);
 
+    nvdimm_build_structure_caps(structures);
+
     return structures;
 }
 

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#4 lore raw

PATCH 3/3 nvdimm: platform capabilities command line option

In reply to Ross Zwisler

Add a device command line option to allow the user to control the Platform Capabilities Structure in the virtualized NFIT.

---
 docs/nvdimm.txt         | 22 ++++++++++++++++++++++
 hw/acpi/nvdimm.c        | 29 +++++++++++++++++++++++++----
 hw/mem/nvdimm.c         | 28 ++++++++++++++++++++++++++++
 include/hw/mem/nvdimm.h |  6 ++++++
 4 files changed, 81 insertions(+), 4 deletions(-)
docs/nvdimm.txt +22 -0
index e903d8bb09..13a2c15b70 100644
@@ -153,3 +153,25 @@ guest NVDIMM region mapping structure.  This unarmed flag indicates
 guest software that this vNVDIMM device contains a region that cannot
 accept persistent writes. In result, for example, the guest Linux
 NVDIMM driver, marks such vNVDIMM device as read-only.
+
+Platform Capabilities
+---------------------
+
+ACPI 6.2 Errata A added support for a new Platform Capabilities Structure
+which allows the platform to communicate what features it supports related to
+NVDIMM data durability.  Users can provide a capabilities value to a guest via
+the optional "cap" device command line option:
+
+ -device nvdimm,id=nvdimm1,memdev=mem1,cap=3
+
+As of ACPI 6.2 Errata A, the following values are valid for the bottom two
+bits:
+
+2 - Memory Controller Flush to NVDIMM Durability on Power Loss Capable.
+3 - CPU Cache Flush to NVDIMM Durability on Power Loss Capable.
+
+For a complete list of the flags available please consult the ACPI spec.
+
+These platform capabilities apply to the entire virtual platform, so it is
+recommended that only one "cap" device command option be given per virtual
+machine.  This value will apply to all NVDIMMs in the virtual platform.
hw/acpi/nvdimm.c +25 -4
index 859b390e07..375237c96c 100644
@@ -370,7 +370,7 @@ static void nvdimm_build_structure_dcr(GArray *structures, DeviceState *dev)
  * ACPI 6.2 Errata A: 5.2.25.9 NVDIMM Platform Capabilities Structure
  */
 static void
-nvdimm_build_structure_caps(GArray *structures)
+nvdimm_build_structure_caps(GArray *structures, uint32_t capabilities)
 {
     NvdimmNfitPlatformCaps *nfit_caps;
 
@@ -378,13 +378,31 @@ nvdimm_build_structure_caps(GArray *structures)
 
     nfit_caps->type = cpu_to_le16(7 /* NVDIMM Platform Capabilities */);
     nfit_caps->length = cpu_to_le16(sizeof(*nfit_caps));
-    nfit_caps->highest_cap = 1;
-    nfit_caps->capabilities = cpu_to_le32(2 /* memory controller */);
+    nfit_caps->highest_cap = 2;
+    nfit_caps->capabilities = cpu_to_le32(capabilities);
 }
+
+static uint32_t nvdimm_get_capabilities(DeviceState *dev)
+{
+    static uint32_t capabilities = 0;
+    uint32_t this_cap = object_property_get_uint(OBJECT(dev),
+                                            NVDIMM_CAPABILITIES_PROP, NULL);
+
+    if (this_cap && !capabilities)
+        capabilities = this_cap;
+
+    if (this_cap && this_cap != capabilities)
+        nvdimm_debug("WARNING: multiple capabilities (%d and %d) defined\n",
+                this_cap, capabilities);
+
+    return capabilities;
+}
+
 static GArray *nvdimm_build_device_structure(void)
 {
     GSList *device_list = nvdimm_get_device_list();
     GArray *structures = g_array_new(false, true /* clear */, 1);
+    uint32_t capabilities = 0;
 
     for (; device_list; device_list = device_list->next) {
         DeviceState *dev = device_list->data;
@@ -400,10 +418,13 @@ static GArray *nvdimm_build_device_structure(void)
 
         /* build NVDIMM Control Region Structure. */
         nvdimm_build_structure_dcr(structures, dev);
+
+        capabilities = nvdimm_get_capabilities(dev);
     }
     g_slist_free(device_list);
 
-    nvdimm_build_structure_caps(structures);
+    if (capabilities)
+        nvdimm_build_structure_caps(structures, capabilities);
 
     return structures;
 }
hw/mem/nvdimm.c +28 -0
index 4087aca25e..923364e190 100644
@@ -87,6 +87,31 @@ static void nvdimm_set_unarmed(Object *obj, bool value, Error **errp)
     error_propagate(errp, local_err);
 }
 
+static void nvdimm_get_capabilities(Object *obj, Visitor *v, const char *name,
+                                  void *opaque, Error **errp)
+{
+    NVDIMMDevice *nvdimm = NVDIMM(obj);
+    uint32_t value = nvdimm->capabilities;
+
+    visit_type_uint32(v, name, &value, errp);
+}
+
+static void nvdimm_set_capabilities(Object *obj, Visitor *v, const char *name,
+                                  void *opaque, Error **errp)
+{
+    NVDIMMDevice *nvdimm = NVDIMM(obj);
+    Error *local_err = NULL;
+    uint32_t value;
+
+    visit_type_uint32(v, name, &value, &local_err);
+    if (local_err)
+        goto out;
+
+    nvdimm->capabilities = value;
+out:
+    error_propagate(errp, local_err);
+}
+
 static void nvdimm_init(Object *obj)
 {
     object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int",
@@ -94,6 +119,9 @@ static void nvdimm_init(Object *obj)
                         NULL, NULL);
     object_property_add_bool(obj, NVDIMM_UNARMED_PROP,
                              nvdimm_get_unarmed, nvdimm_set_unarmed, NULL);
+    object_property_add(obj, NVDIMM_CAPABILITIES_PROP, "uint32",
+                        nvdimm_get_capabilities, nvdimm_set_capabilities,
+                        NULL, NULL, NULL);
 }
 
 static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
include/hw/mem/nvdimm.h +6 -0
index 74c60332e1..68af64ff46 100644
@@ -50,6 +50,7 @@
 
 #define NVDIMM_LABEL_SIZE_PROP "label-size"
 #define NVDIMM_UNARMED_PROP    "unarmed"
+#define NVDIMM_CAPABILITIES_PROP "cap"
 
 struct NVDIMMDevice {
     /* private */
@@ -83,6 +84,11 @@ struct NVDIMMDevice {
      * the guest write persistence.
      */
     bool unarmed;
+
+    /*
+     * Platform capabilities, section 5.2.25.9 of ACPI 6.2 Errata A
+     */
+    uint32_t capabilities;
 };
 typedef struct NVDIMMDevice NVDIMMDevice;
 
Signature · 6 lines
2.14.3

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Reviewed-by on v1 3/3
#5 lore raw

Re: [PATCH 3/3] nvdimm: platform capabilities command line option

Quoted 10 lines · Ross Zwisler

Add a device command line option to allow the user to control the Platform Capabilities Structure in the virtualized NFIT.

---
 docs/nvdimm.txt         | 22 ++++++++++++++++++++++
 hw/acpi/nvdimm.c        | 29 +++++++++++++++++++++++++----
 hw/mem/nvdimm.c         | 28 ++++++++++++++++++++++++++++
 include/hw/mem/nvdimm.h |  6 ++++++
 4 files changed, 81 insertions(+), 4 deletions(-)
#6 lore raw

Re: [Qemu-devel] [PATCH 3/3] nvdimm: platform capabilities command line option

In reply to Ross Zwisler
Quoted 31 lines · On Fri, 27 Apr 2018 15:53:14 -0600 Ross Zwisler <[email protected]>…

Add a device command line option to allow the user to control the Platform Capabilities Structure in the virtualized NFIT.

---
 docs/nvdimm.txt         | 22 ++++++++++++++++++++++
 hw/acpi/nvdimm.c        | 29 +++++++++++++++++++++++++----
 hw/mem/nvdimm.c         | 28 ++++++++++++++++++++++++++++
 include/hw/mem/nvdimm.h |  6 ++++++
 4 files changed, 81 insertions(+), 4 deletions(-)
docs/nvdimm.txt +12 -0
index e903d8bb09..13a2c15b70 100644
@@ -153,3 +153,25 @@ guest NVDIMM region mapping structure.  This unarmed flag indicates
 guest software that this vNVDIMM device contains a region that cannot
 accept persistent writes. In result, for example, the guest Linux
 NVDIMM driver, marks such vNVDIMM device as read-only.
+
+Platform Capabilities
+---------------------
+
+ACPI 6.2 Errata A added support for a new Platform Capabilities Structure
+which allows the platform to communicate what features it supports related to
+NVDIMM data durability.  Users can provide a capabilities value to a guest via
+the optional "cap" device command line option:
+
+ -device nvdimm,id=nvdimm1,memdev=mem1,cap=3
+
+As of ACPI 6.2 Errata A, the following values are valid for the bottom two

docs/nvdimm.txt guest NVDIMM region mapping structure. This unarmed flag indicates · line 177

Quoted 10 lines
docs/nvdimm.txt +10 -0
+bits:
+
+2 - Memory Controller Flush to NVDIMM Durability on Power Loss Capable.
+3 - CPU Cache Flush to NVDIMM Durability on Power Loss Capable.
+
+For a complete list of the flags available please consult the ACPI spec.
+
+These platform capabilities apply to the entire virtual platform, so it is
+recommended that only one "cap" device command option be given per virtual
+machine.  This value will apply to all NVDIMMs in the virtual platform.

This looks like it should be machine property instead of per device one, you can get rid of static variable and mismatch check and a weird nvdimm CLI option that implies that the option is per device.

Also an extra patch to for make check that will test setting 'cap' would be nice (an extra testcase in tests/bios-tables-test.c)

Quoted 122 lines
hw/acpi/nvdimm.c +25 -4
index 859b390e07..375237c96c 100644
@@ -370,7 +370,7 @@ static void nvdimm_build_structure_dcr(GArray *structures, DeviceState *dev)
  * ACPI 6.2 Errata A: 5.2.25.9 NVDIMM Platform Capabilities Structure
  */
 static void
-nvdimm_build_structure_caps(GArray *structures)
+nvdimm_build_structure_caps(GArray *structures, uint32_t capabilities)
 {
     NvdimmNfitPlatformCaps *nfit_caps;
 
@@ -378,13 +378,31 @@ nvdimm_build_structure_caps(GArray *structures)
 
     nfit_caps->type = cpu_to_le16(7 /* NVDIMM Platform Capabilities */);
     nfit_caps->length = cpu_to_le16(sizeof(*nfit_caps));
-    nfit_caps->highest_cap = 1;
-    nfit_caps->capabilities = cpu_to_le32(2 /* memory controller */);
+    nfit_caps->highest_cap = 2;
+    nfit_caps->capabilities = cpu_to_le32(capabilities);
 }
+
+static uint32_t nvdimm_get_capabilities(DeviceState *dev)
+{
+    static uint32_t capabilities = 0;
+    uint32_t this_cap = object_property_get_uint(OBJECT(dev),
+                                            NVDIMM_CAPABILITIES_PROP, NULL);
+
+    if (this_cap && !capabilities)
+        capabilities = this_cap;
+
+    if (this_cap && this_cap != capabilities)
+        nvdimm_debug("WARNING: multiple capabilities (%d and %d) defined\n",
+                this_cap, capabilities);
+
+    return capabilities;
+}
+
 static GArray *nvdimm_build_device_structure(void)
 {
     GSList *device_list = nvdimm_get_device_list();
     GArray *structures = g_array_new(false, true /* clear */, 1);
+    uint32_t capabilities = 0;
 
     for (; device_list; device_list = device_list->next) {
         DeviceState *dev = device_list->data;
@@ -400,10 +418,13 @@ static GArray *nvdimm_build_device_structure(void)
 
         /* build NVDIMM Control Region Structure. */
         nvdimm_build_structure_dcr(structures, dev);
+
+        capabilities = nvdimm_get_capabilities(dev);
     }
     g_slist_free(device_list);
 
-    nvdimm_build_structure_caps(structures);
+    if (capabilities)
+        nvdimm_build_structure_caps(structures, capabilities);
 
     return structures;
 }
hw/mem/nvdimm.c +28 -0
index 4087aca25e..923364e190 100644
@@ -87,6 +87,31 @@ static void nvdimm_set_unarmed(Object *obj, bool value, Error **errp)
     error_propagate(errp, local_err);
 }
 
+static void nvdimm_get_capabilities(Object *obj, Visitor *v, const char *name,
+                                  void *opaque, Error **errp)
+{
+    NVDIMMDevice *nvdimm = NVDIMM(obj);
+    uint32_t value = nvdimm->capabilities;
+
+    visit_type_uint32(v, name, &value, errp);
+}
+
+static void nvdimm_set_capabilities(Object *obj, Visitor *v, const char *name,
+                                  void *opaque, Error **errp)
+{
+    NVDIMMDevice *nvdimm = NVDIMM(obj);
+    Error *local_err = NULL;
+    uint32_t value;
+
+    visit_type_uint32(v, name, &value, &local_err);
+    if (local_err)
+        goto out;
+
+    nvdimm->capabilities = value;
+out:
+    error_propagate(errp, local_err);
+}
+
 static void nvdimm_init(Object *obj)
 {
     object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int",
@@ -94,6 +119,9 @@ static void nvdimm_init(Object *obj)
                         NULL, NULL);
     object_property_add_bool(obj, NVDIMM_UNARMED_PROP,
                              nvdimm_get_unarmed, nvdimm_set_unarmed, NULL);
+    object_property_add(obj, NVDIMM_CAPABILITIES_PROP, "uint32",
+                        nvdimm_get_capabilities, nvdimm_set_capabilities,
+                        NULL, NULL, NULL);
 }
 
 static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
include/hw/mem/nvdimm.h +1 -0
index 74c60332e1..68af64ff46 100644
@@ -50,6 +50,7 @@
 
 #define NVDIMM_LABEL_SIZE_PROP "label-size"
 #define NVDIMM_UNARMED_PROP    "unarmed"
+#define NVDIMM_CAPABILITIES_PROP "cap"
 
 struct NVDIMMDevice {
     /* private */
@@ -83,6 +84,11 @@ struct NVDIMMDevice {
      * the guest write persistence.

include/hw/mem/nvdimm.h struct NVDIMMDevice { · line 94

Quoted 10 lines
include/hw/mem/nvdimm.h +5 -0
      */
     bool unarmed;
+
+    /*
+     * Platform capabilities, section 5.2.25.9 of ACPI 6.2 Errata A
+     */
+    uint32_t capabilities;
 };
 typedef struct NVDIMMDevice NVDIMMDevice;
 

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#7 lore raw

Re: [Qemu-devel] [PATCH 3/3] nvdimm: platform capabilities command line option

Quoted 39 lines · Igor Mammedov
Quoted 36 lines · On Fri, 27 Apr 2018 15:53:14 -0600 Ross Zwisler <[email protected]>…

Add a device command line option to allow the user to control the Platform Capabilities Structure in the virtualized NFIT.

---
 docs/nvdimm.txt         | 22 ++++++++++++++++++++++
 hw/acpi/nvdimm.c        | 29 +++++++++++++++++++++++++----
 hw/mem/nvdimm.c         | 28 ++++++++++++++++++++++++++++
 include/hw/mem/nvdimm.h |  6 ++++++
 4 files changed, 81 insertions(+), 4 deletions(-)
docs/nvdimm.txt +17 -0
index e903d8bb09..13a2c15b70 100644
@@ -153,3 +153,25 @@ guest NVDIMM region mapping structure.  This unarmed flag indicates
 guest software that this vNVDIMM device contains a region that cannot
 accept persistent writes. In result, for example, the guest Linux
 NVDIMM driver, marks such vNVDIMM device as read-only.
+
+Platform Capabilities
+---------------------
+
+ACPI 6.2 Errata A added support for a new Platform Capabilities Structure
+which allows the platform to communicate what features it supports related to
+NVDIMM data durability.  Users can provide a capabilities value to a guest via
+the optional "cap" device command line option:
+
+ -device nvdimm,id=nvdimm1,memdev=mem1,cap=3
+
+As of ACPI 6.2 Errata A, the following values are valid for the bottom two
+bits:
+
+2 - Memory Controller Flush to NVDIMM Durability on Power Loss Capable.
+3 - CPU Cache Flush to NVDIMM Durability on Power Loss Capable.
+
Quoted 8 lines

docs/nvdimm.txt guest NVDIMM region mapping structure. This unarmed flag indicates · line 177

Quoted 5 lines
docs/nvdimm.txt +5 -0
+For a complete list of the flags available please consult the ACPI spec.
+
+These platform capabilities apply to the entire virtual platform, so it is
+recommended that only one "cap" device command option be given per virtual
+machine.  This value will apply to all NVDIMMs in the virtual platform.

This looks like it should be machine property instead of per device one, you can get rid of static variable and mismatch check and a weird nvdimm CLI option that implies that the option is per device.

Yep, that's much better. I have this implemented and ready to go.

Quoted 2 lines

Also an extra patch to for make check that will test setting 'cap' would be nice (an extra testcase in tests/bios-tables-test.c)

Hmm...I've been looking at this, and it doesn't look like there is any verification around a lot of the ACPI tables (NFIT, SRAT, etc).

I've verified my patch by interacting with a guest with various settings - is this good enough, or do you really want me to test the value (which I think would just be "do I get out what I put in at the command line") via the unit test infrastructure?

Thank you for the review.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#8 lore raw

Re: [Qemu-devel] [PATCH 3/3] nvdimm: platform capabilities command line option

Quoted 1 line · On Tue, 15 May 2018 17:03:51 -0600 Ross Zwisler <[email protected]>…

On Thu, May 10, 2018 at 03:28:48PM +0200, Igor Mammedov wrote:

[...]

Quoted 6 lines
Quoted 3 lines

Also an extra patch to for make check that will test setting 'cap' would be nice (an extra testcase in tests/bios-tables-test.c)

Hmm...I've been looking at this, and it doesn't look like there is any verification around a lot of the ACPI tables (NFIT, SRAT, etc).

as far as I recall NFIT and SRAT are verified against expected template (limited but at least something)

Following commits can serve as an example:
e0e5c85 test/acpi-test-data: add ACPI tables for dimmpxm test adae91c tests/bios-tables-test: add test cases for DIMM proximity

Quoted 4 lines

I've verified my patch by interacting with a guest with various settings - is this good enough, or do you really want me to test the value (which I think would just be "do I get out what I put in at the command line") via the unit test infrastructure?

It would be better to add test especially for a new code. The reason for it is to catch regressions down the road, it also makes easier for maintainer to review/test series.

Quoted 1 line

Thank you for the review.

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

Reviewed-by on v1 1/3
#9 lore raw
In reply to Ross Zwisler
Quoted 9 lines · Ross Zwisler
Fixes commit da6789c27c2e ("nvdimm: add a macro for property "label-size"")
Cc Haozhong Zhang <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
Cc Stefan Hajnoczi <[email protected]>
---
 hw/mem/nvdimm.c         | 2 +-
 include/hw/mem/nvdimm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
#10 lore raw
Quoted 11 lines · Stefan Hajnoczi
Quoted 9 lines · Ross Zwisler
Fixes commit da6789c27c2e ("nvdimm: add a macro for property "label-size"")
Cc Haozhong Zhang <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
Cc Stefan Hajnoczi <[email protected]>
---
 hw/mem/nvdimm.c         | 2 +-
 include/hw/mem/nvdimm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 1 line

Thank you for the review.

This is my first QEMU submission - do I need to do anything else to get this merged (create a pull request somewhere), or do I just wait for a maintainer to pull it in?

Thanks,
- Ross
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

#11 lore raw
Quoted 12 lines · Ross Zwisler
Quoted 11 lines · Stefan Hajnoczi
Quoted 9 lines · Ross Zwisler
Fixes commit da6789c27c2e ("nvdimm: add a macro for property "label-size"")
Cc Haozhong Zhang <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
Cc Stefan Hajnoczi <[email protected]>
---
 hw/mem/nvdimm.c         | 2 +-
 include/hw/mem/nvdimm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 7 lines
Quoted 1 line

Thank you for the review.

This is my first QEMU submission - do I need to do anything else to get this merged (create a pull request somewhere), or do I just wait for a maintainer to pull it in?

Michael Tsirkin and Igor Mammedov are the maintainers who will review and merge this series. You don't need to do anything (I have CCed Igor now).

Please include a cover letter in a multi-patch series in the future. This doesn't prevent this patch series from being merged.

Stefan

Reviewed-by on v1 1/3
#12 lore raw
In reply to Ross Zwisler
Quoted 5 lines · On Fri, 27 Apr 2018 15:53:12 -0600 Ross Zwisler <[email protected]>…
Fixes commit da6789c27c2e ("nvdimm: add a macro for property "label-size"")
Cc Haozhong Zhang <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
Cc Stefan Hajnoczi <[email protected]>
Quoted 23 lines
---
 hw/mem/nvdimm.c         | 2 +-
 include/hw/mem/nvdimm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/mem/nvdimm.c +1 -1
index acb656b672..4087aca25e 100644
@@ -89,7 +89,7 @@ static void nvdimm_set_unarmed(Object *obj, bool value, Error **errp)
 
 static void nvdimm_init(Object *obj)
 {
-    object_property_add(obj, NVDIMM_LABLE_SIZE_PROP, "int",
+    object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int",
                         nvdimm_get_label_size, nvdimm_set_label_size, NULL,
                         NULL, NULL);
     object_property_add_bool(obj, NVDIMM_UNARMED_PROP,
include/hw/mem/nvdimm.h +0 -0
index 7fd87c4e1c..74c60332e1 100644

include/hw/mem/nvdimm.h line 54

Quoted 8 lines
include/hw/mem/nvdimm.h +1 -1
@@ -48,7 +48,7 @@
 #define NVDIMM_GET_CLASS(obj) OBJECT_GET_CLASS(NVDIMMClass, (obj), \
                                                TYPE_NVDIMM)
 
-#define NVDIMM_LABLE_SIZE_PROP "label-size"
+#define NVDIMM_LABEL_SIZE_PROP "label-size"
 #define NVDIMM_UNARMED_PROP    "unarmed"
 
 struct NVDIMMDevice {

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm