ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project()
PATCH v2 1/1 ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project()
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of test_dir(project id 123).
[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device /dev/loop0 Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------
0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100
The result of df command as below:
[root@hades mnt_ext4]# df -h test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop0 20M 10M 10M 50% /home/cgxu/test/mnt_ext4
Even though it looks like there is another 10M free space to use, if we write new data to diretory test_dir(inherit project id), the write will fail with errno(-EDQUOT).
After this patch, the df result looks like below.
[root@hades mnt_ext4]# df -h test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop0 10M 10M 3.0K 100% /home/cgxu/test/mnt_ext4
---
- Fix a bug in the limit setting logic.
fs/ext4/super.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
fs/ext4/super.c +17 -6
@@ -5546,9 +5546,15 @@ static int ext4_statfs_project(struct super_block *sb,return PTR_ERR (dquot);spin_lock (&dquot->dq_dqb_lock); - limit = (dquot->dq_dqb.dqb_bsoftlimit ? - dquot->dq_dqb.dqb_bsoftlimit : - dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; + limit =0 ; +if (dquot->dq_dqb.dqb_bsoftlimit && + (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit)) + limit = dquot->dq_dqb.dqb_bsoftlimit; +if (dquot->dq_dqb.dqb_bhardlimit && + (!limit || dquot->dq_dqb.dqb_bhardlimit < limit)) + limit = dquot->dq_dqb.dqb_bhardlimit; + limit >>= sb->s_blocksize_bits; +if (limit && buf->f_blocks > limit) { curblock = (dquot->dq_dqb.dqb_curspace + dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits;
@@ -5558,9 +5564,14 @@ static int ext4_statfs_project(struct super_block *sb, (buf->f_blocks - curblock) : 0; } - limit = dquot->dq_dqb.dqb_isoftlimit ? - dquot->dq_dqb.dqb_isoftlimit : - dquot->dq_dqb.dqb_ihardlimit; + limit =0 ; +if (dquot->dq_dqb.dqb_isoftlimit && + (!limit || dquot->dq_dqb.dqb_isoftlimit < limit)) + limit = dquot->dq_dqb.dqb_isoftlimit; +if (dquot->dq_dqb.dqb_ihardlimit && + (!limit || dquot->dq_dqb.dqb_ihardlimit < limit)) + limit = dquot->dq_dqb.dqb_ihardlimit; +if (limit && buf->f_files > limit) { buf->f_files = limit; buf->f_ffree =
Signature · 1 line
2.20.1
Quoted 29 lines · Chengguang Xu
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
Quoted 7 lines
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.
Thanks for the patch! It looks good to me. You can add:
Just one style nit below:
Quoted 5 lines
fs/ext4/super.c +0
-0
fs/ext4/super.c static int ext4_statfs_project(struct super_block *sb, · line 5551
Quoted 9 lines
fs/ext4/super.c +3
-3@@ -5546,9 +5546,15 @@ static int ext4_statfs_project(struct super_block *sb,return PTR_ERR (dquot);spin_lock (&dquot->dq_dqb_lock); - limit = (dquot->dq_dqb.dqb_bsoftlimit ? - dquot->dq_dqb.dqb_bsoftlimit : - dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; + limit =0 ; +if (dquot->dq_dqb.dqb_bsoftlimit && + (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit))
In ext4 we don't indent wrapped condition to the same depth as the following block. Rather we indent at the start of the condition with spaces like:
if (dquot->dq_dqb.dqb_bsoftlimit && (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit)) do something
Some other subsystems also use:
if (dquot->dq_dqb.dqb_bsoftlimit && (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit)) do something.
But indenting at the same depth like you did makes it easy to conflate the condition with the command block so we don't use that...
Honza
Quoted 33 lines
fs/ext4/super.c +14
-3+ limit = dquot->dq_dqb.dqb_bsoftlimit; +if (dquot->dq_dqb.dqb_bhardlimit && + (!limit || dquot->dq_dqb.dqb_bhardlimit < limit)) + limit = dquot->dq_dqb.dqb_bhardlimit; + limit >>= sb->s_blocksize_bits; +if (limit && buf->f_blocks > limit) { curblock = (dquot->dq_dqb.dqb_curspace + dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits;@@ -5558,9 +5564,14 @@ static int ext4_statfs_project(struct super_block *sb, (buf->f_blocks - curblock) : 0; } - limit = dquot->dq_dqb.dqb_isoftlimit ? - dquot->dq_dqb.dqb_isoftlimit : - dquot->dq_dqb.dqb_ihardlimit; + limit =0 ; +if (dquot->dq_dqb.dqb_isoftlimit && + (!limit || dquot->dq_dqb.dqb_isoftlimit < limit)) + limit = dquot->dq_dqb.dqb_isoftlimit; +if (dquot->dq_dqb.dqb_ihardlimit && + (!limit || dquot->dq_dqb.dqb_ihardlimit < limit)) + limit = dquot->dq_dqb.dqb_ihardlimit; +if (limit && buf->f_files > limit) { buf->f_files = limit; buf->f_ffree =Signature · 1 line
2.20.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 34 lines · Chengguang Xu
Quoted 33 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4
Quoted 8 lines
Quoted 3 lines
Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Reviewed-by Jan Kara <[email protected]>
Hi Jan,
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems on statfs().
Thanks,
Chengguang
Quoted 41 lines · Chengguang Xu
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 40 lines · Chengguang Xu
Quoted 29 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
Quoted 7 lines
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Quoted 8 lines
Quoted 2 lines
Reviewed-by Jan Kara <[email protected]>Hi Jan,
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems onstatfs().
How do the other filesystems (e.g. xfs) behave if someone tries to set a soft limit higher than the hard limit?
--D
Quoted 4 lines
Thanks,
Chengguang
---- 在 星期三, 2019-11-06 13:03:36 Darrick J. Wong <[email protected]> 撰写 ----
Quoted 45 lines · Chengguang Xu
Quoted 44 lines
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 42 lines · Chengguang Xu
Quoted 29 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
Quoted 7 lines
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Reviewed-by Jan Kara <[email protected]>
Quoted 9 lines
Quoted 5 lines
Hi Jan,
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems onstatfs().How do the other filesystems (e.g. xfs) behave if someone tries to set a soft limit higher than the hard limit?
In xfs if (hard && hard < soft), the limit will not be set(or changed) but command xfs_quota does not return error.
Thanks,
Chengguang
---- 在 星期三, 2019-11-06 16:34:24 Chengguang Xu <[email protected]> 撰写 ----
Quoted 52 lines
---- 在 星期三, 2019-11-06 13:03:36 Darrick J. Wong <[email protected]> 撰写 ----
Quoted 51 lines · Chengguang Xu
Quoted 49 lines
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 34 lines · Chengguang Xu
Quoted 33 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Quoted 8 lines
Quoted 3 lines
Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Reviewed-by Jan Kara <[email protected]>Hi Jan,
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems onstatfs().
Quoted 6 lines
Quoted 3 lines
How do the other filesystems (e.g. xfs) behave if someone tries to set a soft limit higher than the hard limit?
In xfs if (hard && hard < soft), the limit will not be set(or changed) but command
xfs_quotadoes not return error.
Hi Darrick,
IMO, set nothing and return success seems not reasonable,
is it possible change to set softlimit to hardlimit when softlimit > hardlimit?
Thanks,
Chengguang
Jan Kara
reviewerQuoted 41 lines · Chengguang Xu
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 40 lines · Chengguang Xu
Quoted 29 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
Quoted 7 lines
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Quoted 8 lines
Quoted 2 lines
Reviewed-by Jan Kara <[email protected]>Hi Jan,
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems onstatfs().
What do you mean exactly? To not allow softlimit to be larger than hardlimit? That would make some sense but I don't think the risk of breaking some user that accidentally depends on current behavior is worth the few checks we can save...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
---- 在 星期三, 2019-11-06 17:49:24 Jan Kara <[email protected]> 撰写 ----
Quoted 47 lines · Chengguang Xu
Quoted 46 lines
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 34 lines · Chengguang Xu
Quoted 33 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Quoted 8 lines
Quoted 3 lines
Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Reviewed-by Jan Kara <[email protected]>Hi Jan,
Quoted 9 lines
Quoted 3 lines
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems onstatfs().What do you mean exactly? To not allow softlimit to be larger than hardlimit? That would make some sense but I don't think the risk of breaking some user that accidentally depends on current behavior is worth the few checks we can save...
Actually, I thought exactly same as you when I wrote my patch for statfs() of ext4. However, even though softlimit > hardlimit, we cannot allow user to use blocks or inode more than hardlimit. IOW, the limit is always there and fixed in this situation. So how about set softlimit to hardlimit when softlimit > hardlimit and return with success?
Thanks,
Chengguang
Jan Kara
reviewerQuoted 58 lines · Chengguang Xu
---- 在 星期三, 2019-11-06 17:49:24 Jan Kara <[email protected]> 撰写 ----
Quoted 47 lines · Chengguang Xu
Quoted 46 lines
---- 在 星期二, 2019-10-15 19:25:23 Jan Kara <[email protected]> 撰写 ----
Quoted 34 lines · Chengguang Xu
Quoted 33 lines
Setting softlimit larger than hardlimit seems meaningless for disk quota but currently it is allowed. In this case, there may be a bit of comfusion for users when they run df comamnd to directory which has project quota.
For example, we set 20M softlimit and 10M hardlimit of block usage limit for project quota of
test_dir(project id 123).[root@hades mnt_ext4]# repquota -P -a
*** Report for project quotas on device/dev/loop0Block grace time: 7days; Inode grace time: 7days
Block limits File limits
Project used soft hard grace used soft hard grace
----------------------------------------------------------------------0 -- 13 0 0 2 0 0 123 -- 10237 20480 10240 5 200 100The result of df command as below:
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop020M 10M 10M 50%/home/cgxu/test/mnt_ext4Even though it looks like there is another 10M free space to use, if we write new data to diretory
test_dir(inherit project id), the write will fail with errno(-EDQUOT).After this patch, the df result looks like below.
[root@hades mnt_ext4]# df -h
test_dir
Filesystem Size Used Avail Use% Mounted on/dev/loop010M 10M 3.0K 100%/home/cgxu/test/mnt_ext4Quoted 8 lines
Quoted 3 lines
Signed-off-by Chengguang Xu <[email protected]>---
- Fix a bug in the limit setting logic.Thanks for the patch! It looks good to me. You can add:
Reviewed-by Jan Kara <[email protected]>Hi Jan,
Quoted 9 lines
Quoted 3 lines
I have a proposal for another direction.
Could we add a check for soft limit in quota layer when setting the value? So that we could not bother with specific file systems onstatfs().What do you mean exactly? To not allow softlimit to be larger than hardlimit? That would make some sense but I don't think the risk of breaking some user that accidentally depends on current behavior is worth the few checks we can save...
Quoted 5 lines
Actually, I thought exactly same as you when I wrote my patch for
statfs()of ext4. However, even though softlimit > hardlimit, we cannot allow user to use blocks or inode more than hardlimit. IOW, the limit is always there and fixed in this situation. So how about set softlimit to hardlimit when softlimit > hardlimit and return with success?
Well, the softlimit > hardlimit won't have any effect but if the hardlimit is then raised (e.g. with a tool like edquota(8)), it may suddently start having effect. That's why I'm reluctant to just ignore or trim too large softlimit.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR