Skip to contentSkip to conversation

remove the BKL: remove "BKL auto-drop" assumption from ext3_remount()

PATCH In review Alessio Igor Bogani 2 participants 4 messages Apr 23, 2009 – Apr 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove the BKL: remove "BKL auto-drop" assumption from ext3_remount()

Fix ext3_remount()'s "schedule() drops the BKL automatically" assumption, when ext3_mark_recovery_complete(), which can sleep, does not do that it can lock up.

---
 fs/ext3/super.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
fs/ext3/super.c +2 -0
index dc905f9..3fa457a 100644
@@ -2561,9 +2561,11 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
 			 * We have to unlock super so that we can wait for
 			 * transactions.
 			 */
+			unlock_kernel();
 			unlock_super(sb);
 			ext3_mark_recovery_complete(sb, es);
 			lock_super(sb);
+			lock_kernel();
 		} else {
 			__le32 ret;
 			if ((ret = EXT3_HAS_RO_COMPAT_FEATURE(sb,
Signature · 1 line
1.6.0.4
#1 lore raw
Quoted 14 lines · Alessio Igor Bogani

Fix ext3_remount()'s "schedule() drops the BKL automatically" assumption, when ext3_mark_recovery_complete(), which can sleep, does not do that it can lock up.

---
 fs/ext3/super.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
fs/ext3/super.c +0 -0
index dc905f9..3fa457a 100644

fs/ext3/super.c static int ext3_remount (struct super_block * sb, int * flags, char * data) · line 2568

Quoted 8 lines
fs/ext3/super.c +2 -0
@@ -2561,9 +2561,11 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
 			 * We have to unlock super so that we can wait for
 			 * transactions.
 			 */
+			unlock_kernel();
 			unlock_super(sb);
 			ext3_mark_recovery_complete(sb, es);
 			lock_super(sb);
+			lock_kernel();

Shouldnt this be a conditional-unlock, so that if the remount moves away from under the BKL we dont break in this place?

Ingo

#2 lore raw

Dear Sir Molnar,

2009/4/26 Ingo Molnar <[email protected]>:
[...]

Quoted 8 lines
Quoted 5 lines

+                     unlock_kernel(); unlock_super(sb); ext3_mark_recovery_complete(sb, es); lock_super(sb);
+                     lock_kernel();

Shouldnt this be a conditional-unlock, so that if the remount moves away from under the BKL we dont break in this place?

[...]

Please excuse me I'm only a stupid howler monkey. :-)

Patch with conditional-unlock/lock follow in a second.

Thank you!

Ciao,
Alessio

#3 lore raw

PATCH 1/1 remove the BKL: remove "BKL auto-drop" assumption from ext3_remount()

In reply to Ingo Molnar

Fix ext3_remount()'s "schedule() drops the BKL automatically" assumption, when ext3_mark_recovery_complete(), which can sleep, does not do that it can lock up.

---
 fs/ext3/super.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
fs/ext3/super.c +5 -0
index dc905f9..5d61a7f 100644
@@ -2503,6 +2503,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
 #ifdef CONFIG_QUOTA
 	int i;
 #endif
+	int bkl = kernel_locked();
 
 	/* Store the original options */
 	old_sb_flags = sb->s_flags;
@@ -2561,9 +2562,13 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
 			 * We have to unlock super so that we can wait for
 			 * transactions.
 			 */
+			if (bkl)
+				unlock_kernel();
 			unlock_super(sb);
 			ext3_mark_recovery_complete(sb, es);
 			lock_super(sb);
+			if (bkl)
+				lock_kernel();
 		} else {
 			__le32 ret;
 			if ((ret = EXT3_HAS_RO_COMPAT_FEATURE(sb,
Signature · 1 line
1.6.0.4