Attachment 291979 Details for Bug 429103 – linux-2.6.18-xen.hg 377:e8b49cfbdac0 backported to 2.6.9-67.0.1.EL

[patch] linux-2.6.18-xen.hg 377:e8b49cfbdac0 backported to 2.6.9-67.0.1.EL

linux-2.6.18-xen-377-e8b49cfbdac0 (text/plain), 4.21 KB, created by Ian Campbell on 2008-01-17 11:04:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2008-01-17 11:04:11 UTC

Size: 4.21 KB

patch

obsolete

># HG changeset patch
># User Ian Campbell <ian.campbell@citrix.com>
># Date 1200325943 0
># Node ID e8b49cfbdac0c5ee680cd9ec3d693ed0e2d42432
># Parent  353802ec1caf399143e48713a04cedd37a106347
>Avoid allocations causing swap activity on the resume path by allowing
>such allocations to access the emergency pools otherwise a
>save/restore/migration of a guest which is low on memory can
>deadlock.
>
>Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>linux-2.6.18-xen changeset: 377:e8b49cfbdac0c5ee680cd9ec3d693ed0e2d42432
>linux-2.6.18-xen date: Mon Jan 14 15:52:23 2008 +0000
>
>Index: linux-2.6.9-67.0.1.EL/drivers/xen/blkfront/blkfront.c
>===================================================================
>--- linux-2.6.9-67.0.1.EL.orig/drivers/xen/blkfront/blkfront.c	2008-01-16 13:28:49.000000000 +0000
>+++ linux-2.6.9-67.0.1.EL/drivers/xen/blkfront/blkfront.c	2008-01-16 13:35:08.000000000 +0000
>@@ -208,7 +208,7 @@
> 
> 	info->ring_ref = GRANT_INVALID_REF;
> 
>-	sring = (blkif_sring_t *)__get_free_page(GFP_KERNEL);
>+	sring = (blkif_sring_t *)__get_free_page(GFP_KERNEL|__GFP_HIGH);
> 	if (!sring) {
> 		xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring");
> 		return -ENOMEM;
>Index: linux-2.6.9-67.0.1.EL/drivers/xen/netfront/netfront.c
>===================================================================
>--- linux-2.6.9-67.0.1.EL.orig/drivers/xen/netfront/netfront.c	2008-01-16 13:28:49.000000000 +0000
>+++ linux-2.6.9-67.0.1.EL/drivers/xen/netfront/netfront.c	2008-01-16 13:35:08.000000000 +0000
>@@ -423,7 +423,7 @@
> 	info->tx.sring = NULL;
> 	info->irq = 0;
> 
>-	txs = (struct netif_tx_sring *)get_zeroed_page(GFP_KERNEL);
>+	txs = (struct netif_tx_sring *)get_zeroed_page(GFP_KERNEL|__GFP_HIGH);
> 	if (!txs) {
> 		err = -ENOMEM;
> 		xenbus_dev_fatal(dev, err, "allocating tx ring page");
>@@ -439,7 +439,7 @@
> 	}
> 	info->tx_ring_ref = err;
> 
>-	rxs = (struct netif_rx_sring *)get_zeroed_page(GFP_KERNEL);
>+	rxs = (struct netif_rx_sring *)get_zeroed_page(GFP_KERNEL|__GFP_HIGH);
> 	if (!rxs) {
> 		err = -ENOMEM;
> 		xenbus_dev_fatal(dev, err, "allocating rx ring page");
>Index: linux-2.6.9-67.0.1.EL/drivers/xen/xenbus/xenbus_client.c
>===================================================================
>--- linux-2.6.9-67.0.1.EL.orig/drivers/xen/xenbus/xenbus_client.c	2008-01-16 13:33:56.000000000 +0000
>+++ linux-2.6.9-67.0.1.EL/drivers/xen/xenbus/xenbus_client.c	2008-01-16 13:35:08.000000000 +0000
>@@ -81,7 +81,7 @@
> 					const char **, unsigned int))
> {
> 	int err;
>-	char *state = kasprintf(GFP_KERNEL, "%s/%s", path, path2);
>+	char *state = kasprintf(GFP_KERNEL|__GFP_HIGH, "%s/%s", path, path2);
> 	if (!state) {
> 		xenbus_dev_fatal(dev, -ENOMEM, "allocating path for watch");
> 		return -ENOMEM;
>Index: linux-2.6.9-67.0.1.EL/drivers/xen/xenbus/xenbus_xs.c
>===================================================================
>--- linux-2.6.9-67.0.1.EL.orig/drivers/xen/xenbus/xenbus_xs.c	2008-01-16 13:33:27.000000000 +0000
>+++ linux-2.6.9-67.0.1.EL/drivers/xen/xenbus/xenbus_xs.c	2008-01-16 13:35:37.000000000 +0000
>@@ -286,9 +286,9 @@
> 	char *buffer;
> 
> 	if (strlen(name) == 0)
>-		buffer = kasprintf(GFP_KERNEL, "%s", dir);
>+		buffer = kasprintf(GFP_KERNEL|__GFP_HIGH, "%s", dir);
> 	else
>-		buffer = kasprintf(GFP_KERNEL, "%s/%s", dir, name);
>+		buffer = kasprintf(GFP_KERNEL|__GFP_HIGH, "%s/%s", dir, name);
> 	return (!buffer) ? ERR_PTR(-ENOMEM) : buffer;
> }
> 
>@@ -300,7 +300,7 @@
> 	*num = count_strings(strings, len);
> 
> 	/* Transfer to one big alloc for easy freeing. */
>-	ret = kmalloc(*num * sizeof(char *) + len, GFP_KERNEL);
>+	ret = kmalloc(*num * sizeof(char *) + len, GFP_KERNEL|__GFP_HIGH);
> 	if (!ret) {
> 		kfree(strings);
> 		return ERR_PTR(-ENOMEM);
>@@ -501,7 +501,7 @@
> #define PRINTF_BUFFER_SIZE 4096
> 	char *printf_buffer;
> 
>-	printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL);
>+	printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL|__GFP_HIGH);
> 	if (printf_buffer == NULL)
> 		return -ENOMEM;
> 
>@@ -751,7 +751,7 @@
> 	char *body;
> 	int err;
> 
>-	msg = kmalloc(sizeof(*msg), GFP_KERNEL);
>+	msg = kmalloc(sizeof(*msg), GFP_KERNEL|__GFP_HIGH);
> 	if (msg == NULL)
> 		return -ENOMEM;
> 
>@@ -761,7 +761,7 @@
> 		return err;
> 	}
> 
>-	body = kmalloc(msg->hdr.len + 1, GFP_KERNEL);
>+	body = kmalloc(msg->hdr.len + 1, GFP_KERNEL|__GFP_HIGH);
> 	if (body == NULL) {
> 		kfree(msg);
> 		return -ENOMEM;

Actions: View | Diff

Attachments on bug 429103: 291978 | 291979 | 292483 | 298729 | 298730 | 299451 | 299452 | 306545