From: Yang Zhong <yang.zhong@intel.com>
To: qemu-devel@nongnu.org
Cc: xiaoguangrong.eric@gmail.com, ehabkost@redhat.com,
alex.williamson@redhat.com, pbonzini@redhat.com,
anthony.xu@intel.com, yang.zhong@intel.com
Subject: [Qemu-devel] [PATCH 1/2] hostmem-file: Add "nopin" option for memory-backend-file
Date: Mon, 16 Oct 2017 16:56:22 +0800 [thread overview]
Message-ID: <1508144183-30844-2-git-send-email-yang.zhong@intel.com> (raw)
In-Reply-To: <1508144183-30844-1-git-send-email-yang.zhong@intel.com>
Since qemu does not need pin nvdimm memory during the VFIO
hotplug, the new option can be used to avoid pin whole nvdimm
memory. The default value is still "nopin=off" as previous.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
backends/hostmem-file.c | 23 +++++++++++++++++++++++
hw/vfio/common.c | 12 +++++++++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index e44c319..e402077 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -33,6 +33,7 @@ struct HostMemoryBackendFile {
bool share;
bool discard_data;
+ bool nopin;
char *mem_path;
};
@@ -128,6 +129,25 @@ static void file_backend_unparent(Object *obj)
}
}
+static bool file_memory_backend_get_nopin(Object *o, Error **errp)
+{
+ HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
+
+ return fb->nopin;
+}
+
+static void file_memory_backend_set_nopin(Object *o, bool value, Error **errp)
+{
+ HostMemoryBackend *backend = MEMORY_BACKEND(o);
+ HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
+
+ if (memory_region_size(&backend->mr)) {
+ error_setg(errp, "cannot change property value");
+ return;
+ }
+ fb->nopin = value;
+}
+
static void
file_backend_class_init(ObjectClass *oc, void *data)
{
@@ -142,6 +162,9 @@ file_backend_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, "discard-data",
file_memory_backend_get_discard_data, file_memory_backend_set_discard_data,
&error_abort);
+ object_class_property_add_bool(oc, "nopin",
+ file_memory_backend_get_nopin, file_memory_backend_set_nopin,
+ &error_abort);
object_class_property_add_str(oc, "mem-path",
get_mem_path, set_mem_path,
&error_abort);
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 7b2924c..f36ff24 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -408,7 +408,8 @@ static void vfio_listener_region_add(MemoryListener *listener,
void *vaddr;
int ret;
VFIOHostDMAWindow *hostwin;
- bool hostwin_found;
+ bool hostwin_found, nopin;
+ Object *obj = section->mr->owner;
if (vfio_listener_skipped_section(section)) {
trace_vfio_listener_region_add_skip(
@@ -424,6 +425,15 @@ static void vfio_listener_region_add(MemoryListener *listener,
return;
}
+ if (obj && object_dynamic_cast(obj, "memory-backend-file")) {
+ nopin = object_property_get_bool(obj, "nopin", NULL);
+ if (nopin) {
+ error_report("warning: If VFIO DMA still map to NVDIMM memory, "
+ "the VM will crash");
+ return;
+ }
+ }
+
iova = TARGET_PAGE_ALIGN(section->offset_within_address_space);
llend = int128_make64(section->offset_within_address_space);
llend = int128_add(llend, section->size);
--
1.9.1
next prev parent reply other threads:[~2017-10-16 8:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 8:56 [Qemu-devel] [PATCH 0/2] add "nopin" option in the memory-backend-file Yang Zhong
2017-10-16 8:56 ` Yang Zhong [this message]
2017-10-16 8:56 ` [Qemu-devel] [PATCH 2/2] nvdimm: Add "nopin" for related documents Yang Zhong
2017-10-16 10:20 ` [Qemu-devel] [PATCH 0/2] add "nopin" option in the memory-backend-file Xiao Guangrong
2017-10-16 11:58 ` Paolo Bonzini
2017-10-18 5:57 ` Zhong Yang
2017-10-18 9:48 ` Paolo Bonzini
2017-10-18 9:56 ` Zhong Yang
2017-10-18 5:34 ` Zhong Yang
2017-10-16 15:47 ` Alex Williamson
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=1508144183-30844-2-git-send-email-yang.zhong@intel.com \
--to=yang.zhong@intel.com \
--cc=alex.williamson@redhat.com \
--cc=anthony.xu@intel.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=xiaoguangrong.eric@gmail.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).