diff options
| author |   Christoph Hellwig <hch@lst.de> | 2021-09-24 17:57:03 +0200 |
|---|---|---|
| committer |   Alex Williamson <alex.williamson@redhat.com> | 2021-09-30 12:46:45 -0600 |
| commit | 65cdbf10633783647c45eb22f0e70f193fee3789 (patch) | |
| tree | 0753a442454722eb9dda790683901a12db4faff2 /drivers/vfio | |
| parent | vfio/spapr_tce: reject mediated devices (diff) | |
| download | linux-dev-65cdbf10633783647c45eb22f0e70f193fee3789.tar.xz linux-dev-65cdbf10633783647c45eb22f0e70f193fee3789.zip | |
vfio/iommu_type1: initialize pgsize_bitmap in ->open
Ensure pgsize_bitmap is always valid by initializing it to PAGE_MASK
in vfio_iommu_type1_open and remove the now pointless update for
the external domain case in vfio_iommu_type1_attach_group, which was
just setting pgsize_bitmap to PAGE_MASK when only external domains
were attached.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210924155705.4258-14-hch@lst.de
[aw: s/ULONG_MAX/PAGE_MASK/ per discussion in link]
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/vfio_iommu_type1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index a48e9f597cb2..27539603eb93 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2196,7 +2196,6 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, if (!iommu->external_domain) { INIT_LIST_HEAD(&domain->group_list); iommu->external_domain = domain; - vfio_update_pgsize_bitmap(iommu); } else { kfree(domain); } @@ -2582,6 +2581,7 @@ static void *vfio_iommu_type1_open(unsigned long arg) mutex_init(&iommu->lock); BLOCKING_INIT_NOTIFIER_HEAD(&iommu->notifier); init_waitqueue_head(&iommu->vaddr_wait); + iommu->pgsize_bitmap = PAGE_MASK; return iommu; } |