Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+4
-4
+2
-2
Documentation/userspace-api/iommufd.rst
+2
-2
Documentation/userspace-api/iommufd.rst
···
43
43
44
44
- IOMMUFD_OBJ_HWPT_PAGING, representing an actual hardware I/O page table
45
45
(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
47
47
indicates that it is backed by an iommu_domain with __IOMMU_DOMAIN_PAGING
48
48
feature flag. This can be either an UNMANAGED stage-1 domain for a device
49
49
running in the user space, or a nesting parent stage-2 domain for mappings
···
76
76
77
77
* Security namespace for guest owned ID, e.g. guest-controlled cache tags
78
78
* 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
80
80
* Virtualization of various platforms IDs, e.g. RIDs and others
81
81
* Delivery of paravirtualized invalidation
82
82
* Direct assigned invalidation queues
+2
-2
drivers/iommu/iommufd/viommu.c
+2
-2
drivers/iommu/iommufd/viommu.c
···
339
339
}
340
340
341
341
*base_pa = (page_to_pfn(pages[0]) << PAGE_SHIFT) + offset;
342
-
kfree(pages);
342
+
kvfree(pages);
343
343
return access;
344
344
345
345
out_unpin:
···
349
349
out_destroy:
350
350
iommufd_access_destroy_internal(viommu->ictx, access);
351
351
out_free:
352
-
kfree(pages);
352
+
kvfree(pages);
353
353
return ERR_PTR(rc);
354
354
}
355
355