Skip to content

Commit 0cab687

Browse files
Christoph Hellwigtehcaster
Christoph Hellwig
authored and
tehcaster
committed
mempool: de-typedef
Switch all uses of the deprecated mempool_t typedef in the core mempool code to use struct mempool instead. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://patch.msgid.link/20251113084022.1255121-11-hch@lst.de Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
1 parent 8b41fb8 commit 0cab687

2 files changed

Lines changed: 45 additions & 44 deletions

File tree

‎include/linux/mempool.h‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,51 @@ typedef struct mempool {
2727
wait_queue_head_t wait;
2828
} mempool_t;
2929

30-
static inline bool mempool_initialized(mempool_t *pool)
30+
static inline bool mempool_initialized(struct mempool *pool)
3131
{
3232
return pool->elements != NULL;
3333
}
3434

35-
static inline bool mempool_is_saturated(mempool_t *pool)
35+
static inline bool mempool_is_saturated(struct mempool *pool)
3636
{
3737
return READ_ONCE(pool->curr_nr) >= pool->min_nr;
3838
}
3939

40-
void mempool_exit(mempool_t *pool);
41-
int mempool_init_node(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn,
42-
mempool_free_t *free_fn, void *pool_data,
43-
gfp_t gfp_mask, int node_id);
44-
45-
int mempool_init_noprof(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn,
46-
mempool_free_t *free_fn, void *pool_data);
40+
void mempool_exit(struct mempool *pool);
41+
int mempool_init_node(struct mempool *pool, int min_nr,
42+
mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,
43+
void *pool_data, gfp_t gfp_mask, int node_id);
44+
int mempool_init_noprof(struct mempool *pool, int min_nr,
45+
mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,
46+
void *pool_data);
4747
#define mempool_init(...) \
4848
alloc_hooks(mempool_init_noprof(__VA_ARGS__))
4949

50-
extern mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
51-
mempool_free_t *free_fn, void *pool_data);
52-
53-
extern mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn,
54-
mempool_free_t *free_fn, void *pool_data,
55-
gfp_t gfp_mask, int nid);
50+
struct mempool *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
51+
mempool_free_t *free_fn, void *pool_data);
52+
struct mempool *mempool_create_node_noprof(int min_nr,
53+
mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,
54+
void *pool_data, gfp_t gfp_mask, int nid);
5655
#define mempool_create_node(...) \
5756
alloc_hooks(mempool_create_node_noprof(__VA_ARGS__))
5857

5958
#define mempool_create(_min_nr, _alloc_fn, _free_fn, _pool_data) \
6059
mempool_create_node(_min_nr, _alloc_fn, _free_fn, _pool_data, \
6160
GFP_KERNEL, NUMA_NO_NODE)
6261

63-
extern int mempool_resize(mempool_t *pool, int new_min_nr);
64-
extern void mempool_destroy(mempool_t *pool);
62+
int mempool_resize(struct mempool *pool, int new_min_nr);
63+
void mempool_destroy(struct mempool *pool);
6564

66-
extern void *mempool_alloc_noprof(mempool_t *pool, gfp_t gfp_mask) __malloc;
65+
void *mempool_alloc_noprof(struct mempool *pool, gfp_t gfp_mask) __malloc;
6766
#define mempool_alloc(...) \
6867
alloc_hooks(mempool_alloc_noprof(__VA_ARGS__))
6968
int mempool_alloc_bulk_noprof(struct mempool *pool, void **elem,
7069
unsigned int count, unsigned int allocated);
7170
#define mempool_alloc_bulk(...) \
7271
alloc_hooks(mempool_alloc_bulk_noprof(__VA_ARGS__))
7372

74-
extern void *mempool_alloc_preallocated(mempool_t *pool) __malloc;
75-
extern void mempool_free(void *element, mempool_t *pool);
73+
void *mempool_alloc_preallocated(struct mempool *pool) __malloc;
74+
void mempool_free(void *element, struct mempool *pool);
7675
unsigned int mempool_free_bulk(struct mempool *pool, void **elem,
7776
unsigned int count);
7877

