Attachment 302504 Details for Bug 442538 – Posted patch for 4.7

[patch] Posted patch for 4.7

vnif-increase-pv-on-hvm-fix.patch (text/plain), 2.22 KB, created by Don Dutile (Red Hat) on 2008-04-15 18:52:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Dutile (Red Hat)

Created: 2008-04-15 18:52:40 UTC

Size: 2.22 KB

patch

obsolete

>--- a/drivers/xen/core/gnttab.c	2008-04-10 13:18:25.000000000 -0400
>+++ b/drivers/xen/core/gnttab.c	2008-04-15 11:54:03.000000000 -0400
>@@ -43,6 +43,10 @@
> #include <xen/interface/memory.h>
> #include <xen/driver_util.h>
> 
>+#ifdef HAVE_XEN_PLATFORM_COMPAT_H
>+#include <xen/platform-compat.h>
>+#endif
>+
> /* External tools reserve first few grant table entries. */
> #define NR_RESERVED_ENTRIES 8
> #define GNTTAB_LIST_END 0xffffffff
>@@ -56,9 +60,6 @@
> static DEFINE_SPINLOCK(gnttab_list_lock);
> 
> static struct grant_entry *shared;
>-#ifndef CONFIG_XEN
>-static unsigned long resume_frames;
>-#endif
> 
> static struct gnttab_free_callback *gnttab_free_callback_list;
> 
>@@ -514,51 +515,48 @@
> 
> #include <platform-pci.h>
> 
>+static unsigned long resume_frames;
>+
> static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
> {
> 	struct xen_add_to_physmap xatp;
>-	unsigned int i;
>+	unsigned int i=end_idx;
> 
> 	/* Loop backwards, so that the first hypercall has the largest index,
> 	 * ensuring that the table will grow only once.
> 	 */
>-	for (i = end_idx; i >= start_idx; i--) {
>+	do {
> 		xatp.domid = DOMID_SELF;
> 		xatp.idx = i;
> 		xatp.space = XENMAPSPACE_grant_table;
> 		xatp.gpfn = (resume_frames >> PAGE_SHIFT) + i;
> 		if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
> 			BUG();
>-	}
>+	} while (i-- > start_idx);
>+
>+	return 0;
> }
> 
> int gnttab_resume(void)
> {
>-	struct xen_add_to_physmap xatp;
>-	unsigned int i, max_nr_gframes, nr_gframes;
>+	unsigned int max_nr_gframes, nr_gframes;
> 
> 	nr_gframes = nr_grant_frames;
> 	max_nr_gframes = max_nr_grant_frames();
> 	if (max_nr_gframes < nr_gframes)
> 		return -ENOSYS;
> 
>-	resume_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
>-
>-	gnttab_map(0, nr_gframes - 1);
>-
>-	shared = ioremap(resume_frames, PAGE_SIZE * max_nr_gframes);
>-	if (shared == NULL) {
>-		printk("error to ioremap gnttab share frames\n");
>-		return -1;
>+	if (!resume_frames) {
>+		resume_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
>+		shared = ioremap(resume_frames, PAGE_SIZE * max_nr_gframes);
>+		if (shared == NULL) {
>+			printk("error to ioremap gnttab share frames\n");
>+			return -1;
>+		}
> 	}
> 
>-	return 0;
>-}
>+	gnttab_map(0, nr_gframes - 1);
> 
>-int gnttab_suspend(void)
>-{
>-	iounmap(shared);
>- 	resume_frames = 0;
> 	return 0;
> }
>

Actions: View | Diff

Attachments on bug 442538: 302504 | 304205 | 305937