xen-changelog

[Top] [All Lists]

[Xen-changelog] Bug fix in error handling in get_page_from_l4e()

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Bug fix in error handling in get_page_from_l4e()
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Tue, 08 Nov 2005 14:46:09 +0000
Delivery-date:	Tue, 08 Nov 2005 14:46:50 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User mafetter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 6d298cac0e8d851331096f16a52cdd7208cbc95c
# Parent  0f62ea79cd8d9e64c326ca703b7230e845425505
Bug fix in error handling in get_page_from_l4e()

diff -r 0f62ea79cd8d -r 6d298cac0e8d xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Tue Nov  8 10:38:32 2005
+++ b/xen/arch/x86/mm.c Tue Nov  8 11:26:48 2005
@@ -507,7 +507,7 @@
         l2e_get_pfn(l2e), PGT_l1_page_table | vaddr, d);
 
 #if CONFIG_PAGING_LEVELS == 2
-    if (!rc)
+    if ( unlikely(!rc) )
         rc = get_linear_pagetable(l2e, pfn, d);
 #endif
     return rc;
@@ -540,7 +540,7 @@
         l3e_get_pfn(l3e),
         PGT_l2_page_table | vaddr, d);
 #if CONFIG_PAGING_LEVELS == 3
-    if (!rc)
+    if ( unlikely(!rc) )
         rc = get_linear_pagetable(l3e, pfn, d);
 #endif
     return rc;
@@ -575,9 +575,9 @@
         PGT_l3_page_table | vaddr, d);
 
     if ( unlikely(!rc) )
-        return get_linear_pagetable(l4e, pfn, d);
-
-    return 1;
+        rc = get_linear_pagetable(l4e, pfn, d);
+
+    return rc;
 }
 
 #endif /* 4 level */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Bug fix in error handling in get_page_from_l4e(), Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Fixed domain refcounting bug (found by inspection), Xen patchbot -unstable
Next by Date:	[Xen-changelog] Cleanup various shadow mode asserts., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Fixed a bug in the audit code., Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Cleanup various shadow mode asserts., Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]