From: Mike Galbraith <efault@gmx.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: linux-mm <linux-mm@kvack.org>,
Barry Song <song.bao.hua@hisilicon.com>,
Vitaly Wool <vitaly.wool@konsulko.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: Re: [patch] zswap: fix zswap_frontswap_load() vs zsmalloc::map/unmap() might_sleep() splat
Date: Sat, 19 Dec 2020 11:12:10 +0100 [thread overview]
Message-ID: <aa9be27f0d247db1b25da55901b975d78537db3d.camel@gmx.de> (raw)
In-Reply-To: <fae85e4440a8ef6f13192476bd33a4826416fc58.camel@gmx.de>
(mailer partially munged formatting? resend)
mm/zswap: fix zswap_frontswap_load() vs zsmalloc::map/unmap() might_sleep() splat
zsmalloc map/unmap methods use preemption disabling bit spinlocks. Take the
mutex outside of pool map/unmap methods in zswap_frontswap_load() as is done
in zswap_frontswap_store().
Signed-off-by: Mike Galbraith <efault@gmx.de>
Fixes: 1ec3b5fe6eec "mm/zswap: move to use crypto_acomp API for hardware acceleration"
---
mm/zswap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -1258,20 +1258,20 @@ static int zswap_frontswap_load(unsigned
/* decompress */
dlen = PAGE_SIZE;
+ acomp_ctx = raw_cpu_ptr(entry->pool->acomp_ctx);
+ mutex_lock(acomp_ctx->mutex);
src = zpool_map_handle(entry->pool->zpool, entry->handle, ZPOOL_MM_RO);
if (zpool_evictable(entry->pool->zpool))
src += sizeof(struct zswap_header);
- acomp_ctx = raw_cpu_ptr(entry->pool->acomp_ctx);
- mutex_lock(acomp_ctx->mutex);
sg_init_one(&input, src, entry->length);
sg_init_table(&output, 1);
sg_set_page(&output, page, PAGE_SIZE, 0);
acomp_request_set_params(acomp_ctx->req, &input, &output, entry->length, dlen);
ret = crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), &acomp_ctx->wait);
- mutex_unlock(acomp_ctx->mutex);
zpool_unmap_handle(entry->pool->zpool, entry->handle);
+ mutex_unlock(acomp_ctx->mutex);
BUG_ON(ret);
freeentry:
next prev parent reply other threads:[~2020-12-19 10:14 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 10:04 [patch] zswap: fix zswap_frontswap_load() vs zsmalloc::map/unmap() might_sleep() splat Mike Galbraith
2020-12-19 10:12 ` Mike Galbraith [this message]
2020-12-19 10:20 ` Vitaly Wool
2020-12-19 10:27 ` Mike Galbraith
2020-12-19 10:46 ` Vitaly Wool
2020-12-19 10:59 ` Mike Galbraith
2020-12-19 11:03 ` Mike Galbraith
2020-12-20 0:22 ` [PATCH] zsmalloc: do not use bit_spin_lock Vitaly Wool
2020-12-20 1:18 ` Matthew Wilcox
2020-12-20 7:21 ` Vitaly Wool
2021-01-14 16:17 ` Sebastian Andrzej Siewior
2020-12-20 1:23 ` Mike Galbraith
2020-12-20 4:11 ` Mike Galbraith
2020-12-20 7:47 ` Mike Galbraith
2020-12-20 21:20 ` Song Bao Hua (Barry Song)
2020-12-20 22:10 ` Mike Galbraith
2020-12-20 1:56 ` Mike Galbraith
2020-12-21 17:24 ` Minchan Kim
2020-12-21 19:20 ` Vitaly Wool
2020-12-21 19:50 ` Shakeel Butt
2020-12-21 20:05 ` Song Bao Hua (Barry Song)
2020-12-21 21:02 ` Shakeel Butt
2020-12-21 21:25 ` Song Bao Hua (Barry Song)
2020-12-21 22:11 ` Vitaly Wool
2020-12-21 22:42 ` Song Bao Hua (Barry Song)
2020-12-21 23:35 ` Song Bao Hua (Barry Song)
2020-12-22 0:59 ` Vitaly Wool
2020-12-22 1:10 ` Song Bao Hua (Barry Song)
2020-12-22 1:42 ` Song Bao Hua (Barry Song)
[not found] ` <CAM4kBBK=5eBdCjWc5VJXcdr=Z4PV1=ZQ2n8fZmJ6ahJbpUyv2A@mail.gmail.com>
2020-12-22 2:07 ` Song Bao Hua (Barry Song)
2020-12-22 2:10 ` Song Bao Hua (Barry Song)
2020-12-22 9:44 ` Vitaly Wool
2020-12-22 21:06 ` Song Bao Hua (Barry Song)
2020-12-23 0:11 ` Vitaly Wool
2020-12-23 12:44 ` tiantao (H)
2020-12-23 18:25 ` Vitaly Wool
2021-01-14 16:18 ` Sebastian Andrzej Siewior
2021-01-14 16:29 ` Vitaly Wool
2021-01-14 16:56 ` Sebastian Andrzej Siewior
2021-01-14 17:15 ` Vitaly Wool
2021-01-14 17:18 ` Sebastian Andrzej Siewior
2020-12-21 22:46 ` Shakeel Butt
2020-12-21 23:02 ` Song Bao Hua (Barry Song)
2020-12-22 9:20 ` David Laight
2020-12-21 20:22 ` Minchan Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aa9be27f0d247db1b25da55901b975d78537db3d.camel@gmx.de \
--to=efault@gmx.de \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=song.bao.hua@hisilicon.com \
--cc=vitaly.wool@konsulko.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).