Blame SOURCES/0179-ccan-list-Import-latest-list-helpers.patch

e0018b
From aaf1059e1c96b8052851030d4db971708e98e4d8 Mon Sep 17 00:00:00 2001
e0018b
From: Dan Williams <dan.j.williams@intel.com>
e0018b
Date: Thu, 14 Jul 2022 10:02:15 -0700
e0018b
Subject: [PATCH 179/217] ccan/list: Import latest list helpers
e0018b
e0018b
Pick up the definition of list_add_{before,after} and other updates from
e0018b
ccan at commit 52b86922f846 ("ccan/base64: fix GCC warning.").
e0018b
e0018b
Link: https://lore.kernel.org/r/165781813572.1555691.15909358688944168922.stgit@dwillia2-xfh.jf.intel.com
e0018b
Reported-by: Ira Weiny <ira.weiny@intel.com>
e0018b
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
e0018b
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
e0018b
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
e0018b
---
e0018b
 ccan/list/list.h   | 258 ++++++++++++++++++++++++++++++++++++++-------
e0018b
 ndctl/lib/inject.c |   1 -
e0018b
 util/list.h        |  40 -------
e0018b
 3 files changed, 222 insertions(+), 77 deletions(-)
e0018b
 delete mode 100644 util/list.h
e0018b
e0018b
diff --git a/ccan/list/list.h b/ccan/list/list.h
e0018b
index 3ebd1b2..15f5fb7 100644
e0018b
--- a/ccan/list/list.h
e0018b
+++ b/ccan/list/list.h
e0018b
@@ -95,8 +95,8 @@ struct list_node *list_check_node(const struct list_node *n,
e0018b
 #define list_debug(h, loc) list_check((h), loc)
e0018b
 #define list_debug_node(n, loc) list_check_node((n), loc)
e0018b
 #else
e0018b
-#define list_debug(h, loc) (h)
e0018b
-#define list_debug_node(n, loc) (n)
e0018b
+#define list_debug(h, loc) ((void)loc, h)
e0018b
+#define list_debug_node(n, loc) ((void)loc, n)
e0018b
 #endif
e0018b
 
e0018b
 /**
e0018b
@@ -111,7 +111,7 @@ struct list_node *list_check_node(const struct list_node *n,
e0018b
  * Example:
e0018b
  *	static struct list_head my_list = LIST_HEAD_INIT(my_list);
e0018b
  */
e0018b
-#define LIST_HEAD_INIT(name) { { &name.n, &name.n } }
e0018b
+#define LIST_HEAD_INIT(name) { { &(name).n, &(name).n } }
e0018b
 
e0018b
 /**
e0018b
  * LIST_HEAD - define and initialize an empty list_head
e0018b
@@ -145,6 +145,48 @@ static inline void list_head_init(struct list_head *h)
e0018b
 	h->n.next = h->n.prev = &h->n;
e0018b
 }
e0018b
 
e0018b
+/**
e0018b
+ * list_node_init - initialize a list_node
e0018b
+ * @n: the list_node to link to itself.
e0018b
+ *
e0018b
+ * You don't need to use this normally!  But it lets you list_del(@n)
e0018b
+ * safely.
e0018b
+ */
e0018b
+static inline void list_node_init(struct list_node *n)
e0018b
+{
e0018b
+	n->next = n->prev = n;
e0018b
+}
e0018b
+
e0018b
+/**
e0018b
+ * list_add_after - add an entry after an existing node in a linked list
e0018b
+ * @h: the list_head to add the node to (for debugging)
e0018b
+ * @p: the existing list_node to add the node after
e0018b
+ * @n: the new list_node to add to the list.
e0018b
+ *
e0018b
+ * The existing list_node must already be a member of the list.
e0018b
+ * The new list_node does not need to be initialized; it will be overwritten.
e0018b
+ *
e0018b
+ * Example:
e0018b
+ *	struct child c1, c2, c3;
e0018b
+ *	LIST_HEAD(h);
e0018b
+ *
e0018b
+ *	list_add_tail(&h, &c1.list);
e0018b
+ *	list_add_tail(&h, &c3.list);
e0018b
+ *	list_add_after(&h, &c1.list, &c2.list);
e0018b
+ */
e0018b
+#define list_add_after(h, p, n) list_add_after_(h, p, n, LIST_LOC)
e0018b
+static inline void list_add_after_(struct list_head *h,
e0018b
+				   struct list_node *p,
e0018b
+				   struct list_node *n,
e0018b
+				   const char *abortstr)
e0018b
+{
e0018b
+	n->next = p->next;
e0018b
+	n->prev = p;
e0018b
+	p->next->prev = n;
e0018b
+	p->next = n;
e0018b
+	(void)list_debug(h, abortstr);
e0018b
+}
e0018b
+
e0018b
 /**
e0018b
  * list_add - add an entry at the start of a linked list.
e0018b
  * @h: the list_head to add the node to
e0018b
@@ -163,10 +205,34 @@ static inline void list_add_(struct list_head *h,
e0018b
 			     struct list_node *n,
e0018b
 			     const char *abortstr)
e0018b
 {
e0018b
-	n->next = h->n.next;
e0018b
-	n->prev = &h->n;
e0018b
-	h->n.next->prev = n;
e0018b
-	h->n.next = n;
e0018b
+	list_add_after_(h, &h->n, n, abortstr);
e0018b
+}
e0018b
+
e0018b
+/**
e0018b
+ * list_add_before - add an entry before an existing node in a linked list
e0018b
+ * @h: the list_head to add the node to (for debugging)
e0018b
+ * @p: the existing list_node to add the node before
e0018b
+ * @n: the new list_node to add to the list.
e0018b
+ *
e0018b
+ * The existing list_node must already be a member of the list.
e0018b
+ * The new list_node does not need to be initialized; it will be overwritten.
e0018b
+ *
e0018b
+ * Example:
e0018b
+ *	list_head_init(&h);
e0018b
+ *	list_add_tail(&h, &c1.list);
e0018b
+ *	list_add_tail(&h, &c3.list);
e0018b
+ *	list_add_before(&h, &c3.list, &c2.list);
e0018b
+ */
e0018b
+#define list_add_before(h, p, n) list_add_before_(h, p, n, LIST_LOC)
e0018b
+static inline void list_add_before_(struct list_head *h,
e0018b
+				    struct list_node *p,
e0018b
+				    struct list_node *n,
e0018b
+				    const char *abortstr)
e0018b
+{
e0018b
+	n->next = p;
e0018b
+	n->prev = p->prev;
e0018b
+	p->prev->next = n;
e0018b
+	p->prev = n;
e0018b
 	(void)list_debug(h, abortstr);
e0018b
 }
e0018b
 
e0018b
@@ -185,11 +251,7 @@ static inline void list_add_tail_(struct list_head *h,
e0018b
 				  struct list_node *n,
e0018b
 				  const char *abortstr)
e0018b
 {
e0018b
-	n->next = &h->n;
e0018b
-	n->prev = h->n.prev;
e0018b
-	h->n.prev->next = n;
e0018b
-	h->n.prev = n;
e0018b
-	(void)list_debug(h, abortstr);
e0018b
+	list_add_before_(h, &h->n, n, abortstr);
e0018b
 }
e0018b
 
e0018b
 /**
e0018b
@@ -229,6 +291,21 @@ static inline bool list_empty_nodebug(const struct list_head *h)
e0018b
 }
e0018b
 #endif
e0018b
 
e0018b
+/**
e0018b
+ * list_empty_nocheck - is a list empty?
e0018b
+ * @h: the list_head
e0018b
+ *
e0018b
+ * If the list is empty, returns true. This doesn't perform any
e0018b
+ * debug check for list consistency, so it can be called without
e0018b
+ * locks, racing with the list being modified. This is ok for
e0018b
+ * checks where an incorrect result is not an issue (optimized
e0018b
+ * bail out path for example).
e0018b
+ */
e0018b
+static inline bool list_empty_nocheck(const struct list_head *h)
e0018b
+{
e0018b
+	return h->n.next == &h->n;
e0018b
+}
e0018b
+
e0018b
 /**
e0018b
  * list_del - delete an entry from an (unknown) linked list.
e0018b
  * @n: the list_node to delete from the list.
e0018b
@@ -237,7 +314,7 @@ static inline bool list_empty_nodebug(const struct list_head *h)
e0018b
  * another list, but not deleted again.
e0018b
  *
e0018b
  * See also:
e0018b
- *	list_del_from()
e0018b
+ *	list_del_from(), list_del_init()
e0018b
  *
e0018b
  * Example:
e0018b
  *	list_del(&child->list);
e0018b
@@ -255,6 +332,27 @@ static inline void list_del_(struct list_node *n, const char* abortstr)
e0018b
 #endif
e0018b
 }
e0018b
 
e0018b
+/**
e0018b
+ * list_del_init - delete a node, and reset it so it can be deleted again.
e0018b
+ * @n: the list_node to be deleted.
e0018b
+ *
e0018b
+ * list_del(@n) or list_del_init() again after this will be safe,
e0018b
+ * which can be useful in some cases.
e0018b
+ *
e0018b
+ * See also:
e0018b
+ *	list_del_from(), list_del()
e0018b
+ *
e0018b
+ * Example:
e0018b
+ *	list_del_init(&child->list);
e0018b
+ *	parent->num_children--;
e0018b
+ */
e0018b
+#define list_del_init(n) list_del_init_(n, LIST_LOC)
e0018b
+static inline void list_del_init_(struct list_node *n, const char *abortstr)
e0018b
+{
e0018b
+	list_del_(n, abortstr);
e0018b
+	list_node_init(n);
e0018b
+}
e0018b
+
e0018b
 /**
e0018b
  * list_del_from - delete an entry from a known linked list.
e0018b
  * @h: the list_head the node is in.
e0018b
@@ -285,6 +383,39 @@ static inline void list_del_from(struct list_head *h, struct list_node *n)
e0018b
 	list_del(n);
e0018b
 }
e0018b
 
e0018b
+/**
e0018b
+ * list_swap - swap out an entry from an (unknown) linked list for a new one.
e0018b
+ * @o: the list_node to replace from the list.
e0018b
+ * @n: the list_node to insert in place of the old one.
e0018b
+ *
e0018b
+ * Note that this leaves @o in an undefined state; it can be added to
e0018b
+ * another list, but not deleted/swapped again.
e0018b
+ *
e0018b
+ * See also:
e0018b
+ *	list_del()
e0018b
+ *
e0018b
+ * Example:
e0018b
+ *	struct child x1, x2;
e0018b
+ *	LIST_HEAD(xh);
e0018b
+ *
e0018b
+ *	list_add(&xh, &x1.list);
e0018b
+ *	list_swap(&x1.list, &x2.list);
e0018b
+ */
e0018b
+#define list_swap(o, n) list_swap_(o, n, LIST_LOC)
e0018b
+static inline void list_swap_(struct list_node *o,
e0018b
+			      struct list_node *n,
e0018b
+			      const char* abortstr)
e0018b
+{
e0018b
+	(void)list_debug_node(o, abortstr);
e0018b
+	*n = *o;
e0018b
+	n->next->prev = n;
e0018b
+	n->prev->next = n;
e0018b
+#ifdef CCAN_LIST_DEBUG
e0018b
+	/* Catch use-after-del. */
e0018b
+	o->next = o->prev = NULL;
e0018b
+#endif
e0018b
+}
e0018b
+
e0018b
 /**
e0018b
  * list_entry - convert a list_node back into the structure containing it.
e0018b
  * @n: the list_node
e0018b
@@ -406,9 +537,29 @@ static inline const void *list_tail_(const struct list_head *h, size_t off)
e0018b
  *		printf("Name: %s\n", child->name);
e0018b
  */
e0018b
 #define list_for_each_rev(h, i, member)					\
e0018b
-	for (i = container_of_var(list_debug(h,	LIST_LOC)->n.prev, i, member); \
e0018b
-	     &i->member != &(h)->n;					\
e0018b
-	     i = container_of_var(i->member.prev, i, member))
e0018b
+	list_for_each_rev_off(h, i, list_off_var_(i, member))
e0018b
+
e0018b
+/**
e0018b
+ * list_for_each_rev_safe - iterate through a list backwards,
e0018b
+ * maybe during deletion
e0018b
+ * @h: the list_head
e0018b
+ * @i: the structure containing the list_node
e0018b
+ * @nxt: the structure containing the list_node
e0018b
+ * @member: the list_node member of the structure
e0018b
+ *
e0018b
+ * This is a convenient wrapper to iterate @i over the entire list backwards.
e0018b
+ * It's a for loop, so you can break and continue as normal.  The extra
e0018b
+ * variable * @nxt is used to hold the next element, so you can delete @i
e0018b
+ * from the list.
e0018b
+ *
e0018b
+ * Example:
e0018b
+ *	struct child *next;
e0018b
+ *	list_for_each_rev_safe(&parent->children, child, next, list) {
e0018b
+ *		printf("Name: %s\n", child->name);
e0018b
+ *	}
e0018b
+ */
e0018b
+#define list_for_each_rev_safe(h, i, nxt, member)			\
e0018b
+	list_for_each_rev_safe_off(h, i, nxt, list_off_var_(i, member))
e0018b
 
e0018b
 /**
e0018b
  * list_for_each_safe - iterate through a list, maybe during deletion
e0018b
@@ -422,7 +573,6 @@ static inline const void *list_tail_(const struct list_head *h, size_t off)
e0018b
  * @nxt is used to hold the next element, so you can delete @i from the list.
e0018b
  *
e0018b
  * Example:
e0018b
- *	struct child *next;
e0018b
  *	list_for_each_safe(&parent->children, child, next, list) {
e0018b
  *		list_del(&child->list);
e0018b
  *		parent->num_children--;
e0018b
@@ -537,10 +687,28 @@ static inline void list_prepend_list_(struct list_head *to,
e0018b
 	list_head_init(from);
e0018b
 }
e0018b
 
e0018b
+/* internal macros, do not use directly */
e0018b
+#define list_for_each_off_dir_(h, i, off, dir)				\
e0018b
+	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.dir,	\
e0018b
+				   (off));				\
e0018b
+	list_node_from_off_((void *)i, (off)) != &(h)->n;		\
e0018b
+	i = list_node_to_off_(list_node_from_off_((void *)i, (off))->dir, \
e0018b
+			      (off)))
e0018b
+
e0018b
+#define list_for_each_safe_off_dir_(h, i, nxt, off, dir)		\
e0018b
+	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.dir,	\
e0018b
+				   (off)),				\
e0018b
+	nxt = list_node_to_off_(list_node_from_off_(i, (off))->dir,	\
e0018b
+				(off));					\
e0018b
+	list_node_from_off_(i, (off)) != &(h)->n;			\
e0018b
+	i = nxt,							\
e0018b
+	nxt = list_node_to_off_(list_node_from_off_(i, (off))->dir,	\
e0018b
+				(off)))
e0018b
+
e0018b
 /**
e0018b
  * list_for_each_off - iterate through a list of memory regions.
e0018b
  * @h: the list_head
e0018b
- * @i: the pointer to a memory region wich contains list node data.
e0018b
+ * @i: the pointer to a memory region which contains list node data.
e0018b
  * @off: offset(relative to @i) at which list node data resides.
e0018b
  *
e0018b
  * This is a low-level wrapper to iterate @i over the entire list, used to
e0018b
@@ -548,12 +716,12 @@ static inline void list_prepend_list_(struct list_head *to,
e0018b
  * so you can break and continue as normal.
e0018b
  *
e0018b
  * WARNING! Being the low-level macro that it is, this wrapper doesn't know
e0018b
- * nor care about the type of @i. The only assumtion made is that @i points
e0018b
+ * nor care about the type of @i. The only assumption made is that @i points
e0018b
  * to a chunk of memory that at some @offset, relative to @i, contains a
e0018b
- * properly filled `struct node_list' which in turn contains pointers to
e0018b
- * memory chunks and it's turtles all the way down. Whith all that in mind
e0018b
+ * properly filled `struct list_node' which in turn contains pointers to
e0018b
+ * memory chunks and it's turtles all the way down. With all that in mind
e0018b
  * remember that given the wrong pointer/offset couple this macro will
e0018b
- * happilly churn all you memory untill SEGFAULT stops it, in other words
e0018b
+ * happily churn all you memory until SEGFAULT stops it, in other words
e0018b
  * caveat emptor.
e0018b
  *
e0018b
  * It is worth mentioning that one of legitimate use-cases for that wrapper
e0018b
@@ -567,17 +735,24 @@ static inline void list_prepend_list_(struct list_head *to,
e0018b
  *		printf("Name: %s\n", child->name);
e0018b
  */