‎mm/mempool.c‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static int __init mempool_faul_inject_init(void)
4040
late_initcall(mempool_faul_inject_init);
4141

4242
#ifdef CONFIG_SLUB_DEBUG_ON
43-
static void poison_error(mempool_t *pool, void *element, size_t size,
43+
static void poison_error(struct mempool *pool, void *element, size_t size,
4444
size_t byte)
4545
{
4646
const int nr = pool->curr_nr;
@@ -57,7 +57,7 @@ static void poison_error(mempool_t *pool, void *element, size_t size,
5757
dump_stack();
5858
}
5959

60-
static void __check_element(mempool_t *pool, void *element, size_t size)
60+
static void __check_element(struct mempool *pool, void *element, size_t size)
6161
{
6262
u8 *obj = element;
6363
size_t i;
@@ -73,7 +73,7 @@ static void __check_element(mempool_t *pool, void *element, size_t size)
7373
memset(obj, POISON_INUSE, size);
7474
}
7575

76-
static void check_element(mempool_t *pool, void *element)
76+
static void check_element(struct mempool *pool, void *element)
7777
{
7878
/* Skip checking: KASAN might save its metadata in the element. */
7979
if (kasan_enabled())
@@ -102,7 +102,7 @@ static void __poison_element(void *element, size_t size)
102102
obj[size - 1] = POISON_END;
103103
}
104104

105-
static void poison_element(mempool_t *pool, void *element)
105+
static void poison_element(struct mempool *pool, void *element)
106106
{
107107
/* Skip poisoning: KASAN might save its metadata in the element. */
108108
if (kasan_enabled())
@@ -123,15 +123,16 @@ static void poison_element(mempool_t *pool, void *element)
123123
}
124124
}
125125
#else /* CONFIG_SLUB_DEBUG_ON */
126-
static inline void check_element(mempool_t *pool, void *element)
126+
static inline void check_element(struct mempool *pool, void *element)
127127
{
128128
}
129-
static inline void poison_element(mempool_t *pool, void *element)
129+
static inline void poison_element(struct mempool *pool, void *element)
130130
{
131131
}
132132
#endif /* CONFIG_SLUB_DEBUG_ON */
133133

134-
static __always_inline bool kasan_poison_element(mempool_t *pool, void *element)
134+
static __always_inline bool kasan_poison_element(struct mempool *pool,
135+
void *element)
135136
{
136137
if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
137138
return kasan_mempool_poison_object(element);
@@ -141,7 +142,7 @@ static __always_inline bool kasan_poison_element(mempool_t *pool, void *element)
141142
return true;
142143
}
143144

144-
static void kasan_unpoison_element(mempool_t *pool, void *element)
145+
static void kasan_unpoison_element(struct mempool *pool, void *element)
145146
{
146147
if (pool->alloc == mempool_kmalloc)
147148
kasan_mempool_unpoison_object(element, (size_t)pool->pool_data);
@@ -153,15 +154,15 @@ static void kasan_unpoison_element(mempool_t *pool, void *element)
153154
(unsigned long)pool->pool_data);
154155
}
155156

156-
static __always_inline void add_element(mempool_t *pool, void *element)
157+
static __always_inline void add_element(struct mempool *pool, void *element)
157158
{
158159
BUG_ON(pool->min_nr != 0 && pool->curr_nr >= pool->min_nr);
159160
poison_element(pool, element);
160161
if (kasan_poison_element(pool, element))
161162
pool->elements[pool->curr_nr++] = element;
162163
}
163164

