diff options
| author | Richard Braun <rbraun@sceen.net> | 2018-04-01 06:44:43 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2018-04-01 06:44:43 +0200 |
| commit | 076476fe6c0f4b947d4441afcfc97561bb23711c (patch) | |
| tree | cd3f4ab74442a82c821d08724c15d755bd216319 /kern/list.h | |
| parent | 7c97fa787d0edcde22be76c10d6aefc7ac16758d (diff) | |
kern/{hash,list}: update from upstream
This commit fixes undefined behavior in hash_str, and RCU linked list
walking.
Diffstat (limited to 'kern/list.h')
| -rw-r--r-- | kern/list.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/kern/list.h b/kern/list.h index 832d94f..8163176 100644 --- a/kern/list.h +++ b/kern/list.h @@ -478,12 +478,12 @@ list_rcu_remove(struct list *node) * the node pointer can only be read once, preventing the combination * of lockless list_empty()/list_first_entry() variants. */ -#define list_rcu_first_entry(list, type, member) \ +#define list_rcu_first_entry(head, type, member) \ MACRO_BEGIN \ struct list *list___; \ struct list *first___; \ \ - list___ = (list); \ + list___ = (head); \ first___ = list_rcu_first(list___); \ list_end(list___, first___) \ ? NULL \ @@ -497,8 +497,17 @@ MACRO_END * the node pointer can only be read once, preventing the combination * of lockless list_empty()/list_next_entry() variants. */ -#define list_rcu_next_entry(entry, member) \ - list_rcu_first_entry(&entry->member, typeof(*entry), member) +#define list_rcu_next_entry(head, entry, member) \ +MACRO_BEGIN \ + struct list *list___; \ + struct list *next___; \ + \ + list___ = (head); \ + next___ = list_rcu_next(&entry->member); \ + list_end(list___, next___) \ + ? NULL \ + : list_entry(next___, typeof(*entry), member); \ +MACRO_END /* * Forge a loop to process all nodes of a list. @@ -515,11 +524,9 @@ for (node = list_rcu_first(list); \ * * The entry node must not be altered during the loop. */ -#define list_rcu_for_each_entry(list, entry, member) \ -for (entry = list_rcu_entry(list_first(list), \ - typeof(*entry), member); \ - !list_end(list, &entry->member); \ - entry = list_rcu_entry(list_next(&entry->member), \ - typeof(*entry), member)) +#define list_rcu_for_each_entry(list, entry, member) \ +for (entry = list_rcu_first_entry(list, typeof(*entry), member); \ + entry != NULL; \ + entry = list_rcu_next_entry(list, entry, member)) #endif /* KERN_LIST_H */ |