e0018b
 #define list_for_each_off(h, i, off)                                    \
e0018b
-	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next,	\
e0018b
-				   (off));				\
e0018b
-       list_node_from_off_((void *)i, (off)) != &(h)->n;                \
e0018b
-       i = list_node_to_off_(list_node_from_off_((void *)i, (off))->next, \
e0018b
-                             (off)))
e0018b
+	list_for_each_off_dir_((h),(i),(off),next)
e0018b
+
e0018b
+/**
e0018b
+ * list_for_each_rev_off - iterate through a list of memory regions backwards
e0018b
+ * @h: the list_head
e0018b
+ * @i: the pointer to a memory region which contains list node data.
e0018b
+ * @off: offset(relative to @i) at which list node data resides.
e0018b
+ *
e0018b
+ * See list_for_each_off for details
e0018b
+ */
e0018b
+#define list_for_each_rev_off(h, i, off)                                    \
e0018b
+	list_for_each_off_dir_((h),(i),(off),prev)
e0018b
 
e0018b
 /**
e0018b
  * list_for_each_safe_off - iterate through a list of memory regions, maybe
e0018b
  * during deletion
e0018b
  * @h: the list_head
e0018b
- * @i: the pointer to a memory region wich contains list node data.
e0018b
+ * @i: the pointer to a memory region which contains list node data.
e0018b
  * @nxt: the structure containing the list_node
e0018b
  * @off: offset(relative to @i) at which list node data resides.
e0018b
  *
e0018b
@@ -590,15 +765,26 @@ static inline void list_prepend_list_(struct list_head *to,
e0018b
  *		printf("Name: %s\n", child->name);
e0018b
  */
