From patchwork Sat Dec 19 10:04:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Galbraith X-Patchwork-Id: 11983405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBE72C4361B for ; Sat, 19 Dec 2020 10:05:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5E78B23B70 for ; Sat, 19 Dec 2020 10:05:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E78B23B70 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 936646B005C; Sat, 19 Dec 2020 05:05:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E6F76B005D; Sat, 19 Dec 2020 05:05:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AFAD6B0068; Sat, 19 Dec 2020 05:05:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0056.hostedemail.com [216.40.44.56]) by kanga.kvack.org (Postfix) with ESMTP id 657E76B005C for ; Sat, 19 Dec 2020 05:05:08 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2C5EC180ACF8F for ; Sat, 19 Dec 2020 10:05:08 +0000 (UTC) X-FDA: 77609598696.27.twig62_2216f1227445 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id B97263D669 for ; Sat, 19 Dec 2020 10:05:07 +0000 (UTC) X-HE-Tag: twig62_2216f1227445 X-Filterd-Recvd-Size: 6913 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Sat, 19 Dec 2020 10:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1608372295; bh=JgwycT7+eFK6ZdJt1y8niB6LmS4rpZzepP2lexfn6yg=; h=X-UI-Sender-Class:Subject:From:To:Cc:Date; b=NqlOkRcVgBYcLRsOYY1zOPSxF64KwREkGuSBOOZXwsEujWa/1onPpo0w7cpv2s6o8 Y03vNC0UfBh3skEZUc2NCry9xRUAWAZKzavvv0cC0CJxLkk6nBHj/LtcMAfqTyvWdV Und2/2iH0Y0JnNyryGMzXbq7JbJn3xowGFjzoQM0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from homer.fritz.box ([185.221.150.14]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDQeU-1kyr6u3PzK-00AY1j; Sat, 19 Dec 2020 11:04:54 +0100 Message-ID: Subject: [patch] zswap: fix zswap_frontswap_load() vs zsmalloc::map/unmap() might_sleep() splat From: Mike Galbraith To: LKML Cc: linux-mm , Barry Song , Vitaly Wool , Sebastian Andrzej Siewior Date: Sat, 19 Dec 2020 11:04:52 +0100 User-Agent: Evolution 3.34.4 MIME-Version: 1.0 X-Provags-ID: V03:K1:0JoVJLpktWKtFgulFnddHiZBdDUtN2k1SgDcUU/+eE3CIZZy5+q tiooSeDdeQ2yiCxkQLwk1Ewwg0mygS5uw+mQULWRXo5JmYrSD+T+fftIZSCfCImUXOakhMT Snr2SJ4At9W0+5pqWt6WEWfeaaBbIuw16jG5hvXIwSwRI6/Vet3/yRktRze7fyRq9qDq5pa Yaeagv2CjuLbxT2pveOig== X-UI-Out-Filterresults: notjunk:1;V03:K0:LtZsJW17/Ak=:EJ2gntUPJTNqJjUOs+bogd 7PhWCL3poXywbqw1PNdjXf9jqaSZtK6a0577UwFrI0Y5cYFGjLl/nCtKKTwJ3mayY3/rrmLSh LHK8Csx1fD04xaRyN8LufMXgbrncCGbAPvGyCoLXmckScBc4jMn+L+7gaEL7HuzCCg90YB6HV dFQnWMaB4nbcnBrjQHEtR4Hl7b29ueGTD3ptUJ+QL9Q36lgTdxkOkuvoibBstGnamCvgjFR1u rB3vuIP/PP+MKmJGHTFComtnQ8EMfk249CKx/D0LFf5qOqQIvws0AHKSwBTetjhcswVH2Q8sM 9sU/fmbRfwmNVVoUC16FJh/PmXnrzgy16slVIQPNGxYKCQ8CzIGKlgGE7w0jkinL9d6qqkgbH XfxyG56fExiFyIu3fTUS9RoWtbX6zp6gZKb7p6HwqdsHyL7y6GH1QCPV0sfCFnKULEZk6SoaM +DOGJNPHvooFYWQ3l2hYEQZgOLtZRB2CEjbd9BWMh5ePFp2KTugmG3+vApNBVkZvPU9+a7AZP 6FKHu/nUp7ZnhnnplubkDeMiGFYIJVZ4zjvTeXLuxtfbqa1fwcLlfHc1LPCLl08QNWqoudqLP XWshcYCRupbtua+aTkcXK732aRvqojqwJJ9uVJUJcp/4nZCkXKknLOaOeRqMT3ykARFQHNGda BJDZO907rfSBJLAe4Ycx8G1wmhLbJE4HGyUT+d4ZfRQUBmKAB5jhFC4YFYf0d0JihmIpu0saL a0LlrNxu/A5FuO/JyVszsSLN7f0p+eBqEoKtX82/qhffR0VgL6T7WxnqMBJYvKC4sp7oNQbu2 m4P3g5wGVUyLdGpduV9FQYkB7vmbr9qIueWY+vkJM8Dw2tTpF71mbE+xU0A6S/TtpiHsrGJgf YcWqS20VxYBGoRLLvI9A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Greetings, Beating on zswap+zsmalloc leads to the splat below, possible patch below that. [ 139.794413] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:935 [ 139.794585] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 907, name: avahi-daemon [ 139.794608] 2 locks held by avahi-daemon/907: [ 139.794621] #0: ffff8881010766d8 (&mm->mmap_lock#2){++++}-{3:3}, at: exc_page_fault+0x15b/0x6e0 [ 139.794659] #1: ffff8881b6b13110 (&zspage->lock){.+.+}-{2:2}, at: zs_map_object+0x89/0x350 [ 139.794691] Preemption disabled at: [ 139.794693] [] zs_map_object+0x38/0x350 [ 139.794719] CPU: 0 PID: 907 Comm: avahi-daemon Kdump: loaded Tainted: G E 5.10.0.g3644e2d-preempt #4 [ 139.794746] Hardware name: MEDION MS-7848/MS-7848, BIOS M7848W08.20C 09/23/2013 [ 139.794766] Call Trace: [ 139.794775] dump_stack+0x77/0x97 [ 139.794788] ___might_sleep+0x17d/0x260 [ 139.794806] __mutex_lock+0x47/0x9d0 [ 139.794823] ? zswap_frontswap_load+0xcb/0x240 [ 139.794841] ? zs_map_object+0x248/0x350 [ 139.794858] ? zswap_frontswap_load+0xcb/0x240 [ 139.794871] zswap_frontswap_load+0xcb/0x240 [ 139.794886] ? lru_cache_add+0xe9/0x1b0 [ 139.794904] __frontswap_load+0x6e/0xd0 [ 139.794921] swap_readpage+0x70/0x240 [ 139.794939] swap_cluster_readahead+0x1d9/0x280 [ 139.794964] ? swapin_readahead+0x140/0x3e0 [ 139.794979] swapin_readahead+0x140/0x3e0 [ 139.794997] ? lookup_swap_cache+0x5c/0x190 [ 139.795016] ? do_swap_page+0x2f7/0x900 [ 139.795030] do_swap_page+0x2f7/0x900 [ 139.795046] handle_mm_fault+0xa06/0x13b0 [ 139.795083] exc_page_fault+0x2a3/0x6e0 [ 139.795110] ? asm_exc_page_fault+0x1e/0x30 [ 139.795139] ? asm_exc_page_fault+0x8/0x30 [ 139.795166] asm_exc_page_fault+0x1e/0x30 [ 139.795191] RIP: 0033:0x560caa4074d0 [ 139.795215] Code: 89 05 e4 74 21 00 0f 84 28 06 00 00 e8 d9 13 00 00 e8 b4 12 00 00 44 8b 25 b9 75 21 00 45 85 e4 0f 85 ac 04 00 00 41 83 cf ff <48> 8b 3d b1 74 21 00 44 89 fe e8 d1 f6 ff ff 85 c0 89 c3 0f 88 d9 [ 139.795299] RSP: 002b:00007ffeb4ec5ce0 EFLAGS: 00010246 [ 139.795316] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00007ff1616e4db4 [ 139.795336] RDX: 0000000000000001 RSI: 00007ffeb4ec5c5f RDI: 0000000000000006 [ 139.795356] RBP: 0000560cab63be60 R08: 0000560cab656220 R09: 0000560cab670750 [ 139.795376] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 [ 139.795395] R13: 0000560cab63f550 R14: 0000560cab63c000 R15: 00000000ffffffff (CC Sebastian because RT has the ~same problem at the same spot, curable the same way, or by fixing the upstream buglet then take backports+fix, and nuking the associated RT patch) 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 Fixes: 1ec3b5fe6eec "mm/zswap: move to use crypto_acomp API for hardware acceleration" Signed-off-by: Mike Galbraith --- 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: