iommu/amd: Only free resources once on init error (5c90501a) · Commits · 戴 / test

When amd_iommu=off was specified on the command line, free_X_resources functions were called immediately after early_amd_iommu_init. They were then called again when amd_iommu_init also failed (as expected). Instead, call them only once: at the end of state_next() whenever there's an error. These functions should be safe to call any time and any number of times. However, since state_next is never called again in an error state, the cleanup will only ever be run once. This also ensures that cleanup code is run as soon as possible after an error is detected rather than waiting for amd_iommu_init() to be called. Signed-off-by:

Kevin Mitchell <kevmitch@arista.com> Signed-off-by:

Joerg Roedel <jroedel@suse.de>

drivers/iommu/amd_iommu_init.c

+13 −14

Original line number	Diff line number	Diff line
		@@ -2631,8 +2631,6 @@ static int __init state_next(void)
		init_state = ret ? IOMMU_INIT_ERROR : IOMMU_ACPI_FINISHED;
		if (init_state == IOMMU_ACPI_FINISHED && amd_iommu_disabled) {
		pr_info("AMD IOMMU disabled on kernel command-line\n");
		free_dma_resources();
		free_iommu_resources();
		init_state = IOMMU_CMDLINE_DISABLED;
		ret = -EINVAL;
		}
		@@ -2673,6 +2671,19 @@ static int __init state_next(void)
		BUG();
		}

		if (ret) {
		free_dma_resources();
		if (!irq_remapping_enabled) {
		disable_iommus();
		free_iommu_resources();
		} else {
		struct amd_iommu *iommu;

		uninit_device_table_dma();
		for_each_iommu(iommu)
		iommu_flush_all_caches(iommu);
		}
		}
		return ret;
		}

		@@ -2746,18 +2757,6 @@ static int __init amd_iommu_init(void)
		int ret;

		ret = iommu_go_to_state(IOMMU_INITIALIZED);
		if (ret) {
		free_dma_resources();
		if (!irq_remapping_enabled) {
		disable_iommus();
		free_iommu_resources();
		} else {
		uninit_device_table_dma();
		for_each_iommu(iommu)
		iommu_flush_all_caches(iommu);
		}
		}

		#ifdef CONFIG_GART_IOMMU
		if (ret && list_empty(&amd_iommu_list)) {
		/*

Admin message