Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 18:55:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XArray: Add calls to might_alloc()

Browse Source 
Catch bogus GFP flags deterministically, instead of occasionally
when we actually have to allocate memory.

Reported-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-07-06 14:51:00 -04:00
parent 32346491dd
commit 1dd685c414
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/xarray.h
View File

@ -16,6 +16,7 @@
#include <linux/kconfig.h> #include <linux/kconfig.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/sched/mm.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/types.h> #include <linux/types.h>
@ -586,6 +587,7 @@ static inline void *xa_store_bh(struct xarray *xa, unsigned long index,
{ {
void *curr; void *curr;
might_alloc(gfp);
xa_lock_bh(xa); xa_lock_bh(xa);
curr = __xa_store(xa, index, entry, gfp); curr = __xa_store(xa, index, entry, gfp);
xa_unlock_bh(xa); xa_unlock_bh(xa);
@ -612,6 +614,7 @@ static inline void *xa_store_irq(struct xarray *xa, unsigned long index,
{ {
void *curr; void *curr;
might_alloc(gfp);
xa_lock_irq(xa); xa_lock_irq(xa);
curr = __xa_store(xa, index, entry, gfp); curr = __xa_store(xa, index, entry, gfp);
xa_unlock_irq(xa); xa_unlock_irq(xa);
@ -687,6 +690,7 @@ static inline void *xa_cmpxchg(struct xarray *xa, unsigned long index,
{ {
void *curr; void *curr;
might_alloc(gfp);
xa_lock(xa); xa_lock(xa);
curr = __xa_cmpxchg(xa, index, old, entry, gfp); curr = __xa_cmpxchg(xa, index, old, entry, gfp);
xa_unlock(xa); xa_unlock(xa);
@ -714,6 +718,7 @@ static inline void *xa_cmpxchg_bh(struct xarray *xa, unsigned long index,
{ {
void *curr; void *curr;
might_alloc(gfp);
xa_lock_bh(xa); xa_lock_bh(xa);
curr = __xa_cmpxchg(xa, index, old, entry, gfp); curr = __xa_cmpxchg(xa, index, old, entry, gfp);
xa_unlock_bh(xa); xa_unlock_bh(xa);
@ -741,6 +746,7 @@ static inline void *xa_cmpxchg_irq(struct xarray *xa, unsigned long index,
{ {
void *curr; void *curr;
might_alloc(gfp);
xa_lock_irq(xa); xa_lock_irq(xa);
curr = __xa_cmpxchg(xa, index, old, entry, gfp); curr = __xa_cmpxchg(xa, index, old, entry, gfp);
xa_unlock_irq(xa); xa_unlock_irq(xa);
@ -770,6 +776,7 @@ static inline int __must_check xa_insert(struct xarray *xa,
{ {
int err; int err;
might_alloc(gfp);
xa_lock(xa); xa_lock(xa);
err = __xa_insert(xa, index, entry, gfp); err = __xa_insert(xa, index, entry, gfp);
xa_unlock(xa); xa_unlock(xa);
@ -799,6 +806,7 @@ static inline int __must_check xa_insert_bh(struct xarray *xa,
{ {
int err; int err;
might_alloc(gfp);
xa_lock_bh(xa); xa_lock_bh(xa);
err = __xa_insert(xa, index, entry, gfp); err = __xa_insert(xa, index, entry, gfp);
xa_unlock_bh(xa); xa_unlock_bh(xa);
@ -828,6 +836,7 @@ static inline int __must_check xa_insert_irq(struct xarray *xa,
{ {
int err; int err;
might_alloc(gfp);
xa_lock_irq(xa); xa_lock_irq(xa);
err = __xa_insert(xa, index, entry, gfp); err = __xa_insert(xa, index, entry, gfp);
xa_unlock_irq(xa); xa_unlock_irq(xa);
@ -857,6 +866,7 @@ static inline __must_check int xa_alloc(struct xarray *xa, u32 *id,
{ {
int err; int err;
might_alloc(gfp);
xa_lock(xa); xa_lock(xa);
err = __xa_alloc(xa, id, entry, limit, gfp); err = __xa_alloc(xa, id, entry, limit, gfp);
xa_unlock(xa); xa_unlock(xa);
@ -886,6 +896,7 @@ static inline int __must_check xa_alloc_bh(struct xarray *xa, u32 *id,
{ {
int err; int err;
might_alloc(gfp);
xa_lock_bh(xa); xa_lock_bh(xa);
err = __xa_alloc(xa, id, entry, limit, gfp); err = __xa_alloc(xa, id, entry, limit, gfp);
xa_unlock_bh(xa); xa_unlock_bh(xa);
@ -915,6 +926,7 @@ static inline int __must_check xa_alloc_irq(struct xarray *xa, u32 *id,
{ {
int err; int err;
might_alloc(gfp);
xa_lock_irq(xa); xa_lock_irq(xa);
err = __xa_alloc(xa, id, entry, limit, gfp); err = __xa_alloc(xa, id, entry, limit, gfp);
xa_unlock_irq(xa); xa_unlock_irq(xa);
@ -948,6 +960,7 @@ static inline int xa_alloc_cyclic(struct xarray *xa, u32 *id, void *entry,
{ {
int err; int err;
might_alloc(gfp);
xa_lock(xa); xa_lock(xa);
err = __xa_alloc_cyclic(xa, id, entry, limit, next, gfp); err = __xa_alloc_cyclic(xa, id, entry, limit, next, gfp);
xa_unlock(xa); xa_unlock(xa);
@ -981,6 +994,7 @@ static inline int xa_alloc_cyclic_bh(struct xarray *xa, u32 *id, void *entry,
{ {
int err; int err;
might_alloc(gfp);
xa_lock_bh(xa); xa_lock_bh(xa);
err = __xa_alloc_cyclic(xa, id, entry, limit, next, gfp); err = __xa_alloc_cyclic(xa, id, entry, limit, next, gfp);
xa_unlock_bh(xa); xa_unlock_bh(xa);
@ -1014,6 +1028,7 @@ static inline int xa_alloc_cyclic_irq(struct xarray *xa, u32 *id, void *entry,
{ {
int err; int err;
might_alloc(gfp);
xa_lock_irq(xa); xa_lock_irq(xa);
err = __xa_alloc_cyclic(xa, id, entry, limit, next, gfp); err = __xa_alloc_cyclic(xa, id, entry, limit, next, gfp);
xa_unlock_irq(xa); xa_unlock_irq(xa);

2
tools/include/linux/sched/mm.h
View File

@ -1,4 +1,6 @@
#ifndef _TOOLS_PERF_LINUX_SCHED_MM_H #ifndef _TOOLS_PERF_LINUX_SCHED_MM_H
#define _TOOLS_PERF_LINUX_SCHED_MM_H #define _TOOLS_PERF_LINUX_SCHED_MM_H
#define might_alloc(gfp) do { } while (0)
#endif /* _TOOLS_PERF_LINUX_SCHED_MM_H */ #endif /* _TOOLS_PERF_LINUX_SCHED_MM_H */