xen-blkfront: drop the use of llist_for_each_entry_safe
Subsystems (3)
PATCH 1/1 xen-blkfront: drop the use of llist_for_each_entry_safe
Replace llist_for_each_entry_safe with a while loop and llist_del_first.
llist_for_each_entry_safe can trigger a bug in GCC 4.1, so it's best to remove it and use a while loop and llist_del_first (which is already in llist.h).
Since xen-blkfront is the only user of the llist_for_each_entry_safe macro remove it from llist.h.
--- drivers/block/xen-blkfront.c | 5 ++--- include/linux/llist.h | 25 ------------------------- 2 files changed, 2 insertions(+), 28 deletions(-)
drivers/block/xen-blkfront.c +2 -3
@@ -790,7 +790,6 @@ static void blkif_restart_queue(struct work_struct *work)static void blkif_free (struct blkfront_info *info,int suspend) { -struct llist_node *all_gnts;struct grant *persistent_gnt;struct llist_node *n;
@@ -804,8 +803,8 @@ static void blkif_free(struct blkfront_info *info, int suspend)/* Remove all persistent grants */ if (info->persistent_gnts_c) { - all_gnts =llist_del_all (&info->persistent_gnts); -llist_for_each_entry_safe (persistent_gnt, n, all_gnts, node) { +while ((n =llist_del_first (&info->persistent_gnts)) !=NULL ) { + persistent_gnt = llist_entry(n, struct grant, node);gnttab_end_foreign_access (persistent_gnt->gref,0 ,0UL );__free_page (pfn_to_page (persistent_gnt->pfn));kfree (persistent_gnt);
include/linux/llist.h +0 -25
@@ -125,31 +125,6 @@ static inline void init_llist_head(struct llist_head *list) (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))/** -* llist_for_each_entry_safe - iterate safely against remove over some entries -* of lock-less list of given type. -* @pos: the type * to use as a loop cursor. -* @n: another type * to use as a temporary storage. -* @node: the fist entry of deleted list entries. -* @member: the name of the llist_node with the struct. -* -* In general, some entries of the lock-less list can be traversed -* safely only after being removed from list, so start with an entry -* instead of list head. This variant allows removal of entries -* as we iterate. -* -* If being used on entries deleted from lock-less list directly, the -* traverse order is from the newest to the oldest added entry. If -* you want to traverse from the oldest to the newest, you must -* reverse the order by yourself before traversing. -*/ -#define llist_for_each_entry_safe (pos, n, node, member) \ - for ((pos) = llist_entry((node), typeof(*(pos)), member), \ - (n) = (pos)->member.next; \ - &(pos)->member != NULL; \ - (pos) = llist_entry(n, typeof(*(pos)), member), \ - (n) = (&(pos)->member != NULL) ? (pos)->member.next : NULL) - -/** * llist_empty - tests whether a lock-less list is empty * @head: the list to test *
Signature · 1 line
1.7.7.5 (Apple Git-26)
Quoted 6 lines · Roger Pau Monne
Replace
llist_for_each_entry_safewith a while loop andllist_del_first.
llist_for_each_entry_safecan trigger a bug in GCC 4.1, so it's best to remove it and use a while loop andllist_del_first(which is already inllist.h).
I spruced this up a bit:
commit f73be4e09510cda1457ab96abf356e664ba96d4a
Author: Roger Pau Monne <[email protected]> Date: Mon Feb 11 17:10:58 2013 +0100
xen-blkfront: drop the use of llist_for_each_entry_safe
Replace llist_for_each_entry_safe with a while loop and llist_del_first.
llist_for_each_entry_safe can trigger a bug in GCC 4.1, so it's best to remove it and use a while loop and llist_del_first (which is already in llist.h).
Specifically this bug can be triggered by hot-unplugging a disk, either by doing xm block-detach or by save/restore cycle.
BUG: unable to handle kernel paging request at fffffffffffffff0
IP: [<ffffffffa0047223>] blkif_free+0x63/0x130 [xen_blkfront] The crash call trace is:
...
bad_area_nosemaphore+0x13/0x20 do_page_fault+0x25e/0x4b0
page_fault+0x25/0x30
? blkif_free+0x63/0x130 [xen_blkfront] blkfront_resume+0x46/0xa0 [xen_blkfront] xenbus_dev_resume+0x6c/0x140
pm_op+0x192/0x1b0
device_resume+0x82/0x1e0
dpm_resume+0xc9/0x1a0
dpm_resume_end+0x15/0x30
do_suspend+0x117/0x1e0
When drilling down to the assembler code, on newer GCC it does .L29:
cmpq $-16, %r12 #, persistent_gnt check
je .L30 #, out of the loop
.L25:
... code in the loop
testq %r13, %r13 # n
je .L29 #, back to the top of the loop
cmpq $-16, %r12 #, persistent_gnt check
movq 16(%r12), %r13 # <variable>.node.next, n
jne .L25 #, back to the top of the loop
.L30:
While on GCC 4.1, it is:
L78:
... code in the loop
testq %r13, %r13 # n
je .L78 #, back to the top of the loop
movq 16(%rbx), %r13 # <variable>.node.next, n
jmp .L78 #, back to the top of the loop
Which basically means that the exit loop condition instead of being:
&(pos)->member != NULL;
is:
;
which makes the loop unbound.
Since xen-blkfront is the only user of the llist_for_each_entry_safe macro remove it from llist.h.
drivers/block/xen-blkfront.c +2 -3
@@ -790,7 +790,6 @@ static void blkif_restart_queue(struct work_struct *work)static void blkif_free (struct blkfront_info *info,int suspend) { -struct llist_node *all_gnts;struct grant *persistent_gnt;struct llist_node *n;
@@ -804,8 +803,8 @@ static void blkif_free(struct blkfront_info *info, int suspend)/* Remove all persistent grants */ if (info->persistent_gnts_c) { - all_gnts =llist_del_all (&info->persistent_gnts); -llist_for_each_entry_safe (persistent_gnt, n, all_gnts, node) { +while ((n =llist_del_first (&info->persistent_gnts)) !=NULL ) { + persistent_gnt = llist_entry(n, struct grant, node);gnttab_end_foreign_access (persistent_gnt->gref,0 ,0UL );__free_page (pfn_to_page (persistent_gnt->pfn));kfree (persistent_gnt);
include/linux/llist.h +0 -25
@@ -125,31 +125,6 @@ static inline void init_llist_head(struct llist_head *list) (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))/** -* llist_for_each_entry_safe - iterate safely against remove over some entries -* of lock-less list of given type. -* @pos: the type * to use as a loop cursor. -* @n: another type * to use as a temporary storage. -* @node: the fist entry of deleted list entries. -* @member: the name of the llist_node with the struct. -* -* In general, some entries of the lock-less list can be traversed -* safely only after being removed from list, so start with an entry -* instead of list head. This variant allows removal of entries -* as we iterate. -* -* If being used on entries deleted from lock-less list directly, the -* traverse order is from the newest to the oldest added entry. If -* you want to traverse from the oldest to the newest, you must -* reverse the order by yourself before traversing. -*/ -#define llist_for_each_entry_safe (pos, n, node, member) \ - for ((pos) = llist_entry((node), typeof(*(pos)), member), \ - (n) = (pos)->member.next; \ - &(pos)->member != NULL; \ - (pos) = llist_entry(n, typeof(*(pos)), member), \ - (n) = (&(pos)->member != NULL) ? (pos)->member.next : NULL) - -/** * llist_empty - tests whether a lock-less list is empty * @head: the list to test *
Quoted 6 lines · Roger Pau Monne
Replace
llist_for_each_entry_safewith a while loop andllist_del_first.
llist_for_each_entry_safecan trigger a bug in GCC 4.1, so it's best to remove it and use a while loop andllist_del_first(which is already inllist.h).
I spruced this up a bit:
commit f73be4e09510cda1457ab96abf356e664ba96d4a
Author: Roger Pau Monne <[email protected]> Date: Mon Feb 11 17:10:58 2013 +0100
xen-blkfront: drop the use of llist_for_each_entry_safe
Replace llist_for_each_entry_safe with a while loop and llist_del_first.
llist_for_each_entry_safe can trigger a bug in GCC 4.1, so it's best to remove it and use a while loop and llist_del_first (which is already in llist.h).
Specifically this bug can be triggered by hot-unplugging a disk, either by doing xm block-detach or by save/restore cycle.
BUG: unable to handle kernel paging request at fffffffffffffff0
IP: [<ffffffffa0047223>] blkif_free+0x63/0x130 [xen_blkfront] The crash call trace is:
...
bad_area_nosemaphore+0x13/0x20 do_page_fault+0x25e/0x4b0
page_fault+0x25/0x30
? blkif_free+0x63/0x130 [xen_blkfront] blkfront_resume+0x46/0xa0 [xen_blkfront] xenbus_dev_resume+0x6c/0x140
pm_op+0x192/0x1b0
device_resume+0x82/0x1e0
dpm_resume+0xc9/0x1a0
dpm_resume_end+0x15/0x30
do_suspend+0x117/0x1e0
When drilling down to the assembler code, on newer GCC it does .L29:
cmpq $-16, %r12 #, persistent_gnt check
je .L30 #, out of the loop
.L25:
... code in the loop
testq %r13, %r13 # n
je .L29 #, back to the top of the loop
cmpq $-16, %r12 #, persistent_gnt check
movq 16(%r12), %r13 # <variable>.node.next, n
jne .L25 #, back to the top of the loop
.L30:
While on GCC 4.1, it is:
L78:
... code in the loop
testq %r13, %r13 # n
je .L78 #, back to the top of the loop
movq 16(%rbx), %r13 # <variable>.node.next, n
jmp .L78 #, back to the top of the loop
Which basically means that the exit loop condition instead of being:
&(pos)->member != NULL;
is:
;
which makes the loop unbound.
Since xen-blkfront is the only user of the llist_for_each_entry_safe macro remove it from llist.h.
drivers/block/xen-blkfront.c +2 -3
@@ -790,7 +790,6 @@ static void blkif_restart_queue(struct work_struct *work)static void blkif_free (struct blkfront_info *info,int suspend) { -struct llist_node *all_gnts;struct grant *persistent_gnt;struct llist_node *n;
@@ -804,8 +803,8 @@ static void blkif_free(struct blkfront_info *info, int suspend)/* Remove all persistent grants */ if (info->persistent_gnts_c) { - all_gnts =llist_del_all (&info->persistent_gnts); -llist_for_each_entry_safe (persistent_gnt, n, all_gnts, node) { +while ((n =llist_del_first (&info->persistent_gnts)) !=NULL ) { + persistent_gnt = llist_entry(n, struct grant, node);gnttab_end_foreign_access (persistent_gnt->gref,0 ,0UL );__free_page (pfn_to_page (persistent_gnt->pfn));kfree (persistent_gnt);
include/linux/llist.h +0 -25
@@ -125,31 +125,6 @@ static inline void init_llist_head(struct llist_head *list) (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))/** -* llist_for_each_entry_safe - iterate safely against remove over some entries -* of lock-less list of given type. -* @pos: the type * to use as a loop cursor. -* @n: another type * to use as a temporary storage. -* @node: the fist entry of deleted list entries. -* @member: the name of the llist_node with the struct. -* -* In general, some entries of the lock-less list can be traversed -* safely only after being removed from list, so start with an entry -* instead of list head. This variant allows removal of entries -* as we iterate. -* -* If being used on entries deleted from lock-less list directly, the -* traverse order is from the newest to the oldest added entry. If -* you want to traverse from the oldest to the newest, you must -* reverse the order by yourself before traversing. -*/ -#define llist_for_each_entry_safe (pos, n, node, member) \ - for ((pos) = llist_entry((node), typeof(*(pos)), member), \ - (n) = (pos)->member.next; \ - &(pos)->member != NULL; \ - (pos) = llist_entry(n, typeof(*(pos)), member), \ - (n) = (&(pos)->member != NULL) ? (pos)->member.next : NULL) - -/** * llist_empty - tests whether a lock-less list is empty * @head: the list to test *
Quoted 9 lines · Konrad Rzeszutek Wilk
Quoted 6 lines · Roger Pau Monne
Replace
llist_for_each_entry_safewith a while loop andllist_del_first.
llist_for_each_entry_safecan trigger a bug in GCC 4.1, so it's best to remove it and use a while loop andllist_del_first(which is already inllist.h).I spruced this up a bit:
And then I re-tested it once more and it did _not_ fix the problem. But this did fix it:
Quoted 1 line
From
5f9c7b8388af474f3692cd78fade6d047981dcdeMon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <[email protected]>
Date: Wed, 13 Feb 2013 13:01:55 -0500
Subject: [PATCH] xen-blkfront: drop the use of llist_for_each_entry_safe
Replace llist_for_each_entry_safe with a while loop.
llist_for_each_entry_safe can trigger a bug in GCC 4.1, so it's best to remove it and use a while loop and do the deletion manually.
Specifically this bug can be triggered by hot-unplugging a disk, either by doing xm block-detach or by save/restore cycle.
BUG: unable to handle kernel paging request at fffffffffffffff0 IP: [<ffffffffa0047223>] blkif_free+0x63/0x130 [xen_blkfront] The crash call trace is: ... bad_area_nosemaphore+0x13/0x20 do_page_fault+0x25e/0x4b0 page_fault+0x25/0x30 ? blkif_free+0x63/0x130 [xen_blkfront] blkfront_resume+0x46/0xa0 [xen_blkfront] xenbus_dev_resume+0x6c/0x140 pm_op+0x192/0x1b0 device_resume+0x82/0x1e0 dpm_resume+0xc9/0x1a0 dpm_resume_end+0x15/0x30 do_suspend+0x117/0x1e0
When drilling down to the assembler code, on newer GCC it does .L29:
cmpq $-16, %r12 #, persistent_gnt check
je .L30 #, out of the loop
.L25:
... code in the loop
testq %r13, %r13 # n
je .L29 #, back to the top of the loop
cmpq $-16, %r12 #, persistent_gnt check
movq 16(%r12), %r13 # <variable>.node.next, n
jne .L25 #, back to the top of the loop
.L30:
While on GCC 4.1, it is:
L78:
... code in the loop
testq %r13, %r13 # n
je .L78 #, back to the top of the loop
movq 16(%rbx), %r13 # <variable>.node.next, n
jmp .L78 #, back to the top of the loop
Which basically means that the exit loop condition instead of being:
&(pos)->member != NULL;
is:
;
which makes the loop unbound.
Since xen-blkfront is the only user of the llist_for_each_entry_safe macro remove it from llist.h.
Orabug: 16263164
--- drivers/block/xen-blkfront.c | 13 ++++++++++--- include/linux/llist.h | 25 ------------------------- 2 files changed, 10 insertions(+), 28 deletions(-)
drivers/block/xen-blkfront.c +10 -3
@@ -791,7 +791,7 @@ static void blkif_restart_queue(struct work_struct *work)static void blkif_free (struct blkfront_info *info,int suspend) {struct llist_node *all_gnts; -struct grant *persistent_gnt; +struct grant *persistent_gnt, *tmp;struct llist_node *n;/* Prevent new requests being issued until we fix things up. */
@@ -805,10 +805,17 @@ static void blkif_free(struct blkfront_info *info, int suspend)/* Remove all persistent grants */ if (info->persistent_gnts_c) { all_gnts =llist_del_all (&info->persistent_gnts); -llist_for_each_entry_safe (persistent_gnt, n, all_gnts, node) { + persistent_gnt =llist_entry (all_gnts,typeof (*(persistent_gnt)), node); +while (persistent_gnt) {gnttab_end_foreign_access (persistent_gnt->gref,0 ,0UL );__free_page (pfn_to_page (persistent_gnt->pfn)); -kfree (persistent_gnt); + tmp = persistent_gnt; + n = persistent_gnt->node.next; +if (n) + persistent_gnt =llist_entry (n,typeof (*(persistent_gnt)), node); +else + persistent_gnt =NULL ; +kfree (tmp); } info->persistent_gnts_c =0 ; }
include/linux/llist.h +0 -25
@@ -125,31 +125,6 @@ static inline void init_llist_head(struct llist_head *list) (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))/** -* llist_for_each_entry_safe - iterate safely against remove over some entries -* of lock-less list of given type. -* @pos: the type * to use as a loop cursor. -* @n: another type * to use as a temporary storage. -* @node: the fist entry of deleted list entries. -* @member: the name of the llist_node with the struct. -* -* In general, some entries of the lock-less list can be traversed -* safely only after being removed from list, so start with an entry -* instead of list head. This variant allows removal of entries -* as we iterate. -* -* If being used on entries deleted from lock-less list directly, the -* traverse order is from the newest to the oldest added entry. If -* you want to traverse from the oldest to the newest, you must -* reverse the order by yourself before traversing. -*/ -#define llist_for_each_entry_safe (pos, n, node, member) \ - for ((pos) = llist_entry((node), typeof(*(pos)), member), \ - (n) = (pos)->member.next; \ - &(pos)->member != NULL; \ - (pos) = llist_entry(n, typeof(*(pos)), member), \ - (n) = (&(pos)->member != NULL) ? (pos)->member.next : NULL) - -/** * llist_empty - tests whether a lock-less list is empty * @head: the list to test *
Signature · 1 line
1.8.0.2
Quoted 9 lines · Konrad Rzeszutek Wilk
Quoted 6 lines · Roger Pau Monne
Replace
llist_for_each_entry_safewith a while loop andllist_del_first.
llist_for_each_entry_safecan trigger a bug in GCC 4.1, so it's best to remove it and use a while loop andllist_del_first(which is already inllist.h).I spruced this up a bit:
And then I re-tested it once more and it did _not_ fix the problem. But this did fix it:
Quoted 1 line
From
5f9c7b8388af474f3692cd78fade6d047981dcdeMon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <[email protected]>
Date: Wed, 13 Feb 2013 13:01:55 -0500
Subject: [PATCH] xen-blkfront: drop the use of llist_for_each_entry_safe
Replace llist_for_each_entry_safe with a while loop.
llist_for_each_entry_safe can trigger a bug in GCC 4.1, so it's best to remove it and use a while loop and do the deletion manually.
Specifically this bug can be triggered by hot-unplugging a disk, either by doing xm block-detach or by save/restore cycle.
BUG: unable to handle kernel paging request at fffffffffffffff0 IP: [<ffffffffa0047223>] blkif_free+0x63/0x130 [xen_blkfront] The crash call trace is: ... bad_area_nosemaphore+0x13/0x20 do_page_fault+0x25e/0x4b0 page_fault+0x25/0x30 ? blkif_free+0x63/0x130 [xen_blkfront] blkfront_resume+0x46/0xa0 [xen_blkfront] xenbus_dev_resume+0x6c/0x140 pm_op+0x192/0x1b0 device_resume+0x82/0x1e0 dpm_resume+0xc9/0x1a0 dpm_resume_end+0x15/0x30 do_suspend+0x117/0x1e0
When drilling down to the assembler code, on newer GCC it does .L29:
cmpq $-16, %r12 #, persistent_gnt check
je .L30 #, out of the loop
.L25:
... code in the loop
testq %r13, %r13 # n
je .L29 #, back to the top of the loop
cmpq $-16, %r12 #, persistent_gnt check
movq 16(%r12), %r13 # <variable>.node.next, n
jne .L25 #, back to the top of the loop
.L30:
While on GCC 4.1, it is:
L78:
... code in the loop
testq %r13, %r13 # n
je .L78 #, back to the top of the loop
movq 16(%rbx), %r13 # <variable>.node.next, n
jmp .L78 #, back to the top of the loop
Which basically means that the exit loop condition instead of being:
&(pos)->member != NULL;
is:
;
which makes the loop unbound.
Since xen-blkfront is the only user of the llist_for_each_entry_safe macro remove it from llist.h.
Orabug: 16263164
--- drivers/block/xen-blkfront.c | 13 ++++++++++--- include/linux/llist.h | 25 ------------------------- 2 files changed, 10 insertions(+), 28 deletions(-)
drivers/block/xen-blkfront.c +10 -3
@@ -791,7 +791,7 @@ static void blkif_restart_queue(struct work_struct *work)static void blkif_free (struct blkfront_info *info,int suspend) {struct llist_node *all_gnts; -struct grant *persistent_gnt; +struct grant *persistent_gnt, *tmp;struct llist_node *n;/* Prevent new requests being issued until we fix things up. */
@@ -805,10 +805,17 @@ static void blkif_free(struct blkfront_info *info, int suspend)/* Remove all persistent grants */ if (info->persistent_gnts_c) { all_gnts =llist_del_all (&info->persistent_gnts); -llist_for_each_entry_safe (persistent_gnt, n, all_gnts, node) { + persistent_gnt =llist_entry (all_gnts,typeof (*(persistent_gnt)), node); +while (persistent_gnt) {gnttab_end_foreign_access (persistent_gnt->gref,0 ,0UL );__free_page (pfn_to_page (persistent_gnt->pfn)); -kfree (persistent_gnt); + tmp = persistent_gnt; + n = persistent_gnt->node.next; +if (n) + persistent_gnt =llist_entry (n,typeof (*(persistent_gnt)), node); +else + persistent_gnt =NULL ; +kfree (tmp); } info->persistent_gnts_c =0 ; }
include/linux/llist.h +0 -25
@@ -125,31 +125,6 @@ static inline void init_llist_head(struct llist_head *list) (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))/** -* llist_for_each_entry_safe - iterate safely against remove over some entries -* of lock-less list of given type. -* @pos: the type * to use as a loop cursor. -* @n: another type * to use as a temporary storage. -* @node: the fist entry of deleted list entries. -* @member: the name of the llist_node with the struct. -* -* In general, some entries of the lock-less list can be traversed -* safely only after being removed from list, so start with an entry -* instead of list head. This variant allows removal of entries -* as we iterate. -* -* If being used on entries deleted from lock-less list directly, the -* traverse order is from the newest to the oldest added entry. If -* you want to traverse from the oldest to the newest, you must -* reverse the order by yourself before traversing. -*/ -#define llist_for_each_entry_safe (pos, n, node, member) \ - for ((pos) = llist_entry((node), typeof(*(pos)), member), \ - (n) = (pos)->member.next; \ - &(pos)->member != NULL; \ - (pos) = llist_entry(n, typeof(*(pos)), member), \ - (n) = (&(pos)->member != NULL) ? (pos)->member.next : NULL) - -/** * llist_empty - tests whether a lock-less list is empty * @head: the list to test *
Signature · 1 line
1.8.0.2