Messages in this thread Patch in this message | | | From | Max Kellermann <> | Subject | [PATCH 17/28] xarray.h: move declarations to xarray_types.h | Date | Wed, 31 Jan 2024 15:49:57 +0100 |
| |
By providing declarations in a lean header, we can reduce header dependencies.
Signed-off-by: Max Kellermann <max.kellermann@ionos.com> --- include/drm/gpu_scheduler.h | 2 +- include/linux/blkdev.h | 2 +- include/linux/list_lru.h | 5 ++- include/linux/mlx5/driver.h | 2 +- include/linux/msi.h | 2 +- include/linux/xarray.h | 56 +---------------------------- include/linux/xarray_types.h | 70 ++++++++++++++++++++++++++++++++++++ include/net/net_namespace.h | 2 +- include/net/sch_generic.h | 2 +- include/sound/core.h | 5 ++- 10 files changed, 85 insertions(+), 63 deletions(-) create mode 100644 include/linux/xarray_types.h
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 9a89f72a3bac..f2fb8931cb17 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -27,7 +27,7 @@ #include <drm/spsc_queue.h> #include <linux/dma-fence.h> #include <linux/completion_types.h> -#include <linux/xarray.h> +#include <linux/xarray_types.h> #include <linux/wait_types.h> #include <linux/workqueue_types.h> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3916d2f0a9af..d2c0934a7224 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -23,7 +23,7 @@ #include <linux/sched.h> #include <linux/uio.h> // for iov_iter_is_aligned() #include <linux/uuid.h> -#include <linux/xarray.h> +#include <linux/xarray_types.h> struct module; struct request_queue; diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h index f2882a820690..bf0b71faa059 100644 --- a/include/linux/list_lru.h +++ b/include/linux/list_lru.h @@ -11,7 +11,10 @@ #include <linux/list.h> #include <linux/nodemask.h> #include <linux/shrinker.h> -#include <linux/xarray.h> + +#ifdef CONFIG_MEMCG_KMEM +#include <linux/xarray_types.h> +#endif struct mem_cgroup; diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index d9b99aca9e72..07956bd2e55b 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -41,7 +41,7 @@ #include <linux/semaphore.h> #include <linux/slab.h> #include <linux/vmalloc.h> -#include <linux/xarray.h> +#include <linux/xarray_types.h> #include <linux/workqueue_types.h> #include <linux/mempool.h> #include <linux/interrupt.h> diff --git a/include/linux/msi.h b/include/linux/msi.h index 04fd2c856287..a3969b00a793 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -21,7 +21,7 @@ #include <linux/irqdomain_defs.h> #include <linux/cpumask.h> #include <linux/msi_api.h> -#include <linux/xarray.h> +#include <linux/xarray_types.h> #include <linux/mutex_types.h> #include <linux/list.h> #include <linux/irq.h> diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 0983c697648a..aab0539f925d 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -9,10 +9,10 @@ * See Documentation/core-api/xarray.rst for how to use the XArray. */ +#include <linux/xarray_types.h> #include <linux/bitmap.h> #include <linux/bug.h> #include <linux/compiler.h> -#include <linux/gfp_types.h> #include <linux/kconfig.h> #include <linux/kernel.h> #include <linux/rcupdate.h> @@ -224,37 +224,12 @@ static inline int xa_err(void *entry) return 0; } -/** - * struct xa_limit - Represents a range of IDs. - * @min: The lowest ID to allocate (inclusive). - * @max: The maximum ID to allocate (inclusive). - * - * This structure is used either directly or via the XA_LIMIT() macro - * to communicate the range of IDs that are valid for allocation. - * Three common ranges are predefined for you: - * * xa_limit_32b - [0 - UINT_MAX] - * * xa_limit_31b - [0 - INT_MAX] - * * xa_limit_16b - [0 - USHRT_MAX] - */ -struct xa_limit { - u32 max; - u32 min; -}; - #define XA_LIMIT(_min, _max) (struct xa_limit) { .min = _min, .max = _max } #define xa_limit_32b XA_LIMIT(0, UINT_MAX) #define xa_limit_31b XA_LIMIT(0, INT_MAX) #define xa_limit_16b XA_LIMIT(0, USHRT_MAX) -typedef unsigned __bitwise xa_mark_t; -#define XA_MARK_0 ((__force xa_mark_t)0U) -#define XA_MARK_1 ((__force xa_mark_t)1U) -#define XA_MARK_2 ((__force xa_mark_t)2U) -#define XA_PRESENT ((__force xa_mark_t)8U) -#define XA_MARK_MAX XA_MARK_2 -#define XA_FREE_MARK XA_MARK_0 - enum xa_lock_type { XA_LOCK_IRQ = 1, XA_LOCK_BH = 2, @@ -277,35 +252,6 @@ enum xa_lock_type { #define XA_FLAGS_ALLOC (XA_FLAGS_TRACK_FREE | XA_FLAGS_MARK(XA_FREE_MARK)) #define XA_FLAGS_ALLOC1 (XA_FLAGS_TRACK_FREE | XA_FLAGS_ZERO_BUSY) -/** - * struct xarray - The anchor of the XArray. - * @xa_lock: Lock that protects the contents of the XArray. - * - * To use the xarray, define it statically or embed it in your data structure. - * It is a very small data structure, so it does not usually make sense to - * allocate it separately and keep a pointer to it in your data structure. - * - * You may use the xa_lock to protect your own data structures as well. - */ -/* - * If all of the entries in the array are NULL, @xa_head is a NULL pointer. - * If the only non-NULL entry in the array is at index 0, @xa_head is that - * entry. If any other entry in the array is non-NULL, @xa_head points - * to an @xa_node. - */ -struct xarray { - spinlock_t xa_lock; -/* private: The rest of the data structure is not to be used directly. */ - gfp_t xa_flags; - void __rcu * xa_head; -}; - -#define XARRAY_INIT(name, flags) { \ - .xa_lock = __SPIN_LOCK_UNLOCKED(name.xa_lock), \ - .xa_flags = flags, \ - .xa_head = NULL, \ -} - /** * DEFINE_XARRAY_FLAGS() - Define an XArray with custom flags. * @name: A string that names your XArray. diff --git a/include/linux/xarray_types.h b/include/linux/xarray_types.h new file mode 100644 index 000000000000..ff241ce647a9 --- /dev/null +++ b/include/linux/xarray_types.h @@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef _LINUX_XARRAY_TYPES_H +#define _LINUX_XARRAY_TYPES_H +/* + * eXtensible Arrays + * Copyright (c) 2017 Microsoft Corporation + * Author: Matthew Wilcox <willy@infradead.org> + * + * See Documentation/core-api/xarray.rst for how to use the XArray. + */ + +#include <linux/gfp_types.h> +#include <linux/spinlock_types.h> +#include <linux/types.h> + +/** + * struct xa_limit - Represents a range of IDs. + * @min: The lowest ID to allocate (inclusive). + * @max: The maximum ID to allocate (inclusive). + * + * This structure is used either directly or via the XA_LIMIT() macro + * to communicate the range of IDs that are valid for allocation. + * Three common ranges are predefined for you: + * * xa_limit_32b - [0 - UINT_MAX] + * * xa_limit_31b - [0 - INT_MAX] + * * xa_limit_16b - [0 - USHRT_MAX] + */ +struct xa_limit { + u32 max; + u32 min; +}; + +typedef unsigned __bitwise xa_mark_t; +#define XA_MARK_0 ((__force xa_mark_t)0U) +#define XA_MARK_1 ((__force xa_mark_t)1U) +#define XA_MARK_2 ((__force xa_mark_t)2U) +#define XA_PRESENT ((__force xa_mark_t)8U) +#define XA_MARK_MAX XA_MARK_2 +#define XA_FREE_MARK XA_MARK_0 + +/** + * struct xarray - The anchor of the XArray. + * @xa_lock: Lock that protects the contents of the XArray. + * + * To use the xarray, define it statically or embed it in your data structure. + * It is a very small data structure, so it does not usually make sense to + * allocate it separately and keep a pointer to it in your data structure. + * + * You may use the xa_lock to protect your own data structures as well. + */ +/* + * If all of the entries in the array are NULL, @xa_head is a NULL pointer. + * If the only non-NULL entry in the array is at index 0, @xa_head is that + * entry. If any other entry in the array is non-NULL, @xa_head points + * to an @xa_node. + */ +struct xarray { + spinlock_t xa_lock; +/* private: The rest of the data structure is not to be used directly. */ + gfp_t xa_flags; + void __rcu * xa_head; +}; + +#define XARRAY_INIT(name, flags) { \ + .xa_lock = __SPIN_LOCK_UNLOCKED(name.xa_lock), \ + .xa_flags = flags, \ + .xa_head = NULL, \ +} + +#endif /* _LINUX_XARRAY_TYPES_H */ diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index a2f221a39cd2..7ffdd8c31151 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -41,7 +41,7 @@ #include <linux/idr.h> #include <linux/skbuff.h> #include <linux/notifier.h> -#include <linux/xarray.h> +#include <linux/xarray_types.h> struct user_namespace; struct proc_dir_entry; diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 6ec5064156d9..9845ea172382 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -18,7 +18,7 @@ #include <net/gen_stats.h> #include <net/rtnetlink.h> #include <net/flow_offload.h> -#include <linux/xarray.h> +#include <linux/xarray_types.h> struct Qdisc_ops; struct qdisc_walker; diff --git a/include/sound/core.h b/include/sound/core.h index f95f6863986f..7dcba88b2fb7 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -14,7 +14,10 @@ #include <linux/stringify.h> #include <linux/printk.h> #include <linux/wait.h> -#include <linux/xarray.h> + +#ifdef CONFIG_SND_CTL_FAST_LOOKUP +#include <linux/xarray_types.h> +#endif /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS -- 2.39.2
| |