Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp1783234rwb; Sun, 18 Sep 2022 14:27:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4fsWLr+52BBU9gRsg2HjiBke0VhADks11WnT1w9ocoueZ1RwYOP4/nPWPAMjNPSLpdhrIC X-Received: by 2002:a05:6a00:139b:b0:540:de3c:cf9d with SMTP id t27-20020a056a00139b00b00540de3ccf9dmr15584315pfg.54.1663536473933; Sun, 18 Sep 2022 14:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663536473; cv=none; d=google.com; s=arc-20160816; b=htNs6CFpUBzvncqHhp1m2NZvTxC0H/0hn+dMbw5Nu4oA7G7YPmwNsr3+aiWMQjvhC2 +srjArqmi0Pa2vDQJRCZLlZP6CzWP5FYT/5h8P25HdpT34oc+AstReOlBiG/FUnnJmDH quTOewMqE/6iMNuHrDFPPA4pqJwyBAW1WoMKwfmKYwcF99/OOcpgl2dNi60inZY/txwg jY8F3fayvinLXIhmdjuKLZIt2OV3fc1xuc+HN/5VQ3HG19c1ytHUzI02zCDusfpe1lPV NERGc+y94OUMg5GTJ0qgLBu8ZC0jhcRKCU41VDu/RBmupEvwGekIK+wNpP8z7l4RuxLf +ORQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=UFsuxA6/C4rSRdMsXNxuwZ9ga1EMJaW1urs2eGrYQJA=; b=XSy8v9AW4pLGjeoHDALXtOQ6LG1vgQwa5K3tEVdATRie4Ya4Bd0EOldfb4hHPq/oIW H9VmvrOcVvH8uEc3m2LnTl92Qj/Hbf3LejmHe4QGhAgbAFFRcg9+49aoaH3SG2PrX7Fj yIQD/6cH17nQu+r+GLjczmT9Mga7iF2J3V5dNdQR3BB2+NZMig93dNwjY6+oxi2zPV25 cHHdy6lW6MFSGnGBMYSt5OJ4lidM+ZqowO4g2TO8Q5cs4S+Dp6o/k7pt0BNCVztxN6bw diNX8DAC0Mdg4OvcvSGycXSSD7TrOiC8GnBD1uO46Yayn1HSHK5d8Gmp/ANo7SqwPAqu z2Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=OV1fvONa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s19-20020a170903201300b0016dc3b5367asi23933687pla.608.2022.09.18.14.27.41; Sun, 18 Sep 2022 14:27:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=OV1fvONa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229552AbiIRVLO (ORCPT + 99 others); Sun, 18 Sep 2022 17:11:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbiIRVLN (ORCPT ); Sun, 18 Sep 2022 17:11:13 -0400 Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BFE6E036 for ; Sun, 18 Sep 2022 14:11:12 -0700 (PDT) Received: by mail-qv1-xf32.google.com with SMTP id g4so20611283qvo.3 for ; Sun, 18 Sep 2022 14:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:message-id:subject:cc:to:from:date:from:to:cc:subject :date; bh=UFsuxA6/C4rSRdMsXNxuwZ9ga1EMJaW1urs2eGrYQJA=; b=OV1fvONaztx1a28mzQTfh14ez+xCms2Govf+yuKsKMB8IDqCsTV/bjHRVM0mhKwI4u WWhxoqTA779MErMThIhFdmtW1/1TxPbV0CYCjmJyD0RZBG4Va4O/vrGJpTBjrIe5zsI8 Tj3UP1kd4z22YtLf6HW8lzBu0o6VTYTxDeeZTwvImQQF+ziupyV/nzsC9pRN7xXSGWK2 bUEkAsu/TWZvhznNk85UuWULXPchXUzZZps4ht+EsPcV7KowADHN742CTmdpSP2h4dt+ 8pI56Im+bS7VLw0LDkUdbM6p3Qi8HZQB4QJ9YTUVQ+rS7GU9tLC1UG2mknz4BzCwhqfe uRSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date; bh=UFsuxA6/C4rSRdMsXNxuwZ9ga1EMJaW1urs2eGrYQJA=; b=wE4nA52rFgPU9CUNdtR7AW8y0pU7yCow3Xkr3cBliLVi1WmQO5yfXNSjd0aYO11Rc6 nTgoPjKUJCfaOHyvbsh4MSQdrVXX39hoLOy1qI5HOVAubhg1Ri1HgochHU3BJ6h82gnc rt01HsQhYTB77cQ55Opbjd9JIqZZ3CT/om6HQVyD0yXplHCSpP26et49a44HKLmuivvi pGz8Dx1K4UaNUiOqhR4+64gzuZjnTuxg6ZcMKgrC4kMhMJVpf7507rFDugnAvfIomM9Q V//Jsg9ObpP4Cih3KBSVVS69BB0xWbqE+XWtxFIuUxBXGB7NQURCrsF1qSqwUEN/CkO2 tlhg== X-Gm-Message-State: ACrzQf0YWg4jZ7ihTAKUOjUqnoQSpVu8ekbSzYaUPOlgzhuJE3ci726t q6u7BLkSRxdw7vVnvDouRce+2w== X-Received: by 2002:a05:6214:e69:b0:4ac:93e7:62f0 with SMTP id jz9-20020a0562140e6900b004ac93e762f0mr12350535qvb.40.1663535471096; Sun, 18 Sep 2022 14:11:11 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id c8-20020a05620a268800b006ce60296f97sm10907958qkp.68.2022.09.18.14.11.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Sep 2022 14:11:10 -0700 (PDT) Date: Sun, 18 Sep 2022 14:10:51 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Jens Axboe cc: Keith Busch , Yu Kuai , Jan Kara , Liu Song , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH next] sbitmap: fix lockup while swapping Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 4acb83417cad ("sbitmap: fix batched wait_cnt accounting") is a big improvement: without it, I had to revert to before commit 040b83fcecfb ("sbitmap: fix possible io hung due to lost wakeup") to avoid the high system time and freezes which that had introduced. Now okay on the NVME laptop, but 4acb83417cad is a disaster for heavy swapping (kernel builds in low memory) on another: soon locking up in sbitmap_queue_wake_up() (into which __sbq_wake_up() is inlined), cycling around with waitqueue_active() but wait_cnt 0 . Here is a backtrace, showing the common pattern of outer sbitmap_queue_wake_up() interrupted before setting wait_cnt 0 back to wake_batch (in some cases other CPUs are idle, in other cases they're spinning for a lock in dd_bio_merge()): sbitmap_queue_wake_up < sbitmap_queue_clear < blk_mq_put_tag < __blk_mq_free_request < blk_mq_free_request < __blk_mq_end_request < scsi_end_request < scsi_io_completion < scsi_finish_command < scsi_complete < blk_complete_reqs < blk_done_softirq < __do_softirq < __irq_exit_rcu < irq_exit_rcu < common_interrupt < asm_common_interrupt < _raw_spin_unlock_irqrestore < __wake_up_common_lock < __wake_up < sbitmap_queue_wake_up < sbitmap_queue_clear < blk_mq_put_tag < __blk_mq_free_request < blk_mq_free_request < dd_bio_merge < blk_mq_sched_bio_merge < blk_mq_attempt_bio_merge < blk_mq_submit_bio < __submit_bio < submit_bio_noacct_nocheck < submit_bio_noacct < submit_bio < __swap_writepage < swap_writepage < pageout < shrink_folio_list < evict_folios < lru_gen_shrink_lruvec < shrink_lruvec < shrink_node < do_try_to_free_pages < try_to_free_pages < __alloc_pages_slowpath < __alloc_pages < folio_alloc < vma_alloc_folio < do_anonymous_page < __handle_mm_fault < handle_mm_fault < do_user_addr_fault < exc_page_fault < asm_exc_page_fault I have almost no grasp of all the possible sbitmap races, and their consequences: but using the same !waitqueue_active() check as used elsewhere, fixes the lockup and shows no adverse consequence for me. Fixes: 4acb83417cad ("sbitmap: fix batched wait_cnt accounting") Signed-off-by: Hugh Dickins --- lib/sbitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -620,7 +620,7 @@ static bool __sbq_wake_up(struct sbitmap * function again to wakeup a new batch on a different 'ws'. */ if (cur == 0) - return true; + return !waitqueue_active(&ws->wait); sub = min(*nr, cur); wait_cnt = cur - sub; } while (!atomic_try_cmpxchg(&ws->wait_cnt, &cur, wait_cnt));