Author: hselasky
Date: Tue Jan 26 15:12:31 2016
New Revision: 294837
URL: https://svnweb.freebsd.org/changeset/base/294837
Log:
LinuxKPI list updates:
- Add some new hlist macros.
- Update existing hlist macros removing the need for a temporary
iteration variable.
- Properly define the RCU hlist macros to be SMP safe with regard
to RCU.
- Safe list macro arguments by adding a pair of parentheses.
- Prefix the _list_add() and _list_splice() functions with "linux"
to reflect they are LinuxKPI internal functions.
Obtained from: Linux
MFC after: 1 week
Sponsored by: Mellanox Technologies
Modified:
head/sys/compat/linuxkpi/common/include/linux/list.h
head/sys/compat/linuxkpi/common/include/linux/rcupdate.h
head/sys/ofed/drivers/net/mlx4/en_netdev.c
Modified: head/sys/compat/linuxkpi/common/include/linux/list.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/list.h Tue Jan 26
14:46:39 2016 (r294836)
+++ head/sys/compat/linuxkpi/common/include/linux/list.h Tue Jan 26
15:12:31 2016 (r294837)
@@ -2,7 +2,7 @@
* Copyright (c) 2010 Isilon Systems, Inc.
* Copyright (c) 2010 iX Systems, Inc.
* Copyright (c) 2010 Panasas, Inc.
- * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
+ * Copyright (c) 2013-2016 Mellanox Technologies, Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,7 @@ list_replace(struct list_head *old, stru
}
static inline void
-_list_add(struct list_head *new, struct list_head *prev,
+linux_list_add(struct list_head *new, struct list_head *prev,
struct list_head *next)
{
@@ -136,47 +136,55 @@ list_del_init(struct list_head *entry)
list_entry(((ptr)->member.next), typeof(*(ptr)), member)
#define list_for_each(p, head)
\
- for (p = (head)->next; p != (head); p = p->next)
+ for (p = (head)->next; p != (head); p = (p)->next)
#define list_for_each_safe(p, n, head)
\
- for (p = (head)->next, n = p->next; p != (head); p = n, n = p->next)
+ for (p = (head)->next, n = (p)->next; p != (head); p = n, n = (p)->next)
#define list_for_each_entry(p, h, field) \
- for (p = list_entry((h)->next, typeof(*p), field); &p->field != (h); \
- p = list_entry(p->field.next, typeof(*p), field))
+ for (p = list_entry((h)->next, typeof(*p), field); &(p)->field != (h); \
+ p = list_entry((p)->field.next, typeof(*p), field))
#define list_for_each_entry_safe(p, n, h, field) \
for (p = list_entry((h)->next, typeof(*p), field), \
- n = list_entry(p->field.next, typeof(*p), field); &p->field != (h);\
+ n = list_entry((p)->field.next, typeof(*p), field); &(p)->field !=
(h);\
p = n, n = list_entry(n->field.next, typeof(*n), field))
+#define list_for_each_entry_from(p, h, field) \
+ for ( ; &(p)->field != (h); \
+ p = list_entry((p)->field.next, typeof(*p), field))
+
#define list_for_each_entry_continue(p, h, field)
\
- for (p = list_next_entry((p), field); &p->field != (h); \
+ for (p = list_next_entry((p), field); &(p)->field != (h); \
p = list_next_entry((p), field))
#define list_for_each_entry_safe_from(pos, n, head, member)
\
- for (n = list_entry(pos->member.next, typeof(*pos), member);
\
- &pos->member != (head);
\
+ for (n = list_entry((pos)->member.next, typeof(*pos), member);
\
+ &(pos)->member != (head);
\
pos = n, n = list_entry(n->member.next, typeof(*n), member))
#define list_for_each_entry_reverse(p, h, field)
\
- for (p = list_entry((h)->prev, typeof(*p), field); &p->field != (h); \
- p = list_entry(p->field.prev, typeof(*p), field))
+ for (p = list_entry((h)->prev, typeof(*p), field); &(p)->field != (h); \
+ p = list_entry((p)->field.prev, typeof(*p), field))
+
+#define list_for_each_entry_continue_reverse(p, h, field) \
+ for (p = list_entry((p)->field.prev, typeof(*p), field); &(p)->field !=
(h); \
+ p = list_entry((p)->field.prev, typeof(*p), field))
-#define list_for_each_prev(p, h) for (p = (h)->prev; p != (h); p =
p->prev)
+#define list_for_each_prev(p, h) for (p = (h)->prev; p != (h); p =
(p)->prev)
static inline void
list_add(struct list_head *new, struct list_head *head)
{
- _list_add(new, head, head->next);
+ linux_list_add(new, head, head->next);
}
static inline void
list_add_tail(struct list_head *new, struct list_head *head)
{
- _list_add(new, head->prev, head);
+ linux_list_add(new, head->prev, head);
}
static inline void
@@ -196,7 +204,7 @@ list_move_tail(struct list_head *entry,
}
static inline void
-_list_splice(const struct list_head *list, struct list_head *prev,
+linux_list_splice(const struct list_head *list, struct list_head *prev,
struct list_head *next)
{
struct list_head *first;
@@ -216,21 +224,21 @@ static inline void
list_splice(const struct list_head *list, struct list_head *head)
{
- _list_splice(list, head, head->next);
+ linux_list_splice(list, head, head->next);
}
static inline void
list_splice_tail(struct list_head *list, struct list_head *head)
{
- _list_splice(list, head->prev, head);
+ linux_list_splice(list, head->prev, head);
}
static inline void
list_splice_init(struct list_head *list, struct list_head *head)
{
- _list_splice(list, head, head->next);
+ linux_list_splice(list, head, head->next);
INIT_LIST_HEAD(list);
}
@@ -238,7 +246,7 @@ static inline void
list_splice_tail_init(struct list_head *list, struct list_head *head)
{
- _list_splice(list, head->prev, head);
+ linux_list_splice(list, head->prev, head);
INIT_LIST_HEAD(list);
}
@@ -401,10 +409,10 @@ static inline int list_is_last(const str
#define hlist_entry(ptr, type, field) container_of(ptr, type, field)
#define hlist_for_each(p, head)
\
- for (p = (head)->first; p; p = p->next)
+ for (p = (head)->first; p; p = (p)->next)
#define hlist_for_each_safe(p, n, head)
\
- for (p = (head)->first; p && ({ n = p->next; 1; }); p = n)
+ for (p = (head)->first; p && ({ n = (p)->next; 1; }); p = n)
#define hlist_entry_safe(ptr, type, member) \
((ptr) ? hlist_entry(ptr, type, member) : NULL)
@@ -414,21 +422,18 @@ static inline int list_is_last(const str
pos; \
pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-#define hlist_for_each_entry_continue(tp, p, field) \
- for (p = (p)->next; \
- p ? (tp = hlist_entry(p, typeof(*tp), field)): NULL; p = p->next)
-
-#define hlist_for_each_entry_from(tp, p, field)
\
- for (; p ? (tp = hlist_entry(p, typeof(*tp), field)): NULL; p = p->next)
-
-#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \
- for (pos = (head)->first; \
- (pos) != 0 && ({ n = (pos)->next; \
- tpos = hlist_entry((pos), typeof(*(tpos)), member); 1;}); \
- pos = (n))
+#define hlist_for_each_entry_continue(pos, member)
\
+ for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)),
member); \
+ (pos); \
+ pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-#define hlist_add_head_rcu(n, h) hlist_add_head(n, h)
+#define hlist_for_each_entry_from(pos, member)
\
+ for (; (pos);
\
+ pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-#define hlist_del_init_rcu(n) hlist_del_init(n)
+#define hlist_for_each_entry_safe(pos, n, head, member)
\
+ for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member); \
+ (pos) && ({ n = (pos)->member.next; 1; }); \
+ pos = hlist_entry_safe(n, typeof(*(pos)), member))
#endif /* _LINUX_LIST_H_ */
Modified: head/sys/compat/linuxkpi/common/include/linux/rcupdate.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/rcupdate.h Tue Jan 26
14:46:39 2016 (r294836)
+++ head/sys/compat/linuxkpi/common/include/linux/rcupdate.h Tue Jan 26
15:12:31 2016 (r294837)
@@ -73,4 +73,25 @@ synchronize_rcu(void)
sx_xunlock(&linux_global_rcu_lock);
}
+#define hlist_add_head_rcu(n, h) \
+do { \
+ sx_xlock(&linux_global_rcu_lock); \
+ hlist_add_head(n, h); \
+ sx_xunlock(&linux_global_rcu_lock); \
+} while (0)
+
+#define hlist_del_init_rcu(n) \
+do { \
+ sx_xlock(&linux_global_rcu_lock); \
+ hlist_del_init(n); \
+ sx_xunlock(&linux_global_rcu_lock); \
+} while (0)
+
+#define hlist_del_rcu(n) \
+do { \
+ sx_xlock(&linux_global_rcu_lock); \
+ hlist_del(n); \
+ sx_xunlock(&linux_global_rcu_lock); \
+} while (0)
+
#endif /* _LINUX_RCUPDATE_H_ */
Modified: head/sys/ofed/drivers/net/mlx4/en_netdev.c
==============================================================================
--- head/sys/ofed/drivers/net/mlx4/en_netdev.c Tue Jan 26 14:46:39 2016
(r294836)
+++ head/sys/ofed/drivers/net/mlx4/en_netdev.c Tue Jan 26 15:12:31 2016
(r294837)
@@ -606,13 +606,13 @@ static void mlx4_en_put_qp(struct mlx4_e
mlx4_unregister_mac(dev, priv->port, mac);
} else {
struct mlx4_mac_entry *entry;
- struct hlist_node *n, *tmp;
+ struct hlist_node *tmp;
struct hlist_head *bucket;
unsigned int i;
for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {
bucket = &priv->mac_hash[i];
- hlist_for_each_entry_safe(entry, n, tmp, bucket, hlist)
{
+ hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
mac = mlx4_mac_to_u64(entry->mac);
en_dbg(DRV, priv, "Registering MAC: %pM for
deleting\n",
entry->mac);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
