Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1973577ybh; Tue, 14 Jul 2020 12:02:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJys3R1qLrFX8mZDb7mZWlfCpMG8vOk8sBApiCxhDY2QidgPX30dNrMaHFSMrWdnbpp1lBtX X-Received: by 2002:a17:906:d217:: with SMTP id w23mr6083407ejz.292.1594753341410; Tue, 14 Jul 2020 12:02:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753341; cv=none; d=google.com; s=arc-20160816; b=XQggHd7B2HDc7CUInvgfKPQTtxS+cak3W8p1uso56JENskYPlsiYmYCUSagPBeUVT0 orFdOqk8h5xSmFJUYDYpLvihTpfrzoQkFt207C0PsfyTKAwUsbySeNZIjqcRzrx+5drP 5Cgg6kesrSNwz4iC9A+5lqT/8EcnVKqjPknr6k2ZJDDAyD9riZHu2i3vXCuRINc4FnCM BUoZ1HVQG50ZPSY5GkklQwcLKGqE1ouzhaVhMYTr1QUiS0a/SzxsE3R7khFYI3X/ORoP U8z130EXIL859udJ53+QK9I+R3IhFsn35WelGhX7/etYadiCpD6gOnS+4IL2at5OJ2/y 8aXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=toO/MAdcz3Lmxi+Kl3FmcaGMChU2xicnI562DjN1+xg=; b=wuCim0w8QH/Sfs6O/g2T90QE9uLyvRTSXW/cNujh+Wcg7OjRd7F8+dQ5uCnr17gxJM d5yluedUe2KgMVcfIV5kfHf9RuBJGWJE+0xBDd8/hbqHbt85KvLf1CZSVNpVmjE9fhq0 f1f62YgEMdAPV0QZq8853lQOeFy3Y5ihIdBeWwauG1/l4gm2E3YLGBHpbf9IvHbzdCKQ gsUj57FlJi8PMD6qgNNno1PTAhrSwE5IQXy0pBOPNMQXv2joKTbDgl8v0dWueC5NPIB/ lkpXwPMwQtUkMB8j0g7TXpTOJp+n8NSdZd1E/TG0D+zWjKBYgGP29YSdry8er5Wpp/Jn TQtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NYPk0qNh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d4si11018341ejb.349.2020.07.14.12.01.57; Tue, 14 Jul 2020 12:02:21 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NYPk0qNh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730605AbgGNS7N (ORCPT + 99 others); Tue, 14 Jul 2020 14:59:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:57586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731067AbgGNS7C (ORCPT ); Tue, 14 Jul 2020 14:59:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 93ACE229CA; Tue, 14 Jul 2020 18:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753142; bh=/SwL4lhyb9H479yrYfVEdAQXaqBeWOFBvjRzYCTP14M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NYPk0qNhqoNvX2WHbor0HWuhyARbH8n5oGNT8GcV1RL661+k+GKTyEMzApIN44oXA pDm3GbozZbUZJpymm65mSXTvJi+jltUu2myfQ2r1OniGuWOkATcseGbKD0zpYC9roO 63TZRCl+Jjf0xvVnbcqR5tpciPkd+Q9lBfsb1zpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcos Paulo de Souza , Anand Jain , Qu Wenruo , David Sterba Subject: [PATCH 5.7 136/166] btrfs: discard: add missing put when grabbing block group from unused list Date: Tue, 14 Jul 2020 20:45:01 +0200 Message-Id: <20200714184122.344961940@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qu Wenruo commit 04e484c5973ed0f9234c97685c3c5e1ebf0d6eb6 upstream. [BUG] The following small test script can trigger ASSERT() at unmount time: mkfs.btrfs -f $dev mount $dev $mnt mount -o remount,discard=async $mnt umount $mnt The call trace: assertion failed: atomic_read(&block_group->count) == 1, in fs/btrfs/block-group.c:3431 ------------[ cut here ]------------ kernel BUG at fs/btrfs/ctree.h:3204! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 4 PID: 10389 Comm: umount Tainted: G O 5.8.0-rc3-custom+ #68 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 Call Trace: btrfs_free_block_groups.cold+0x22/0x55 [btrfs] close_ctree+0x2cb/0x323 [btrfs] btrfs_put_super+0x15/0x17 [btrfs] generic_shutdown_super+0x72/0x110 kill_anon_super+0x18/0x30 btrfs_kill_super+0x17/0x30 [btrfs] deactivate_locked_super+0x3b/0xa0 deactivate_super+0x40/0x50 cleanup_mnt+0x135/0x190 __cleanup_mnt+0x12/0x20 task_work_run+0x64/0xb0 __prepare_exit_to_usermode+0x1bc/0x1c0 __syscall_return_slowpath+0x47/0x230 do_syscall_64+0x64/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The code: ASSERT(atomic_read(&block_group->count) == 1); btrfs_put_block_group(block_group); [CAUSE] Obviously it's some btrfs_get_block_group() call doesn't get its put call. The offending btrfs_get_block_group() happens here: void btrfs_mark_bg_unused(struct btrfs_block_group *bg) { if (list_empty(&bg->bg_list)) { btrfs_get_block_group(bg); list_add_tail(&bg->bg_list, &fs_info->unused_bgs); } } So every call sites removing the block group from unused_bgs list should reduce the ref count of that block group. However for async discard, it didn't follow the call convention: void btrfs_discard_punt_unused_bgs_list(struct btrfs_fs_info *fs_info) { list_for_each_entry_safe(block_group, next, &fs_info->unused_bgs, bg_list) { list_del_init(&block_group->bg_list); btrfs_discard_queue_work(&fs_info->discard_ctl, block_group); } } And in btrfs_discard_queue_work(), it doesn't call btrfs_put_block_group() either. [FIX] Fix the problem by reducing the reference count when we grab the block group from unused_bgs list. Reported-by: Marcos Paulo de Souza Fixes: 6e80d4f8c422 ("btrfs: handle empty block_group removal for async discard") CC: stable@vger.kernel.org # 5.6+ Tested-by: Marcos Paulo de Souza Reviewed-by: Anand Jain Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/discard.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/btrfs/discard.c +++ b/fs/btrfs/discard.c @@ -619,6 +619,7 @@ void btrfs_discard_punt_unused_bgs_list( list_for_each_entry_safe(block_group, next, &fs_info->unused_bgs, bg_list) { list_del_init(&block_group->bg_list); + btrfs_put_block_group(block_group); btrfs_discard_queue_work(&fs_info->discard_ctl, block_group); } spin_unlock(&fs_info->unused_bgs_lock);