From 076c34d12a341f3915a2d8021752e0641df07496 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 17 Sep 2019 16:05:34 +0200 Subject: [PATCH] AMD/IOMMU: let callers of amd_iommu_alloc_intremap_table() handle errors Additional users of the function will want to handle errors more gracefully. Remove the BUG_ON()s and make the current caller panic() instead. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/drivers/passthrough/amd/iommu_acpi.c | 4 ++++ xen/drivers/passthrough/amd/iommu_intr.c | 20 +++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 197f3e6403..8df034730f 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -86,6 +86,10 @@ static void __init add_ivrs_mapping_entry( ivrs_mappings[alias_id].intremap_table = shared_intremap_table; ivrs_mappings[alias_id].intremap_inuse = shared_intremap_inuse; } + + if ( !ivrs_mappings[alias_id].intremap_table ) + panic("No memory for %04x:%02x:%02x.%u's IRT\n", iommu->seg, + PCI_BUS(alias_id), PCI_SLOT(alias_id), PCI_FUNC(alias_id)); } ivrs_mappings[alias_id].valid = true; diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index 4f8a56f9c5..e3018e16f4 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -817,12 +817,22 @@ int __init amd_iommu_free_intremap_table( void *__init amd_iommu_alloc_intremap_table( const struct amd_iommu *iommu, unsigned long **inuse_map) { - void *tb = __alloc_amd_iommu_tables(intremap_table_order(iommu)); + unsigned int order = intremap_table_order(iommu); + void *tb = __alloc_amd_iommu_tables(order); + + if ( tb ) + { + *inuse_map = xzalloc_array(unsigned long, + BITS_TO_LONGS(INTREMAP_ENTRIES)); + if ( *inuse_map ) + memset(tb, 0, PAGE_SIZE << order); + else + { + __free_amd_iommu_tables(tb, order); + tb = NULL; + } + } - BUG_ON(tb == NULL); - memset(tb, 0, PAGE_SIZE << intremap_table_order(iommu)); - *inuse_map = xzalloc_array(unsigned long, BITS_TO_LONGS(INTREMAP_ENTRIES)); - BUG_ON(*inuse_map == NULL); return tb; } -- 2.30.2