xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
PATCH 1/1 xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
From: Matt Wilson <[email protected]>
Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/xen/grant-table.c +4 -2
@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();
@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();
Signature · 1 line
1.7.9.5
Quoted 5 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Quoted 8 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>
Regards,
Anthony Liguori
Quoted 40 lines
--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-3@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode (); --1.7.9.5
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 5 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Quoted 8 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>
Regards,
Anthony Liguori
Quoted 40 lines
--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-3@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode (); --1.7.9.5
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Should be tagged for stable.
David
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Should be tagged for stable.
David
Quoted 5 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Quoted 8 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>
Quoted 34 lines
drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 5 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Quoted 8 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>
Quoted 34 lines
drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Stefano?
Quoted 44 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Stefano?
Quoted 44 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 8 lines · Konrad Rzeszutek Wilk
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.Stefano?
Already acked here:
http://marc.info/?l=linux-kernel&m=138505917602905&w=2
Quoted 44 lines
Quoted 43 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 8 lines · Konrad Rzeszutek Wilk
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.Stefano?
Already acked here:
http://marc.info/?l=linux-kernel&m=138505917602905&w=2
Quoted 44 lines
Quoted 43 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 7 lines · Stefano Stabellini
Quoted 6 lines · Konrad Rzeszutek Wilk
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Quoted 6 lines
Quoted 2 lines
Stefano?
Already acked here:
Sent to Linus today.
Thank you!
Quoted 47 lines
Quoted 47 lines
Quoted 46 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5
Quoted 7 lines · Stefano Stabellini
Quoted 6 lines · Konrad Rzeszutek Wilk
Quoted 4 lines · Matt Wilson
From: Matt Wilson <[email protected]>
Commit
f62805f1introduced a bug where lazy MMU mode isn't exited if a m2p_add/remove_override call fails.
Quoted 6 lines
Quoted 2 lines
Stefano?
Already acked here:
Sent to Linus today.
Thank you!
Quoted 47 lines
Quoted 47 lines
Quoted 46 lines
Cc Stefano Stabellini <[email protected]>Cc Konrad Rzeszutek Wilk <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc David Vrabel <[email protected]>Cc Anthony Liguori <[email protected]>Signed-off-by Matt Wilson <[email protected]>--- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/xen/grant-table.c +4
-2@@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, ret =m2p_add_override (mfn, pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();@@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, ret =m2p_remove_override (pages[i], kmap_ops ? &kmap_ops[i] :NULL );if (ret) -return ret; + goto out; } + out:if (lazy)arch_leave_lazy_mmu_mode ();Signature · 1 line
1.7.9.5