Skip to contentSkip to conversation

x86/iommu: Fix two minimal issues in check_iommu_entries()

PATCH In review Zhenzhong Duan 3 participants 5 messages Dec 23, 2020 – Jan 7, 2021 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/iommu: Fix two minimal issues in check_iommu_entries()

check_iommu_entries() checks for cyclic dependency in iommu entries and fixes the cyclic dependency by setting x->depend to NULL. But this repairing isn't correct if q is in front of p, there will be "EXECUTION ORDER INVALID!" report following. Fix it by NULLing whichever in the front.

The second issue is about the report of exectuion order reverse, the order is reversed incorrectly in the report, fix it.

---
 arch/x86/kernel/pci-iommu_table.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/pci-iommu_table.c +5 -2
index 2e9006c..40c8249 100644
@@ -60,7 +60,10 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
 			printk(KERN_ERR "CYCLIC DEPENDENCY FOUND! %pS depends on %pS and vice-versa. BREAKING IT.\n",
 			       p->detect, q->detect);
 			/* Heavy handed way..*/
-			x->depend = NULL;
+			if (p > q)
+				q->depend = NULL;
+			else
+				p->depend = NULL;
 		}
 	}
 
@@ -68,7 +71,7 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
 		q = find_dependents_of(p, finish, p);
 		if (q && q > p) {
 			printk(KERN_ERR "EXECUTION ORDER INVALID! %pS should be called before %pS!\n",
-			       p->detect, q->detect);
+			       q->detect, p->detect);
 		}
 	}
 }
Signature · 6 lines
1.8.3.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer
#1 lore raw
Quoted 5 lines · Zhenzhong Duan

check_iommu_entries() checks for cyclic dependency in iommu entries and fixes the cyclic dependency by setting x->depend to NULL. But this repairing isn't correct if q is in front of p, there will be "EXECUTION ORDER INVALID!" report following. Fix it by NULLing whichever in the front.

When does "q is in front of p" happen? How does it happen?

Quoted 2 lines

The second issue is about the report of exectuion order reverse, the order is reversed incorrectly in the report, fix it.

I have no clue what that means.

Plese structure your commit message something like this:

Problem is A.

It happens because of B.

Fix it by doing C.

(Potentially do D).

For more detailed info, see Documentation/process/submitting-patches.rst, Section "2) Describe your changes".

Thx.

Signature · 8 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
#2 lore raw
Quoted 9 lines · Borislav Petkov
Quoted 5 lines · Zhenzhong Duan

check_iommu_entries() checks for cyclic dependency in iommu entries and fixes the cyclic dependency by setting x->depend to NULL. But this repairing isn't correct if q is in front of p, there will be "EXECUTION ORDER INVALID!" report following. Fix it by NULLing whichever in the front.

When does "q is in front of p" happen? How does it happen?

Sorry, just realized it never happen.

Quoted 5 lines
Quoted 3 lines

The second issue is about the report of exectuion order reverse, the order is reversed incorrectly in the report, fix it.

I have no clue what that means.

I mean if p depends on q, then q->detect should be called before p->detect. The message generated by printk() is wrong.

Regards
Zhenzhong
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#3 lore raw
In reply to Zhenzhong Duan
Quoted 8 lines · Zhenzhong Duan

check_iommu_entries() checks for cyclic dependency in iommu entries and fixes the cyclic dependency by setting x->depend to NULL. But this repairing isn't correct if q is in front of p, there will be "EXECUTION ORDER INVALID!" report following. Fix it by NULLing whichever in the front.

The second issue is about the report of exectuion order reverse, the order is reversed incorrectly in the report, fix it.

Heya!

When you debugged this, did you by any chance save the serial logs and the debug logs to double-check it?

Thanks!

Quoted 34 lines
---
 arch/x86/kernel/pci-iommu_table.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/pci-iommu_table.c +5 -2
index 2e9006c..40c8249 100644
@@ -60,7 +60,10 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
 			printk(KERN_ERR "CYCLIC DEPENDENCY FOUND! %pS depends on %pS and vice-versa. BREAKING IT.\n",
 			       p->detect, q->detect);
 			/* Heavy handed way..*/
-			x->depend = NULL;
+			if (p > q)
+				q->depend = NULL;
+			else
+				p->depend = NULL;
 		}
 	}
 
@@ -68,7 +71,7 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
 		q = find_dependents_of(p, finish, p);
 		if (q && q > p) {
 			printk(KERN_ERR "EXECUTION ORDER INVALID! %pS should be called before %pS!\n",
-			       p->detect, q->detect);
+			       q->detect, p->detect);
 		}
 	}
 }
Signature · 1 line
1.8.3.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#4 lore raw
Quoted 8 lines · Konrad Rzeszutek Wilk
Quoted 6 lines · Zhenzhong Duan

check_iommu_entries() checks for cyclic dependency in iommu entries and fixes the cyclic dependency by setting x->depend to NULL. But this repairing isn't correct if q is in front of p, there will be "EXECUTION ORDER INVALID!" report following. Fix it by NULLing whichever in the front.

Quoted 7 lines
Quoted 2 lines

The second issue is about the report of exectuion order reverse, the order is reversed incorrectly in the report, fix it.

Heya!

When you debugged this, did you by any chance save the serial logs and the debug logs to double-check it?

Hi Konrad,

The iommu_table_entry is sorted by sort_iommu_table() and check_iommu_entries() finds nothing abnormal,
so there is no related logs to check.

Sorry for my poor english, I'm not saying there is order reverse, even if there is, it will be repaired by sort_iommu_table(). Then check_iommu_entries() report nothing.
What I mean is about check_iommu_entries() itself, below printk isn't correct.

printk(KERN_ERR "EXECUTION ORDER INVALID! %pS should be called before %pS!\n",

                               p->detect, q->detect);

Should be:

printk(KERN_ERR "EXECUTION ORDER INVALID! %pS should be called before %pS!\n",

                               q->detect, p->detect);

Regards
Zhenzhong
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu