diff options
| author | Qian Cai <qcai@redhat.com> | 2020-12-05 22:14:55 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-11 13:25:02 +0100 |
| commit | 2498ae24602cdd33666cc305e16773c73c2ec252 (patch) | |
| tree | bc4af5acf73d39dc2c1cde3cc55f8b4159dbed7e /mm | |
| parent | 7517a3834271fd761ffab9b8b3f55c16e6063f87 (diff) | |
| download | linux-stable-2498ae24602cdd33666cc305e16773c73c2ec252.tar.gz linux-stable-2498ae24602cdd33666cc305e16773c73c2ec252.tar.bz2 linux-stable-2498ae24602cdd33666cc305e16773c73c2ec252.zip | |
mm/swapfile: do not sleep with a spin lock held
commit b11a76b37a5aa7b07c3e3eeeaae20b25475bddd3 upstream.
We can't call kvfree() with a spin lock held, so defer it. Fixes a
might_sleep() runtime warning.
Fixes: 873d7bcfd066 ("mm/swapfile.c: use kvzalloc for swap_info_struct allocation")
Signed-off-by: Qian Cai <qcai@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20201202151549.10350-1-qcai@redhat.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/swapfile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index adeb49fcad23..130e2e41a48c 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2825,6 +2825,7 @@ late_initcall(max_swapfiles_check); static struct swap_info_struct *alloc_swap_info(void) { struct swap_info_struct *p; + struct swap_info_struct *defer = NULL; unsigned int type; int i; int size = sizeof(*p) + nr_node_ids * sizeof(struct plist_node); @@ -2854,7 +2855,7 @@ static struct swap_info_struct *alloc_swap_info(void) smp_wmb(); WRITE_ONCE(nr_swapfiles, nr_swapfiles + 1); } else { - kvfree(p); + defer = p; p = swap_info[type]; /* * Do not memset this entry: a racing procfs swap_next() @@ -2867,6 +2868,7 @@ static struct swap_info_struct *alloc_swap_info(void) plist_node_init(&p->avail_lists[i], 0); p->flags = SWP_USED; spin_unlock(&swap_lock); + kvfree(defer); spin_lock_init(&p->lock); spin_lock_init(&p->cont_lock); |