From patchwork Tue Feb 11 21:40:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11376955 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 80DD892A for ; Tue, 11 Feb 2020 21:40:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 602BF2073C for ; Tue, 11 Feb 2020 21:40:50 +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="pqZwr6qM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727970AbgBKVkt (ORCPT ); Tue, 11 Feb 2020 16:40:49 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:36759 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727961AbgBKVks (ORCPT ); Tue, 11 Feb 2020 16:40:48 -0500 Received: by mail-qk1-f194.google.com with SMTP id w25so38417qki.3 for ; Tue, 11 Feb 2020 13:40:48 -0800 (PST) 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=jnceg/tyrGCwujOV27hUIDkS5QYyCPfAkZwNveltVtI=; b=pqZwr6qMIxBjwWUbe8v/YM55+u614nXDG57xs1luUyAI5JRxlU+B4r2DEePrZ94bFK 8CsiugD7i8MpQ6vFS7Ly+IpBZbEmmwZ0HY1eVyxjuycUGkbM8Vb45pi8gPNowDsVgPpO 9fcd7+e7gcSpkOkrZDASq0Y/71a17gePbawqd0Q0bcVzCMICAm8yyUAnY4/H26pHVo15 zKCYIKKYr3SccjOUDykXS6t0aWZ2BHlwsyzx0qzynm+ZTqVn9e+RjAS08y+qEW4dsOkb hsfvCV4NRdsK2+cml+kE9asB5ykekgV+X/E3QCxOqbIIlWeqhm+o44QGAh2uxOKR9K4m N4eA== 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=jnceg/tyrGCwujOV27hUIDkS5QYyCPfAkZwNveltVtI=; b=MLEiNXgufJl9fErpcDDq+DIQ+cQboH199sOLjR8mW9MKkdMefm0HhWgAg1EyHMDseG emJIdmBaGrgOLpns/o8InxtHvMvkYTT7jTzdjWb9sEtDuqHMjYbC4zoSZ73qjnNCNHWR HHae3TuxgO3km01Udo0TUcLaw8yd8suqy5LfZuDAWYhP+7Ik4tS9tJIdQ14CgpN6wXkj Ha8dSaIcHkGdrdZJUWddHLzyQnkFCBdBxDu9pBgSLYg3AUwpIhjumkmGPzEiPF5gUYoV II3c8NC5ST4iRkM5Thi14zquDXcKazfc0J37aVmGr7CTLVwPNv1pluN8ufuF8FihSvY5 Az2A== X-Gm-Message-State: APjAAAX1F2v60B4ptKiUd/zLAAPmfjFG3OuZ9zQTY1ZhJX5gqUqERSSe 7FhPxWkyJZ7eaBeKjsazwAxZiA+Ii58= X-Google-Smtp-Source: APXvYqz5MlF/1Wug8/7MEqj6PDQfidRheSfxzR2cabNum5CH32oKY2+Wtc15d00o6/uM2RogWVy0aQ== X-Received: by 2002:a37:de16:: with SMTP id h22mr4660803qkj.400.1581457247296; Tue, 11 Feb 2020 13:40:47 -0800 (PST) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id o10sm2864049qko.38.2020.02.11.13.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 13:40:46 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 1/4] btrfs: set fs_root = NULL on error Date: Tue, 11 Feb 2020 16:40:39 -0500 Message-Id: <20200211214042.4645-2-josef@toxicpanda.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211214042.4645-1-josef@toxicpanda.com> References: <20200211214042.4645-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 While running my error injection script I hit a panic when we tried to clean up the fs_root when free'ing the fs_root. This is because fs_info->fs_root == PTR_ERR(-EIO), which isn't great. Fix this by setting fs_info->fs_root = NULL; if we fail to read the root. Signed-off-by: Josef Bacik Reviewed-by: Qu Wenruo Reviewed-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov --- fs/btrfs/disk-io.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index eb441fa3711b..5b6140482cef 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3260,6 +3260,7 @@ int __cold open_ctree(struct super_block *sb, if (IS_ERR(fs_info->fs_root)) { err = PTR_ERR(fs_info->fs_root); btrfs_warn(fs_info, "failed to read fs tree: %d", err); + fs_info->fs_root = NULL; goto fail_qgroup; } From patchwork Tue Feb 11 21:40:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11376957 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 5E97C14E3 for ; Tue, 11 Feb 2020 21:40:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E75C2073C for ; Tue, 11 Feb 2020 21:40:52 +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="RG/fetWo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727974AbgBKVkv (ORCPT ); Tue, 11 Feb 2020 16:40:51 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:34655 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727961AbgBKVku (ORCPT ); Tue, 11 Feb 2020 16:40:50 -0500 Received: by mail-qk1-f193.google.com with SMTP id c20so49782qkm.1 for ; Tue, 11 Feb 2020 13:40:49 -0800 (PST) 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=JWq8njORNn2WUZBkJp63poF2IG9OfU22Rwjfm6Wt62k=; b=RG/fetWoNfBkK+pksapjdk/qa2o7iKCy4/8gE0QYZk9g9dt8/IdXm6SntRZo+zUP2m VaOSj+JGXCt6RjUuSaBZR9VFLdP+W9ZvbV7xQbDpJpe1Tgyz1O54Td+gqb5aL23qIhEB lAicaJF2/HBhGEUaHGvSLIrbey1mB9ekkzxAYYOsYODvIR1UxVi40Bs7mu6FdwxaVjM9 QQOhwxCXkVZJE+u3gJlEq1NxN41s7Ge3O/qqAYPlRdenwwRZV/+jYUuHUZSzy8jjgR0n iPtbVcqjEzWvRDFMLAg9FIvjbcq5C95ttqoPK8x4OvrLdNFHqmceZwXUHdNt7Ew/5xmg NYBg== 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=JWq8njORNn2WUZBkJp63poF2IG9OfU22Rwjfm6Wt62k=; b=pfDUmKO2BSABu52OchsyPmZa5oYMyErrZxSTk3Pfqprgo7Ch51+G1qXDiJv8eUZSTP Zdwk2wDzmjNlQhw4JqSlO4gfWpybo3QVc9MBSEbE3NdYrrnjkyB00TiXA1EyZ04tJR8I j0YSNRakOuQBg95cWOI7Y7Oyiios2Jg1ejcVBuHwC4jlK5fIpHhYbJmgvc6kGC7itaUJ EJR1wz7wJu4f8hKXmOcgTbXlcTgTGRPFvtcbbhKoFTOboJVzWRn+wKYtuH2zHhm4amEy DrNC28XsUP7f2HSjqi1vzdRK6xKgx+SOcH9xZyAGIc8A5qHkKB70cQh+sos0XKt7ypfb 9XGw== X-Gm-Message-State: APjAAAUHAXg2I98cXsqUMENmQDtjP2pjtFfDUkcZ3ufexZ+LMQUxa4yM VpGJTZxFXEY/1Q4WB+VmR+h06VJMJ+I= X-Google-Smtp-Source: APXvYqxPic08bBR9OEGubbWvqStrcoAQnyXQKClvTFw2VLybZkyovmZAkhvTuqQKOSPrjU5vsh9zHQ== X-Received: by 2002:a05:620a:134d:: with SMTP id c13mr4611507qkl.322.1581457249080; Tue, 11 Feb 2020 13:40:49 -0800 (PST) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id 126sm2257511qkd.110.2020.02.11.13.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 13:40:48 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 2/4] btrfs: do not check delayed items are empty for single trans cleanup Date: Tue, 11 Feb 2020 16:40:40 -0500 Message-Id: <20200211214042.4645-3-josef@toxicpanda.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211214042.4645-1-josef@toxicpanda.com> References: <20200211214042.4645-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 btrfs_assert_delayed_root_empty() will check if the delayed root is completely empty, but this is a fs wide check. On cleanup we may have allowed other transactions to begin, for whatever reason, and thus the delayed root is not empty. So remove this check from cleanup_one_transation(). This however can stay in btrfs_cleanup_transaction(), because it checks only after all of the transactions have been properly cleaned up, and thus is valid. Signed-off-by: Josef Bacik Reviewed-by: Qu Wenruo Reviewed-by: Nikolay Borisov Reviewed-by: Johannes Thumshirn --- fs/btrfs/disk-io.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 5b6140482cef..601ed3335cf6 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4543,7 +4543,6 @@ void btrfs_cleanup_one_transaction(struct btrfs_transaction *cur_trans, wake_up(&fs_info->transaction_wait); btrfs_destroy_delayed_inodes(fs_info); - btrfs_assert_delayed_root_empty(fs_info); btrfs_destroy_marked_extents(fs_info, &cur_trans->dirty_pages, EXTENT_DIRTY); From patchwork Tue Feb 11 21:40:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11376959 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 837F914E3 for ; Tue, 11 Feb 2020 21:40:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61CB92073C for ; Tue, 11 Feb 2020 21:40:54 +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="oGLqRLjh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727979AbgBKVkx (ORCPT ); Tue, 11 Feb 2020 16:40:53 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:38700 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727961AbgBKVkw (ORCPT ); Tue, 11 Feb 2020 16:40:52 -0500 Received: by mail-qt1-f194.google.com with SMTP id c24so20680qtp.5 for ; Tue, 11 Feb 2020 13:40:51 -0800 (PST) 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=ybxDtnfdsoEM1GzkSsc/ipKZi9W7rroe3qi+OrZucuY=; b=oGLqRLjhrl72iki16liE8ZPlh2hwUE+sAo6R7BuwCBDgtocJ7fYoih16vleLxQzUrD jN3RtuwV7vvXxvFT1NuLpn0AOuXrwBS0TvQmZLE7KYuhLJ1npQekQ/4GYaYY9flT4fHS TUFyOeVUTRyLJOX9oO3aZkojj38kTYnaYXpejyihQU9ih5H4fkUVLklv2QKMZRfN0CPs XC8+HyjxlUxut2A2xet79ThzJPaY9NCnk7Nu6waLdCGMSUtas0Vrgbh95w36IDAuNtO2 dRjkYuOrZ8pSbgB6qR11qi18UhlOuPbZilJj3bTSEIb7vym6gZL1d0A9dNmSx+rXbS83 nBlQ== 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=ybxDtnfdsoEM1GzkSsc/ipKZi9W7rroe3qi+OrZucuY=; b=EyRxkN10oenvvf99ncT2S7Zs4JrO/OvvXTb3b02FxDRzSLwwGum1m4Gk3An0JEQs3H rt99fSXB+dCa1ZNhsvokmVTnk/nu+c30unGLQ3QUXkfaY6bm7S6Feukc85qdXA/hHn3b H3O5CCTFHvuz86KLrHDssHObaJhNqL3+7fC5pqSbqDmkoyNG3ry4QpFCl9zXqxftLmGx If6t8TMUk4hCSzZxTxd0XfA3ev80Uc8eXVsMJqic8sJYfmaw/Z536NNv/nb4xiOuCDMK WH9BSbu3VVibgJSvzHb/VbL1YN/AZWilZ9p3ryQQDPnQO6FMkl6g7VCU+x1LhDrICXp2 MpIQ== X-Gm-Message-State: APjAAAVv23KhpfXj+CjmRFB3qENrjUuxtqNOxIUOBdAF9MAH8uC0QXAc ZRuyvhdqysbZd8QOn3tyRhgeCxyZWjc= X-Google-Smtp-Source: APXvYqxluzTdB+VrOKhaFPWzwnCeI6q70JcLLDsnXFGc/kit8eq3Dz9Dzd0cGiO1Z0h+344nbXeNZQ== X-Received: by 2002:ac8:7357:: with SMTP id q23mr15633348qtp.12.1581457250904; Tue, 11 Feb 2020 13:40:50 -0800 (PST) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id w60sm2895619qte.39.2020.02.11.13.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 13:40:50 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 3/4] btrfs: handle logged extent failure properly Date: Tue, 11 Feb 2020 16:40:41 -0500 Message-Id: <20200211214042.4645-4-josef@toxicpanda.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211214042.4645-1-josef@toxicpanda.com> References: <20200211214042.4645-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 If we're allocating a logged extent we attempt to insert an extent record for the file extent directly. We increase space_info->bytes_reserved, because the extent entry addition will call btrfs_update_block_group(), which will convert the ->bytes_reserved to ->bytes_used. However if we fail at any point while inserting the extent entry we will bail and leave space on ->bytes_reserved, which will trigger a WARN_ON() on umount. Fix this by pinning the space if we fail to insert, which is what happens in every other failure case that involves adding the extent entry. Signed-off-by: Josef Bacik Reviewed-by: Qu Wenruo Reviewed-by: Nikolay Borisov Reviewed-by: Johannes Thumshirn --- fs/btrfs/extent-tree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index c43acb329fa6..2b4c3ca5e651 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4430,6 +4430,8 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans, ret = alloc_reserved_file_extent(trans, 0, root_objectid, 0, owner, offset, ins, 1); + if (ret) + btrfs_pin_extent(fs_info, ins->objectid, ins->offset, 1); btrfs_put_block_group(block_group); return ret; } From patchwork Tue Feb 11 21:40:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11376961 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 934EE92A for ; Tue, 11 Feb 2020 21:40:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72B292073C for ; Tue, 11 Feb 2020 21:40:56 +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="ZYqYx2va" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727987AbgBKVkz (ORCPT ); Tue, 11 Feb 2020 16:40:55 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:43445 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727961AbgBKVky (ORCPT ); Tue, 11 Feb 2020 16:40:54 -0500 Received: by mail-qt1-f196.google.com with SMTP id d18so9189481qtj.10 for ; Tue, 11 Feb 2020 13:40:53 -0800 (PST) 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=0jgcdIuY6gU1NaU+92gd+csfulh3MbNTikfALkkU4j4=; b=ZYqYx2vaNN89ptC4CRm+uuG//K/axsQJkwl3GH6HSnnh/iR5AiQYK0ixr9I1j3SZ5F Prs+v1WgKw6X5mbwc7Cayku/OA5F5wOoPeHk4zOZTqMpmYVaVdMKmSUZIoIBREGoMJiQ WxVdrWBlSW+djT0qYucdy0hRxtqdhOSMicLLvjCZsUXuqKFiK6tcxKO5z15G1sfltWHE iGXUNmTbvwaULq/jJKlhFefxDpUp8CD70OCC9qosGDNjjcL8JdtL221YCLTvbJ4rXH3Y /lW09Wxmc3QTRyuQhVYX/KhoCWJRkHeLPgduhEOfAjhTpyNL7avmXLjg66oIEmO3iDGM 3Ukw== 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=0jgcdIuY6gU1NaU+92gd+csfulh3MbNTikfALkkU4j4=; b=NWxIaPLLvISFUxAGap5/MscbutmXXCg3EyCs5WrgI71lAPxAj3prPYYsjkH+5DzqeF YSaoq1kaZ6YRXPYVKECvQ0SBIhCSf2iml3KWyQ2Uu9M5Y2gpMFtTkh7ilG5iw7OkdLsp pXHMMCvST2o9sO8cnw7c4QOGw+PpdxULwtrizSqVNkZil6o+aHkcgXJ7t/0z26qwzHvX DydSqnWKSCJAABsT2pfqqp5hwuUjfdxTCqS/fWyL6Qo0CjOEf+xewYz/KjtVoCupOsCS RqzyxvL0ty84PtBTuTDkxb16wo8MUuSOXQzNaVi2DfIbU6ARL31EIEdW/xMx0pP5wOSj 8xxw== X-Gm-Message-State: APjAAAVQRuFJNFLBmN3+N6YJHnOp2+aj8ZUZNKLPoO9SNoNysYcuOPsD ytAfJV09uBwH4o85qhX7WWFCo7rsPGg= X-Google-Smtp-Source: APXvYqygQsa3sFLsSq24a97UzqsxnIr9XFZ/hqHyFBPzGWeLRIiKEkiIMAucZNSgjkF791ErSoqJfQ== X-Received: by 2002:ac8:74c:: with SMTP id k12mr4368501qth.185.1581457252866; Tue, 11 Feb 2020 13:40:52 -0800 (PST) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id e3sm2921263qtb.65.2020.02.11.13.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 13:40:52 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 4/4] btrfs: fix bytes_may_use underflow in prealloc error condtition Date: Tue, 11 Feb 2020 16:40:42 -0500 Message-Id: <20200211214042.4645-5-josef@toxicpanda.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200211214042.4645-1-josef@toxicpanda.com> References: <20200211214042.4645-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 hit the following warning while running my error injection stress testing ------------[ cut here ]------------ WARNING: CPU: 3 PID: 1453 at fs/btrfs/space-info.h:108 btrfs_free_reserved_data_space_noquota+0xfd/0x160 [btrfs] RIP: 0010:btrfs_free_reserved_data_space_noquota+0xfd/0x160 [btrfs] Call Trace: btrfs_free_reserved_data_space+0x4f/0x70 [btrfs] __btrfs_prealloc_file_range+0x378/0x470 [btrfs] elfcorehdr_read+0x40/0x40 ? elfcorehdr_read+0x40/0x40 ? btrfs_commit_transaction+0xca/0xa50 [btrfs] ? dput+0xb4/0x2a0 ? btrfs_log_dentry_safe+0x55/0x70 [btrfs] ? btrfs_sync_file+0x30e/0x420 [btrfs] ? do_fsync+0x38/0x70 ? __x64_sys_fdatasync+0x13/0x20 ? do_syscall_64+0x5b/0x1b0 ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 ---[ end trace 70ccb5d0fe51151c ]--- This happens if we fail to insert our reserved file extent. At this point we've already converted our reservation from ->bytes_may_use to ->bytes_reserved. However once we break we will attempt to free everything from [cur_offset, end] from ->bytes_may_use, but our extent reservation will overlap part of this. Fix this problem by adding ins.offset (our extent allocation size) to cur_offset so we remove the actual remaining part from ->bytes_may_use. I validated this fix using my inject-error.py script python inject-error.py -o should_fail_bio -t cache_save_setup -t \ __btrfs_prealloc_file_range \ -t insert_reserved_file_extent.constprop.0 \ -r "-5" ./run-fsstress.sh where run-fsstress.sh simply mounts and runs fsstress on a disk. Signed-off-by: Josef Bacik Reviewed-by: Qu Wenruo --- fs/btrfs/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 84e649724549..747d860aedf6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9919,6 +9919,14 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode, ins.offset, 0, 0, 0, BTRFS_FILE_EXTENT_PREALLOC); if (ret) { + /* + * We've reserved this space, and thus converted it from + * ->bytes_may_use to ->bytes_reserved, which we cleanup + * here. We need to adjust cur_offset so that we only + * drop the ->bytes_may_use for the area we still have + * remaining in ->>bytes_may_use. + */ + cur_offset += ins.objectid; btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 0); btrfs_abort_transaction(trans, ret);