Skip to content

Commit 471b25a

Browse files
committed
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()
2 parents cf6fc5e + 447c614 commit 471b25a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Documentation/userspace-api/iommufd.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Following IOMMUFD objects are exposed to userspace:
4343

4444
- IOMMUFD_OBJ_HWPT_PAGING, representing an actual hardware I/O page table
4545
(i.e. a single struct iommu_domain) managed by the iommu driver. "PAGING"
46-
primarly indicates this type of HWPT should be linked to an IOAS. It also
46+
primarily indicates this type of HWPT should be linked to an IOAS. It also
4747
indicates that it is backed by an iommu_domain with __IOMMU_DOMAIN_PAGING
4848
feature flag. This can be either an UNMANAGED stage-1 domain for a device
4949
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:
7676

7777
* Security namespace for guest owned ID, e.g. guest-controlled cache tags
7878
* Non-device-affiliated event reporting, e.g. invalidation queue errors
79-
* Access to a sharable nesting parent pagetable across physical IOMMUs
79+
* Access to a shareable nesting parent pagetable across physical IOMMUs
8080
* Virtualization of various platforms IDs, e.g. RIDs and others
8181
* Delivery of paravirtualized invalidation
8282
* Direct assigned invalidation queues

drivers/iommu/iommufd/viommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ iommufd_hw_queue_alloc_phys(struct iommu_hw_queue_alloc *cmd,
339339
}
340340

341341
*base_pa = (page_to_pfn(pages[0]) << PAGE_SHIFT) + offset;
342-
kfree(pages);
342+
kvfree(pages);
343343
return access;
344344

345345
out_unpin:
@@ -349,7 +349,7 @@ iommufd_hw_queue_alloc_phys(struct iommu_hw_queue_alloc *cmd,
349349
out_destroy:
350350
iommufd_access_destroy_internal(viommu->ictx, access);
351351
out_free:
352-
kfree(pages);
352+
kvfree(pages);
353353
return ERR_PTR(rc);
354354
}
355355

0 commit comments

Comments
 (0)