Commit 471b25a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd 

Pull iommufd fixes from Jason Gunthorpe:
 "Two very minor fixes:

   - Fix mismatched kvalloc()/kfree()

   - Spelling fixes in documentation"

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommufd: Fix spelling errors in iommufd.rst
  iommufd: viommu: free memory allocated by kvcalloc() using kvfree()
parents cf6fc5ee 447c6141

Documentation/userspace-api/iommufd.rst

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Following IOMMUFD objects are exposed to userspace: 


- IOMMUFD_OBJ_HWPT_PAGING, representing an actual hardware I/O page table

  (i.e. a single struct iommu_domain) managed by the iommu driver. "PAGING"

  primarly indicates this type of HWPT should be linked to an IOAS. It also

  primarily indicates this type of HWPT should be linked to an IOAS. It also

  indicates that it is backed by an iommu_domain with __IOMMU_DOMAIN_PAGING

  feature flag. This can be either an UNMANAGED stage-1 domain for a device

  running in the user space, or a nesting parent stage-2 domain for mappings
@@ -76,7 +76,7 @@ Following IOMMUFD objects are exposed to userspace: 


  * Security namespace for guest owned ID, e.g. guest-controlled cache tags

  * Non-device-affiliated event reporting, e.g. invalidation queue errors

  * Access to a sharable nesting parent pagetable across physical IOMMUs

  * Access to a shareable nesting parent pagetable across physical IOMMUs

  * Virtualization of various platforms IDs, e.g. RIDs and others

  * Delivery of paravirtualized invalidation

  * Direct assigned invalidation queues

drivers/iommu/iommufd/viommu.c

+2 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ iommufd_hw_queue_alloc_phys(struct iommu_hw_queue_alloc *cmd, 
	}



	*base_pa = (page_to_pfn(pages[0]) << PAGE_SHIFT) + offset;

	kfree(pages);

	kvfree(pages);

	return access;



out_unpin:
@@ -349,7 +349,7 @@ iommufd_hw_queue_alloc_phys(struct iommu_hw_queue_alloc *cmd, 
out_destroy:

	iommufd_access_destroy_internal(viommu->ictx, access);

out_free:

	kfree(pages);

	kvfree(pages);

	return ERR_PTR(rc);

}