QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply patch for xen-netfront crash on network detach

Browse Source 
It still isn't clear this fix doesn't introduce some memory leak, but
even if so, it's much better to have memory leak in rare situation, than
crash preventing netvm change operation. Details in this thread:
http://xen.markmail.org/thread/pw5edbtqienjx4q5
Unfortunately no one responded there about possible memory leak...

Fixes QubesOS/qubes-issues#975

(cherry picked from commit fdbdf930ba)

Conflicts:
	series.conf
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-31 15:53:31 +01:00
parent 3387f469d9
commit 30606502a8
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches.xen/xen-netfront-detach-crash.patch Normal file
View File

@ -0,0 +1,26 @@
When it get to free_page(queue->grant_tx_page[i]), the use counter on this page
is already 0, which cause a crash. Not sure if this is the proper fix
(according to git log this may introduce some memory leak), but at least it
prevent the crash.
Details in this thread:
http://xen.markmail.org/thread/pw5edbtqienjx4q5
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f821a97..a5efbb0 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1065,9 +1069,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
skb = queue->tx_skbs[i].skb;
get_page(queue->grant_tx_page[i]);
- gnttab_end_foreign_access(queue->grant_tx_ref[i],
- GNTMAP_readonly,
- (unsigned long)page_address(queue->grant_tx_page[i]));
+ gnttab_end_foreign_access_ref(
+ queue->grant_tx_ref[i], GNTMAP_readonly);
+ gnttab_release_grant_reference(
+ &queue->gref_tx_head, queue->grant_tx_ref[i]);
queue->grant_tx_page[i] = NULL;
queue->grant_tx_ref[i] = GRANT_INVALID_REF;
add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i);

1
series.conf
View File

@ -3,6 +3,7 @@ patches.rpmify/makefile-after_link.patch
patches.xen/0001-Revert-xen-xenbus-Avoid-synchronous-wait-on-XenBus-s.patch
patches.xen/0001-xen-fix-deadlock-on-proc-xen-xenbus-access.patch
patches.xen/0001-xen-grant-fix-race-condition-in-gntdev_release.patch
patches.xen/xen-netfront-detach-crash.patch
# Additional features
#patches.xen/pvops-0100-usb-xen-pvusb-driver.patch