quota: fix dquot_disable vs dquot_trasnfer race
PATCH 1/1 quota: fix dquot_disable vs dquot_trasnfer race
Jan please take care of the patch attached. This race relatively easy to reproduce so IMHO it is candidate for stable trees
Quoted 1 line
From
1c438550a9aca7c3e209a492a9747954de571d38Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <[email protected]>
Date: Sat, 9 Oct 2010 18:57:45 +0400
Subject: [PATCH] quota: fix dquot_disable vs dquot_trasnfer race
I've got following race:dquot_disable dquot_transfer
->dqget()
sb_has_quota_active
dqopt->flags &= ~dquot_state_flag(f, cnt) atomic_inc(dq->dq_count)
->drop_dquot_ref(sb, cnt);
down_write(dqptr_sem)
inode->i_dquot[cnt] = NULL ->__dquot_transferinvalidate_dquots(sb, cnt); down_write(&dqptr_sem)
->wait for dq_wait_unused inode->i_dquot = new_dquot
/* wait forever */ ^^^^New quota user^^^^^^
Inodes was already cleaned from quotas, and we can not allow new ones. We have to recheck quota state under dqptr_sem and before assignment, as we do it in dquot_initialize()
--- fs/quota/dquot.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
fs/quota/dquot.c +5 -0
@@ -1759,6 +1759,9 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) {if (!transfer_to[cnt])continue ; +/* Avoid races with quotaoff() */ +if (!sb_has_quota_active (inode->i_sb, cnt)) +continue ; transfer_from[cnt] = inode->i_dquot[cnt]; ret =check_idq (transfer_to[cnt],1 , warntype_to + cnt);if (ret)
@@ -1777,6 +1780,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)*/ if (!transfer_to[cnt])continue ; +if (!sb_has_quota_active (inode->i_sb, cnt)) +continue ;/* Due to IO error we might not have transfer_from[] structure */ if (transfer_from[cnt]) {
Signature · 1 line
1.6.6.1
Quoted 2 lines · Dmitry Monakhov
Jan please take care of the patch attached. This race relatively easy to reproduce so IMHO it is candidate for stable trees
OOps, please excuse me, this patch was prepared against my local tree which has not "Pass back references to put" logic at the end. Please ignore this patch. I'll send correct one soon.
Quoted 53 lines
From
1c438550a9aca7c3e209a492a9747954de571d38Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <[email protected]>
Date: Sat, 9 Oct 2010 18:57:45 +0400
Subject: [PATCH] quota: fixdquot_disablevsdquot_trasnferraceI've got following race:
dquot_disabledquot_transfer->dqget() sb_has_quota_active dqopt->flags &= ~dquot_state_flag(f, cnt) atomic_inc(dq->dq_count) ->drop_dquot_ref(sb, cnt); down_write(dqptr_sem) inode->i_dquot[cnt] = NULL ->__dquot_transfer
invalidate_dquots(sb, cnt);down_write(&dqptr_sem)
->wait fordq_wait_unusedinode->i_dquot=new_dquot
/* wait forever */ ^^^^New quota user^^^^^^Inodes was already cleaned from quotas, and we can not allow new ones. We have to recheck quota state under
dqptr_semand before assignment, as we do it indquot_initialize()Signed-off-by Dmitry Monakhov <[email protected]>--- fs/quota/dquot.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)fs/quota/dquot.c +5
-0@@ -1759,6 +1759,9 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) {if (!transfer_to[cnt])continue ; +/* Avoid races with quotaoff() */ +if (!sb_has_quota_active (inode->i_sb, cnt)) +continue ; transfer_from[cnt] = inode->i_dquot[cnt]; ret =check_idq (transfer_to[cnt],1 , warntype_to + cnt);if (ret)@@ -1777,6 +1780,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)*/ if (!transfer_to[cnt])continue ; +if (!sb_has_quota_active (inode->i_sb, cnt)) +continue ;/* Due to IO error we might not have transfer_from[] structure */ if (transfer_from[cnt]) {Signature · 1 line
1.6.6.1
PATCH 1/1 quota: fix dquot_disable vs dquot_trasnfer race v2
I've got following lockup:dquot_disable dquot_transfer
->dqget()
sb_has_quota_active
dqopt->flags &= ~dquot_state_flag(f, cnt) atomic_inc(dq->dq_count)
->drop_dquot_ref(sb, cnt);
down_write(dqptr_sem)
inode->i_dquot[cnt] = NULL ->__dquot_transferinvalidate_dquots(sb, cnt); down_write(&dqptr_sem)
->wait for dq_wait_unused inode->i_dquot = new_dquot
/* wait forever */ ^^^^New quota user^^^^^^
Inodes was already cleaned from quotas, and we can not allow new ones. We have to recheck quota state under dqptr_sem and before assignment, as we do it in dquot_initialize()
--- fs/quota/dquot.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-)
fs/quota/dquot.c +12 -6
@@ -1736,6 +1736,7 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)qsize_t rsv_space =0 ;struct dquot *transfer_from[MAXQUOTAS ] = {};int cnt, ret =0 ; +char is_valid[MAXQUOTAS ] = {};char warntype_to[MAXQUOTAS ];char warntype_from_inodes[MAXQUOTAS ], warntype_from_space[MAXQUOTAS ];
@@ -1757,8 +1758,15 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to) space = cur_space + rsv_space;/* Build the transfer_from list and check the limits */ for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) { +/* +* Skip changes for same uid or gid or for turned off quota-type. +*/ if (!transfer_to[cnt])continue ; +/* Avoid races with quotaoff() */ +if (!sb_has_quota_active (inode->i_sb, cnt)) +continue ; + is_valid[cnt] =1 ; transfer_from[cnt] = inode->i_dquot[cnt]; ret =check_idq (transfer_to[cnt],1 , warntype_to + cnt);if (ret)
@@ -1772,12 +1780,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)* Finally perform the needed transfer from transfer_from to transfer_to */ for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) { -/* -* Skip changes for same uid or gid or for turned off quota-type. -*/ -if (!transfer_to[cnt]) +if (!is_valid[cnt])continue ; -/* Due to IO error we might not have transfer_from[] structure */ if (transfer_from[cnt]) { warntype_from_inodes[cnt] =
@@ -1803,7 +1807,9 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)mark_all_dquot_dirty (transfer_to);/* Pass back references to put */ for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) - transfer_to[cnt] = transfer_from[cnt]; +if (is_valid[cnt]) + transfer_to[cnt] = transfer_from[cnt]; + warn:flush_warnings (transfer_to, warntype_to);flush_warnings (transfer_from, warntype_from_inodes);
Signature · 1 line
1.6.6.1
Jan Kara
reviewerRe: [PATCH] quota: fix dquot_disable vs dquot_trasnfer race v2
Quoted 9 lines · Dmitry
I've got following lockup:
dquot_disabledquot_transfer->dqget() sb_has_quota_active dqopt->flags &= ~dquot_state_flag(f, cnt) atomic_inc(dq->dq_count) ->drop_dquot_ref(sb, cnt); down_write(dqptr_sem) inode->i_dquot[cnt] = NULL ->__dquot_transfer
Quoted 7 lines
invalidate_dquots(sb, cnt);down_write(&dqptr_sem)
->wait fordq_wait_unusedinode->i_dquot=new_dquot
/* wait forever */ ^^^^New quota user^^^^^^Inodes was already cleaned from quotas, and we can not allow new ones. We have to recheck quota state under
dqptr_semand before assignment, as we do it indquot_initialize()
Thanks. Merged into my tree.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR