Blame SOURCES/kvm-vhost-allow-backends-to-filter-memory-sections.patch

26ba25
From 1a875754c500068de9c210b9f57621843c78e8b3 Mon Sep 17 00:00:00 2001
26ba25
From: "plai@redhat.com" <plai@redhat.com>
26ba25
Date: Thu, 21 Jun 2018 18:54:41 +0200
26ba25
Subject: [PATCH 162/268] vhost: allow backends to filter memory sections
26ba25
26ba25
RH-Author: plai@redhat.com
26ba25
Message-id: <1529607285-9942-7-git-send-email-plai@redhat.com>
26ba25
Patchwork-id: 80941
26ba25
O-Subject: [RHEL7.6 PATCH BZ 1526645 06/10] vhost: allow backends to filter memory sections
26ba25
Bugzilla: 1526645
26ba25
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
26ba25
RH-Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
26ba25
From: Tiwei Bie <tiwei.bie@intel.com>
26ba25
26ba25
This patch introduces a vhost op for vhost backends to allow
26ba25
them to filter the memory sections that they can handle.
26ba25
26ba25
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
26ba25
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
26ba25
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
26ba25
(cherry picked from commit 988a27754bbbc45698f7acb54352e5a1ae699514)
26ba25
Signed-off-by: Paul Lai <plai@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 hw/virtio/vhost-user.c            | 11 +++++++++++
26ba25
 hw/virtio/vhost.c                 |  9 +++++++--
26ba25
 include/hw/virtio/vhost-backend.h |  4 ++++
26ba25
 3 files changed, 22 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
26ba25
index 85d8fd2..ebb946a 100644
26ba25
--- a/hw/virtio/vhost-user.c
26ba25
+++ b/hw/virtio/vhost-user.c
26ba25
@@ -1620,6 +1620,16 @@ vhost_user_crypto_close_session(struct vhost_dev *dev, uint64_t session_id)
26ba25
     return 0;
26ba25
 }
26ba25
 
26ba25
+static bool vhost_user_mem_section_filter(struct vhost_dev *dev,
26ba25
+                                          MemoryRegionSection *section)
26ba25
+{
26ba25
+    bool result;
26ba25
+
26ba25
+    result = memory_region_get_fd(section->mr) >= 0;
26ba25
+
26ba25
+    return result;
26ba25
+}
26ba25
+
26ba25
 const VhostOps user_ops = {
26ba25
         .backend_type = VHOST_BACKEND_TYPE_USER,
26ba25
         .vhost_backend_init = vhost_user_init,
26ba25
@@ -1650,4 +1660,5 @@ const VhostOps user_ops = {
26ba25
         .vhost_set_config = vhost_user_set_config,
26ba25
         .vhost_crypto_create_session = vhost_user_crypto_create_session,
26ba25
         .vhost_crypto_close_session = vhost_user_crypto_close_session,
26ba25
+        .vhost_backend_mem_section_filter = vhost_user_mem_section_filter,
26ba25
 };
26ba25
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
26ba25
index 9d5850a..1ae68ff 100644
26ba25
--- a/hw/virtio/vhost.c
26ba25
+++ b/hw/virtio/vhost.c
26ba25
@@ -386,7 +386,7 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
26ba25
     return r;
26ba25
 }
26ba25
 
26ba25
-static bool vhost_section(MemoryRegionSection *section)
26ba25
+static bool vhost_section(struct vhost_dev *dev, MemoryRegionSection *section)
26ba25
 {
26ba25
     bool result;
26ba25
     bool log_dirty = memory_region_get_dirty_log_mask(section->mr) &
26ba25
@@ -399,6 +399,11 @@ static bool vhost_section(MemoryRegionSection *section)
26ba25
      */
26ba25
     result &= !log_dirty;
26ba25
 
26ba25
+    if (result && dev->vhost_ops->vhost_backend_mem_section_filter) {
26ba25
+        result &=
26ba25
+            dev->vhost_ops->vhost_backend_mem_section_filter(dev, section);
26ba25
+    }
26ba25
+
26ba25
     trace_vhost_section(section->mr->name, result);
26ba25
     return result;
26ba25
 }
26ba25
@@ -632,7 +637,7 @@ static void vhost_region_addnop(MemoryListener *listener,
26ba25
     struct vhost_dev *dev = container_of(listener, struct vhost_dev,
26ba25
                                          memory_listener);
26ba25
 
26ba25
-    if (!vhost_section(section)) {
26ba25
+    if (!vhost_section(dev, section)) {
26ba25
         return;
26ba25
     }
26ba25
     vhost_region_add_section(dev, section);
26ba25
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
26ba25
index 5dac61f..81283ec 100644
26ba25
--- a/include/hw/virtio/vhost-backend.h
26ba25
+++ b/include/hw/virtio/vhost-backend.h
26ba25
@@ -101,6 +101,9 @@ typedef int (*vhost_crypto_create_session_op)(struct vhost_dev *dev,
26ba25
 typedef int (*vhost_crypto_close_session_op)(struct vhost_dev *dev,
26ba25
                                              uint64_t session_id);
26ba25
 
26ba25
+typedef bool (*vhost_backend_mem_section_filter_op)(struct vhost_dev *dev,
26ba25
+                                                MemoryRegionSection *section);
26ba25
+
26ba25
 typedef struct VhostOps {
26ba25
     VhostBackendType backend_type;
26ba25
     vhost_backend_init vhost_backend_init;
26ba25
@@ -138,6 +141,7 @@ typedef struct VhostOps {
26ba25
     vhost_set_config_op vhost_set_config;
26ba25
     vhost_crypto_create_session_op vhost_crypto_create_session;
26ba25
     vhost_crypto_close_session_op vhost_crypto_close_session;
26ba25
+    vhost_backend_mem_section_filter_op vhost_backend_mem_section_filter;
26ba25
 } VhostOps;
26ba25
 
26ba25
 extern const VhostOps user_ops;
26ba25
-- 
26ba25
1.8.3.1
26ba25