{"id":2221392,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2221392/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20260409114204.917154-1-yi.zhang@huaweicloud.com/","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/1.2/projects/8/?format=json","name":"Linux ext4 filesystem development","link_name":"linux-ext4","list_id":"linux-ext4.vger.kernel.org","list_email":"linux-ext4@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260409114204.917154-1-yi.zhang@huaweicloud.com>","list_archive_url":null,"date":"2026-04-09T11:42:03","name":"[v2] jbd2: fix deadlock in jbd2_journal_cancel_revoke()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5a781fac57686ae85428d5fc5616b1294b01a47e","submitter":{"id":85428,"url":"http://patchwork.ozlabs.org/api/1.2/people/85428/?format=json","name":"Zhang Yi","email":"yi.zhang@huaweicloud.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20260409114204.917154-1-yi.zhang@huaweicloud.com/mbox/","series":[{"id":499281,"url":"http://patchwork.ozlabs.org/api/1.2/series/499281/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/list/?series=499281","date":"2026-04-09T11:42:03","name":"[v2] jbd2: fix deadlock in jbd2_journal_cancel_revoke()","version":2,"mbox":"http://patchwork.ozlabs.org/series/499281/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2221392/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221392/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-ext4@vger.kernel.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","patchwork-incoming@ozlabs.org"],"Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org\n (client-ip=2404:9400:2221:ea00::3; helo=mail.ozlabs.org;\n envelope-from=srs0=aprz=ci=vger.kernel.org=linux-ext4+bounces-15695-patchwork-incoming=ozlabs.org@ozlabs.org;\n receiver=patchwork.ozlabs.org)","gandalf.ozlabs.org;\n arc=pass smtp.remote-ip=172.234.253.10 arc.chain=subspace.kernel.org","gandalf.ozlabs.org;\n dmarc=none (p=none dis=none) header.from=huaweicloud.com","gandalf.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=linux-ext4+bounces-15695-patchwork-incoming=ozlabs.org@vger.kernel.org;\n receiver=ozlabs.org)","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=45.249.212.56","smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=huaweicloud.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=huaweicloud.com"],"Received":["from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1 raw public key)\n server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fryqP1nWvz1yD3\n\tfor ; Thu, 09 Apr 2026 21:47:59 +1000 (AEST)","from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3])\n\tby gandalf.ozlabs.org (Postfix) with ESMTP id 4fryqM55G2z4wSY\n\tfor ; Thu, 09 Apr 2026 21:47:59 +1000 (AEST)","by gandalf.ozlabs.org (Postfix)\n\tid 4fryqM4fBPz4wM1; Thu, 09 Apr 2026 21:47:59 +1000 (AEST)","from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby gandalf.ozlabs.org (Postfix) with ESMTPS id 4fryqH4X4gz4wSY\n\tfor ; Thu, 09 Apr 2026 21:47:55 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id AB8CD301F189\n\tfor ; Thu, 9 Apr 2026 11:47:50 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 5CC093C2760;\n\tThu, 9 Apr 2026 11:47:49 +0000 (UTC)","from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com\n [45.249.212.56])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 13E44391820;\n\tThu, 9 Apr 2026 11:47:43 +0000 (UTC)","from mail.maildlp.com (unknown [172.19.163.177])\n\tby dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4frypw0bsCzKHMk3;\n\tThu, 9 Apr 2026 19:47:36 +0800 (CST)","from mail02.huawei.com (unknown [10.116.40.112])\n\tby mail.maildlp.com (Postfix) with ESMTP id 4266340592;\n\tThu, 9 Apr 2026 19:47:36 +0800 (CST)","from huaweicloud.com (unknown [10.50.85.155])\n\tby APP1 (Coremail) with SMTP id cCh0CgAHC9vQkddpnPjFDw--.28749S4;\n\tThu, 09 Apr 2026 19:47:36 +0800 (CST)"],"ARC-Seal":["i=2; a=rsa-sha256; d=ozlabs.org; s=201707; t=1775735279; cv=pass;\n\tb=EpV+5j/Bss1Br6HLU8dVNklxnM7Jn7U6pNeB71mljYm2VnpHJOiDhEK26h9Uis4zKPP+XGAFxVmmWgzhJDBD9CR5k7BJJe/P9fif/2ZLuVntRudZQjyGT94N0YbpyAEBNw03XnjxhxcIgvlxtlnJIw5J1iBh3IEfxRJWbDFhbWf5MwiB5a4OYEBrAh2f7wQJEAcWmxbN2DhV9JQj0tjEWgnteCxYEr5+P9f8Cp+CyGcJHtggctOh7h7c5Skam71wHlmmdGkG+o4NtxXFo04UxPBrvXcn4DXJ+831VNv5hPjtJmEN9uw/Z5NXWiLXyqcdaB/vSvmXilMrjG1WihNZwQ==","i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775735268; cv=none;\n b=I4ipVaPsex4fMWGwijJqutFg6158UlgQGbu9FPKOgQ8/RDxdBFjdlgsuwLUvLVBMOYp7n+vZuNNLRvT6Ov70saHeuLnQqjFujADkinvCOKrTZy8riNoCa10+AK0UF6LMpes+gPMNcTy7iwpxWOXz51zxFp/gjnP1c1A3e/YGW2E="],"ARC-Message-Signature":["i=2; a=rsa-sha256; d=ozlabs.org; s=201707;\n\tt=1775735279; c=relaxed/relaxed;\n\tbh=xS0gioP37LtWMXGDo5PBu7Kd9z57IkPGynB8i/701LM=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=x3H4ZUvbbGiLpdrT2WBQzQAvuZqpYhsTo8HpcW8upRejXzBGF9wzsIiDbGIOd8+wTjjyTFKleBe+2nvCDylfAbdJf1zVsXPD5ByzwPoX/OJa7w6tS0BP+4BeyCGhVlr89+G/UXlgJdnE7yIVJKgElBapXX1aisFMLj2h4+myZt540GaLkg4yWXzRnbPoK+R88aQ6MYSmj3A9fFcwFTpfQJZpaZ90UEanoHyduq09TITH1lb6EA6IrnXXbXMAUtX8epOK8KlNiB45sZ+g2MFtM5qKI5r+04IeIgJTPluirbXGAESXUm0i1IbtkusttsllOXqHp7whSlyGlKQNplrluA==","i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775735268; c=relaxed/simple;\n\tbh=UBWP4HMYIq3fCF5zPk//N+07aF3jABzOqwEjmLuncd8=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=EVTJPszpaBd+0m22njfa0UJ3aW6ZKnvatYVnJNxuC8rikgn8lD4uLHq0Wthx5REUYlg1onF/oO0pN8n+O7jCVwxUNGNZpWuoaUaHT2cJBiA/Xub1Etg8s0aVaHlCih84iTYD+fIVnmPjAs0rdHzX+7/8bT91KIhvuwnA0mkr/Gk="],"ARC-Authentication-Results":["i=2; gandalf.ozlabs.org;\n dmarc=none (p=none dis=none) header.from=huaweicloud.com;\n spf=pass (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=linux-ext4+bounces-15695-patchwork-incoming=ozlabs.org@vger.kernel.org;\n receiver=ozlabs.org) smtp.mailfrom=vger.kernel.org","i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=huaweicloud.com;\n spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56"],"From":"Zhang Yi ","To":"linux-ext4@vger.kernel.org","Cc":"linux-fsdevel@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tdave@stgolabs.net,\n\ttytso@mit.edu,\n\tadilger.kernel@dilger.ca,\n\tjack@suse.cz,\n\tojaswin@linux.ibm.com,\n\tritesh.list@gmail.com,\n\tlibaokun@linux.alibaba.com,\n\tyi.zhang@huawei.com,\n\tyi.zhang@huaweicloud.com,\n\tyizhang089@gmail.com,\n\tyangerkun@huawei.com,\n\tyukuai@fnnas.com","Subject":"[PATCH v2] jbd2: fix deadlock in jbd2_journal_cancel_revoke()","Date":"Thu, 9 Apr 2026 19:42:03 +0800","Message-ID":"<20260409114204.917154-1-yi.zhang@huaweicloud.com>","X-Mailer":"git-send-email 2.52.0","Precedence":"bulk","X-Mailing-List":"linux-ext4@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-CM-TRANSID":"cCh0CgAHC9vQkddpnPjFDw--.28749S4","X-Coremail-Antispam":"1UD129KBjvJXoW7Kw15XF4rJr15JF43XFWrKrg_yoW5JFyUpF\n\t98KFyYkrykuF1qk3Z7Xay5JF13Gw4kGryUCFZF9wnIkF45XF97KFW7K3WYqFyjvrs7Xw4v\n\tqrWjya4rua109rDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n\t9KBjDU0xBIdaVrnRJUUU9014x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0\n\trVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02\n\t1l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j\n\t6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV\n\tCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0\n\tI7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r\n\t4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v\n\tn2kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x\n\tkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E\n\t67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw\n\tCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x\n\tMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIda\n\tVFxhVjvjDU0xZFpf9x0JUQID7UUUUU=","X-CM-SenderInfo":"d1lo6xhdqjqx5xdzvxpfor3voofrz/","X-Spam-Status":"No, score=-1.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,\n\tDMARC_MISSING,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,\n\tSPF_HELO_NONE,SPF_PASS autolearn=disabled version=4.0.1","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on gandalf.ozlabs.org"},"content":"From: Zhang Yi \n\nCommit f76d4c28a46a (\"fs/jbd2: use sleeping version of\n__find_get_block()\") changed jbd2_journal_cancel_revoke() to use\n__find_get_block_nonatomic() which holds the folio lock instead of\ni_private_lock. This breaks the lock ordering (folio -> buffer) and\ncauses an ABBA deadlock when the filesystem blocksize < pagesize:\n\n T1 T2\next4_mkdir()\n ext4_init_new_dir()\n ext4_append()\n ext4_getblk()\n lock_buffer() <- A\n sync_blockdev()\n blkdev_writepages()\n writeback_iter()\n writeback_get_folio()\n folio_lock() <- B\n ext4_journal_get_create_access()\n jbd2_journal_cancel_revoke()\n __find_get_block_nonatomic()\n folio_lock() <- B\n block_write_full_folio()\n lock_buffer() <- A\n\nThis can occasionally cause generic/013 to hang.\n\nFix by only calling __find_get_block_nonatomic() when the passed\nbuffer_head doesn't belong to the bdev, which is the only case that we\nneed to look up its bdev alias. Otherwise, the lookup is redundant since\nthe found buffer_head is equal to the one we passed in.\n\nFixes: f76d4c28a46a (\"fs/jbd2: use sleeping version of __find_get_block()\")\nSigned-off-by: Zhang Yi \n---\nv1->v2:\n - Switch to using sb_is_blkdev_sb() to check whether the bh belongs to\n the bdev.\n\n fs/jbd2/revoke.c | 8 +++++---\n 1 file changed, 5 insertions(+), 3 deletions(-)","diff":"diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c\nindex 9016ddb82447..e4c2fbd381f1 100644\n--- a/fs/jbd2/revoke.c\n+++ b/fs/jbd2/revoke.c\n@@ -428,6 +428,7 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)\n \tjournal_t *journal = handle->h_transaction->t_journal;\n \tint need_cancel;\n \tstruct buffer_head *bh = jh2bh(jh);\n+\tstruct address_space *bh_mapping = bh->b_folio->mapping;\n \n \tjbd2_debug(4, \"journal_head %p, cancelling revoke\\n\", jh);\n \n@@ -464,13 +465,14 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)\n \t * buffer_head? If so, we'd better make sure we clear the\n \t * revoked status on any hashed alias too, otherwise the revoke\n \t * state machine will get very upset later on. */\n-\tif (need_cancel) {\n+\tif (need_cancel && !sb_is_blkdev_sb(bh_mapping->host->i_sb)) {\n \t\tstruct buffer_head *bh2;\n+\n \t\tbh2 = __find_get_block_nonatomic(bh->b_bdev, bh->b_blocknr,\n \t\t\t\t\t\t bh->b_size);\n \t\tif (bh2) {\n-\t\t\tif (bh2 != bh)\n-\t\t\t\tclear_buffer_revoked(bh2);\n+\t\t\tWARN_ON_ONCE(bh2 == bh);\n+\t\t\tclear_buffer_revoked(bh2);\n \t\t\t__brelse(bh2);\n \t\t}\n \t}\n","prefixes":["v2"]}