x86/ioapic: fix clear_IO_APIC_pin when using interrupt remapping
cover x86/ioapic: fix clear_IO_APIC_pin when using interrupt remapping
Hello,
Current code in clear_IO_APIC_pin doesn't properly deal with IO-APIC entries already configured to point to entries in the iommu interrupt remapping table, fix this.
Roger Pau Monne (2):
x86/ioapic: remove usage of TRUE and FALSE in clear_IO_APIC_pin x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
xen/arch/x86/io_apic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/2 x86/ioapic: remove usage of TRUE and FALSE in clear_IO_APIC_pin
And instead use proper booleans. No functional change intended.
---
Cc: Juergen Gross <[email protected]>
--- xen/arch/x86/io_apic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
xen/arch/x86/io_apic.c +6 -6
@@ -502,7 +502,7 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)struct IO_APIC_route_entry entry;/* Check delivery_mode to be sure we're not clearing an SMI pin */ - entry =__ioapic_read_entry (apic, pin, FALSE); + entry =__ioapic_read_entry (apic, pin, false);if (entry.delivery_mode == dest_SMI)return ;
@@ -512,15 +512,15 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ if (!entry.mask) { entry.mask =1 ; -__ioapic_write_entry (apic, pin, FALSE, entry); +__ioapic_write_entry (apic, pin, false, entry); } - entry =__ioapic_read_entry (apic, pin, TRUE); + entry =__ioapic_read_entry (apic, pin, true);if (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { entry.trigger =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, true, entry); }__io_apic_eoi (apic, entry.vector, pin); }
@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, true, entry); - entry =__ioapic_read_entry (apic, pin, TRUE); + entry =__ioapic_read_entry (apic, pin, true);if (entry.irr)printk (KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n" ,IO_APIC_ID (apic), pin);
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 1/2] x86/ioapic: remove usage of TRUE and FALSE in clear_IO_APIC_pin
Quoted 6 lines · Roger Pau Monne
And instead use proper booleans. No functional change intended.
Signed-off-by Roger Pau Monné <[email protected]>---
Cc: Juergen Gross <[email protected]>
---
Urgh. Can we purge with prejudice all of this TRUE and FALSE nonsense? There are only a few users more than this path.
EFI adds in conditionally in a buggy way (which I thought I'd properly excised back with the switch from bool_t to bool, but clearly not), and ACPI undef's its surrounding and implements it differently.
Code like this has no buisness remaining, and what we currently have is a disaster waiting to happen.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 1/2] x86/ioapic: remove usage of TRUE and FALSE in clear_IO_APIC_pin
In reply to Roger Pau MonneQuoted 3 lines · Roger Pau Monne
And instead use proper booleans. No functional change intended.
Signed-off-by Roger Pau Monné <[email protected]>
Other than Andrew I think this is fine without further extension, i.e.
Of course this isn't to say that I wouldn't welcome a more complete cleanup, as suggested by him.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/2 x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
In reply to Roger Pau Monneclear_IO_APIC_pin can be called after the iommu has been enabled, and using raw entry reads and writes will result in a misconfiguration of the entries already setup to use the interrupt remapping table. This fixes the following panic seen on AMD Rome boxes:
(XEN) [ 10.082154] ENABLING IO-APIC IRQs (XEN) [ 10.087789] -> Using new ACK method (XEN) [ 10.093738] Assertion 'get_rte_index(rte) == offset' failed at iommu_intr.c:328
---
Cc: Juergen Gross <[email protected]>
--- xen/arch/x86/io_apic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
xen/arch/x86/io_apic.c +4 -4
@@ -514,13 +514,13 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) entry.mask =1 ;__ioapic_write_entry (apic, pin, false, entry); } - entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { entry.trigger =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry); }__io_apic_eoi (apic, entry.vector, pin); }
@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry); - entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr)printk (KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n" ,IO_APIC_ID (apic), pin);
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 3 lines · Roger Pau Monne
clear_IO_APIC_pincan be called after the iommu has been enabled, and using raw entry reads and writes will result in a misconfiguration of the entries already setup to use the interrupt remapping table.
I'm afraid I don't understand this: Raw reads and writes don't even go to the IOMMU interrupt remapping code, so how would the assertion be triggered?
Quoted 5 lines
(XEN) [ 10.082154] ENABLING IO-APIC IRQs (XEN) [ 10.087789] -> Using new ACK method (XEN) [ 10.093738] Assertion 'get_rte_index(rte) == offset' failed at iommu_intr.c:328Signed-off-by Roger Pau Monné <[email protected]>
"Reported-by: Sergey ..." ahead of this?
Quoted 6 lines
xen/arch/x86/io_apic.c +0
-0@@ -514,13 +514,13 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) entry.mask =1 ;__ioapic_write_entry (apic, pin, false, entry); }
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 524
Quoted 10 lines
xen/arch/x86/io_apic.c +2
-2- entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { entry.trigger =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry); }
All we do here is set the trigger bit. No translation back and forth of the RTE should be needed.
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines
xen/arch/x86/io_apic.c +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry);
I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 538
Quoted 5 lines
xen/arch/x86/io_apic.c +1
-1- entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr)printk (KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n" ,IO_APIC_ID (apic), pin);
This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 8 lines · Jan Beulich
Quoted 3 lines · Roger Pau Monne
clear_IO_APIC_pincan be called after the iommu has been enabled, and using raw entry reads and writes will result in a misconfiguration of the entries already setup to use the interrupt remapping table.I'm afraid I don't understand this: Raw reads and writes don't even go to the IOMMU interrupt remapping code, so how would the assertion be triggered?
Because the code does something like:
memset(&rte, 0, ...);
...__ioapic_write_entry(apic, pin, true, rte);
At which point you misconfigure an ioapic entry that was already setup to point to an interrupt remapping entry, and the AMD IOMMU code chokes in the assert below.
Quoted 8 lines
Quoted 6 lines
(XEN) [ 10.082154] ENABLING IO-APIC IRQs (XEN) [ 10.087789] -> Using new ACK method (XEN) [ 10.093738] Assertion 'get_rte_index(rte) == offset' failed at iommu_intr.c:328Signed-off-by Roger Pau Monné <[email protected]>"Reported-by: Sergey ..." ahead of this?
Oh yes.
Quoted 20 lines
Quoted 6 lines
xen/arch/x86/io_apic.c +0
-0@@ -514,13 +514,13 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) entry.mask =1 ;__ioapic_write_entry (apic, pin, false, entry); }xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 524
Quoted 10 lines
xen/arch/x86/io_apic.c +2
-2- entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { entry.trigger =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry); }All we do here is set the trigger bit. No translation back and forth of the RTE should be needed.
Quoted 9 lines
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines
xen/arch/x86/io_apic.c +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry);I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
Yes, this is the one that's actually incorrect, but see my reasoning below.
Quoted 10 lines
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 538
Quoted 6 lines
xen/arch/x86/io_apic.c +1
-1- entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr)printk (KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n" ,IO_APIC_ID (apic), pin);This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
TBH, I think raw mode should only be used by the iommu code in order to setup the entries to point to the interrupt remapping table, everything else shouldn't be using raw mode. While it's true that some of the cases here are safe to use raw mode I would discourage it's usage as it can lead to issues, and this is not a performance critical path anyway.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 12 lines · Roger Pau Monné
Quoted 8 lines · Jan Beulich
Quoted 3 lines · Roger Pau Monne
clear_IO_APIC_pincan be called after the iommu has been enabled, and using raw entry reads and writes will result in a misconfiguration of the entries already setup to use the interrupt remapping table.I'm afraid I don't understand this: Raw reads and writes don't even go to the IOMMU interrupt remapping code, so how would the assertion be triggered?
Because the code does something like:
Quoted 7 lines
memset(&rte, 0, ...);
...__ioapic_write_entry(apic, pin, true, rte);At which point you misconfigure an ioapic entry that was already setup to point to an interrupt remapping entry, and the AMD IOMMU code chokes in the assert below.
Just to clarify since I think my reply hasn't been fully clear, the ASSERT doesn't trigger in clear_IO_APIC_pin, but at a later point when the IO-APIC entry is configured.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
In reply to Roger Pau MonnéQuoted 26 lines · Roger Pau Monné
Quoted 10 lines · Jan Beulich
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines · Roger Pau Monne
xen/arch/x86/io_apic.c +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry);I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
Yes, this is the one that's actually incorrect, but see my reasoning below.
Quoted 10 lines
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 538
Quoted 6 lines
xen/arch/x86/io_apic.c +1
-1- entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr)printk (KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n" ,IO_APIC_ID (apic), pin);This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
Quoted 6 lines
TBH, I think raw mode should only be used by the iommu code in order to setup the entries to point to the interrupt remapping table, everything else shouldn't be using raw mode. While it's true that some of the cases here are safe to use raw mode I would discourage it's usage as it can lead to issues, and this is not a performance critical path anyway.
You also should take the other possible perspective - not using raw mode means going through interrupt remapping logic, which can (needlessly) trigger errors. I think you want to break the patch into a necessary and an optional part. The optional part should be discussed separately and deferred until after 4.13.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 34 lines · Jan Beulich
Quoted 26 lines · Roger Pau Monné
Quoted 10 lines · Jan Beulich
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines · Roger Pau Monne
xen/arch/x86/io_apic.c +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry);I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
Yes, this is the one that's actually incorrect, but see my reasoning below.
Quoted 10 lines
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 538
Quoted 6 lines
xen/arch/x86/io_apic.c +1
-1- entry =__ioapic_read_entry (apic, pin, true); + entry =__ioapic_read_entry (apic, pin, false);if (entry.irr)printk (KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n" ,IO_APIC_ID (apic), pin);This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
Quoted 6 lines
TBH, I think raw mode should only be used by the iommu code in order to setup the entries to point to the interrupt remapping table, everything else shouldn't be using raw mode. While it's true that some of the cases here are safe to use raw mode I would discourage it's usage as it can lead to issues, and this is not a performance critical path anyway.
Quoted 5 lines
You also should take the other possible perspective - not using raw mode means going through interrupt remapping logic, which can (needlessly) trigger errors. I think you want to break the patch into a necessary and an optional part. The optional part should be discussed separately and deferred until after 4.13.
IMO generic IO-APIC code has not business playing with raw entries when interrupt remapping is enabled, the layout of IO-APIC entries in that case is vendor-specific, and hence the generic IO-APIC code is not able to parse it.
For example the code in clear_IO_APIC_pin modifies the mask or the trigger fields of RAW entries, is there any guarantee that those fields don't have different meanings/layout when interrupt remapping is enabled?
I can split the specific bugfix into a separate patch, but IMO the code in clear_IO_APIC_pin is not safe.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 46 lines · Roger Pau Monné
Quoted 34 lines · Jan Beulich
Quoted 26 lines · Roger Pau Monné
Quoted 10 lines · Jan Beulich
Review static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines · Roger Pau Monne
(quoted diff) +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) */ memset(&entry, 0, sizeof(entry)); entry.mask = 1; - __ioapic_write_entry(apic, pin, true, entry); + __ioapic_write_entry(apic, pin, false, entry);I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
Yes, this is the one that's actually incorrect, but see my reasoning below.
Quoted 10 lines
Review static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 537
Quoted 6 lines
(quoted diff) +1
-1- entry = __ioapic_read_entry(apic, pin, true); + entry = __ioapic_read_entry(apic, pin, false); if (entry.irr) printk(KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n", IO_APIC_ID(apic), pin);This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
Quoted 6 lines
TBH, I think raw mode should only be used by the iommu code in order to setup the entries to point to the interrupt remapping table, everything else shouldn't be using raw mode. While it's true that some of the cases here are safe to use raw mode I would discourage it's usage as it can lead to issues, and this is not a performance critical path anyway.
Quoted 5 lines
You also should take the other possible perspective - not using raw mode means going through interrupt remapping logic, which can (needlessly) trigger errors. I think you want to break the patch into a necessary and an optional part. The optional part should be discussed separately and deferred until after 4.13.
IMO generic IO-APIC code has not business playing with raw entries when interrupt remapping is enabled, the layout of IO-APIC entries in that case is vendor-specific, and hence the generic IO-APIC code is not able to parse it.
Quoted 4 lines
For example the code in
clear_IO_APIC_pinmodifies the mask or the trigger fields of RAW entries, is there any guarantee that those fields don't have different meanings/layout when interrupt remapping is enabled?
From an abstract pov there's no such guarantee, but in practice the meaning of the fields doesn't change. You make a good point though nevertheless: For VT-d the trigger mode fields in RTE and IRTE need to match, so the interrupt remapping code needs to see the trigger mode change. See below for a possible alternative patch.
Quoted 2 lines
I can split the specific bugfix into a separate patch, but IMO the code in
clear_IO_APIC_pinis not safe.
A change is needed, yes, but in particular because of the use of the function from clear_IO_APIC(), in turn called from disable_IO_APIC(), yet in turn used e.g. during emergency shutdown after a crash, I'd like the function to do as simple operations as possible, i.e. specifically avoid going through interrupt remapping code (because its data structures may also be corrupted at that point) unless really needed (hence the alternative patch suggestion below).
As an aside, iommu_crash_shutdown() - even if actually doing something, i.e. disabling interrupt remapping - does _not_ cause the RTEs to be re-written in non-translated format.
Jan
xen/arch/x86/io_apic.c +3 -2
@@ -519,8 +519,9 @@ static void clear_IO_APIC_pin(unsigned iif (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { + entry =__ioapic_read_entry (apic, pin, false); entry.trigger =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, false, entry); }__io_apic_eoi (apic, entry.vector, pin); }
@@ -530,7 +531,7 @@ static void clear_IO_APIC_pin(unsigned i*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, false, entry); entry =__ioapic_read_entry (apic, pin, TRUE);if (entry.irr)
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 62 lines · Jan Beulich
Quoted 46 lines · Roger Pau Monné
Quoted 34 lines · Jan Beulich
Quoted 26 lines · Roger Pau Monné
Quoted 10 lines · Jan Beulich
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines · Roger Pau Monne
xen/arch/x86/io_apic.c +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry);I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
Yes, this is the one that's actually incorrect, but see my reasoning below.
Quoted 10 lines
Review static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 537
Quoted 6 lines
(quoted diff) +1
-1- entry = __ioapic_read_entry(apic, pin, true); + entry = __ioapic_read_entry(apic, pin, false); if (entry.irr) printk(KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n", IO_APIC_ID(apic), pin);This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
Quoted 6 lines
TBH, I think raw mode should only be used by the iommu code in order to setup the entries to point to the interrupt remapping table, everything else shouldn't be using raw mode. While it's true that some of the cases here are safe to use raw mode I would discourage it's usage as it can lead to issues, and this is not a performance critical path anyway.
Quoted 5 lines
You also should take the other possible perspective - not using raw mode means going through interrupt remapping logic, which can (needlessly) trigger errors. I think you want to break the patch into a necessary and an optional part. The optional part should be discussed separately and deferred until after 4.13.
IMO generic IO-APIC code has not business playing with raw entries when interrupt remapping is enabled, the layout of IO-APIC entries in that case is vendor-specific, and hence the generic IO-APIC code is not able to parse it.
Quoted 4 lines
For example the code in
clear_IO_APIC_pinmodifies the mask or the trigger fields of RAW entries, is there any guarantee that those fields don't have different meanings/layout when interrupt remapping is enabled?From an abstract pov there's no such guarantee, but in practice the meaning of the fields doesn't change. You make a good point though nevertheless: For VT-d the trigger mode fields in RTE and IRTE need to match, so the interrupt remapping code needs to see the trigger mode change. See below for a possible alternative patch.
Quoted 2 lines
I can split the specific bugfix into a separate patch, but IMO the code in
clear_IO_APIC_pinis not safe.
Quoted 8 lines
A change is needed, yes, but in particular because of the use of the function from
clear_IO_APIC(), in turn called fromdisable_IO_APIC(), yet in turn used e.g. during emergency shutdown after a crash, I'd like the function to do as simple operations as possible, i.e. specifically avoid going through interrupt remapping code (because its data structures may also be corrupted at that point) unless really needed (hence the alternative patch suggestion below).
Isn't just masking the entries fine when disabling the IO-APIC, or a full wipe of all the entries is required?
I would be fine with having a maskall_IO_APIC function that reads entries in raw format, sets the mask bit and writes the entry back in raw format as long as it's annotated that this is done in order to limit as much a possible the chances of hitting corrupted data in the crash case.
Quoted 3 lines
As an aside,
iommu_crash_shutdown()- even if actually doing something, i.e. disabling interrupt remapping - does _not_ cause the RTEs to be re-written in non-translated format.
I'm not sure whether that will work, it's possible that some entries can't be translated because they use x2APIC IDs, and thus don't fit in a non-translated IO-APIC entry.
Quoted 16 lines
Jan
xen/arch/x86/io_apic.c +2
-1@@ -519,8 +519,9 @@ static void clear_IO_APIC_pin(unsigned iif (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { + entry =__ioapic_read_entry (apic, pin, false); entry.trigger =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, false, entry); }__io_apic_eoi (apic, entry.vector, pin); }
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned i · line 537
Quoted 8 lines
xen/arch/x86/io_apic.c +1
-1@@ -530,7 +531,7 @@ static void clear_IO_APIC_pin(unsigned i*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, false, entry); entry =__ioapic_read_entry (apic, pin, TRUE);if (entry.irr)
Well, this is certainly better than what's there currently, and should fix the issue reported by Sergey, albeit I still think checking the irr or the trigger fields of a raw entry when using interrupt remapping is not safe future wise.
There's no guarantee that future interrupt remapping implementations don't clobber the non-translated fields with different ones when using a remapped IO-APIC entry, and hence while this fixes the current issue at hand it seems fragile.
Anyway, I think this should be fixed ASAP, so if you are happy with this version that's fine for me. Do you want me to pick this up and rebase it on top of my TRUE/FALSE removal patch, or would you rather send it formally standalone?
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.13 2/2] x86/ioapic: don't use raw entry reads/writes in clear_IO_APIC_pin
Quoted 72 lines · Roger Pau Monné
Quoted 62 lines · Jan Beulich
Quoted 46 lines · Roger Pau Monné
Quoted 34 lines · Jan Beulich
Quoted 26 lines · Roger Pau Monné
Quoted 10 lines · Jan Beulich
xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 533
Quoted 6 lines · Roger Pau Monne
xen/arch/x86/io_apic.c +1
-1@@ -530,9 +530,9 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, true, entry); +__ioapic_write_entry (apic, pin, false, entry);I may be able to understand why this one can't use raw mode, but as per above a better overall description is needed.
Yes, this is the one that's actually incorrect, but see my reasoning below.
Quoted 10 lines
Review static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) · line 537
Quoted 6 lines
(quoted diff) +1
-1- entry = __ioapic_read_entry(apic, pin, true); + entry = __ioapic_read_entry(apic, pin, false); if (entry.irr) printk(KERN_ERR "IO-APIC%02x-%u: Unable to reset IRR\n", IO_APIC_ID(apic), pin);This read again shouldn't need conversion, as the IRR bit doesn't get touched (I think) by the interrupt remapping code during the translation it does.
Quoted 6 lines
TBH, I think raw mode should only be used by the iommu code in order to setup the entries to point to the interrupt remapping table, everything else shouldn't be using raw mode. While it's true that some of the cases here are safe to use raw mode I would discourage it's usage as it can lead to issues, and this is not a performance critical path anyway.
Quoted 5 lines
You also should take the other possible perspective - not using raw mode means going through interrupt remapping logic, which can (needlessly) trigger errors. I think you want to break the patch into a necessary and an optional part. The optional part should be discussed separately and deferred until after 4.13.
IMO generic IO-APIC code has not business playing with raw entries when interrupt remapping is enabled, the layout of IO-APIC entries in that case is vendor-specific, and hence the generic IO-APIC code is not able to parse it.
Quoted 4 lines
For example the code in
clear_IO_APIC_pinmodifies the mask or the trigger fields of RAW entries, is there any guarantee that those fields don't have different meanings/layout when interrupt remapping is enabled?From an abstract pov there's no such guarantee, but in practice the meaning of the fields doesn't change. You make a good point though nevertheless: For VT-d the trigger mode fields in RTE and IRTE need to match, so the interrupt remapping code needs to see the trigger mode change. See below for a possible alternative patch.
Quoted 2 lines
I can split the specific bugfix into a separate patch, but IMO the code in
clear_IO_APIC_pinis not safe.Quoted 8 lines
A change is needed, yes, but in particular because of the use of the function from
clear_IO_APIC(), in turn called fromdisable_IO_APIC(), yet in turn used e.g. during emergency shutdown after a crash, I'd like the function to do as simple operations as possible, i.e. specifically avoid going through interrupt remapping code (because its data structures may also be corrupted at that point) unless really needed (hence the alternative patch suggestion below).
Quoted 2 lines
Isn't just masking the entries fine when disabling the IO-APIC, or a full wipe of all the entries is required?
Just masking the RTE _should_ be fine (but you never know).
Quoted 5 lines
I would be fine with having a
maskall_IO_APICfunction that reads entries in raw format, sets the mask bit and writes the entry back in raw format as long as it's annotated that this is done in order to limit as much a possible the chances of hitting corrupted data in the crash case.
Right, certainly something we may want to do for 4.14.
Quoted 7 lines
Quoted 3 lines
As an aside,
iommu_crash_shutdown()- even if actually doing something, i.e. disabling interrupt remapping - does _not_ cause the RTEs to be re-written in non-translated format.I'm not sure whether that will work, it's possible that some entries can't be translated because they use x2APIC IDs, and thus don't fit in a non-translated IO-APIC entry.
And of course there's no expectation that interrupts would still work, but any inspection (e.g. via dumping) of the RTEs would be misleading at that point.
Quoted 33 lines
Quoted 14 lines
xen/arch/x86/io_apic.c +2
-1@@ -519,8 +519,9 @@ static void clear_IO_APIC_pin(unsigned iif (entry.irr) {/* Make sure the trigger mode is set to level. */ if (!entry.trigger) { + entry =__ioapic_read_entry (apic, pin, false); entry.trigger =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, false, entry); }__io_apic_eoi (apic, entry.vector, pin); }xen/arch/x86/io_apic.c static void clear_IO_APIC_pin(unsigned i · line 537
Quoted 8 lines
xen/arch/x86/io_apic.c +1
-1@@ -530,7 +531,7 @@ static void clear_IO_APIC_pin(unsigned i*/ memset (&entry,0 ,sizeof (entry)); entry.mask =1 ; -__ioapic_write_entry (apic, pin, TRUE, entry); +__ioapic_write_entry (apic, pin, false, entry); entry =__ioapic_read_entry (apic, pin, TRUE);if (entry.irr)Well, this is certainly better than what's there currently, and should fix the issue reported by Sergey, albeit I still think checking the irr or the trigger fields of a raw entry when using interrupt remapping is not safe future wise.
There's no guarantee that future interrupt remapping implementations don't clobber the non-translated fields with different ones when using a remapped IO-APIC entry, and hence while this fixes the current issue at hand it seems fragile.
Quoted 4 lines
Anyway, I think this should be fixed ASAP, so if you are happy with this version that's fine for me. Do you want me to pick this up and rebase it on top of my TRUE/FALSE removal patch, or would you rather send it formally standalone?
I'd appreciate you making this a v2 of your original patch, ideally with a further improved description.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel