Skip to contentSkip to conversation

iova-lockdep-false-alarm-fix.

PATCH In review mark gross 2 participants 3 messages Feb 21, 2008 – Feb 25, 2008 PCI

lore
Share & tools
lore

mark gross

author
#0 lore raw

PATCH 1/1 iova-lockdep-false-alarm-fix.

lockdep goes off on the iova copy_reserved_iova because it and a function it calls grabs locks in the from, and the to of the copy operation.

This patch gives the reserved_ioval_list locks special lockdep classes.

--mgross

Signed-off-by <[email protected]>
drivers/pci/intel-iommu.c +7 -0
Index: linux-2.6.24-mm1/drivers/pci/intel-iommu.c
===================================================================
@@ -1127,6 +1127,8 @@
 }
 
 static struct iova_domain reserved_iova_list;
+static struct lock_class_key reserved_alloc_key;
+static struct lock_class_key reserved_rbtree_key;
 
 static void dmar_init_reserved_ranges(void)
 {
@@ -1137,6 +1139,11 @@
 
 	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
+	lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
+		&reserved_alloc_key);
+	lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
+		&reserved_rbtree_key);
+
 	/* IOAPIC ranges shouldn't be accessed by DMA */
 	iova = reserve_iova(&reserved_iova_list, IOVA_PFN(IOAPIC_RANGE_START),
 		IOVA_PFN(IOAPIC_RANGE_END));
#1 lore raw
Quoted 2 lines

Subject: [PATCH]iova-lockdep-false-alarm-fix.

Nice English titles, please...

Quoted 7 lines · On Wed, 20 Feb 2008 16:35:28 -0800 mark gross <[email protected]> wrote:

lockdep goes off on the iova copy_reserved_iova because it and a function it calls grabs locks in the from, and the to of the copy operation.

This patch gives the reserved_ioval_list locks special lockdep classes.

Confused. Why not fix the ranking inconsistency instead?

Your changelog doesn't tell us why this isn't a real bug?

Quoted 25 lines

Index: linux-2.6.24-mm1/drivers/pci/intel-iommu.c
===================================================================

drivers/pci/intel-iommu.c +7 -0
@@ -1127,6 +1127,8 @@
 }
 
 static struct iova_domain reserved_iova_list;
+static struct lock_class_key reserved_alloc_key;
+static struct lock_class_key reserved_rbtree_key;
 
 static void dmar_init_reserved_ranges(void)
 {
@@ -1137,6 +1139,11 @@
 
 	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
+	lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
+		&reserved_alloc_key);
+	lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
+		&reserved_rbtree_key);
+
 	/* IOAPIC ranges shouldn't be accessed by DMA */
 	iova = reserve_iova(&reserved_iova_list, IOVA_PFN(IOAPIC_RANGE_START),
 		IOVA_PFN(IOAPIC_RANGE_END));
author
#2 lore raw
Quoted 11 lines · Andrew Morton
Quoted 2 lines

Subject: [PATCH]iova-lockdep-false-alarm-fix.

Nice English titles, please...

Quoted 4 lines · On Wed, 20 Feb 2008 16:35:28 -0800 mark gross <[email protected]> wrote:

lockdep goes off on the iova copy_reserved_iova because it and a function it calls grabs locks in the from, and the to of the copy operation.

Quoted 5 lines
Quoted 3 lines

This patch gives the reserved_ioval_list locks special lockdep classes.

Confused. Why not fix the ranking inconsistency instead?

Its not a ranking inconsistency issues the function grab locks of the same lock classes triggering the warning. The first lock grabbed is for the constant reserved areas that is never accessed after early boot. Technically you could do without grabbing the locks for the "from" structure its copying reserved areas from.

But dropping the from locks to me looks wrong, even though it would be ok.

The affected code only runs in early boot as its setting up the DMAR engines.

--mgross

Quoted 28 lines

Your changelog doesn't tell us why this isn't a real bug?

Quoted 25 lines

Index: linux-2.6.24-mm1/drivers/pci/intel-iommu.c
===================================================================

drivers/pci/intel-iommu.c +7 -0
@@ -1127,6 +1127,8 @@
 }
 
 static struct iova_domain reserved_iova_list;
+static struct lock_class_key reserved_alloc_key;
+static struct lock_class_key reserved_rbtree_key;
 
 static void dmar_init_reserved_ranges(void)
 {
@@ -1137,6 +1139,11 @@
 
 	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
+	lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
+		&reserved_alloc_key);
+	lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
+		&reserved_rbtree_key);
+
 	/* IOAPIC ranges shouldn't be accessed by DMA */
 	iova = reserve_iova(&reserved_iova_list, IOVA_PFN(IOAPIC_RANGE_START),
 		IOVA_PFN(IOAPIC_RANGE_END));