e0018b
 #define list_for_each_safe_off(h, i, nxt, off)                          \
e0018b
-	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next,	\
e0018b
-				   (off)),				\
e0018b
-         nxt = list_node_to_off_(list_node_from_off_(i, (off))->next,   \
e0018b
-                                 (off));                                \
e0018b
-       list_node_from_off_(i, (off)) != &(h)->n;                        \
e0018b
-       i = nxt,                                                         \
e0018b
-         nxt = list_node_to_off_(list_node_from_off_(i, (off))->next,   \
e0018b
-                                 (off)))
e0018b
+	list_for_each_safe_off_dir_((h),(i),(nxt),(off),next)
e0018b
 
e0018b
+/**
e0018b
+ * list_for_each_rev_safe_off - iterate backwards through a list of
e0018b
+ * memory regions, maybe during deletion
e0018b
+ * @h: the list_head
e0018b
+ * @i: the pointer to a memory region which contains list node data.
e0018b
+ * @nxt: the structure containing the list_node
e0018b
+ * @off: offset(relative to @i) at which list node data resides.
e0018b
+ *
e0018b
+ * For details see `list_for_each_rev_off' and `list_for_each_rev_safe'
e0018b
+ * descriptions.
e0018b
+ *
e0018b
+ * Example:
e0018b
+ *	list_for_each_rev_safe_off(&parent->children, child,
e0018b
+ *		next, offsetof(struct child, list))
e0018b
+ *		printf("Name: %s\n", child->name);
e0018b
+ */
e0018b
+#define list_for_each_rev_safe_off(h, i, nxt, off)                      \
e0018b
+	list_for_each_safe_off_dir_((h),(i),(nxt),(off),prev)
e0018b
 
