diff for duplicates of <31d6e625-b89d-c183-0b38-0ab8ec202e47@arm.com> diff --git a/a/1.txt b/N1/1.txt index 8d0980d..cd05172 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,15 +51,15 @@ https://lore.kernel.org/linux-iommu/4ea5eb64246f1ee188d1a61c3e93b37756932eb7.165 > driver->ops->detach_group(container->iommu_data, > group->iommu_group); > -> - if (group->type = VFIO_IOMMU) -> + if (group->type = VFIO_IOMMU && iommu_group_dma_owner_claimed(group->iommu_group)) +> - if (group->type == VFIO_IOMMU) +> + if (group->type == VFIO_IOMMU && iommu_group_dma_owner_claimed(group->iommu_group)) > iommu_group_release_dma_owner(group->iommu_group); > > group->container = NULL; > @@ -1010,9 +1011,8 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) > } > -> if (group->type = VFIO_IOMMU) { +> if (group->type == VFIO_IOMMU) { > - ret = iommu_group_claim_dma_owner(group->iommu_group, f.file); > - if (ret) > - goto unlock_out; @@ -72,8 +72,8 @@ https://lore.kernel.org/linux-iommu/4ea5eb64246f1ee188d1a61c3e93b37756932eb7.165 > group->iommu_group, > group->type); > if (ret) { -> - if (group->type = VFIO_IOMMU) -> + if (group->type = VFIO_IOMMU && +> - if (group->type == VFIO_IOMMU) +> + if (group->type == VFIO_IOMMU && > + iommu_group_dma_owner_claimed(group->iommu_group)) > iommu_group_release_dma_owner( > group->iommu_group); diff --git a/a/content_digest b/N1/content_digest index 199dab0..92d601b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020220701061751.1955857-1-aik@ozlabs.ru\0" "From\0Robin Murphy <robin.murphy@arm.com>\0" "Subject\0Re: [RFC PATCH kernel] vfio: Skip checking for IOMMU_CAP_CACHE_COHERENCY on POWER and more\0" - "Date\0Fri, 01 Jul 2022 10:34:20 +0000\0" + "Date\0Fri, 1 Jul 2022 11:34:20 +0100\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>" " kvm@vger.kernel.org\0" "Cc\0Lu Baolu <baolu.lu@linux.intel.com>" @@ -65,15 +65,15 @@ "> \t\tdriver->ops->detach_group(container->iommu_data,\n" "> \t\t\t\t\t group->iommu_group);\n" "> \n" - "> -\tif (group->type = VFIO_IOMMU)\n" - "> +\tif (group->type = VFIO_IOMMU && iommu_group_dma_owner_claimed(group->iommu_group))\n" + "> -\tif (group->type == VFIO_IOMMU)\n" + "> +\tif (group->type == VFIO_IOMMU && iommu_group_dma_owner_claimed(group->iommu_group))\n" "> \t\tiommu_group_release_dma_owner(group->iommu_group);\n" "> \n" "> \tgroup->container = NULL;\n" "> @@ -1010,9 +1011,8 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd)\n" "> \t}\n" "> \n" - "> \tif (group->type = VFIO_IOMMU) {\n" + "> \tif (group->type == VFIO_IOMMU) {\n" "> -\t\tret = iommu_group_claim_dma_owner(group->iommu_group, f.file);\n" "> -\t\tif (ret)\n" "> -\t\t\tgoto unlock_out;\n" @@ -86,11 +86,11 @@ "> \t\t\t\t\t\tgroup->iommu_group,\n" "> \t\t\t\t\t\tgroup->type);\n" "> \t\tif (ret) {\n" - "> -\t\t\tif (group->type = VFIO_IOMMU)\n" - "> +\t\t\tif (group->type = VFIO_IOMMU &&\n" + "> -\t\t\tif (group->type == VFIO_IOMMU)\n" + "> +\t\t\tif (group->type == VFIO_IOMMU &&\n" "> +\t\t\t iommu_group_dma_owner_claimed(group->iommu_group))\n" "> \t\t\t\tiommu_group_release_dma_owner(\n" "> \t\t\t\t\tgroup->iommu_group);\n" "> \t\t\tgoto unlock_out;" -a850ca1c07e7745d10376f0d83296199f892d5a919c6c226fc1438af30e0014c +271835f9dd7da29f602739cf34702e41616589db709769146e9e05407f0a77e4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.