164-
static void *remove_element(mempool_t *pool)
165+
static void *remove_element(struct mempool *pool)
165166
{
166167
void *element = pool->elements[--pool->curr_nr];
167168

@@ -182,7 +183,7 @@ static void *remove_element(mempool_t *pool)
182183
* May be called on a zeroed but uninitialized mempool (i.e. allocated with
183184
* kzalloc()).
184185
*/
185-
void mempool_exit(mempool_t *pool)
186+
void mempool_exit(struct mempool *pool)
186187
{
187188
while (pool->curr_nr) {
188189
void *element = remove_element(pool);
@@ -201,7 +202,7 @@ EXPORT_SYMBOL(mempool_exit);
201202
* Free all reserved elements in @pool and @pool itself. This function
202203
* only sleeps if the free_fn() function sleeps.
203204
*/
204-
void mempool_destroy(mempool_t *pool)
205+
void mempool_destroy(struct mempool *pool)
205206
{
206207
if (unlikely(!pool))
207208
return;
@@ -211,9 +212,9 @@ void mempool_destroy(mempool_t *pool)
211212
}
212213
EXPORT_SYMBOL(mempool_destroy);
213214

214-
int mempool_init_node(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn,
215-
mempool_free_t *free_fn, void *pool_data,
216-
gfp_t gfp_mask, int node_id)
215+
int mempool_init_node(struct mempool *pool, int min_nr,
216+
mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,
217+
void *pool_data, gfp_t gfp_mask, int node_id)
217218
{
218219
spin_lock_init(&pool->lock);
219220
pool->min_nr = min_nr;
@@ -263,8 +264,9 @@ EXPORT_SYMBOL(mempool_init_node);
263264
*
264265
* Return: %0 on success, negative error code otherwise.
265266
*/
266-
int mempool_init_noprof(mempool_t *pool, int min_nr, mempool_alloc_t *alloc_fn,
267-
mempool_free_t *free_fn, void *pool_data)
267+
int mempool_init_noprof(struct mempool *pool, int min_nr,
268+
mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,
269+
void *pool_data)
268270
{
269271
return mempool_init_node(pool, min_nr, alloc_fn, free_fn,
270272
pool_data, GFP_KERNEL, NUMA_NO_NODE);
@@ -290,11 +292,11 @@ EXPORT_SYMBOL(mempool_init_noprof);
290292
*
291293
* Return: pointer to the created memory pool object or %NULL on error.
292294
*/
293-
mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn,
294-
mempool_free_t *free_fn, void *pool_data,
295-
gfp_t gfp_mask, int node_id)
295+
struct mempool *mempool_create_node_noprof(int min_nr,
296+
mempool_alloc_t *alloc_fn, mempool_free_t *free_fn,
297+
void *pool_data, gfp_t gfp_mask, int node_id)
296298
{
297-
mempool_t *pool;
299+
struct mempool *pool;
298300

299301
pool = kmalloc_node_noprof(sizeof(*pool), gfp_mask | __GFP_ZERO, node_id);
300302
if (!pool)
@@ -328,7 +330,7 @@ EXPORT_SYMBOL(mempool_create_node_noprof);
328330
*
329331
* Return: %0 on success, negative error code otherwise.
330332
*/
331-
int mempool_resize(mempool_t *pool, int new_min_nr)
333+
int mempool_resize(struct mempool *pool, int new_min_nr)
332334
{
333335
void *element;
334336
void **new_elements;
@@ -530,7 +532,7 @@ EXPORT_SYMBOL_GPL(mempool_alloc_bulk_noprof);
530532
* an element. Allocation failure can only happen when @gfp_mask does not
531533
* include %__GFP_DIRECT_RECLAIM.
532534
*/
533-
void *mempool_alloc_noprof(mempool_t *pool, gfp_t gfp_mask)
535+
void *mempool_alloc_noprof(struct mempool *pool, gfp_t gfp_mask)
534536
{
535537
gfp_t gfp_temp = mempool_adjust_gfp(&gfp_mask);
536538
void *element;
@@ -582,7 +584,7 @@ EXPORT_SYMBOL(mempool_alloc_noprof);
582584
* Return: pointer to the allocated element or %NULL if no elements are
583585
* available.
584586
*/
585-
void *mempool_alloc_preallocated(mempool_t *pool)
587+
void *mempool_alloc_preallocated(struct mempool *pool)
586588
{
587589
void *element = NULL;
588590

0 commit comments

Comments
 (0)