All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shida Zhang <starzhangzsd@gmail.com>
To: djwong@kernel.org, dchinner@redhat.com
Cc: zhangshida@kylinos.cn, starzhangzsd@gmail.com,
	linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: [PATCH v3] xfs: add check before calling xfs_mod_fdblocks
Date: Tue, 21 Jun 2022 16:42:38 +0800	[thread overview]
Message-ID: <20220621084238.1235880-1-zhangshida@kylinos.cn> (raw)

Checks are missing when delta equals 0 in __xfs_ag_resv_free() and
__xfs_ag_resv_init().

the case that the delta equals 0 is reachable with the command
sequence below:

 # mkfs.xfs -f /dev/sdb5
 # mount /dev/sdb5 /mnt/scratch/

where /dev/sdb5 is my disk for test. And if the patch below is
applied:

====
xfs_mod_freecounter(
        if (rsvd)
                ASSERT(has_resv_pool);

+       if (delta == 0)
+               dump_stack();
+
        if (delta > 0) {
                /*
                 * If the reserve pool is depleted, put blocks back into it
====

the following stack will be shown in the message:

=>  xfs_mod_freecounter+0x84/0x2b8
=>  __xfs_ag_resv_free+0xc4/0x188
=>  xfs_ag_resv_free+0x24/0x50
=>  xfs_fs_unreserve_ag_blocks+0x40/0x160
=>  xfs_mountfs+0x500/0x900
=>  xfs_fs_fill_super+0x3d8/0x810
=>  get_tree_bdev+0x164/0x258
=>  xfs_fs_get_tree+0x20/0x30
=>  vfs_get_tree+0x30/0xf8
=>  path_mount+0x3c4/0xa58
=>  do_mount+0x74/0x98

=>  xfs_mod_freecounter+0x84/0x2b8
=>  __xfs_ag_resv_init+0x64/0x1d0
=>  xfs_ag_resv_init+0x108/0x1c8
=>  xfs_fs_reserve_ag_blocks+0x4c/0x110
=>  xfs_mountfs+0x57c/0x900
=>  xfs_fs_fill_super+0x3d8/0x810
=>  get_tree_bdev+0x164/0x258
=>  xfs_fs_get_tree+0x20/0x30
=>  vfs_get_tree+0x30/0xf8
=>  path_mount+0x3c4/0xa58
=>  do_mount+0x74/0x98

After applying this patch, we can avoid to call xfs_mod_fdblocks when
delta equals 0.

Signed-off-by: Shida Zhang <zhangshida@kylinos.cn>
---
 Changes from v1:
 -Add checks before calling xfs_mod_fdblocks instead.
 Changes from v2:
 -Rephrase the commit description.

 fs/xfs/libxfs/xfs_ag_resv.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_ag_resv.c b/fs/xfs/libxfs/xfs_ag_resv.c
index fe94058d4e9e..c8fa032e4b00 100644
--- a/fs/xfs/libxfs/xfs_ag_resv.c
+++ b/fs/xfs/libxfs/xfs_ag_resv.c
@@ -149,7 +149,12 @@ __xfs_ag_resv_free(
 		oldresv = resv->ar_orig_reserved;
 	else
 		oldresv = resv->ar_reserved;
-	error = xfs_mod_fdblocks(pag->pag_mount, oldresv, true);
+
+	if (oldresv)
+		error = xfs_mod_fdblocks(pag->pag_mount, oldresv, true);
+	else
+		error = 0;
+
 	resv->ar_reserved = 0;
 	resv->ar_asked = 0;
 	resv->ar_orig_reserved = 0;
@@ -215,8 +220,13 @@ __xfs_ag_resv_init(
 
 	if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_AG_RESV_FAIL))
 		error = -ENOSPC;
-	else
-		error = xfs_mod_fdblocks(mp, -(int64_t)hidden_space, true);
+	else {
+		error = 0;
+		if (hidden_space)
+			error = xfs_mod_fdblocks(mp, -(int64_t)hidden_space,
+						true);
+	}
+
 	if (error) {
 		trace_xfs_ag_resv_init_error(pag->pag_mount, pag->pag_agno,
 				error, _RET_IP_);
-- 
2.25.1


             reply	other threads:[~2022-06-21  8:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-21  8:42 Shida Zhang [this message]
2022-06-22  4:41 ` [PATCH v3] xfs: add check before calling xfs_mod_fdblocks Darrick J. Wong
2022-06-22  5:57   ` Stephen Zhang
2022-06-23  1:15     ` Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220621084238.1235880-1-zhangshida@kylinos.cn \
    --to=starzhangzsd@gmail.com \
    --cc=dchinner@redhat.com \
    --cc=djwong@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=zhangshida@kylinos.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.