The patch titled
Lockdep: Annotate the quota code
has been added to the -mm tree. Its filename is
lockdep-annotate-the-quota-code.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Lockdep: Annotate the quota code
From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
The quota code plays interesting games with the lock ordering; to quote
Jan:
| i_mutex of inode containing quota file is acquired after all other
| quota locks. i_mutex of all other inodes is acquired before quota
| locks. Quota code makes sure (by resetting inode operations and
| setting special flag on inode) that noone tries to enter quota code
| while holding i_mutex on a quota file...
The good news is that all of this special case i_mutex grabbing happens
in the (per filesystem) low level quota write function. For this special
case we need a new I_MUTEX_* nesting level, since this just entirely
outside any of the regular VFS locking rules for i_mutex. I trust Jan on
his blue eyes that this is not ever going to deadlock; and based on that
the patch below is what it takes to inform lockdep of these very
interesting new locking rules.
The new locking rule for the I_MUTEX_QUOTA nesting level is that this is
the deepest possible level of nesting for i_mutex, and that this only
should be used in quota write (and possibly read) function of
filesystems. This makes the lock ordering of the I_MUTEX_* levels:
I_MUTEX_PARENT -> I_MUTEX_CHILD -> I_MUTEX_NORMAL -> I_MUTEX_QUOTA
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/dquot.c | 2 +-
fs/ext2/super.c | 2 +-
fs/ext3/super.c | 2 +-
fs/reiserfs/super.c | 2 +-
fs/ufs/super.c | 2 +-
include/linux/fs.h | 7 ++++++-
6 files changed, 11 insertions(+), 6 deletions(-)
diff -puN fs/dquot.c~lockdep-annotate-the-quota-code fs/dquot.c
--- devel/fs/dquot.c~lockdep-annotate-the-quota-code 2006-06-06 16:16:02.000000000 -0700
+++ devel-akpm/fs/dquot.c 2006-06-06 16:16:02.000000000 -0700
@@ -1475,7 +1475,7 @@ static int vfs_quota_on_inode(struct ino
goto out_file_init;
}
mutex_unlock(&dqopt->dqio_mutex);
- mutex_unlock(&inode->i_mutex);
+ mutex_unlock_non_nested(&inode->i_mutex);
set_enable_flags(dqopt, type);
add_dquot_ref(sb, type);
diff -puN fs/ext2/super.c~lockdep-annotate-the-quota-code fs/ext2/super.c
--- devel/fs/ext2/super.c~lockdep-annotate-the-quota-code 2006-06-06 16:16:02.000000000 -0700
+++ devel-akpm/fs/ext2/super.c 2006-06-06 16:16:02.000000000 -0700
@@ -1157,7 +1157,7 @@ static ssize_t ext2_quota_write(struct s
struct buffer_head tmp_bh;
struct buffer_head *bh;
- mutex_lock(&inode->i_mutex);
+ mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
while (towrite > 0) {
tocopy = sb->s_blocksize - offset < towrite ?
sb->s_blocksize - offset : towrite;
diff -puN fs/ext3/super.c~lockdep-annotate-the-quota-code fs/ext3/super.c
--- devel/fs/ext3/super.c~lockdep-annotate-the-quota-code 2006-06-06 16:16:02.000000000 -0700
+++ devel-akpm/fs/ext3/super.c 2006-06-06 16:16:02.000000000 -0700
@@ -2614,7 +2614,7 @@ static ssize_t ext3_quota_write(struct s
struct buffer_head *bh;
handle_t *handle = journal_current_handle();
- mutex_lock(&inode->i_mutex);
+ mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
while (towrite > 0) {
tocopy = sb->s_blocksize - offset < towrite ?
sb->s_blocksize - offset : towrite;
diff -puN fs/reiserfs/super.c~lockdep-annotate-the-quota-code fs/reiserfs/super.c
--- devel/fs/reiserfs/super.c~lockdep-annotate-the-quota-code 2006-06-06 16:16:02.000000000 -0700
+++ devel-akpm/fs/reiserfs/super.c 2006-06-06 16:16:02.000000000 -0700
@@ -2204,7 +2204,7 @@ static ssize_t reiserfs_quota_write(stru
size_t towrite = len;
struct buffer_head tmp_bh, *bh;
- mutex_lock(&inode->i_mutex);
+ mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
while (towrite > 0) {
tocopy = sb->s_blocksize - offset < towrite ?
sb->s_blocksize - offset : towrite;
diff -puN fs/ufs/super.c~lockdep-annotate-the-quota-code fs/ufs/super.c
--- devel/fs/ufs/super.c~lockdep-annotate-the-quota-code 2006-06-06 16:16:02.000000000 -0700
+++ devel-akpm/fs/ufs/super.c 2006-06-06 16:16:02.000000000 -0700
@@ -1269,7 +1269,7 @@ static ssize_t ufs_quota_write(struct su
size_t towrite = len;
struct buffer_head *bh;
- mutex_lock(&inode->i_mutex);
+ mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
while (towrite > 0) {
tocopy = sb->s_blocksize - offset < towrite ?
sb->s_blocksize - offset : towrite;
diff -puN include/linux/fs.h~lockdep-annotate-the-quota-code include/linux/fs.h
--- devel/include/linux/fs.h~lockdep-annotate-the-quota-code 2006-06-06 16:16:02.000000000 -0700
+++ devel-akpm/include/linux/fs.h 2006-06-06 16:16:02.000000000 -0700
@@ -563,12 +563,17 @@ struct inode {
* 0: the object of the current VFS operation
* 1: parent
* 2: child/target
+ * 3: quota file
+ *
+ * The locking order between these types is
+ * parent -> child -> normal -> quota
*/
enum inode_i_mutex_lock_type
{
I_MUTEX_NORMAL,
I_MUTEX_PARENT,
- I_MUTEX_CHILD
+ I_MUTEX_CHILD,
+ I_MUTEX_QUOTA
};
/*
_
Patches currently in -mm which might be from arjan@xxxxxxxxxxxxxxx are
git-netdev-all.patch
lock-validator-fix-ns83820c-irq-flags-bug-part.patch
lock-validator-fix-ns83820c-irq-flags-part-3.patch
lock-validator-lockdep-small-xfs-init_rwsem-cleanup.patch
add-export_unused_symbol-and-export_unused_symbol_gpl.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
spin-rwlock-init-cleanups.patch
lock-validator-introduce-warn_on_oncecond.patch
emu10k1-mark-midi_spinlock-as-used.patch
epoll-use-unlocked-wqueue-operations.patch
pi-futex-futex-code-cleanups.patch
pi-futex-introduce-debug_check_no_locks_freed.patch
pi-futex-add-plist-implementation.patch
pi-futex-scheduler-support-for-pi.patch
pi-futex-rt-mutex-core.patch
pi-futex-rt-mutex-docs.patch
pi-futex-rt-mutex-debug.patch
pi-futex-rt-mutex-tester.patch
pi-futex-rt-mutex-futex-api.patch
pi-futex-futex_lock_pi-futex_unlock_pi-support.patch
lock-validator-floppyc-irq-release-fix.patch
lock-validator-floppyc-irq-release-fix-fix-fix.patch
lock-validator-forcedethc-fix.patch
lock-validator-mutex-section-binutils-workaround.patch
lock-validator-add-__module_address-method.patch
lock-validator-better-lock-debugging.patch
lock-validator-locking-api-self-tests.patch
lock-validator-locking-api-self-tests-self-test-fix.patch
lock-validator-locking-init-debugging-improvement.patch
lock-validator-beautify-x86_64-stacktraces.patch
lock-validator-beautify-x86_64-stacktraces-fix.patch
lock-validator-x86_64-document-stack-frame-internals.patch
lock-validator-stacktrace.patch
lock-validator-stacktrace-build-fix.patch
lock-validator-stacktrace-warning-fix.patch
lock-validator-stacktrace-fix-on-x86_64.patch
lock-validator-fown-locking-workaround.patch
lock-validator-sk_callback_lock-workaround.patch
lock-validator-irqtrace-core.patch
lock-validator-irqtrace-core-powerpc-fix-1.patch
lock-validator-irqtrace-core-non-x86-fix.patch
lock-validator-irqtrace-core-non-x86-fix-2.patch
lock-validator-irqtrace-core-non-x86-fix-3.patch
lock-validator-irqtrace-entrys-fix.patch
lock-validator-irqtrace-core-remove-softirqc-warn_on.patch
lock-validator-irqtrace-cleanup-include-asm-i386-irqflagsh.patch
lock-validator-irqtrace-cleanup-include-asm-x86_64-irqflagsh.patch
lock-validator-lockdep-add-local_irq_enable_in_hardirq-api.patch
lock-validator-add-per_cpu_offset.patch
lock-validator-add-per_cpu_offset-fix.patch
lock-validator-core.patch
lock-validator-procfs.patch
lock-validator-core-multichar-fix.patch
lock-validator-core-count_matching_names-fix.patch
lock-validator-design-docs.patch
lock-validator-prove-rwsem-locking-correctness.patch
lock-validator-prove-rwsem-locking-correctness-fix.patch
lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch
lock-validator-prove-spinlock-rwlock-locking-correctness.patch
lock-validator-prove-mutex-locking-correctness.patch
lock-validator-prove-mutex-locking-correctness-fix-null-type-name-bug.patch
lock-validator-print-all-lock-types-on-sysrq-d.patch
lock-validator-x86_64-early-init.patch
lock-validator-smp-alternatives-workaround.patch
lock-validator-do-not-recurse-in-printk.patch
lock-validator-disable-nmi-watchdog-if-config_lockdep.patch
lock-validator-disable-nmi-watchdog-if-config_lockdep-i386.patch
lock-validator-disable-nmi-watchdog-if-config_lockdep-x86_64.patch
lock-validator-special-locking-bdev.patch
lock-validator-special-locking-bdev-fix.patch
lock-validator-special-locking-direct-io.patch
lock-validator-special-locking-serial.patch
lock-validator-special-locking-serial-fix.patch
lock-validator-special-locking-dcache.patch
lock-validator-special-locking-i_mutex.patch
lock-validator-special-locking-s_lock.patch
lock-validator-special-locking-futex.patch
lock-validator-special-locking-genirq.patch
lock-validator-special-locking-genirq-lock-validator-early_init_irq_lock_type-build-fix.patch
lock-validator-special-locking-completions.patch
lock-validator-special-locking-waitqueues.patch
lock-validator-special-locking-mm.patch
lock-validator-special-locking-serio.patch
lock-validator-special-locking-slab.patch
lock-validator-special-locking-skb_queue_head_init.patch
lock-validator-special-locking-net-ipv4-igmpcpatch.patch
lock-validator-special-locking-timerc.patch
lock-validator-special-locking-schedc.patch
lock-validator-special-locking-sctp.patch
lock-validator-special-locking-hrtimerc.patch
lock-validator-special-locking-sock_lock_init.patch
lock-validator-special-locking-af_unix.patch
lock-validator-special-locking-bh_lock_sock.patch
lock-validator-special-locking-mmap_sem.patch
lock-validator-special-locking-sb-s_umount.patch
lock-validator-special-locking-sb-s_umount-fix.patch
lock-validator-special-locking-sb-s_umount-2.patch
lock-validator-special-locking-sb-s_umount-2-fix.patch
lockdep-annotate-rpc_populate-for.patch
lock-validator-special-locking-jbd.patch
lock-validator-special-locking-posix-timers.patch
lock-validator-special-locking-sch_genericc.patch
lock-validator-special-locking-xfrm.patch
lockdep-annotate-the-quota-code.patch
lockdep-add-i_mutex-ordering-annotations-to-the-sunrpc.patch
lockdep-add-parent-child-annotations-to-usbfs.patch
lock-validator-special-locking-sound-core-seq-seq_portsc.patch
lock-validator-special-locking-sound-core-seq-seq_devicec.patch
lock-validator-fix-rt_hash_lock_sz.patch
lock-validator-introduce-irq__lockdep.patch
locking-validator-special-rule-8390c-disable_irq.patch
locking-validator-special-rule-3c59xc-disable_irq.patch
lock-validator-enable-lock-validator-in-kconfig.patch
lock-validator-enable-lock-validator-in-kconfig-require-trace_irqflags_support.patch
lock-validator-enable-lock-validator-in-kconfig-not-yet.patch
lockdep-one-stacktrace-column-if-config_lockdep=y.patch
lockdep-further-improve-stacktrace-output.patch
lock-validator-disable-oprofile-if-lockdep=y.patch
lock-validator-v3.patch
lock-validator-special-locking-kgdb.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
