9e9b5acb9c
5604f239-x86-PV-properly-populate-descriptor-tables.patch 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-0.patch 561d2046-VT-d-use-proper-error-codes-in-iommu_enable_x2apic_IR.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-handling.patch - bsc#951845 - VUL-0: CVE-2015-7972: xen: x86: populate-on-demand balloon size inaccuracy can crash guests (XSA-153) xsa153-libxl.patch - bsc#950703 - VUL-1: CVE-2015-7969: xen: leak of main per-domain vcpu pointer array (DoS) (XSA-149) xsa149.patch - bsc#950705 - VUL-1: CVE-2015-7969: xen: x86: leak of per-domain profiling-related vcpu pointer array (DoS) (XSA-151) xsa151.patch - bsc#950706 - VUL-0: CVE-2015-7971: xen: x86: some pmu and profiling hypercalls log without rate limiting (XSA-152) xsa152.patch - Dropped 55dc7937-x86-IO-APIC-don-t-create-pIRQ-mapping-from-masked-RTE.patch 5604f239-x86-PV-properly-populate-descriptor-tables.patch - bsc#932267 - VUL-1: CVE-2015-4037: qemu,kvm,xen: insecure temporary file use in /net/slirp.c CVE-2015-4037-qemuu-smb-config-dir-name.patch CVE-2015-4037-qemut-smb-config-dir-name.patch - bsc#877642 - VUL-0: CVE-2014-0222: qemu: qcow1: validate L2 table size to avoid integer overflows OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=382
114 lines
3.6 KiB
Diff
114 lines
3.6 KiB
Diff
# Commit 6851e979874ebc05d270ea94360c49d920d3eaf4
|
|
# Date 2015-10-13 17:16:22 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
VT-d: use proper error codes in iommu_enable_x2apic_IR()
|
|
|
|
... allowing to suppress a confusing message combination: When
|
|
ACPI_DMAR_X2APIC_OPT_OUT is set, so far we first logged a message
|
|
that IR could not be enabled (hence not using x2APIC), followed by
|
|
one indicating successful initialization of IR (if no other problems
|
|
prevented that).
|
|
|
|
Also adjust the return type of iommu_supports_eim() and fix some
|
|
broken indentation in the function.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Yang Zhang <yang.z.zhang@intel.com>
|
|
|
|
--- a/xen/arch/x86/apic.c
|
|
+++ b/xen/arch/x86/apic.c
|
|
@@ -946,8 +946,18 @@ void __init x2apic_bsp_setup(void)
|
|
mask_8259A();
|
|
mask_IO_APIC_setup(ioapic_entries);
|
|
|
|
- if ( iommu_enable_x2apic_IR() )
|
|
+ switch ( iommu_enable_x2apic_IR() )
|
|
{
|
|
+ case 0:
|
|
+ break;
|
|
+ case -ENXIO: /* ACPI_DMAR_X2APIC_OPT_OUT set */
|
|
+ if ( !x2apic_enabled )
|
|
+ {
|
|
+ printk("Not enabling x2APIC (upon firmware request)\n");
|
|
+ goto restore_out;
|
|
+ }
|
|
+ /* fall through */
|
|
+ default:
|
|
if ( x2apic_enabled )
|
|
panic("Interrupt remapping could not be enabled while "
|
|
"x2APIC is already enabled by BIOS");
|
|
--- a/xen/drivers/passthrough/vtd/intremap.c
|
|
+++ b/xen/drivers/passthrough/vtd/intremap.c
|
|
@@ -144,10 +144,10 @@ static void set_hpet_source_id(unsigned
|
|
set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_13_IGNORE_3, hpetid_to_bdf(id));
|
|
}
|
|
|
|
-int iommu_supports_eim(void)
|
|
+bool_t iommu_supports_eim(void)
|
|
{
|
|
struct acpi_drhd_unit *drhd;
|
|
- int apic;
|
|
+ unsigned int apic;
|
|
|
|
if ( !iommu_qinval || !iommu_intremap || list_empty(&acpi_drhd_units) )
|
|
return 0;
|
|
@@ -155,12 +155,12 @@ int iommu_supports_eim(void)
|
|
/* We MUST have a DRHD unit for each IOAPIC. */
|
|
for ( apic = 0; apic < nr_ioapics; apic++ )
|
|
if ( !ioapic_to_drhd(IO_APIC_ID(apic)) )
|
|
- {
|
|
+ {
|
|
dprintk(XENLOG_WARNING VTDPREFIX,
|
|
"There is not a DRHD for IOAPIC %#x (id: %#x)!\n",
|
|
apic, IO_APIC_ID(apic));
|
|
return 0;
|
|
- }
|
|
+ }
|
|
|
|
for_each_drhd_unit ( drhd )
|
|
if ( !ecap_queued_inval(drhd->iommu->ecap) ||
|
|
@@ -834,10 +834,10 @@ int iommu_enable_x2apic_IR(void)
|
|
struct iommu *iommu;
|
|
|
|
if ( !iommu_supports_eim() )
|
|
- return -1;
|
|
+ return -EOPNOTSUPP;
|
|
|
|
if ( !platform_supports_x2apic() )
|
|
- return -1;
|
|
+ return -ENXIO;
|
|
|
|
for_each_drhd_unit ( drhd )
|
|
{
|
|
@@ -862,7 +862,7 @@ int iommu_enable_x2apic_IR(void)
|
|
{
|
|
dprintk(XENLOG_INFO VTDPREFIX,
|
|
"Failed to enable Queued Invalidation!\n");
|
|
- return -1;
|
|
+ return -EIO;
|
|
}
|
|
}
|
|
|
|
@@ -874,7 +874,7 @@ int iommu_enable_x2apic_IR(void)
|
|
{
|
|
dprintk(XENLOG_INFO VTDPREFIX,
|
|
"Failed to enable Interrupt Remapping!\n");
|
|
- return -1;
|
|
+ return -EIO;
|
|
}
|
|
}
|
|
|
|
--- a/xen/include/asm-x86/iommu.h
|
|
+++ b/xen/include/asm-x86/iommu.h
|
|
@@ -28,7 +28,7 @@ int iommu_setup_hpet_msi(struct msi_desc
|
|
/* While VT-d specific, this must get declared in a generic header. */
|
|
int adjust_vtd_irq_affinities(void);
|
|
void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, int order, int present);
|
|
-int iommu_supports_eim(void);
|
|
+bool_t iommu_supports_eim(void);
|
|
int iommu_enable_x2apic_IR(void);
|
|
void iommu_disable_x2apic_IR(void);
|
|
|