e0018b
 /* Other -off variants. */
e0018b
 #define list_entry_off(n, type, off)		\
e0018b
diff --git a/ndctl/lib/inject.c b/ndctl/lib/inject.c
e0018b
index d61c02c..3486ffe 100644
e0018b
--- a/ndctl/lib/inject.c
e0018b
+++ b/ndctl/lib/inject.c
e0018b
@@ -2,7 +2,6 @@
e0018b
 // Copyright (C) 2014-2020, Intel Corporation. All rights reserved.
e0018b
 #include <stdlib.h>
e0018b
 #include <limits.h>
e0018b
-#include <util/list.h>
e0018b
 #include <util/size.h>
e0018b
 #include <ndctl/libndctl.h>
e0018b
 #include <ccan/list/list.h>
e0018b
diff --git a/util/list.h b/util/list.h
e0018b
deleted file mode 100644
e0018b
index 1ea9c59..0000000
e0018b
--- a/util/list.h
e0018b
+++ /dev/null
e0018b
@@ -1,40 +0,0 @@
e0018b
-/* SPDX-License-Identifier: GPL-2.0 */
e0018b
-/* Copyright (C) 2015-2020 Intel Corporation. All rights reserved. */
e0018b
-#ifndef _NDCTL_LIST_H_
e0018b
-#define _NDCTL_LIST_H_
e0018b
-
e0018b
-#include <ccan/list/list.h>
e0018b
-
e0018b
-/**
e0018b
- * list_add_after - add an entry after the given node in the linked list.
e0018b
- * @h: the list_head to add the node to
e0018b
- * @l: the list_node after which to add to
e0018b
- * @n: the list_node to add to the list.
e0018b
- *
e0018b
- * The list_node does not need to be initialized; it will be overwritten.
e0018b
- * Example:
e0018b
- *	struct child *child = malloc(sizeof(*child));
e0018b
- *
e0018b
- *	child->name = "geoffrey";
e0018b
- *	list_add_after(&parent->children, &child1->list, &child->list);
e0018b
- *	parent->num_children++;
e0018b
- */
e0018b
-#define list_add_after(h, l, n) list_add_after_(h, l, n, LIST_LOC)
e0018b
-static inline void list_add_after_(struct list_head *h,
e0018b
-				   struct list_node *l,
e0018b
-				   struct list_node *n,
e0018b
-				   const char *abortstr)
e0018b
-{
e0018b
-	if (l->next == &h->n) {
e0018b
-		/* l is the last element, this becomes a list_add_tail */
e0018b
-		list_add_tail(h, n);
e0018b
-		return;
e0018b
-	}
e0018b
-	n->next = l->next;
e0018b
-	n->prev = l;
e0018b
-	l->next->prev = n;
e0018b
-	l->next = n;
e0018b
-	(void)list_debug(h, abortstr);
e0018b
-}
e0018b
-
e0018b
-#endif /* _NDCTL_LIST_H_ */
e0018b
-- 
e0018b
2.27.0
e0018b