All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tiejun Chen <tiejun.chen@intel.com>
To: jbeulich@suse.com, ian.jackson@eu.citrix.com,
	stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com,
	wei.liu2@citrix.com, kevin.tian@intel.com, tim@xen.org,
	yang.z.zhang@intel.com
Cc: xen-devel@lists.xen.org
Subject: [v8][PATCH 06/17] tools/libxc: check if modules space is overlapping with reserved device memory
Date: Mon,  1 Dec 2014 17:24:24 +0800	[thread overview]
Message-ID: <1417425875-9634-7-git-send-email-tiejun.chen@intel.com> (raw)
In-Reply-To: <1417425875-9634-1-git-send-email-tiejun.chen@intel.com>

In case of reserved device memory overlapping with ram, it also probably
overlap with modules space so we need to check these reserved device
memory as well.

Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
 tools/libxc/xc_hvm_build_x86.c | 94 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 15 deletions(-)

diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c
index c81a25b..ddcf06d 100644
--- a/tools/libxc/xc_hvm_build_x86.c
+++ b/tools/libxc/xc_hvm_build_x86.c
@@ -54,9 +54,82 @@
 
 #define VGA_HOLE_SIZE (0x20)
 
+/*
+ * Check whether there exists mmio hole in the specified memory range.
+ * Returns 1 if exists, else returns 0.
+ */
+static int check_mmio_hole(uint64_t start, uint64_t memsize,
+                           uint64_t mmio_start, uint64_t mmio_size)
+{
+    if ( start + memsize <= mmio_start || start >= mmio_start + mmio_size )
+        return 0;
+    else
+        return 1;
+}
+
+/* Getting all reserved device memory map info. */
+static struct xen_reserved_device_memory
+*xc_get_reserved_device_memory_map(xc_interface *xch, unsigned int nr_entries,
+                                   uint32_t dom)
+{
+    struct xen_reserved_device_memory *xrdm = NULL;
+    int rc = xc_reserved_device_memory_map(xch, dom, xrdm, &nr_entries);
+
+    if ( rc < 0 )
+    {
+        if ( errno == ENOBUFS )
+        {
+            if ( (xrdm = malloc(nr_entries *
+                                sizeof(xen_reserved_device_memory_t))) == NULL )
+            {
+                PERROR("Could not allocate memory.");
+                return 0;
+            }
+            rc = xc_reserved_device_memory_map(xch, dom, xrdm, &nr_entries);
+            if ( rc )
+            {
+                PERROR("Could not get reserved device memory maps.");
+                free(xrdm);
+                return 0;
+            }
+        }
+        else
+            PERROR("Could not get reserved device memory maps.");
+    }
+
+    return xrdm;
+}
+
+static int xc_check_modules_space(xc_interface *xch, uint64_t *mstart_out,
+                                  uint64_t *mend_out, uint32_t dom)
+{
+    unsigned int i = 0, nr_entries = 0;
+    uint64_t rdm_start = 0, rdm_end = 0;
+    struct xen_reserved_device_memory *rdm_map =
+                        xc_get_reserved_device_memory_map(xch, nr_entries, dom);
+
+    for ( i = 0; i < nr_entries; i++ )
+    {
+        rdm_start = (uint64_t)rdm_map[i].start_pfn << XC_PAGE_SHIFT;
+        rdm_end = rdm_start + ((uint64_t)rdm_map[i].nr_pages << XC_PAGE_SHIFT);
+
+        /* Just use check_mmio_hole() to check modules ranges. */
+        if ( check_mmio_hole(rdm_start,
+                             rdm_end - rdm_start,
+                             *mstart_out, *mend_out) )
+            return -1;
+    }
+    
+    free(rdm_map);
+
+    return 0;
+}
+
 static int modules_init(struct xc_hvm_build_args *args,
                         uint64_t vend, struct elf_binary *elf,
-                        uint64_t *mstart_out, uint64_t *mend_out)
+                        uint64_t *mstart_out, uint64_t *mend_out,
+                        xc_interface *xch,
+                        uint32_t dom)
 {
 #define MODULE_ALIGN 1UL << 7
 #define MB_ALIGN     1UL << 20
@@ -80,6 +153,10 @@ static int modules_init(struct xc_hvm_build_args *args,
     if ( *mend_out > vend )    
         return -1;
 
+    /* Is it overlapping with reserved device memory? */
+    if ( xc_check_modules_space(xch, mstart_out, mend_out, dom) )
+        return -1;
+
     if ( args->acpi_module.length != 0 )
         args->acpi_module.guest_addr_out = *mstart_out;
     if ( args->smbios_module.length != 0 )
@@ -226,19 +303,6 @@ static int loadmodules(xc_interface *xch,
     return rc;
 }
 
-/*
- * Check whether there exists mmio hole in the specified memory range.
- * Returns 1 if exists, else returns 0.
- */
-static int check_mmio_hole(uint64_t start, uint64_t memsize,
-                           uint64_t mmio_start, uint64_t mmio_size)
-{
-    if ( start + memsize <= mmio_start || start >= mmio_start + mmio_size )
-        return 0;
-    else
-        return 1;
-}
-
 static int setup_guest(xc_interface *xch,
                        uint32_t dom, struct xc_hvm_build_args *args,
                        char *image, unsigned long image_size)
@@ -282,7 +346,7 @@ static int setup_guest(xc_interface *xch,
         goto error_out;
     }
 
-    if ( modules_init(args, v_end, &elf, &m_start, &m_end) != 0 )
+    if ( modules_init(args, v_end, &elf, &m_start, &m_end, xch, dom) != 0 )
     {
         ERROR("Insufficient space to load modules.");
         goto error_out;
-- 
1.9.1

  parent reply	other threads:[~2014-12-01  9:24 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-01  9:24 [v8][PATCH 00/17] xen: RMRR fix Tiejun Chen
2014-12-01  9:24 ` [v8][PATCH 01/17] tools/hvmloader: link errno.h from xen internal Tiejun Chen
2014-12-01  9:24 ` [v8][PATCH 02/17] introduce XEN_DOMCTL_set_rdm Tiejun Chen
2014-12-02  8:33   ` Tian, Kevin
2014-12-08  1:30     ` Chen, Tiejun
2014-12-02 19:39   ` Konrad Rzeszutek Wilk
2014-12-08  3:16     ` Chen, Tiejun
2014-12-08 15:57       ` Konrad Rzeszutek Wilk
2014-12-09  1:06         ` Chen, Tiejun
2014-12-09  8:33           ` Jan Beulich
2014-12-09 16:36             ` Konrad Rzeszutek Wilk
2014-12-04 15:33   ` Jan Beulich
2014-12-05  6:13     ` Tian, Kevin
2014-12-08  6:06     ` Chen, Tiejun
2014-12-08  8:43       ` Jan Beulich
2014-12-09  2:38         ` Chen, Tiejun
2014-12-09  7:29           ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 03/17] introduce XENMEM_reserved_device_memory_map Tiejun Chen
2014-12-02 19:47   ` Konrad Rzeszutek Wilk
2014-12-08  6:17     ` Chen, Tiejun
2014-12-08 10:00       ` Jan Beulich
2014-12-08 16:45         ` Daniel De Graaf
2014-12-08 16:54           ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 04/17] update the existing hypercall to support XEN_DOMCTL_set_rdm Tiejun Chen
2014-12-02  8:46   ` Tian, Kevin
2014-12-08  6:22     ` Chen, Tiejun
2014-12-04 15:50   ` Jan Beulich
2014-12-08  7:11     ` Chen, Tiejun
2014-12-08  8:51       ` Jan Beulich
2014-12-09  7:47         ` Chen, Tiejun
2014-12-09  8:19           ` Jan Beulich
2014-12-09  9:12             ` Chen, Tiejun
2014-12-09  9:21               ` Jan Beulich
2014-12-09  9:35                 ` Chen, Tiejun
2014-12-09 10:11             ` Tim Deegan
2014-12-09 10:22               ` Jan Beulich
2014-12-10  1:59                 ` Chen, Tiejun
2014-12-10 20:21                   ` Konrad Rzeszutek Wilk
2014-12-10  3:39               ` Tian, Kevin
2014-12-10  9:01                 ` Jan Beulich
2014-12-10  9:57                   ` Tian, Kevin
2014-12-10 11:12                 ` Tim Deegan
2014-12-11  2:03                   ` Tian, Kevin
2014-12-11 13:09                     ` Tim Deegan
2014-12-18 16:13                       ` Tim Deegan
2014-12-19  1:03                         ` Chen, Tiejun
2014-12-01  9:24 ` [v8][PATCH 05/17] tools/libxc: introduce hypercall for xc_reserved_device_memory_map Tiejun Chen
2014-12-02  8:46   ` Tian, Kevin
2014-12-02 19:50   ` Konrad Rzeszutek Wilk
2014-12-08  7:25     ` Chen, Tiejun
2014-12-08 15:52       ` Konrad Rzeszutek Wilk
2014-12-01  9:24 ` Tiejun Chen [this message]
2014-12-02  8:54   ` [v8][PATCH 06/17] tools/libxc: check if modules space is overlapping with reserved device memory Tian, Kevin
2014-12-02 19:55   ` Konrad Rzeszutek Wilk
2014-12-08  7:49     ` Chen, Tiejun
2014-12-01  9:24 ` [v8][PATCH 07/17] hvmloader/util: get reserved device memory maps Tiejun Chen
2014-12-02  8:59   ` Tian, Kevin
2014-12-08  7:55     ` Chen, Tiejun
2014-12-02 20:01   ` Konrad Rzeszutek Wilk
2014-12-08  8:09     ` Chen, Tiejun
2014-12-08  8:45       ` Chen, Tiejun
2014-12-04 15:52   ` Jan Beulich
2014-12-08  8:52     ` Chen, Tiejun
2014-12-08  9:18       ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 08/17] hvmloader/mmio: reconcile guest mmio with reserved device memory Tiejun Chen
2014-12-02  9:11   ` Tian, Kevin
2014-12-08  9:04     ` Chen, Tiejun
2014-12-04 16:04   ` Jan Beulich
2014-12-08  9:10     ` Chen, Tiejun
2014-12-01  9:24 ` [v8][PATCH 09/17] hvmloader/ram: check if guest memory is out of reserved device memory maps Tiejun Chen
2014-12-02  9:42   ` Tian, Kevin
2014-12-02 20:17   ` Konrad Rzeszutek Wilk
2014-12-04 16:20   ` Jan Beulich
2014-12-05  6:23     ` Tian, Kevin
2014-12-05  7:43       ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 10/17] hvmloader/mem_hole_alloc: skip any overlap with reserved device memory Tiejun Chen
2014-12-02  9:48   ` Tian, Kevin
2014-12-02 20:23   ` Konrad Rzeszutek Wilk
2014-12-04 16:28   ` Jan Beulich
2014-12-05  6:24     ` Tian, Kevin
2014-12-05  7:46       ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 11/17] xen/x86/p2m: reject populating for reserved device memory mapping Tiejun Chen
2014-12-02  9:57   ` Tian, Kevin
2014-12-04 16:42   ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 12/17] xen/x86/ept: handle reserved device memory in ept_handle_violation Tiejun Chen
2014-12-02  9:59   ` Tian, Kevin
2014-12-02 20:26   ` Konrad Rzeszutek Wilk
2014-12-04 16:46   ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 13/17] xen/mem_access: don't allow accessing reserved device memory Tiejun Chen
2014-12-02 14:54   ` Julien Grall
2014-12-18 22:56     ` Tamas K Lengyel
2014-12-02 20:27   ` Konrad Rzeszutek Wilk
2014-12-04 16:51   ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 14/17] xen/x86/p2m: introduce set_identity_p2m_entry Tiejun Chen
2014-12-02 10:00   ` Tian, Kevin
2014-12-02 20:29   ` Konrad Rzeszutek Wilk
2014-12-01  9:24 ` [v8][PATCH 15/17] xen:vtd: create RMRR mapping Tiejun Chen
2014-12-02 10:02   ` Tian, Kevin
2014-12-02 20:30   ` Konrad Rzeszutek Wilk
2014-12-01  9:24 ` [v8][PATCH 16/17] xen/vtd: group assigned device with RMRR Tiejun Chen
2014-12-02 10:11   ` Tian, Kevin
2014-12-02 20:40   ` Konrad Rzeszutek Wilk
2014-12-04 17:05   ` Jan Beulich
2014-12-01  9:24 ` [v8][PATCH 17/17] xen/vtd: re-enable USB device assignment if enable pci_force Tiejun Chen
2014-12-05 16:12   ` Konrad Rzeszutek Wilk
2014-12-02 19:17 ` [v8][PATCH 00/17] xen: RMRR fix Konrad Rzeszutek Wilk

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=1417425875-9634-7-git-send-email-tiejun.chen@intel.com \
    --to=tiejun.chen@intel.com \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=jbeulich@suse.com \
    --cc=kevin.tian@intel.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tim@xen.org \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xen.org \
    --cc=yang.z.zhang@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.