From patchwork Wed Jul 22 16:07:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11678893 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F0E8613B1 for ; Wed, 22 Jul 2020 16:07:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE67F2071A for ; Wed, 22 Jul 2020 16:07:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20150623.gappssmtp.com header.i=@toxicpanda-com.20150623.gappssmtp.com header.b="V0U6K5sM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728283AbgGVQH1 (ORCPT ); Wed, 22 Jul 2020 12:07:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726406AbgGVQH0 (ORCPT ); Wed, 22 Jul 2020 12:07:26 -0400 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 032DEC0619DC for ; Wed, 22 Jul 2020 09:07:26 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id u64so2445709qka.12 for ; Wed, 22 Jul 2020 09:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4LIIadGfjf5vap5O8GtVjZ/UJ287tTItNUfk15DlxM0=; b=V0U6K5sMainp1Nwb24wooUqLarXzpz0JfDi4vWCkVBikj21ezOimCZnjxzqqIfgNgr 2de+supwE9fPM8D9Ugn2LB06HSBdxBii39zmbiakclz2zEoDrZhpVOVUq+2080EGwUoz TCWqF+FrIPXuMZIX/jvBdcgv5YhApPAH45i4lhMwhEIO0D3/tU5eF0yH4ry8pWDmBiI3 AWQ7P4LBCXtASFAKU5E1hwjnTKmKRBhj+sDO/yAxHJiCyAfDIaL9WCsVxP7GoMD0D09L hegWhM4ZudHq4ALs3hacA8UUo+/tefaNBxvOu1bDWP/vX5XI1bYB62hNhjhZym4CyN8n qgbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4LIIadGfjf5vap5O8GtVjZ/UJ287tTItNUfk15DlxM0=; b=T8Z7zyKLjalbhEz1rm0X95NW7B70kVfmQ5W/myebREpRCFt+oJXcBGUjl4xZWC3tFo rooq0KS5aUE2dXtbytqpIfz5E2kLLJZzTW+tt/YGyaxQRntUA2LaasOn+YZBnSbfHAZG jNyFF6NBqOaBdzXliBIHBjiIPcgy9eyWNSVWXQAUgxMwzNACRzIXReZClSnLEXtTFm/Q LwbrIF5JHln3tMl+xbDbiANuJpK4vbbWHx17Ue0fMcCpczexS8vqH7MBksOWXg3Nnkw8 PSZOvs/Rj79Dq5Ixc8C6rP1W4poEz05gMqBR09RqB5+zKmppOhZu8wPLscC84QXXaOoe VLpA== X-Gm-Message-State: AOAM530soG62zKOLZE1JUHG4paFyizsugpoakWeOmIQyakELJnhCwbf9 plJvKdbPhhA8ztIr16aWB0FXhAsxWV3jxQ== X-Google-Smtp-Source: ABdhPJwoC6WE3NzxDJ+oCy5h43Uo3ZYhkjPg20aiR8kwhXsnmwktx1w6b5z8jrxJnPI0gQNpjploaw== X-Received: by 2002:a37:b987:: with SMTP id j129mr737887qkf.120.1595434044804; Wed, 22 Jul 2020 09:07:24 -0700 (PDT) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id t35sm69235qth.79.2020.07.22.09.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 09:07:24 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 1/2] btrfs: free fs roots on failed mount Date: Wed, 22 Jul 2020 12:07:21 -0400 Message-Id: <20200722160722.8641-1-josef@toxicpanda.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org While testing a weird problem with -o degraded, I noticed I was getting leaked root errors BTRFS warning (device loop0): writable mount is not allowed due to too many missing devices BTRFS error (device loop0): open_ctree failed BTRFS error (device loop0): leaked root -9-0 refcount 1 This is the DATA_RELOC root, which gets read before the other fs roots, but is included in the fs roots radix tree, and thus gets freed by btrfs_free_fs_roots. Fix this by moving the call into fail_tree_roots: in open_ctree. With this fix we no longer leak that root on mount failure. Signed-off-by: Josef Bacik --- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c850d7f44fbe..f1fdbdd44c02 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3421,7 +3421,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device fail_trans_kthread: kthread_stop(fs_info->transaction_kthread); btrfs_cleanup_transaction(fs_info); - btrfs_free_fs_roots(fs_info); fail_cleaner: kthread_stop(fs_info->cleaner_kthread); @@ -3441,6 +3440,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device btrfs_put_block_group_cache(fs_info); fail_tree_roots: + btrfs_free_fs_roots(fs_info); free_root_pointers(fs_info, true); invalidate_inode_pages2(fs_info->btree_inode->i_mapping); From patchwork Wed Jul 22 16:07:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11678895 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CB92913 for ; Wed, 22 Jul 2020 16:07:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 345002071A for ; Wed, 22 Jul 2020 16:07:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20150623.gappssmtp.com header.i=@toxicpanda-com.20150623.gappssmtp.com header.b="wsTmCyvJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728365AbgGVQHa (ORCPT ); Wed, 22 Jul 2020 12:07:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726406AbgGVQH3 (ORCPT ); Wed, 22 Jul 2020 12:07:29 -0400 Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DB06C0619DC for ; Wed, 22 Jul 2020 09:07:29 -0700 (PDT) Received: by mail-qt1-x842.google.com with SMTP id k18so2175291qtm.10 for ; Wed, 22 Jul 2020 09:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6diZpmoYJxFJo2bayk6PN2hMSNmGQAMLPG5IUsglcDk=; b=wsTmCyvJulnjhNLAuBt2mJqnq3xNfbdYC/eWNnOetDsJ8dZJRR3DpD/JTqLEyfXABC wJz9ZGnG0hAMrBLfqKmsl62N7E8uZCiy7g8uLKxnt0tA+cMXyXkF9HIbystR16Ym9XNe lyA8QvQy9R5Nd4JRgq6Sh8REspsP5XwDyy7EEa3LCcyifx7d5eChkEc3BAcCotkyHKjP YnmuzaFbterQV0uEjy6mnJjlnurrPlua7djXjSO70DJYNNUfu7dkMq/nH4bilfKoABl9 5FeOioB42qRSVYY4y1If0tfN4JGxoq97lbr17Y/KYOCz13Vtj4ABIg+aMWTXoEv+QRD/ Dxsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6diZpmoYJxFJo2bayk6PN2hMSNmGQAMLPG5IUsglcDk=; b=NUd/DCRiafdDvtkVOgOSYQ1wiVuiAsGhne3aUIRrycM56LO0FZYRD86qiJZojV3jJd NY3SZ6GtqkUQwcnThok7OkQuIRXilzZyyROeQVhgRPvGTk715gtw7JRa8h2pp3rhTHyS x00ElXbYAaklFe2qfFlIcsojX2p2l0ShX1oE+YcZ3QTB/SEKEIygERLXIMxYJSflOVzQ Kpj49ry5Z7hB4f3ZREHyF74TzA5E9SBTzk1RscAR+FDr/a7DepcLoH6swIqEydnsurbm A6UYBmZXKz1btxGeVsDY9GyC2J4wpr31RVOMpWJuOXXNXP0fnH0ehSuMw5GqvEdaTulA M8Bg== X-Gm-Message-State: AOAM5305L5qp8tDR19JHbMWueZUhLYV0717XgfCJzbd5wPxcZ4LoOONS ZSgEG+TOPtr/66Y4wSD5IMa2E/ArRPzz/Q== X-Google-Smtp-Source: ABdhPJwbAJnVUhZk1NxRASVzzjFxukqvEtBrI6mZOK9z7mgnRCVMg8HdTXxI3J/S8VqVdtPaGMXWag== X-Received: by 2002:ac8:66d1:: with SMTP id m17mr70961qtp.88.1595434046513; Wed, 22 Jul 2020 09:07:26 -0700 (PDT) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id a3sm194586qkf.131.2020.07.22.09.07.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 09:07:25 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 2/2] btrfs: fix root leak printk to use %lld instead of %llu Date: Wed, 22 Jul 2020 12:07:22 -0400 Message-Id: <20200722160722.8641-2-josef@toxicpanda.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200722160722.8641-1-josef@toxicpanda.com> References: <20200722160722.8641-1-josef@toxicpanda.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org I'm a actual human being so am incapable of converting u64 to s64 in my head, use %lld so we can see the negative number in order to identify which of our special roots we leaked. Signed-off-by: Josef Bacik --- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index f1fdbdd44c02..cc4081a1c7f9 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1508,7 +1508,7 @@ void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info) while (!list_empty(&fs_info->allocated_roots)) { root = list_first_entry(&fs_info->allocated_roots, struct btrfs_root, leak_list); - btrfs_err(fs_info, "leaked root %llu-%llu refcount %d", + btrfs_err(fs_info, "leaked root %lld-%llu refcount %d", root->root_key.objectid, root->root_key.offset, refcount_read(&root->refs)); while (refcount_read(&root->refs) > 1)