Message ID | 20250410064447.29583-2-sarunkod@amd.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | amd_iommu: Fixes | expand |
+ Michael, On 4/10/2025 12:14 PM, Sairaj Kodilkar wrote: > Current amd_iommu enables the iommu_nodma address space when pt_supported > flag is on. This causes device to bypass the IOMMU and use untranslated > address to perform DMA when guest kernel uses DMA mode, resulting in > failure to setup the devices in the guest. > > Fix the issue by removing pt_supported check and disabling nodma memory > region. Adding pt_supported requires additional changes and we will look > into it later. > > Fixes: c1f46999ef506 ("amd_iommu: Add support for pass though mode") > Signed-off-by: Sairaj Kodilkar <sarunkod@amd.com> Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> -Vasant
Hi Alejandro, On 4/15/2025 1:56 AM, Alejandro Jimenez wrote: > Hi Sairaj, > > I'm conflicted by the implementation of the change, so I'd like to make > sure I fully understand... > > On 4/10/25 2:44 AM, Sairaj Kodilkar wrote: >> Current amd_iommu enables the iommu_nodma address space when pt_supported >> flag is on. > > As it should, that is the intended purpose of the iommu_nodma memory > region. > > This causes device to bypass the IOMMU and use untranslated >> address to perform DMA when guest kernel uses DMA mode, resulting in >> failure to setup the devices in the guest. > > So the scenario you are describing above is this QEMU cmdline (using > explicit options): > > -device amd-iommu,intremap=on,xtsup=on,pt=on \ > -device vfio-pci,host=0000:a1:00.1... > > and guest forcing DMA remap mode e.g. 'iommu.passthrough=0' > > which will cause failures from QEMU: > > qemu-system-x86_64: AHCI: Failed to start DMA engine: bad command list > buffer address > qemu-system-x86_64: AHCI: Failed to start FIS receive engine: bad FIS > receive buffer address > qemu-system-x86_64: AHCI: Failed to start DMA engine: bad command list > buffer address > qemu-system-x86_64: AHCI: Failed to start FIS receive engine: bad FIS > receive buffer address > qemu-system-x86_64: AHCI: Failed to start DMA engine: bad command list > buffer address > > and also errors from the VF driver on the guest. e.g.: > > [ 69.424937] mlx5_core 0000:00:03.0: mlx5_function_enable:1212:(pid > 2492): enable hca failed > [ 69.437048] mlx5_core 0000:00:03.0: probe_one:1994:(pid 2492): > mlx5_init_one failed with error code -110 > [ 69.444913] mlx5_core 0000:00:03.0: probe with driver mlx5_core > failed with error -110 > > > Whereas after your change the guest would fail to launch because VFIO > will try to register a MAP notifier for the device and fail the check in > amdvi_iommu_notify_flag_changed(). > > If my above description is correct, then... > Yep, The above description is correct. I should have included it in the cover letter. >> >> Fix the issue by removing pt_supported check and disabling nodma memory >> region. Adding pt_supported requires additional changes and we will look >> into it later. > > I see that you are trying to essentially block a guest from enabling an > IOMMU feature that is not currently supported by the vIOMMU. Hopefully > that limitation will be solved soon (shameless plug): > https://lore.kernel.org/qemu-devel/20250414020253.443831-1- > alejandro.j.jimenez@oracle.com/ > > But in the meantime, I think enabling amdvi_dev_as->iommu when DMA > remapping capability is not available is likely to cause more confusion > for anyone trying to understand the already convoluted details of the > memory region setup. > To a reader of the code and the commit message, it > is confusing that to support the "NO DMA" case, the nodma memory region > must be disabled, which is the opposite of what it is meant to do. > I dont think that I understand above statement. What do you mean by "NO DMA" case here ? is it iommu.passthrough=0 ? Essentially, I am trying to support the "DMA" case that is iommu.passthrough=0 for the emulated devices, by reverting the changes that introduced the regression. If I understand correct --> The original intent of the flag (in case of Intel) is 1. To turn on the optimization which will use nodma region (dynamically enabling it) if guest configures the device with passthrough (pt=1) for given context entry. 2. The flag should not enable no_dma region if guest does not configure device with pt. Intel driver does this dynamically (for every context entry update while guest is running). But for AMD this is static and does not change with the DTE updates, which is causing this regression. > To explain the "trick": this change is always enabling amdvi_dev_as- > >iommu, which is explicitly created as an IOMMU memory region (i.e. a > memory region with mr->is_iommu == true), and it is meant to support DMA > remapping. It is relying on the "side effect" that VFIO will try to > register notifiers for memory regions that are an "IOMMU" (i.e. pass the > check in memory_region_is_iommu()), and later fail when trying to > register the notifier. > > If this change is merged, I think you should at least include the > explanation above in the commit message, since it is not obvious to me > at first reading. That being said, in my opinion, this approach adds > potential confusion that is not worth the trouble, since most guests > will not be using AMD vIOMMU at this point. And if they are, they would > also have to be specifically requesting to enable DMA translation to hit > the problem. Unfortunately, guests will always have the ability of > specifying an invalid configuration if they try really hard (or not hard > at all in this case). > Yep, I should have explained it in details. Sorry about the confusion will keep in mind while sending future patches. Regards Sairaj > Alejandro > >> >> Fixes: c1f46999ef506 ("amd_iommu: Add support for pass though mode") >> Signed-off-by: Sairaj Kodilkar <sarunkod@amd.com> >> --- >> hw/i386/amd_iommu.c | 12 ++---------- >> 1 file changed, 2 insertions(+), 10 deletions(-) >> >> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c >> index 5f9b95279997..df8ba5d39ada 100644 >> --- a/hw/i386/amd_iommu.c >> +++ b/hw/i386/amd_iommu.c >> @@ -1426,7 +1426,6 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus >> *bus, void *opaque, int devfn) >> AMDVIState *s = opaque; >> AMDVIAddressSpace **iommu_as, *amdvi_dev_as; >> int bus_num = pci_bus_num(bus); >> - X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); >> iommu_as = s->address_spaces[bus_num]; >> @@ -1486,15 +1485,8 @@ static AddressSpace >> *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) >> AMDVI_INT_ADDR_FIRST, >> &amdvi_dev_as->iommu_ir, >> 1); >> - if (!x86_iommu->pt_supported) { >> - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, >> false); >> - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as- >> >iommu), >> - true); >> - } else { >> - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as- >> >iommu), >> - false); >> - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, true); >> - } >> + memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); >> + memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as- >> >iommu), true); >> } >> return &iommu_as[devfn]->as; >> } >
On 4/15/25 2:38 AM, Sairaj Kodilkar wrote: > > > Hi Alejandro, > > On 4/15/2025 1:56 AM, Alejandro Jimenez wrote: > >> Hi Sairaj, >> >> I'm conflicted by the implementation of the change, so I'd like to >> make sure I fully understand... >> >> On 4/10/25 2:44 AM, Sairaj Kodilkar wrote: >>> Fix the issue by removing pt_supported check and disabling nodma memory >>> region. Adding pt_supported requires additional changes and we will look >>> into it later. >> >> I see that you are trying to essentially block a guest from enabling >> an IOMMU feature that is not currently supported by the vIOMMU. >> Hopefully that limitation will be solved soon (shameless plug): >> https://lore.kernel.org/qemu-devel/20250414020253.443831-1- >> alejandro.j.jimenez@oracle.com/ >> >> But in the meantime, I think enabling amdvi_dev_as->iommu when DMA >> remapping capability is not available is likely to cause more >> confusion for anyone trying to understand the already convoluted >> details of the memory region setup. > >> To a reader of the code and the commit message, it is confusing that >> to support the "NO DMA" case, the nodma memory region must be >> disabled, which is the opposite of what it is meant to do. >> > > I dont think that I understand above statement. What do you mean by "NO > DMA" case here ? is it iommu.passthrough=0 ? I meant it from the point of view of the vIOMMU configuration (since we don't control what the guest can request). So in terms of vIOMMU modes and corresponding Memory Regions that must be enabled to support such modes, I see it as: Passthrough(NO DMA) --> MR: iommu_nodma: enabled && iommu: disabled DMA remap --> MR: iommu: enabled && iommu_nodma: disabled But I recognize that view/model is probably too rigid for now, although it should be the "correct state" once we support DMA remapping. > > Essentially, I am trying to support the "DMA" case that is > iommu.passthrough=0 for the emulated devices, by reverting the changes> that introduced the regression. I understand the goal is to make emulated devs to work in more scenarios. Because of that view that I mention above, is why I don't think of c1f46999ef506 ("amd_iommu: Add support for pass though mode") as introducing a regression, but more of a prerequisite to support both PT and DMA modes. > > If I understand correct --> > The original intent of the flag (in case of Intel) is > > 1. To turn on the optimization which will use nodma region (dynamically > enabling it) if guest configures the device with passthrough (pt=1) > for given context entry. This is why I said I am conflicted with the implementation. Your change always disables the iommu_nodma region, where the default for Linux guests is to use passthrough mode, which "normally" would result in iommu_nodma being enabled. I almost suggested on my first reply that you instead forced x86_iommu->pt_supported = 0 in the AMDVi code, but that creates a similar type of contradiction. In short, I understand what you are trying to do, but I think "the trick" as I called it below should probably be documented. > > 2. The flag should not enable no_dma region if guest does not configure > device with pt. > > Intel driver does this dynamically (for every context entry update while > guest is running). But for AMD this is static and does not change with > the DTE updates, which is causing this regression. hopefully solved soon: https://lore.kernel.org/qemu-devel/20250414020253.443831-15-alejandro.j.jimenez@oracle.com/ Alejandro > >> To explain the "trick": this change is always enabling amdvi_dev_as- >> >iommu, which is explicitly created as an IOMMU memory region (i.e. a >> memory region with mr->is_iommu == true), and it is meant to support >> DMA remapping. It is relying on the "side effect" that VFIO will try >> to register notifiers for memory regions that are an "IOMMU" (i.e. >> pass the check in memory_region_is_iommu()), and later fail when >> trying to register the notifier. >> >> If this change is merged, I think you should at least include the >> explanation above in the commit message, since it is not obvious to me >> at first reading. That being said, in my opinion, this approach adds >> potential confusion that is not worth the trouble, since most guests >> will not be using AMD vIOMMU at this point. And if they are, they >> would also have to be specifically requesting to enable DMA >> translation to hit the problem. Unfortunately, guests will always have >> the ability of specifying an invalid configuration if they try really >> hard (or not hard at all in this case). >> > > Yep, I should have explained it in details. Sorry about the confusion > will keep in mind while sending future patches. > > Regards > Sairaj > >> Alejandro
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 5f9b95279997..df8ba5d39ada 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1426,7 +1426,6 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) AMDVIState *s = opaque; AMDVIAddressSpace **iommu_as, *amdvi_dev_as; int bus_num = pci_bus_num(bus); - X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s); iommu_as = s->address_spaces[bus_num]; @@ -1486,15 +1485,8 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) AMDVI_INT_ADDR_FIRST, &amdvi_dev_as->iommu_ir, 1); - if (!x86_iommu->pt_supported) { - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), - true); - } else { - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), - false); - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, true); - } + memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); + memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), true); } return &iommu_as[devfn]->as; }
Current amd_iommu enables the iommu_nodma address space when pt_supported flag is on. This causes device to bypass the IOMMU and use untranslated address to perform DMA when guest kernel uses DMA mode, resulting in failure to setup the devices in the guest. Fix the issue by removing pt_supported check and disabling nodma memory region. Adding pt_supported requires additional changes and we will look into it later. Fixes: c1f46999ef506 ("amd_iommu: Add support for pass though mode") Signed-off-by: Sairaj Kodilkar <sarunkod@amd.com> --- hw/i386/amd_iommu.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)