Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <aa9be27f0d247db1b25da55901b975d78537db3d.camel@gmx.de>
Subject: Re: [patch] zswap: fix zswap_frontswap_load() vs
 zsmalloc::map/unmap() might_sleep() splat
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>
Date:   Sat, 19 Dec 2020 11:12:10 +0100
In-Reply-To: <fae85e4440a8ef6f13192476bd33a4826416fc58.camel@gmx.de>
References: <fae85e4440a8ef6f13192476bd33a4826416fc58.camel@gmx.de>
Content-Type: text/plain; charset="ISO-8859-15"
User-Agent: Evolution 3.34.4 
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

(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 t=
he
mutex outside of pool map/unmap methods in zswap_frontswap_load() as is do=
ne
in zswap_frontswap_store().

Signed-off-by: Mike Galbraith <efault@gmx.de>
Fixes: 1ec3b5fe6eec "mm/zswap: move to use crypto_acomp API for hardware a=
cceleration"
=2D--
 mm/zswap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

=2D-- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -1258,20 +1258,20 @@ static int zswap_frontswap_load(unsigned

 	/* decompress */
 	dlen =3D PAGE_SIZE;
+	acomp_ctx =3D raw_cpu_ptr(entry->pool->acomp_ctx);
+	mutex_lock(acomp_ctx->mutex);
 	src =3D zpool_map_handle(entry->pool->zpool, entry->handle, ZPOOL_MM_RO)=
;
 	if (zpool_evictable(entry->pool->zpool))
 		src +=3D sizeof(struct zswap_header);

-	acomp_ctx =3D 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 =3D 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: