fix two issue about quota
cover fix two issue about quota
Ye Bin (2):
quota: fix null-ptr-deref in ext4_acquire_dquot()
quota: fix warning in dqgrab()
fs/quota/dquot.c | 2 +- include/linux/quotaops.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 quota: fix null-ptr-deref in ext4_acquire_dquot()
Syzbot found the following issue:
Unable to handle kernel paging request at virtual address dfff800000000005 KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
Mem abort info:
ESR = 0x0000000096000006
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x06: level 2 translation fault
Data abort info:
ISV = 0, ISS = 0x00000006
CM = 0, WnR = 0
[dfff800000000005] address between user and kernel address ranges
Internal error: Oops: 0000000096000006 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 6080 Comm: syz-executor747 Not tainted 6.3.0-rc7-syzkaller-g14f8db1c0f9a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/14/2023 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ext4_acquire_dquot+0x1d4/0x398 fs/ext4/super.c:6766 lr : dquot_to_inode fs/ext4/super.c:6740 [inline] lr : ext4_acquire_dquot+0x1ac/0x398 fs/ext4/super.c:6766
sp : ffff80001eb27280
x29: ffff80001eb27280 x28: 1fffe0001c3c01fc x27: ffff800015d705b0
x26: ffff0000dd93c000 x25: ffff0000dd93e000 x24: 1fffe0001c3c021c
x23: dfff800000000000 x22: 0000000000000049 x21: 0000000000000028
x20: 0000000000000000 x19: ffff0000e1e00fc0 x18: ffff0001b426cca8
x17: 0000000000000000 x16: ffff8000089669b0 x15: 0000000000000001
x14: 1ffff00002bae0b0 x13: dfff800000000000 x12: 0000000000000001
x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000 x8 : 0000000000000005 x7 : ffff800008c11f68 x6 : 0000000000000000 x5 : 0000000000000000 x4 : 0000000000000001 x3 : ffff800012441b4c x2 : 0000000000000001 x1 : 0000000000000001 x0 : 0000000000000003
Call trace: ext4_acquire_dquot+0x1d4/0x398 fs/ext4/super.c:6766 dqget+0x844/0xc48 fs/quota/dquot.c:914 __dquot_initialize+0x2cc/0xb54 fs/quota/dquot.c:1492 dquot_initialize fs/quota/dquot.c:1550 [inline] dquot_file_open+0x90/0xc8 fs/quota/dquot.c:2181 ext4_file_open+0x230/0x590 fs/ext4/file.c:903 do_dentry_open+0x724/0xf90 fs/open.c:920 vfs_open+0x7c/0x90 fs/open.c:1051 do_open fs/namei.c:3560 [inline] path_openat+0x1f2c/0x27f8 fs/namei.c:3715 do_filp_open+0x1bc/0x3cc fs/namei.c:3742 do_sys_openat2+0x128/0x3d8 fs/open.c:1348 do_sys_open fs/open.c:1364 [inline] __do_sys_openat fs/open.c:1380 [inline] __se_sys_openat fs/open.c:1375 [inline] __arm64_sys_openat+0x1f0/0x240 fs/open.c:1375 __invoke_syscall arch/arm64/kernel/syscall.c:38 [inline] invoke_syscall+0x98/0x2c0 arch/arm64/kernel/syscall.c:52 el0_svc_common+0x138/0x258 arch/arm64/kernel/syscall.c:142 do_el0_svc+0x64/0x198 arch/arm64/kernel/syscall.c:193 el0_svc+0x4c/0x15c arch/arm64/kernel/entry-common.c:637 el0t_64_sync_handler+0x84/0xf0 arch/arm64/kernel/entry-common.c:655 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:591 Code: 97e8a7df f94002a8 9100a115 d343fea8 (38776908) ---[ end trace 0000000000000000 ]---
Above issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_locked
reconfigure_super
ext4_remount
dquot_suspend -> suspend all type quota
sys_fsconfig
vfs_fsconfig_locked
reconfigure_super
ext4_remount
dquot_resume
ret = dquot_load_quota_sb
add_dquot_ref
do_open -> open file O_RDWR
vfs_open
do_dentry_open
get_write_access
atomic_inc_unless_negative(&inode->i_writecount)
ext4_file_open
dquot_file_open
dquot_initialize
__dquot_initialize
dqget
if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
__dquot_initialize
__dquot_initialize
dqget
if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
ext4_acquire_dquot -> Return error
if (ret < 0)
vfs_cleanup_quota_inode
dqopt->files[type] = NULL;
ext4_acquire_dquot
-->dquot_to_inode(dquot) is NULLTo solve above issue, if quota has been loaded, there's unneed to cleaup quota inode if dquot_load_quota_sb() return failed when do dquot_resume();
--- fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/quota/dquot.c +1 -1
@@ -2476,7 +2476,7 @@ int dquot_resume(struct super_block *sb, int type) flags =dquot_generic_flag (flags, cnt); ret =dquot_load_quota_sb (sb, cnt, dqopt->info[cnt].dqi_fmt_id, flags); -if (ret <0 ) +if (ret <0 && !sb_has_quota_loaded (sb, cnt))vfs_cleanup_quota_inode (sb, cnt); }
Signature · 1 line
2.31.1
Re: [PATCH 1/2] quota: fix null-ptr-deref in ext4_acquire_dquot()
Quoted 3 lines · Ye Bin
Syzbot found the following issue:
Unable to handle kernel paging request at virtual address dfff800000000005 KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]
...
Quoted 6 lines
CPU: 0 PID: 6080 Comm: syz-executor747 Not tainted 6.3.0-rc7-syzkaller-g14f8db1c0f9a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/14/2023 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ext4_acquire_dquot+0x1d4/0x398 fs/ext4/super.c:6766 lr : dquot_to_inode fs/ext4/super.c:6740 [inline] lr : ext4_acquire_dquot+0x1ac/0x398 fs/ext4/super.c:6766
OK, this is bad...
Quoted 27 lines
Above issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_locked
reconfigure_superext4_remount dquot_suspend -> suspend all type quota sys_fsconfig vfs_fsconfig_locked reconfigure_super ext4_remount dquot_resume ret = dquot_load_quota_sb add_dquot_ref do_open -> open file O_RDWR vfs_open do_dentry_open get_write_access atomic_inc_unless_negative(&inode->i_writecount) ext4_file_open dquot_file_open dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
Quoted 8 lines
__dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) ext4_acquire_dquot -> Return error if (ret < 0) vfs_cleanup_quota_inode dqopt->files[type] = NULL;
But I don't see how this can happen. The code in dquot_load_quota_sb() looks like:
error = add_dquot_ref(sb, type);
if (error)
dquot_disable(sb, type, flags);So if an error happens in add_dquot_ref(), we'll call dquot_disable(). dquot_disable() then does:
drop_dquot_ref(sb, cnt);
invalidate_dquots(sb, cnt);and invalidate_dquots() waits for reference count of all dquots to drop to
0. Hence if dqget() returned a dquot pointer to ProcessC, then ProcessB should wait until ProcessC drops the dquot reference (hence ext4_acquire_dquot() is done).
What am I missing?
Honza
Quoted 29 lines
ext4_acquire_dquot -->dquot_to_inode(dquot) is NULLTo solve above issue, if quota has been loaded, there's unneed to cleaup quota inode if
dquot_load_quota_sb()return failed when dodquot_resume();Reported-by [email protected]Signed-off-by Ye Bin <[email protected]>--- fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/quota/dquot.c +1
-1@@ -2476,7 +2476,7 @@ int dquot_resume(struct super_block *sb, int type) flags =dquot_generic_flag (flags, cnt); ret =dquot_load_quota_sb (sb, cnt, dqopt->info[cnt].dqi_fmt_id, flags); -if (ret <0 ) +if (ret <0 && !sb_has_quota_loaded (sb, cnt))vfs_cleanup_quota_inode (sb, cnt); }Signature · 1 line
2.31.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 1/2] quota: fix null-ptr-deref in ext4_acquire_dquot()
Quoted 61 lines · Jan Kara
Quoted 3 lines · Ye Bin
Syzbot found the following issue:
Unable to handle kernel paging request at virtual address dfff800000000005 KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]...
Quoted 6 lines
CPU: 0 PID: 6080 Comm: syz-executor747 Not tainted 6.3.0-rc7-syzkaller-g14f8db1c0f9a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/14/2023 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ext4_acquire_dquot+0x1d4/0x398 fs/ext4/super.c:6766 lr : dquot_to_inode fs/ext4/super.c:6740 [inline] lr : ext4_acquire_dquot+0x1ac/0x398 fs/ext4/super.c:6766OK, this is bad...
Quoted 27 lines
Above issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_lockedreconfigure_super ext4_remount dquot_suspend -> suspend all type quota sys_fsconfig vfs_fsconfig_locked reconfigure_super ext4_remount dquot_resume ret = dquot_load_quota_sb add_dquot_ref do_open -> open file O_RDWR vfs_open do_dentry_open get_write_access atomic_inc_unless_negative(&inode->i_writecount) ext4_file_open dquot_file_open dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))Quoted 8 lines
__dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) ext4_acquire_dquot -> Return error if (ret < 0) vfs_cleanup_quota_inode dqopt->files[type] = NULL;But I don't see how this can happen. The code in
dquot_load_quota_sb()looks like:error = add_dquot_ref(sb, type); if (error) dquot_disable(sb, type, flags);So if an error happens in
add_dquot_ref(), we'll calldquot_disable().dquot_disable()then does:drop_dquot_ref(sb, cnt); invalidate_dquots(sb, cnt);
Quoted 8 lines
and
invalidate_dquots()waits for reference count of all dquots to drop to
0. Hence ifdqget()returned a dquot pointer to ProcessC, then ProcessB should wait until ProcessC drops the dquot reference (henceext4_acquire_dquot()is done).What am I missing?
Honza
My reproduction condition is:
mkfs.ext4 -F /dev/sda
tune2fs -Q usrquota /dev/sda
dquot_disable
...
if ((flags & DQUOT_USAGE_ENABLED && !(flags &
DQUOT_LIMITS_ENABLED))
|| (flags & DQUOT_SUSPENDED && flags & (DQUOT_LIMITS_ENABLED |
DQUOT_USAGE_ENABLED)))
return -EINVAL;...
If without enable DQUOT_LIMITS_ENABLED dquot_disable() will just return -EINVAL.
Quoted 28 lines
Quoted 28 lines
ext4_acquire_dquot -->dquot_to_inode(dquot) is NULLTo solve above issue, if quota has been loaded, there's unneed to cleaup quota inode if
dquot_load_quota_sb()return failed when dodquot_resume();Reported-by [email protected]Signed-off-by Ye Bin <[email protected]>--- fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/quota/dquot.c +1
-1@@ -2476,7 +2476,7 @@ int dquot_resume(struct super_block *sb, int type) flags =dquot_generic_flag (flags, cnt); ret =dquot_load_quota_sb (sb, cnt, dqopt->info[cnt].dqi_fmt_id, flags); -if (ret <0 ) +if (ret <0 && !sb_has_quota_loaded (sb, cnt))vfs_cleanup_quota_inode (sb, cnt); }Signature · 1 line
2.31.1
Re: [PATCH 1/2] quota: fix null-ptr-deref in ext4_acquire_dquot()
Quoted 78 lines · yebin (H)
Quoted 61 lines · Jan Kara
Quoted 3 lines · Ye Bin
Syzbot found the following issue:
Unable to handle kernel paging request at virtual address dfff800000000005 KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]...
Quoted 6 lines
CPU: 0 PID: 6080 Comm: syz-executor747 Not tainted 6.3.0-rc7-syzkaller-g14f8db1c0f9a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/14/2023 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ext4_acquire_dquot+0x1d4/0x398 fs/ext4/super.c:6766 lr : dquot_to_inode fs/ext4/super.c:6740 [inline] lr : ext4_acquire_dquot+0x1ac/0x398 fs/ext4/super.c:6766OK, this is bad...
Quoted 27 lines
Above issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_lockedreconfigure_super ext4_remount dquot_suspend -> suspend all type quota sys_fsconfig vfs_fsconfig_locked reconfigure_super ext4_remount dquot_resume ret = dquot_load_quota_sb add_dquot_ref do_open -> open file O_RDWR vfs_open do_dentry_open get_write_access atomic_inc_unless_negative(&inode->i_writecount) ext4_file_open dquot_file_open dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))Quoted 8 lines
__dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) ext4_acquire_dquot -> Return error if (ret < 0) vfs_cleanup_quota_inode dqopt->files[type] = NULL;But I don't see how this can happen. The code in
dquot_load_quota_sb()looks like:error = add_dquot_ref(sb, type); if (error) dquot_disable(sb, type, flags);So if an error happens in
add_dquot_ref(), we'll calldquot_disable().dquot_disable()then does:drop_dquot_ref(sb, cnt); invalidate_dquots(sb, cnt);Quoted 8 lines
and
invalidate_dquots()waits for reference count of all dquots to drop to
0. Hence ifdqget()returned a dquot pointer to ProcessC, then ProcessB should wait until ProcessC drops the dquot reference (henceext4_acquire_dquot()is done).What am I missing?
Honza
My reproduction condition is:
mkfs.ext4 -F/dev/sda
tune2fs -Q usrquota/dev/sda
dquot_disable
...
Quoted 8 lines
if ((flags & DQUOT_USAGE_ENABLED && !(flags & DQUOT_LIMITS_ENABLED)) || (flags & DQUOT_SUSPENDED && flags & (DQUOT_LIMITS_ENABLED | DQUOT_USAGE_ENABLED))) return -EINVAL;...
If without enableDQUOT_LIMITS_ENABLEDdquot_disable()will just return-EINVAL.
Aha, that is the bug! Does attached patch fix your problem?
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
From 2bb758bff7f9c92a25af7156cdeedc1f39201eba Mon Sep 17 00:00:00 2001
From: Jan Kara <[email protected]>
Date: Mon, 5 Jun 2023 13:39:28 +0200
Subject: [PATCH] quota: Properly disable quotas when add_dquot_ref() fails
When add_dquot_ref() fails (usually due to IO error or ENOMEM), we want to disable quotas we are trying to enable. However dquot_disable() call was passed just the flags we are enabling so in case flags == DQUOT_USAGE_ENABLED dquot_disable() call will just fail with EINVAL instead of properly disabling quotas. Fix the problem by always passing DQUOT_LIMITS_ENABLED | DQUOT_USAGE_ENABLED to dquot_disable() in this case.
--- fs/quota/dquot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/quota/dquot.c +2 -1
@@ -2409,7 +2409,8 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, error =add_dquot_ref (sb, type);if (error) -dquot_disable (sb, type, flags); +dquot_disable (sb, type, +DQUOT_USAGE_ENABLED |DQUOT_LIMITS_ENABLED );return error; out_fmt:
Signature · 1 line
2.35.3
Re: [PATCH 1/2] quota: fix null-ptr-deref in ext4_acquire_dquot()
Quoted 86 lines · Jan Kara
Quoted 77 lines · yebin (H)
Quoted 61 lines · Jan Kara
Quoted 3 lines · Ye Bin
Syzbot found the following issue:
Unable to handle kernel paging request at virtual address dfff800000000005 KASAN: null-ptr-deref in range [0x0000000000000028-0x000000000000002f]...
Quoted 6 lines
CPU: 0 PID: 6080 Comm: syz-executor747 Not tainted 6.3.0-rc7-syzkaller-g14f8db1c0f9a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/14/2023 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ext4_acquire_dquot+0x1d4/0x398 fs/ext4/super.c:6766 lr : dquot_to_inode fs/ext4/super.c:6740 [inline] lr : ext4_acquire_dquot+0x1ac/0x398 fs/ext4/super.c:6766OK, this is bad...
Quoted 27 lines
Above issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfigvfs_fsconfig_locked reconfigure_super ext4_remount dquot_suspend -> suspend all type quota sys_fsconfig vfs_fsconfig_locked reconfigure_super ext4_remount dquot_resume ret = dquot_load_quota_sb add_dquot_ref do_open -> open file O_RDWR vfs_open do_dentry_open get_write_access atomic_inc_unless_negative(&inode->i_writecount) ext4_file_open dquot_file_open dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))Quoted 8 lines
__dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) ext4_acquire_dquot -> Return error if (ret < 0) vfs_cleanup_quota_inode dqopt->files[type] = NULL;But I don't see how this can happen. The code in
dquot_load_quota_sb()looks like:error = add_dquot_ref(sb, type); if (error) dquot_disable(sb, type, flags);So if an error happens in
add_dquot_ref(), we'll calldquot_disable().dquot_disable()then does:drop_dquot_ref(sb, cnt); invalidate_dquots(sb, cnt);Quoted 8 lines
and
invalidate_dquots()waits for reference count of all dquots to drop to
0. Hence ifdqget()returned a dquot pointer to ProcessC, then ProcessB should wait until ProcessC drops the dquot reference (henceext4_acquire_dquot()is done).What am I missing?
Honza
My reproduction condition is:
mkfs.ext4 -F/dev/sda
tune2fs -Q usrquota/dev/sda
dquot_disable
...Quoted 8 lines
if ((flags & DQUOT_USAGE_ENABLED && !(flags & DQUOT_LIMITS_ENABLED)) || (flags & DQUOT_SUSPENDED && flags & (DQUOT_LIMITS_ENABLED | DQUOT_USAGE_ENABLED))) return -EINVAL;...
If without enableDQUOT_LIMITS_ENABLEDdquot_disable()will just return-EINVAL.
Quoted 3 lines
Aha, that is the bug! Does attached patch fix your problem?
Honza
Yes , it's works.
PATCH 2/2 quota: fix warning in dqgrab()
In reply to Ye BinThere's issue as follows when do fault injection:
WARNING: CPU: 1 PID: 14870 at include/linux/quotaops.h:51 dquot_disable+0x13b7/0x18c0 Modules linked in: CPU: 1 PID: 14870 Comm: fsconfig Not tainted 6.3.0-next-20230505-00006-g5107a9c821af-dirty #541 RIP: 0010:dquot_disable+0x13b7/0x18c0 RSP: 0018:ffffc9000acc79e0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff88825e41b980 RDX: 0000000000000000 RSI: ffff88825e41b980 RDI: 0000000000000002 RBP: ffff888179f68000 R08: ffffffff82087ca7 R09: 0000000000000000 R10: 0000000000000001 R11: ffffed102f3ed026 R12: ffff888179f68130 R13: ffff888179f68110 R14: dffffc0000000000 R15: ffff888179f68118 FS: 00007f450a073740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffe96f2efd8 CR3: 000000025c8ad000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> dquot_load_quota_sb+0xd53/0x1060 dquot_resume+0x172/0x230 ext4_reconfigure+0x1dc6/0x27b0 reconfigure_super+0x515/0xa90 __x64_sys_fsconfig+0xb19/0xd20 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Above issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_locked
reconfigure_super
ext4_remount
dquot_suspend -> suspend all type quota
sys_fsconfig
vfs_fsconfig_locked
reconfigure_super
ext4_remount
dquot_resume
ret = dquot_load_quota_sb
add_dquot_ref
do_open -> open file O_RDWR
vfs_open
do_dentry_open
get_write_access
atomic_inc_unless_negative(&inode->i_writecount)
ext4_file_open
dquot_file_open
dquot_initialize
__dquot_initialize
dqget
atomic_inc(&dquot->dq_count);
__dquot_initialize
__dquot_initialize
dqget
if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
ext4_acquire_dquot
-> Return error DQ_ACTIVE_B flag isn't set
dquot_disable
invalidate_dquots
if (atomic_read(&dquot->dq_count))
dqgrab
WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
-> Trigger warningIn the above scenario, 'dquot->dq_flags' has no DQ_ACTIVE_B is normal when dqgrab().
So just remove 'WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))' in dqgrab().
--- include/linux/quotaops.h | 1 - 1 file changed, 1 deletion(-)
include/linux/quotaops.h +0 -1
@@ -48,7 +48,6 @@ static inline struct dquot *dqgrab(struct dquot *dquot) {/* Make sure someone else has active reference to dquot */ WARN_ON_ONCE (!atomic_read (&dquot->dq_count)); -WARN_ON_ONCE (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags));atomic_inc (&dquot->dq_count);return dquot; }
Signature · 1 line
2.31.1
Re: [PATCH 2/2] quota: fix warning in dqgrab()
Quoted 66 lines · Ye Bin
There's issue as follows when do fault injection:
WARNING: CPU: 1 PID: 14870 at include/linux/quotaops.h:51 dquot_disable+0x13b7/0x18c0 Modules linked in: CPU: 1 PID: 14870 Comm: fsconfig Not tainted 6.3.0-next-20230505-00006-g5107a9c821af-dirty #541 RIP: 0010:dquot_disable+0x13b7/0x18c0 RSP: 0018:ffffc9000acc79e0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff88825e41b980 RDX: 0000000000000000 RSI: ffff88825e41b980 RDI: 0000000000000002 RBP: ffff888179f68000 R08: ffffffff82087ca7 R09: 0000000000000000 R10: 0000000000000001 R11: ffffed102f3ed026 R12: ffff888179f68130 R13: ffff888179f68110 R14: dffffc0000000000 R15: ffff888179f68118 FS: 00007f450a073740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffe96f2efd8 CR3: 000000025c8ad000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> dquot_load_quota_sb+0xd53/0x1060 dquot_resume+0x172/0x230 ext4_reconfigure+0x1dc6/0x27b0 reconfigure_super+0x515/0xa90 __x64_sys_fsconfig+0xb19/0xd20 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcdAbove issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_locked
reconfigure_superext4_remount dquot_suspend -> suspend all type quota sys_fsconfig vfs_fsconfig_locked reconfigure_super ext4_remount dquot_resume ret = dquot_load_quota_sb add_dquot_ref do_open -> open file O_RDWR vfs_open do_dentry_open get_write_access atomic_inc_unless_negative(&inode->i_writecount) ext4_file_open dquot_file_open dquot_initialize __dquot_initialize dqget atomic_inc(&dquot->dq_count); __dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) ext4_acquire_dquot -> Return error DQ_ACTIVE_B flag isn't set dquot_disable invalidate_dquots if (atomic_read(&dquot->dq_count)) dqgrab WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) -> Trigger warning
Quoted 6 lines
In the above scenario, '
dquot->dq_flags' has noDQ_ACTIVE_Bis normal whendqgrab().
So just remove 'WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))' indqgrab().Signed-off-by Ye Bin <[email protected]>
Thanks for the patch! Actually rather than deleting the assertion from dqgrab() (which can be and is used by filesystems) I'd replace the dqgrab() use in invalidate_dquots() with plain:
atomic_inc(&dquot->dq_count); Honza
Quoted 19 lines
--- include/linux/quotaops.h | 1 - 1 file changed, 1 deletion(-)include/linux/quotaops.h +0
-1@@ -48,7 +48,6 @@ static inline struct dquot *dqgrab(struct dquot *dquot) {/* Make sure someone else has active reference to dquot */ WARN_ON_ONCE (!atomic_read (&dquot->dq_count)); -WARN_ON_ONCE (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags));atomic_inc (&dquot->dq_count);return dquot; }Signature · 1 line
2.31.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 2/2] quota: fix warning in dqgrab()
Quoted 72 lines · Jan Kara
Quoted 71 lines · Ye Bin
There's issue as follows when do fault injection:
WARNING: CPU: 1 PID: 14870 at include/linux/quotaops.h:51 dquot_disable+0x13b7/0x18c0 Modules linked in: CPU: 1 PID: 14870 Comm: fsconfig Not tainted 6.3.0-next-20230505-00006-g5107a9c821af-dirty #541 RIP: 0010:dquot_disable+0x13b7/0x18c0 RSP: 0018:ffffc9000acc79e0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff88825e41b980 RDX: 0000000000000000 RSI: ffff88825e41b980 RDI: 0000000000000002 RBP: ffff888179f68000 R08: ffffffff82087ca7 R09: 0000000000000000 R10: 0000000000000001 R11: ffffed102f3ed026 R12: ffff888179f68130 R13: ffff888179f68110 R14: dffffc0000000000 R15: ffff888179f68118 FS: 00007f450a073740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffe96f2efd8 CR3: 000000025c8ad000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> dquot_load_quota_sb+0xd53/0x1060 dquot_resume+0x172/0x230 ext4_reconfigure+0x1dc6/0x27b0 reconfigure_super+0x515/0xa90 __x64_sys_fsconfig+0xb19/0xd20 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcdAbove issue may happens as follows:
ProcessA ProcessB ProcessCsys_fsconfig
vfs_fsconfig_lockedreconfigure_super ext4_remount dquot_suspend -> suspend all type quota sys_fsconfig vfs_fsconfig_locked reconfigure_super ext4_remount dquot_resume ret = dquot_load_quota_sb add_dquot_ref do_open -> open file O_RDWR vfs_open do_dentry_open get_write_access atomic_inc_unless_negative(&inode->i_writecount) ext4_file_open dquot_file_open dquot_initialize __dquot_initialize dqget atomic_inc(&dquot->dq_count); __dquot_initialize __dquot_initialize dqget if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) ext4_acquire_dquot -> Return error DQ_ACTIVE_B flag isn't set dquot_disable invalidate_dquots if (atomic_read(&dquot->dq_count)) dqgrab WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) -> Trigger warningIn the above scenario, '
dquot->dq_flags' has noDQ_ACTIVE_Bis normal whendqgrab().
So just remove 'WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))' indqgrab().
Quoted 8 lines
Quoted 1 line
Signed-off-by Ye Bin <[email protected]>Thanks for the patch! Actually rather than deleting the assertion from
dqgrab()(which can be and is used by filesystems) I'd replace thedqgrab()use ininvalidate_dquots()with plain:atomic_inc(&dquot->dq_count); Honza
This is indeed a good idea, I will send a new version.
Quoted 19 lines
Quoted 19 lines
--- include/linux/quotaops.h | 1 - 1 file changed, 1 deletion(-)include/linux/quotaops.h +0
-1@@ -48,7 +48,6 @@ static inline struct dquot *dqgrab(struct dquot *dquot) {/* Make sure someone else has active reference to dquot */ WARN_ON_ONCE (!atomic_read (&dquot->dq_count)); -WARN_ON_ONCE (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags));atomic_inc (&dquot->dq_count);return dquot; }Signature · 1 line
2.31.1