iommu: Prepare to deliver page faults to user space
Subsystems (5)
Lu Baolu
maintainerv10 cover iommu: Prepare to deliver page faults to user space
When a user-managed page table is attached to an IOMMU, it is necessary to deliver IO page faults to user space so that they can be handled appropriately. One use case for this is nested translation, which is currently being discussed in the mailing list.
I have posted a RFC series [1] that describes the implementation of delivering page faults to user space through IOMMUFD. This series has received several comments on the IOMMU refactoring, which I am trying to address in this series.
The major refactoring includes:
- [PATCH 01 ~ 04] Move include/uapi/linux/iommu.h to include/linux/iommu.h. Remove the unrecoverable fault data definition.
- [PATCH 05 ~ 06] Remove iommu_[un]register_device_fault_handler().
- [PATCH 07 ~ 10] Separate SVA and IOPF. Make IOPF a generic page fault handling framework.
- [PATCH 11 ~ 16] Improve iopf framework.
This is also available at github [2].
[1] https://lore.kernel.org/linux-iommu/[email protected]/
[2] https://github.com/LuBaolu/intel-iommu/commits/preparatory-io-pgfault-delivery-v10
Change log:
v10:
- Make iopf_group_response() return void, as nobody can do anything with the failure.
- Make iommu_report_device_fault() automatically respond to unhandleable faults and change its return type to void.
- PATCH 01 ~ 14 are in good shapes now.
v9: https://lore.kernel.org/linux-iommu/[email protected]/
- Protecting the assignment of dev->iommu->fault_param with RCU.
- Extending the fault parameter's lifetime to the entire path of iopf handling.
- Since iopf_queue_flush_dev() can only be called before iopf_queue_remove_device(), there's no need to hold a reference
count.
- Improve iopf_queue_remove_device() as per Jason's comments on the device removal sequence from the iopf queue. This will likely
require changes to the iommu drivers, which are supposed to be addressed in separate series.
- Track the iopf_group as a whole instead of the last fault within the group to simplify the fault report and response paths.
- PATCH 01 ~ 11 are in good shapes now.
v8: https://lore.kernel.org/linux-iommu/[email protected]/
- Drop PATCH 12/12 as it is no longer necessary to drain page requests page requests during PASID translation changes.
- Separate PATCH 11/12 into two distinct patches. The first patch
refines locking scheme for protecting per-device fault data, while
the second patch replaces mutex with RCU to enhance locking
efficiency.
- PATCH 01 ~ 10 are in good shapes now.
v7: https://lore.kernel.org/linux-iommu/[email protected]/
- Rebase to v6.7-rc1.
- Export iopf_group_response() for global use.
- Release lock when calling iopf handler.
- The whole series has been verified to work for SVA case on Intel platforms by Zhao Yan. Add her Tested-by to affected patches.
v6: https://lore.kernel.org/linux-iommu/[email protected]/
- [PATCH 09/12] Check IS_ERR() against the iommu domain. [Jingqi/Jason]
- [PATCH 12/12] Rename the comments and name of iopf_queue_flush_dev(), no functionality changes. [Kevin]
- All patches rebased on the latest iommu/core branch.
v5: https://lore.kernel.org/linux-iommu/[email protected]/
- Consolidate per-device fault data management. (New patch 11)
- Improve iopf_queue_flush_dev(). (New patch 12)
v4: https://lore.kernel.org/linux-iommu/[email protected]/
- Merge iommu_fault_event and iopf_fault. They are duplicate.
- Move iommu_report_device_fault() and iommu_page_response() to io-pgfault.c.
- Move iommu_sva_domain_alloc() to iommu-sva.c.
- Add group->domain and use it directly in sva fault handler.
- Misc code refactoring and refining.
v3: https://lore.kernel.org/linux-iommu/[email protected]/
- Convert the fault data structures from uAPI to kAPI.
- Merge iopf_device_param into iommu_fault_param.
- Add debugging on domain lifetime for iopf.
- Remove patch "iommu: Change the return value of dev_iommu_get()".
- Remove patch "iommu: Add helper to set iopf handler for domain".
- Misc code refactoring and refining.
v2: https://lore.kernel.org/linux-iommu/[email protected]/
- Remove unrecoverable fault data definition as suggested by Kevin.
- Drop the per-device fault cookie code considering that doesn't make
much sense for SVA.
- Make the IOMMU page fault handling framework generic. So that it can available for use cases other than SVA.
v1: https://lore.kernel.org/linux-iommu/[email protected]/
Lu Baolu (16):
iommu: Move iommu fault data to linux/iommu.h iommu/arm-smmu-v3: Remove unrecoverable faults reporting
iommu: Remove unrecoverable fault data
iommu: Cleanup iopf data structure definitions
iommu: Merge iopf_device_param into iommu_fault_param
iommu: Remove iommu_[un]register_device_fault_handler()
iommu: Merge iommu_fault_event and iopf_fault
iommu: Prepare for separating SVA and IOPF
iommu: Make iommu_queue_iopf() more generic
iommu: Separate SVA and IOPF
iommu: Refine locking for per-device fault data management
iommu: Use refcount for fault data access
iommu: Improve iopf_queue_remove_device()
iommu: Track iopf group instead of last fault
iommu: Make iopf_group_response() return void
iommu: Make iommu_report_device_fault() reutrn void
include/linux/iommu.h | 266 +++++++--- drivers/iommu/intel/iommu.h | 4 +- drivers/iommu/iommu-sva.h | 71 --- include/uapi/linux/iommu.h | 161 ------ .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 14 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 103 ++-- drivers/iommu/intel/iommu.c | 28 +- drivers/iommu/intel/svm.c | 41 +- drivers/iommu/io-pgfault.c | 480 +++++++++++------- drivers/iommu/iommu-sva.c | 71 ++- drivers/iommu/iommu.c | 233 --------- MAINTAINERS | 1 - drivers/iommu/Kconfig | 4 + drivers/iommu/Makefile | 3 +- drivers/iommu/intel/Kconfig | 1 + 15 files changed, 596 insertions(+), 885 deletions(-) delete mode 100644 drivers/iommu/iommu-sva.h delete mode 100644 include/uapi/linux/iommu.h
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 1/16 iommu: Move iommu fault data to linux/iommu.h
The iommu fault data is currently defined in uapi/linux/iommu.h, but is only used inside the iommu subsystem. Move it to linux/iommu.h, where it will be more accessible to kernel drivers.
With this done, uapi/linux/iommu.h becomes empty and can be removed from the tree.
--- include/linux/iommu.h | 152 +++++++++++++++++++++++++++++++++- include/uapi/linux/iommu.h | 161 ------------------------------------- MAINTAINERS | 1 - 3 files changed, 151 insertions(+), 163 deletions(-) delete mode 100644 include/uapi/linux/iommu.h
include/linux/iommu.h +151 -1
@@ -14,7 +14,6 @@#include <linux/err.h> #include <linux/of.h> #include <linux/iova_bitmap.h> -#include <uapi/linux/iommu.h> #define IOMMU_READ (1 << 0)#define IOMMU_WRITE (1 << 1)
@@ -44,6 +43,157 @@ struct iommu_sva;struct iommu_fault_event ;struct iommu_dma_cookie ; +#define IOMMU_FAULT_PERM_READ (1 << 0)/* read */ +#define IOMMU_FAULT_PERM_WRITE (1 << 1)/* write */ +#define IOMMU_FAULT_PERM_EXEC (1 << 2)/* exec */ +#define IOMMU_FAULT_PERM_PRIV (1 << 3)/* privileged */ + +/* Generic fault types, can be expanded IRQ remapping fault */ +enum iommu_fault_type { +IOMMU_FAULT_DMA_UNRECOV =1 ,/* unrecoverable fault */ +IOMMU_FAULT_PAGE_REQ ,/* page request fault */ +}; + +enum iommu_fault_reason { +IOMMU_FAULT_REASON_UNKNOWN =0 , + +/* Could not access the PASID table (fetch caused external abort) */ +IOMMU_FAULT_REASON_PASID_FETCH , + +/* PASID entry is invalid or has configuration errors */ +IOMMU_FAULT_REASON_BAD_PASID_ENTRY , + +/* +* PASID is out of range (e.g. exceeds the maximum PASID +* supported by the IOMMU) or disabled. +*/ +IOMMU_FAULT_REASON_PASID_INVALID , + +/* +* An external abort occurred fetching (or updating) a translation +* table descriptor +*/ +IOMMU_FAULT_REASON_WALK_EABT , + +/* +* Could not access the page table entry (Bad address), +* actual translation fault +*/ +IOMMU_FAULT_REASON_PTE_FETCH , + +/* Protection flag check failed */ +IOMMU_FAULT_REASON_PERMISSION , + +/* access flag check failed */ +IOMMU_FAULT_REASON_ACCESS , + +/* Output address of a translation stage caused Address Size fault */ +IOMMU_FAULT_REASON_OOR_ADDRESS , +}; + +/** +* struct iommu_fault_unrecoverable - Unrecoverable fault data +* @reason: reason of the fault, from &enum iommu_fault_reason +* @flags: parameters of this fault (IOMMU_FAULT_UNRECOV_* values) +* @pasid: Process Address Space ID +* @perm: requested permission access using by the incoming transaction +* (IOMMU_FAULT_PERM_* values) +* @addr: offending page address +* @fetch_addr: address that caused a fetch abort, if any +*/ +struct iommu_fault_unrecoverable { +__u32 reason; +#define IOMMU_FAULT_UNRECOV_PASID_VALID (1 << 0) +#define IOMMU_FAULT_UNRECOV_ADDR_VALID (1 << 1) +#define IOMMU_FAULT_UNRECOV_FETCH_ADDR_VALID (1 << 2) +__u32 flags; +__u32 pasid; +__u32 perm; +__u64 addr; +__u64 fetch_addr; +}; + +/** +* struct iommu_fault_page_request - Page Request data +* @flags: encodes whether the corresponding fields are valid and whether this +* is the last page in group (IOMMU_FAULT_PAGE_REQUEST_* values). +* When IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID is set, the page response +* must have the same PASID value as the page request. When it is clear, +* the page response should not have a PASID. +* @pasid: Process Address Space ID +* @grpid: Page Request Group Index +* @perm: requested page permissions (IOMMU_FAULT_PERM_* values) +* @addr: page address +* @private_data: device-specific private information +*/ +struct iommu_fault_page_request { +#define IOMMU_FAULT_PAGE_REQUEST_PASID_VALID (1 << 0) +#define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE (1 << 1) +#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA (1 << 2) +#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID (1 << 3) +__u32 flags; +__u32 pasid; +__u32 grpid; +__u32 perm; +__u64 addr; +__u64 private_data[2 ]; +}; + +/** +* struct iommu_fault - Generic fault data +* @type: fault type from &enum iommu_fault_type +* @padding: reserved for future use (should be zero) +* @event: fault event, when @type is %IOMMU_FAULT_DMA_UNRECOV +* @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ +* @padding2: sets the fault size to allow for future extensions +*/ +struct iommu_fault { +__u32 type; +__u32 padding; +union { +struct iommu_fault_unrecoverable event; +struct iommu_fault_page_request prm; +__u8 padding2[56 ]; + }; +}; + +/** +* enum iommu_page_response_code - Return status of fault handlers +* @IOMMU_PAGE_RESP_SUCCESS: Fault has been handled and the page tables +* populated, retry the access. This is "Success" in PCI PRI. +* @IOMMU_PAGE_RESP_FAILURE: General error. Drop all subsequent faults from +* this device if possible. This is "Response Failure" in PCI PRI. +* @IOMMU_PAGE_RESP_INVALID: Could not handle this fault, don't retry the +* access. This is "Invalid Request" in PCI PRI. +*/ +enum iommu_page_response_code { +IOMMU_PAGE_RESP_SUCCESS =0 , +IOMMU_PAGE_RESP_INVALID , +IOMMU_PAGE_RESP_FAILURE , +}; + +/** +* struct iommu_page_response - Generic page response information +* @argsz: User filled size of this data +* @version: API version of this structure +* @flags: encodes whether the corresponding fields are valid +* (IOMMU_FAULT_PAGE_RESPONSE_* values) +* @pasid: Process Address Space ID +* @grpid: Page Request Group Index +* @code: response code from &enum iommu_page_response_code +*/ +struct iommu_page_response { +__u32 argsz; +#define IOMMU_PAGE_RESP_VERSION_1 1 +__u32 version; +#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) +__u32 flags; +__u32 pasid; +__u32 grpid; +__u32 code; +}; + +/* iommu fault flags */ #define IOMMU_FAULT_READ 0x0#define IOMMU_FAULT_WRITE 0x1
include/uapi/linux/iommu.h deleted +0 -161
161 lines not on this page · raw message
MAINTAINERS +0 -1
@@ -11239,7 +11239,6 @@ F: drivers/iommu/ F: include/linux/iommu.h F: include/linux/iova.h F: include/linux/of_iommu.h -F: include/uapi/linux/iommu.h IOMMUFD M: Jason Gunthorpe <[email protected]>
Signature · 1 line
2.34.1
Re: [PATCH v10 01/16] iommu: Move iommu fault data to linux/iommu.h
Quoted 6 lines · Lu Baolu
The iommu fault data is currently defined in
uapi/linux/iommu.h, but is only used inside the iommu subsystem. Move it tolinux/iommu.h, where it will be more accessible to kernel drivers.With this done,
uapi/linux/iommu.hbecomes empty and can be removed from the tree.
The reason for removing this [1] is that it is only being used by internal code in the kernel. What happens with usespace code that have used these definitions? Should we deprecate instead of just removing?
Best
[1] https://lore.kernel.org/all/[email protected]/
Quoted 366 lines
Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>Reviewed-by Kevin Tian <[email protected]>Reviewed-by Yi Liu <[email protected]>Tested-by Yan Zhao <[email protected]>Tested-by Longfang Liu <[email protected]>--- include/linux/iommu.h | 152 +++++++++++++++++++++++++++++++++- include/uapi/linux/iommu.h | 161 ------------------------------------- MAINTAINERS | 1 - 3 files changed, 151 insertions(+), 163 deletions(-) delete mode 100644 include/uapi/linux/iommu.hinclude/linux/iommu.h +151
-1@@ -14,7 +14,6 @@#include <linux/err.h> #include <linux/of.h> #include <linux/iova_bitmap.h> -#include <uapi/linux/iommu.h> #define IOMMU_READ (1 << 0)#define IOMMU_WRITE (1 << 1)@@ -44,6 +43,157 @@ struct iommu_sva;struct iommu_fault_event ;struct iommu_dma_cookie ; +#define IOMMU_FAULT_PERM_READ (1 << 0)/* read */ +#define IOMMU_FAULT_PERM_WRITE (1 << 1)/* write */ +#define IOMMU_FAULT_PERM_EXEC (1 << 2)/* exec */ +#define IOMMU_FAULT_PERM_PRIV (1 << 3)/* privileged */ + +/* Generic fault types, can be expanded IRQ remapping fault */ +enum iommu_fault_type { +IOMMU_FAULT_DMA_UNRECOV =1 ,/* unrecoverable fault */ +IOMMU_FAULT_PAGE_REQ ,/* page request fault */ +}; + +enum iommu_fault_reason { +IOMMU_FAULT_REASON_UNKNOWN =0 , + +/* Could not access the PASID table (fetch caused external abort) */ +IOMMU_FAULT_REASON_PASID_FETCH , + +/* PASID entry is invalid or has configuration errors */ +IOMMU_FAULT_REASON_BAD_PASID_ENTRY , + +/* +* PASID is out of range (e.g. exceeds the maximum PASID +* supported by the IOMMU) or disabled. +*/ +IOMMU_FAULT_REASON_PASID_INVALID , + +/* +* An external abort occurred fetching (or updating) a translation +* table descriptor +*/ +IOMMU_FAULT_REASON_WALK_EABT , + +/* +* Could not access the page table entry (Bad address), +* actual translation fault +*/ +IOMMU_FAULT_REASON_PTE_FETCH , + +/* Protection flag check failed */ +IOMMU_FAULT_REASON_PERMISSION , + +/* access flag check failed */ +IOMMU_FAULT_REASON_ACCESS , + +/* Output address of a translation stage caused Address Size fault */ +IOMMU_FAULT_REASON_OOR_ADDRESS , +}; + +/** +* struct iommu_fault_unrecoverable - Unrecoverable fault data +* @reason: reason of the fault, from &enum iommu_fault_reason +* @flags: parameters of this fault (IOMMU_FAULT_UNRECOV_* values) +* @pasid: Process Address Space ID +* @perm: requested permission access using by the incoming transaction +* (IOMMU_FAULT_PERM_* values) +* @addr: offending page address +* @fetch_addr: address that caused a fetch abort, if any +*/ +struct iommu_fault_unrecoverable { +__u32 reason; +#define IOMMU_FAULT_UNRECOV_PASID_VALID (1 << 0) +#define IOMMU_FAULT_UNRECOV_ADDR_VALID (1 << 1) +#define IOMMU_FAULT_UNRECOV_FETCH_ADDR_VALID (1 << 2) +__u32 flags; +__u32 pasid; +__u32 perm; +__u64 addr; +__u64 fetch_addr; +}; + +/** +* struct iommu_fault_page_request - Page Request data +* @flags: encodes whether the corresponding fields are valid and whether this +* is the last page in group (IOMMU_FAULT_PAGE_REQUEST_* values). +* When IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID is set, the page response +* must have the same PASID value as the page request. When it is clear, +* the page response should not have a PASID. +* @pasid: Process Address Space ID +* @grpid: Page Request Group Index +* @perm: requested page permissions (IOMMU_FAULT_PERM_* values) +* @addr: page address +* @private_data: device-specific private information +*/ +struct iommu_fault_page_request { +#define IOMMU_FAULT_PAGE_REQUEST_PASID_VALID (1 << 0) +#define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE (1 << 1) +#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA (1 << 2) +#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID (1 << 3) +__u32 flags; +__u32 pasid; +__u32 grpid; +__u32 perm; +__u64 addr; +__u64 private_data[2 ]; +}; + +/** +* struct iommu_fault - Generic fault data +* @type: fault type from &enum iommu_fault_type +* @padding: reserved for future use (should be zero) +* @event: fault event, when @type is %IOMMU_FAULT_DMA_UNRECOV +* @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ +* @padding2: sets the fault size to allow for future extensions +*/ +struct iommu_fault { +__u32 type; +__u32 padding; +union { +struct iommu_fault_unrecoverable event; +struct iommu_fault_page_request prm; +__u8 padding2[56 ]; + }; +}; + +/** +* enum iommu_page_response_code - Return status of fault handlers +* @IOMMU_PAGE_RESP_SUCCESS: Fault has been handled and the page tables +* populated, retry the access. This is "Success" in PCI PRI. +* @IOMMU_PAGE_RESP_FAILURE: General error. Drop all subsequent faults from +* this device if possible. This is "Response Failure" in PCI PRI. +* @IOMMU_PAGE_RESP_INVALID: Could not handle this fault, don't retry the +* access. This is "Invalid Request" in PCI PRI. +*/ +enum iommu_page_response_code { +IOMMU_PAGE_RESP_SUCCESS =0 , +IOMMU_PAGE_RESP_INVALID , +IOMMU_PAGE_RESP_FAILURE , +}; + +/** +* struct iommu_page_response - Generic page response information +* @argsz: User filled size of this data +* @version: API version of this structure +* @flags: encodes whether the corresponding fields are valid +* (IOMMU_FAULT_PAGE_RESPONSE_* values) +* @pasid: Process Address Space ID +* @grpid: Page Request Group Index +* @code: response code from &enum iommu_page_response_code +*/ +struct iommu_page_response { +__u32 argsz; +#define IOMMU_PAGE_RESP_VERSION_1 1 +__u32 version; +#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) +__u32 flags; +__u32 pasid; +__u32 grpid; +__u32 code; +}; + +/* iommu fault flags */ #define IOMMU_FAULT_READ 0x0#define IOMMU_FAULT_WRITE 0x1include/uapi/linux/iommu.h deleted +0
-161@@ -1,161 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* -* IOMMU user API definitions -*/ - -#ifndef _UAPI_IOMMU_H -#define _UAPI_IOMMU_H - -#include <linux/types.h> - -#define IOMMU_FAULT_PERM_READ (1 << 0)/* read */ -#define IOMMU_FAULT_PERM_WRITE (1 << 1)/* write */ -#define IOMMU_FAULT_PERM_EXEC (1 << 2)/* exec */ -#define IOMMU_FAULT_PERM_PRIV (1 << 3)/* privileged */ - -/* Generic fault types, can be expanded IRQ remapping fault */ -enum iommu_fault_type { -IOMMU_FAULT_DMA_UNRECOV =1 ,/* unrecoverable fault */ -IOMMU_FAULT_PAGE_REQ ,/* page request fault */ -}; - -enum iommu_fault_reason { -IOMMU_FAULT_REASON_UNKNOWN =0 , - -/* Could not access the PASID table (fetch caused external abort) */ -IOMMU_FAULT_REASON_PASID_FETCH , - -/* PASID entry is invalid or has configuration errors */ -IOMMU_FAULT_REASON_BAD_PASID_ENTRY , - -/* -* PASID is out of range (e.g. exceeds the maximum PASID -* supported by the IOMMU) or disabled. -*/ -IOMMU_FAULT_REASON_PASID_INVALID , - -/* -* An external abort occurred fetching (or updating) a translation -* table descriptor -*/ -IOMMU_FAULT_REASON_WALK_EABT , - -/* -* Could not access the page table entry (Bad address), -* actual translation fault -*/ -IOMMU_FAULT_REASON_PTE_FETCH , - -/* Protection flag check failed */ -IOMMU_FAULT_REASON_PERMISSION , - -/* access flag check failed */ -IOMMU_FAULT_REASON_ACCESS , - -/* Output address of a translation stage caused Address Size fault */ -IOMMU_FAULT_REASON_OOR_ADDRESS , -}; - -/** -* struct iommu_fault_unrecoverable - Unrecoverable fault data -* @reason: reason of the fault, from &enum iommu_fault_reason -* @flags: parameters of this fault (IOMMU_FAULT_UNRECOV_* values) -* @pasid: Process Address Space ID -* @perm: requested permission access using by the incoming transaction -* (IOMMU_FAULT_PERM_* values) -* @addr: offending page address -* @fetch_addr: address that caused a fetch abort, if any -*/ -struct iommu_fault_unrecoverable { -__u32 reason; -#define IOMMU_FAULT_UNRECOV_PASID_VALID (1 << 0) -#define IOMMU_FAULT_UNRECOV_ADDR_VALID (1 << 1) -#define IOMMU_FAULT_UNRECOV_FETCH_ADDR_VALID (1 << 2) -__u32 flags; -__u32 pasid; -__u32 perm; -__u64 addr; -__u64 fetch_addr; -}; - -/** -* struct iommu_fault_page_request - Page Request data -* @flags: encodes whether the corresponding fields are valid and whether this -* is the last page in group (IOMMU_FAULT_PAGE_REQUEST_* values). -* When IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID is set, the page response -* must have the same PASID value as the page request. When it is clear, -* the page response should not have a PASID. -* @pasid: Process Address Space ID -* @grpid: Page Request Group Index -* @perm: requested page permissions (IOMMU_FAULT_PERM_* values) -* @addr: page address -* @private_data: device-specific private information -*/ -struct iommu_fault_page_request { -#define IOMMU_FAULT_PAGE_REQUEST_PASID_VALID (1 << 0) -#define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE (1 << 1) -#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA (1 << 2) -#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID (1 << 3) -__u32 flags; -__u32 pasid; -__u32 grpid; -__u32 perm; -__u64 addr; -__u64 private_data[2 ]; -}; - -/** -* struct iommu_fault - Generic fault data -* @type: fault type from &enum iommu_fault_type -* @padding: reserved for future use (should be zero) -* @event: fault event, when @type is %IOMMU_FAULT_DMA_UNRECOV -* @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ -* @padding2: sets the fault size to allow for future extensions -*/ -struct iommu_fault { -__u32 type; -__u32 padding; -union { -struct iommu_fault_unrecoverable event; -struct iommu_fault_page_request prm; -__u8 padding2[56 ]; - }; -}; - -/** -* enum iommu_page_response_code - Return status of fault handlers -* @IOMMU_PAGE_RESP_SUCCESS: Fault has been handled and the page tables -* populated, retry the access. This is "Success" in PCI PRI. -* @IOMMU_PAGE_RESP_FAILURE: General error. Drop all subsequent faults from -* this device if possible. This is "Response Failure" in PCI PRI. -* @IOMMU_PAGE_RESP_INVALID: Could not handle this fault, don't retry the -* access. This is "Invalid Request" in PCI PRI. -*/ -enum iommu_page_response_code { -IOMMU_PAGE_RESP_SUCCESS =0 , -IOMMU_PAGE_RESP_INVALID , -IOMMU_PAGE_RESP_FAILURE , -}; - -/** -* struct iommu_page_response - Generic page response information -* @argsz: User filled size of this data -* @version: API version of this structure -* @flags: encodes whether the corresponding fields are valid -* (IOMMU_FAULT_PAGE_RESPONSE_* values) -* @pasid: Process Address Space ID -* @grpid: Page Request Group Index -* @code: response code from &enum iommu_page_response_code -*/ -struct iommu_page_response { -__u32 argsz; -#define IOMMU_PAGE_RESP_VERSION_1 1 -__u32 version; -#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) -__u32 flags; -__u32 pasid; -__u32 grpid; -__u32 code; -}; - -#endif /* _UAPI_IOMMU_H */ MAINTAINERS +0
-1@@ -11239,7 +11239,6 @@ F: drivers/iommu/ F: include/linux/iommu.h F: include/linux/iova.h F: include/linux/of_iommu.h -F: include/uapi/linux/iommu.h IOMMUFD M: Jason Gunthorpe <[email protected]>Signature · 1 line
2.34.1
Signature · 1 line
Joel Granados
Baolu Lu
maintainerRe: [PATCH v10 01/16] iommu: Move iommu fault data to linux/iommu.h
Quoted 10 lines · Joel Granados
Quoted 6 lines · Lu Baolu
The iommu fault data is currently defined in
uapi/linux/iommu.h, but is only used inside the iommu subsystem. Move it tolinux/iommu.h, where it will be more accessible to kernel drivers.With this done,
uapi/linux/iommu.hbecomes empty and can be removed from the tree.The reason for removing this [1] is that it is only being used by internal code in the kernel. What happens with usespace code that have used these definitions? Should we deprecate instead of just removing?
The interfaces to deliver I/O page faults to user space have never been implemented in the Linux kernel before. Therefore, from a uAPI point of view, this definition is actually dead code.
Best regards,
baolu
Re: [PATCH v10 01/16] iommu: Move iommu fault data to linux/iommu.h
Quoted 8 lines · Baolu Lu
Quoted 7 lines · Joel Granados
Quoted 6 lines · Lu Baolu
The iommu fault data is currently defined in
uapi/linux/iommu.h, but is only used inside the iommu subsystem. Move it tolinux/iommu.h, where it will be more accessible to kernel drivers.With this done,
uapi/linux/iommu.hbecomes empty and can be removed from the tree.
Quoted 7 lines
Quoted 3 lines
The reason for removing this [1] is that it is only being used by internal code in the kernel. What happens with usespace code that have used these definitions? Should we deprecate instead of just removing?
The interfaces to deliver I/O page faults to user space have never been implemented in the Linux kernel before. Therefore, from a uAPI point of view, this definition is actually dead code.
thx for the explanation.
I was thinking it was something like that. Just wanted to make sure.
Best
Signature · 1 line
Joel Granados
Re: [PATCH v10 01/16] iommu: Move iommu fault data to linux/iommu.h
In reply to Joel GranadosQuoted 11 lines · Joel Granados
Quoted 6 lines · Lu Baolu
The iommu fault data is currently defined in
uapi/linux/iommu.h, but is only used inside the iommu subsystem. Move it tolinux/iommu.h, where it will be more accessible to kernel drivers.With this done,
uapi/linux/iommu.hbecomes empty and can be removed from the tree.The reason for removing this [1] is that it is only being used by internal code in the kernel. What happens with usespace code that have used these definitions? Should we deprecate instead of just removing?
There was never an in-tree kernel implementation. Any userspace that implemented this needs to decide on its own if it will continue to support the non-mainline kernel and provide a copy of the definitions itself..
(it was a process mistake to merge a uapi header without a corresponding uapi implementation, sorry)
Jason
Re: [PATCH v10 01/16] iommu: Move iommu fault data to linux/iommu.h
Quoted 13 lines · Jason Gunthorpe
Quoted 11 lines · Joel Granados
Quoted 6 lines · Lu Baolu
The iommu fault data is currently defined in
uapi/linux/iommu.h, but is only used inside the iommu subsystem. Move it tolinux/iommu.h, where it will be more accessible to kernel drivers.With this done,
uapi/linux/iommu.hbecomes empty and can be removed from the tree.The reason for removing this [1] is that it is only being used by internal code in the kernel. What happens with usespace code that have used these definitions? Should we deprecate instead of just removing?
Quoted 7 lines
There was never an in-tree kernel implementation. Any userspace that implemented this needs to decide on its own if it will continue to support the non-mainline kernel and provide a copy of the definitions itself..
(it was a process mistake to merge a uapi header without a corresponding uapi implementation, sorry)
Thx.
This makes sense and its actually a good thing that we remove it.
Best
Quoted 2 lines
Jason
Signature · 1 line
Joel Granados
Lu Baolu
maintainerPATCH v10 2/16 iommu/arm-smmu-v3: Remove unrecoverable faults reporting
In reply to Lu BaoluNo device driver registers fault handler to handle the reported unrecoveraable faults. Remove it to avoid dead code.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 46 ++++++--------------- 1 file changed, 13 insertions(+), 33 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +13 -33
@@ -1461,7 +1461,6 @@ arm_smmu_find_master(struct arm_smmu_device *smmu, u32 sid)static int arm_smmu_handle_evt (struct arm_smmu_device *smmu,u64 *evt) {int ret; -u32 reason;u32 perm =0 ;struct arm_smmu_master *master;bool ssid_valid = evt[0 ] &EVTQ_0_SSV ;
@@ -1471,16 +1470,9 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt)switch (FIELD_GET (EVTQ_0_ID , evt[0 ])) {case EVT_ID_TRANSLATION_FAULT : - reason =IOMMU_FAULT_REASON_PTE_FETCH ; -break ;case EVT_ID_ADDR_SIZE_FAULT : - reason =IOMMU_FAULT_REASON_OOR_ADDRESS ; -break ;case EVT_ID_ACCESS_FAULT : - reason =IOMMU_FAULT_REASON_ACCESS ; -break ;case EVT_ID_PERMISSION_FAULT : - reason =IOMMU_FAULT_REASON_PERMISSION ;break ;default :return -EOPNOTSUPP ;
@@ -1490,6 +1482,9 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt)if (evt[1 ] &EVTQ_1_S2 )return -EFAULT ; +if (!(evt[1 ] &EVTQ_1_STALL )) +return -EOPNOTSUPP ; +if (evt[1 ] & EVTQ_1_RnW) perm |=IOMMU_FAULT_PERM_READ ;else
@@ -1501,32 +1496,17 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt)if (evt[1 ] & EVTQ_1_PnU) perm |=IOMMU_FAULT_PERM_PRIV ; -if (evt[1 ] &EVTQ_1_STALL ) { - flt->type =IOMMU_FAULT_PAGE_REQ ; - flt->prm = (struct iommu_fault_page_request ) { - .flags =IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE , - .grpid =FIELD_GET (EVTQ_1_STAG , evt[1 ]), - .perm = perm, - .addr =FIELD_GET (EVTQ_2_ADDR , evt[2 ]), - }; + flt->type =IOMMU_FAULT_PAGE_REQ ; + flt->prm = (struct iommu_fault_page_request ) { + .flags =IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE , + .grpid =FIELD_GET (EVTQ_1_STAG , evt[1 ]), + .perm = perm, + .addr =FIELD_GET (EVTQ_2_ADDR , evt[2 ]), + }; -if (ssid_valid) { - flt->prm.flags |=IOMMU_FAULT_PAGE_REQUEST_PASID_VALID ; - flt->prm.pasid =FIELD_GET (EVTQ_0_SSID , evt[0 ]); - } - }else { - flt->type =IOMMU_FAULT_DMA_UNRECOV ; - flt->event = (struct iommu_fault_unrecoverable ) { - .reason = reason, - .flags =IOMMU_FAULT_UNRECOV_ADDR_VALID , - .perm = perm, - .addr =FIELD_GET (EVTQ_2_ADDR , evt[2 ]), - }; - -if (ssid_valid) { - flt->event.flags |=IOMMU_FAULT_UNRECOV_PASID_VALID ; - flt->event.pasid =FIELD_GET (EVTQ_0_SSID , evt[0 ]); - } +if (ssid_valid) { + flt->prm.flags |=IOMMU_FAULT_PAGE_REQUEST_PASID_VALID ; + flt->prm.pasid =FIELD_GET (EVTQ_0_SSID , evt[0 ]); }mutex_lock (&smmu->streams_mutex);
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 3/16 iommu: Remove unrecoverable fault data
In reply to Lu BaoluThe unrecoverable fault data is not used anywhere. Remove it to avoid dead code.
--- include/linux/iommu.h | 72 ++----------------------------------------- 1 file changed, 2 insertions(+), 70 deletions(-)
include/linux/iommu.h +2 -70
@@ -50,67 +50,7 @@ struct iommu_dma_cookie;/* Generic fault types, can be expanded IRQ remapping fault */ enum iommu_fault_type { -IOMMU_FAULT_DMA_UNRECOV =1 ,/* unrecoverable fault */ -IOMMU_FAULT_PAGE_REQ ,/* page request fault */ -}; - -enum iommu_fault_reason { -IOMMU_FAULT_REASON_UNKNOWN =0 , - -/* Could not access the PASID table (fetch caused external abort) */ -IOMMU_FAULT_REASON_PASID_FETCH , - -/* PASID entry is invalid or has configuration errors */ -IOMMU_FAULT_REASON_BAD_PASID_ENTRY , - -/* -* PASID is out of range (e.g. exceeds the maximum PASID -* supported by the IOMMU) or disabled. -*/ -IOMMU_FAULT_REASON_PASID_INVALID , - -/* -* An external abort occurred fetching (or updating) a translation -* table descriptor -*/ -IOMMU_FAULT_REASON_WALK_EABT , - -/* -* Could not access the page table entry (Bad address), -* actual translation fault -*/ -IOMMU_FAULT_REASON_PTE_FETCH , - -/* Protection flag check failed */ -IOMMU_FAULT_REASON_PERMISSION , - -/* access flag check failed */ -IOMMU_FAULT_REASON_ACCESS , - -/* Output address of a translation stage caused Address Size fault */ -IOMMU_FAULT_REASON_OOR_ADDRESS , -}; - -/** -* struct iommu_fault_unrecoverable - Unrecoverable fault data -* @reason: reason of the fault, from &enum iommu_fault_reason -* @flags: parameters of this fault (IOMMU_FAULT_UNRECOV_* values) -* @pasid: Process Address Space ID -* @perm: requested permission access using by the incoming transaction -* (IOMMU_FAULT_PERM_* values) -* @addr: offending page address -* @fetch_addr: address that caused a fetch abort, if any -*/ -struct iommu_fault_unrecoverable { -__u32 reason; -#define IOMMU_FAULT_UNRECOV_PASID_VALID (1 << 0) -#define IOMMU_FAULT_UNRECOV_ADDR_VALID (1 << 1) -#define IOMMU_FAULT_UNRECOV_FETCH_ADDR_VALID (1 << 2) -__u32 flags; -__u32 pasid; -__u32 perm; -__u64 addr; -__u64 fetch_addr; +IOMMU_FAULT_PAGE_REQ =1 ,/* page request fault */ };/**
@@ -142,19 +82,11 @@ struct iommu_fault_page_request {/** * struct iommu_fault - Generic fault data * @type: fault type from &enum iommu_fault_type -* @padding: reserved for future use (should be zero) -* @event: fault event, when @type is %IOMMU_FAULT_DMA_UNRECOV * @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ -* @padding2: sets the fault size to allow for future extensions */ struct iommu_fault {__u32 type; -__u32 padding; -union { -struct iommu_fault_unrecoverable event; -struct iommu_fault_page_request prm; -__u8 padding2[56 ]; - }; +struct iommu_fault_page_request prm; };/**
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 4/16 iommu: Cleanup iopf data structure definitions
In reply to Lu Baolustruct iommu_fault_page_request and struct iommu_page_response are not part of uAPI anymore. Convert them to data structures for kAPI.
--- include/linux/iommu.h | 27 +++++++++++---------------- drivers/iommu/io-pgfault.c | 1 - drivers/iommu/iommu.c | 4 ---- 3 files changed, 11 insertions(+), 21 deletions(-)
include/linux/iommu.h +11 -16
@@ -71,12 +71,12 @@ struct iommu_fault_page_request {#define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE (1 << 1)#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA (1 << 2)#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID (1 << 3) -__u32 flags; -__u32 pasid; -__u32 grpid; -__u32 perm; -__u64 addr; -__u64 private_data[2 ]; +u32 flags; +u32 pasid; +u32 grpid; +u32 perm; +u64 addr; +u64 private_data[2 ]; };/**
@@ -85,7 +85,7 @@ struct iommu_fault_page_request {* @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ */ struct iommu_fault { -__u32 type; +u32 type;struct iommu_fault_page_request prm; };
@@ -106,8 +106,6 @@ enum iommu_page_response_code {/** * struct iommu_page_response - Generic page response information -* @argsz: User filled size of this data -* @version: API version of this structure * @flags: encodes whether the corresponding fields are valid * (IOMMU_FAULT_PAGE_RESPONSE_* values) * @pasid: Process Address Space ID
@@ -115,14 +113,11 @@ enum iommu_page_response_code {* @code: response code from &enum iommu_page_response_code */ struct iommu_page_response { -__u32 argsz; -#define IOMMU_PAGE_RESP_VERSION_1 1 -__u32 version;#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) -__u32 flags; -__u32 pasid; -__u32 grpid; -__u32 code; +u32 flags; +u32 pasid; +u32 grpid; +u32 code; };
drivers/iommu/io-pgfault.c +0 -1
@@ -56,7 +56,6 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, enum iommu_page_response_code status) {struct iommu_page_response resp = { - .version =IOMMU_PAGE_RESP_VERSION_1 , .pasid = iopf->fault.prm.pasid, .grpid = iopf->fault.prm.grpid, .code = status,
drivers/iommu/iommu.c +0 -4
@@ -1494,10 +1494,6 @@ int iommu_page_response(struct device *dev,if (!param || !param->fault_param)return -EINVAL ; -if (msg->version !=IOMMU_PAGE_RESP_VERSION_1 || - msg->flags & ~IOMMU_PAGE_RESP_PASID_VALID ) -return -EINVAL ; -/* Only send response if there is a fault report pending */ mutex_lock (¶m->fault_param->lock);if (list_empty (¶m->fault_param->faults)) {
Signature · 1 line
2.34.1
Re: [PATCH v10 04/16] iommu: Cleanup iopf data structure definitions
Quoted 92 lines · Lu Baolu
struct
iommu_fault_page_requestand structiommu_page_responseare not part of uAPI anymore. Convert them to data structures for kAPI.Signed-off-by Lu Baolu <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>Reviewed-by Kevin Tian <[email protected]>Reviewed-by Yi Liu <[email protected]>Tested-by Yan Zhao <[email protected]>Tested-by Longfang Liu <[email protected]>--- include/linux/iommu.h | 27 +++++++++++---------------- drivers/iommu/io-pgfault.c | 1 - drivers/iommu/iommu.c | 4 ---- 3 files changed, 11 insertions(+), 21 deletions(-)include/linux/iommu.h +11
-16@@ -71,12 +71,12 @@ struct iommu_fault_page_request {#define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE (1 << 1)#define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA (1 << 2)#define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID (1 << 3) -__u32 flags; -__u32 pasid; -__u32 grpid; -__u32 perm; -__u64 addr; -__u64 private_data[2 ]; +u32 flags; +u32 pasid; +u32 grpid; +u32 perm; +u64 addr; +u64 private_data[2 ]; };/** @@ -85,7 +85,7 @@ struct iommu_fault_page_request {* @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ */ struct iommu_fault { -__u32 type; +u32 type;struct iommu_fault_page_request prm; };@@ -106,8 +106,6 @@ enum iommu_page_response_code {/** * struct iommu_page_response - Generic page response information -* @argsz: User filled size of this data -* @version: API version of this structure * @flags: encodes whether the corresponding fields are valid * (IOMMU_FAULT_PAGE_RESPONSE_* values) * @pasid: Process Address Space ID @@ -115,14 +113,11 @@ enum iommu_page_response_code {* @code: response code from &enum iommu_page_response_code */ struct iommu_page_response { -__u32 argsz; -#define IOMMU_PAGE_RESP_VERSION_1 1 -__u32 version;#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) -__u32 flags; -__u32 pasid; -__u32 grpid; -__u32 code; +u32 flags; +u32 pasid; +u32 grpid; +u32 code; };drivers/iommu/io-pgfault.c +0
-1@@ -56,7 +56,6 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, enum iommu_page_response_code status) {struct iommu_page_response resp = { - .version =IOMMU_PAGE_RESP_VERSION_1 , .pasid = iopf->fault.prm.pasid, .grpid = iopf->fault.prm.grpid, .code = status,drivers/iommu/iommu.c +0
-0
drivers/iommu/iommu.c int iommu_page_response(struct device *dev, · line 1500
Quoted 7 lines
drivers/iommu/iommu.c +0
-4@@ -1494,10 +1494,6 @@ int iommu_page_response(struct device *dev,if (!param || !param->fault_param)return -EINVAL ; -if (msg->version !=IOMMU_PAGE_RESP_VERSION_1 || - msg->flags & ~IOMMU_PAGE_RESP_PASID_VALID ) -return -EINVAL ; -
I see that this function iommu_page_response eventually lands in drivers/iommu/io-pgfault.c as iopf_group_response. But it seems that the check for IOMMU_PAGE_RESP_PASID_VALID is dropped.
I see that after applying [1] and [2] there are only three places where IOMMU_PAGE_RESP_PASID_VALID appears in the code: One is the definition and the other two are just setting the value. We effectively dropped the check. Is the drop intended? and if so, should we just get rid of IOMMU_PAGE_RESP_PASID_VALID?
Best
[1] https://lore.kernel.org/all/[email protected]
[2] https://lore.kernel.org/all/[email protected]
Quoted 6 lines
drivers/iommu/iommu.c +0
-0/* Only send response if there is a fault report pending */ mutex_lock (¶m->fault_param->lock);if (list_empty (¶m->fault_param->faults)) {Signature · 1 line
2.34.1
Signature · 1 line
Joel Granados
Baolu Lu
maintainerRe: [PATCH v10 04/16] iommu: Cleanup iopf data structure definitions
Quoted 28 lines · Joel Granados
Quoted 17 lines
drivers/iommu/io-pgfault.c +0
-1@@ -56,7 +56,6 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf, enum iommu_page_response_code status) {struct iommu_page_response resp = { - .version =IOMMU_PAGE_RESP_VERSION_1 , .pasid = iopf->fault.prm.pasid, .grpid = iopf->fault.prm.grpid, .code = status,drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_page_response(struct device *dev, · line 1500
Quoted 7 lines
drivers/iommu/iommu.c +0
-4@@ -1494,10 +1494,6 @@ int iommu_page_response(struct device *dev,if (!param || !param->fault_param)return -EINVAL ; -if (msg->version !=IOMMU_PAGE_RESP_VERSION_1 || - msg->flags & ~IOMMU_PAGE_RESP_PASID_VALID ) -return -EINVAL ; -I see that this function
iommu_page_responseeventually lands indrivers/iommu/io-pgfault.casiopf_group_response. But it seems that the check forIOMMU_PAGE_RESP_PASID_VALIDis dropped.
Quoted 3 lines
I see that after applying [1] and [2] there are only three places where
IOMMU_PAGE_RESP_PASID_VALIDappears in the code: One is the definition and the other two are just setting the value. We effectively dropped the
Yes, really. Thanks for pointing this out.
$ git grep IOMMU_PAGE_RESP_PASID_VALID drivers/iommu/io-pgfault.c: resp.flags = IOMMU_PAGE_RESP_PASID_VALID; drivers/iommu/io-pgfault.c: resp.flags = IOMMU_PAGE_RESP_PASID_VALID; include/linux/iommu.h:#define IOMMU_PAGE_RESP_PASID_VALID (1 << 0)
Quoted 2 lines
check. Is the drop intended? and if so, should we just get rid of
IOMMU_PAGE_RESP_PASID_VALID?
In my opinion, we should keep this hardware detail in the individual driver. When the page fault handling framework in IOMMU and IOMMUFD subsystems includes a valid PASID in the fault message, the response message should also contain the *same* PASID value. Individual drivers should be responsible for deciding whether to include the PASID in the messages they provide for the hardware.
Quoted 5 lines
Best
[1]https://lore.kernel.org/all/[email protected] [2]https://lore.kernel.org/all/[email protected]
Best regards,
baolu
Re: [PATCH v10 04/16] iommu: Cleanup iopf data structure definitions
Quoted 9 lines · Baolu Lu
Quoted 2 lines
check. Is the drop intended? and if so, should we just get rid of
IOMMU_PAGE_RESP_PASID_VALID?In my opinion, we should keep this hardware detail in the individual driver. When the page fault handling framework in IOMMU and IOMMUFD subsystems includes a valid PASID in the fault message, the response message should also contain the *same* PASID value. Individual drivers should be responsible for deciding whether to include the PASID in the messages they provide for the hardware.
+1
Jason
Lu Baolu
maintainerPATCH v10 5/16 iommu: Merge iopf_device_param into iommu_fault_param
In reply to Lu BaoluThe struct dev_iommu contains two pointers, fault_param and iopf_param. The fault_param pointer points to a data structure that is used to store pending faults that are awaiting responses. The iopf_param pointer points to a data structure that is used to store partial faults that are part of a Page Request Group.
The fault_param and iopf_param pointers are essentially duplicate. This causes memory waste. Merge the iopf_device_param pointer into the iommu_fault_param pointer to consolidate the code and save memory. The consolidated pointer would be allocated on demand when the device driver enables the iopf on device, and would be freed after iopf is disabled.
--- include/linux/iommu.h | 18 ++++-- drivers/iommu/io-pgfault.c | 110 ++++++++++++++++++------------------- drivers/iommu/iommu.c | 34 ++---------- 3 files changed, 72 insertions(+), 90 deletions(-)
include/linux/iommu.h +14 -4
@@ -42,6 +42,7 @@ struct notifier_block;struct iommu_sva ;struct iommu_fault_event ;struct iommu_dma_cookie ; +struct iopf_queue ;#define IOMMU_FAULT_PERM_READ (1 << 0)/* read */ #define IOMMU_FAULT_PERM_WRITE (1 << 1)/* write */
@@ -672,21 +673,31 @@ struct iommu_fault_event {* struct iommu_fault_param - per-device IOMMU fault data * @handler: Callback function to handle IOMMU faults at device level * @data: handler private data -* @faults: holds the pending faults which needs response * @lock: protect pending faults list +* @dev: the device that owns this param +* @queue: IOPF queue +* @queue_list: index into queue->devices +* @partial: faults that are part of a Page Request Group for which the last +* request hasn't been submitted yet. +* @faults: holds the pending faults which need response */ struct iommu_fault_param {iommu_dev_fault_handler_t handler;void *data; +struct mutex lock; + +struct device *dev; +struct iopf_queue *queue; +struct list_head queue_list; + +struct list_head partial;struct list_head faults; -struct mutex lock; };/** * struct dev_iommu - Collection of per-device IOMMU data * * @fault_param: IOMMU detected device fault reporting data -* @iopf_param: I/O Page Fault queue and data * @fwspec: IOMMU fwspec data * @iommu_dev: IOMMU device this device is linked to * @priv: IOMMU Driver private data
@@ -702,7 +713,6 @@ struct iommu_fault_param {struct dev_iommu {struct mutex lock;struct iommu_fault_param *fault_param; -struct iopf_device_param *iopf_param;struct iommu_fwspec *fwspec;struct iommu_device *iommu_dev;void *priv;
drivers/iommu/io-pgfault.c +52 -58
183 lines not on this page · raw message
drivers/iommu/iommu.c +6 -28
@@ -1355,27 +1355,18 @@ int iommu_register_device_fault_handler(struct device *dev,struct dev_iommu *param = dev->iommu;int ret =0 ; -if (!param) +if (!param || !param->fault_param)return -EINVAL ;mutex_lock (¶m->lock);/* Only allow one fault handler registered for each device */ -if (param->fault_param) { +if (param->fault_param->handler) { ret = -EBUSY ; goto done_unlock; } -get_device (dev); - param->fault_param =kzalloc (sizeof (*param->fault_param),GFP_KERNEL ); -if (!param->fault_param) { -put_device (dev); - ret = -ENOMEM ; - goto done_unlock; - } param->fault_param->handler = handler; param->fault_param->data = data; -mutex_init (¶m->fault_param->lock); -INIT_LIST_HEAD (¶m->fault_param->faults); done_unlock:mutex_unlock (¶m->lock);
@@ -1396,29 +1387,16 @@ EXPORT_SYMBOL_GPL(iommu_register_device_fault_handler);int iommu_unregister_device_fault_handler (struct device *dev) {struct dev_iommu *param = dev->iommu; -int ret =0 ; -if (!param) +if (!param || !param->fault_param)return -EINVAL ;mutex_lock (¶m->lock); - -if (!param->fault_param) - goto unlock; - -/* we cannot unregister handler if there are pending faults */ -if (!list_empty (¶m->fault_param->faults)) { - ret = -EBUSY ; - goto unlock; - } - -kfree (param->fault_param); - param->fault_param =NULL ; -put_device (dev); -unlock: + param->fault_param->handler =NULL ; + param->fault_param->data =NULL ;mutex_unlock (¶m->lock); -return ret; +return 0 ; }EXPORT_SYMBOL_GPL (iommu_unregister_device_fault_handler);
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 6/16 iommu: Remove iommu_[un]register_device_fault_handler()
In reply to Lu BaoluThe individual iommu driver reports the iommu page faults by calling iommu_report_device_fault(), where a pre-registered device fault handler is called to route the fault to another fault handler installed on the corresponding iommu domain.
The pre-registered device fault handler is static and won't be dynamic as the fault handler is eventually per iommu domain. Replace calling device fault handler with iommu_queue_iopf().
After this replacement, the registering and unregistering fault handler interfaces are not needed anywhere. Remove the interfaces and the related data structures to avoid dead code.
Convert cookie parameter of iommu_queue_iopf() into a device pointer that is really passed.
--- include/linux/iommu.h | 23 ------ drivers/iommu/iommu-sva.h | 4 +- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 13 +--- drivers/iommu/intel/iommu.c | 24 ++---- drivers/iommu/io-pgfault.c | 6 +- drivers/iommu/iommu.c | 76 +------------------ 6 files changed, 13 insertions(+), 133 deletions(-)
include/linux/iommu.h +0 -23
@@ -128,7 +128,6 @@ struct iommu_page_response {typedef int (*iommu_fault_handler_t )(struct iommu_domain *,struct device *,unsigned long ,int ,void *); -typedef int (*iommu_dev_fault_handler_t )(struct iommu_fault *,void *);struct iommu_domain_geometry {dma_addr_t aperture_start;/* First address that can be mapped */
@@ -671,8 +670,6 @@ struct iommu_fault_event {/** * struct iommu_fault_param - per-device IOMMU fault data -* @handler: Callback function to handle IOMMU faults at device level -* @data: handler private data * @lock: protect pending faults list * @dev: the device that owns this param * @queue: IOPF queue
@@ -682,8 +679,6 @@ struct iommu_fault_event {* @faults: holds the pending faults which need response */ struct iommu_fault_param { -iommu_dev_fault_handler_t handler; -void *data;struct mutex lock;struct device *dev;
@@ -806,11 +801,6 @@ extern int iommu_group_for_each_dev(struct iommu_group *group, void *data,extern struct iommu_group *iommu_group_get (struct device *dev);extern struct iommu_group *iommu_group_ref_get (struct iommu_group *group);extern void iommu_group_put (struct iommu_group *group); -extern int iommu_register_device_fault_handler (struct device *dev, -iommu_dev_fault_handler_t handler, -void *data); - -extern int iommu_unregister_device_fault_handler (struct device *dev);extern int iommu_report_device_fault (struct device *dev,struct iommu_fault_event *evt);
@@ -1222,19 +1212,6 @@ static inline void iommu_group_put(struct iommu_group *group) { } -static inline -int iommu_register_device_fault_handler (struct device *dev, -iommu_dev_fault_handler_t handler, -void *data) -{ -return -ENODEV ; -} - -static inline int iommu_unregister_device_fault_handler (struct device *dev) -{ -return 0 ; -} -static inline int iommu_report_device_fault (struct device *dev,struct iommu_fault_event *evt) {
drivers/iommu/iommu-sva.h +2 -2
@@ -13,7 +13,7 @@ struct iommu_fault;struct iopf_queue ;#ifdef CONFIG_IOMMU_SVA -int iommu_queue_iopf (struct iommu_fault *fault,void *cookie); +int iommu_queue_iopf (struct iommu_fault *fault,struct device *dev);int iopf_queue_add_device (struct iopf_queue *queue,struct device *dev); int iopf_queue_remove_device(struct iopf_queue *queue,
@@ -26,7 +26,7 @@ enum iommu_page_response_code iommu_sva_handle_iopf(struct iommu_fault *fault, void *data);#else /* CONFIG_IOMMU_SVA */ -static inline int iommu_queue_iopf (struct iommu_fault *fault,void *cookie) +static inline int iommu_queue_iopf (struct iommu_fault *fault,struct device *dev) {return -ENODEV ; }
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +1 -12
@@ -487,7 +487,6 @@ bool arm_smmu_master_sva_enabled(struct arm_smmu_master *master)static int arm_smmu_master_sva_enable_iopf (struct arm_smmu_master *master) { -int ret;struct device *dev = master->dev;/*
@@ -500,16 +499,7 @@ static int arm_smmu_master_sva_enable_iopf(struct arm_smmu_master *master)if (!master->iopf_enabled)return -EINVAL ; - ret =iopf_queue_add_device (master->smmu->evtq.iopf, dev); -if (ret) -return ret; - - ret =iommu_register_device_fault_handler (dev, iommu_queue_iopf, dev); -if (ret) { -iopf_queue_remove_device (master->smmu->evtq.iopf, dev); -return ret; - } -return 0 ; +return iopf_queue_add_device (master->smmu->evtq.iopf, dev); }static void arm_smmu_master_sva_disable_iopf (struct arm_smmu_master *master)
@@ -519,7 +509,6 @@ static void arm_smmu_master_sva_disable_iopf(struct arm_smmu_master *master)if (!master->iopf_enabled)return ; -iommu_unregister_device_fault_handler (dev);iopf_queue_remove_device (master->smmu->evtq.iopf, dev); }
drivers/iommu/intel/iommu.c +7 -17
@@ -4427,23 +4427,15 @@ static int intel_iommu_enable_iopf(struct device *dev)if (ret)return ret; - ret =iommu_register_device_fault_handler (dev, iommu_queue_iopf, dev); -if (ret) - goto iopf_remove_device; - ret =pci_enable_pri (pdev,PRQ_DEPTH ); -if (ret) - goto iopf_unregister_handler; +if (ret) { +iopf_queue_remove_device (iommu->iopf_queue, dev); +return ret; + } + info->pri_enabled =1 ;return 0 ; - -iopf_unregister_handler: -iommu_unregister_device_fault_handler (dev); -iopf_remove_device: -iopf_queue_remove_device (iommu->iopf_queue, dev); - -return ret; }static int intel_iommu_disable_iopf (struct device *dev)
@@ -4466,11 +4458,9 @@ static int intel_iommu_disable_iopf(struct device *dev) info->pri_enabled =0 ;/* -* With PRI disabled and outstanding PRQs drained, unregistering -* fault handler and removing device from iopf queue should never -* fail. +* With PRI disabled and outstanding PRQs drained, removing device +* from iopf queue should never fail. */ -WARN_ON (iommu_unregister_device_fault_handler (dev));WARN_ON (iopf_queue_remove_device (iommu->iopf_queue, dev));return 0 ;
drivers/iommu/io-pgfault.c +2 -4
@@ -87,7 +87,7 @@ static void iopf_handler(struct work_struct *work)/** * iommu_queue_iopf - IO Page Fault handler * @fault: fault event -* @cookie: struct device, passed to iommu_register_device_fault_handler. +* @dev: struct device. * * Add a fault to the device workqueue, to be handled by mm. *
@@ -124,14 +124,12 @@ static void iopf_handler(struct work_struct *work)* * Return: 0 on success and <0 on error. */ -int iommu_queue_iopf (struct iommu_fault *fault,void *cookie) +int iommu_queue_iopf (struct iommu_fault *fault,struct device *dev) {int ret;struct iopf_group *group;struct iopf_fault *iopf, *next;struct iommu_fault_param *iopf_param; - -struct device *dev = cookie;struct dev_iommu *param = dev->iommu;lockdep_assert_held (¶m->lock);
drivers/iommu/iommu.c +1 -75
94 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 7/16 iommu: Merge iommu_fault_event and iopf_fault
In reply to Lu BaoluThe iommu_fault_event and iopf_fault data structures store the same information about an iopf fault. They are also used in the same way. Merge these two data structures into a single one to make the code more concise and easier to maintain.
--- include/linux/iommu.h | 27 ++++++--------------- drivers/iommu/intel/iommu.h | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 +-- drivers/iommu/intel/svm.c | 5 ++-- drivers/iommu/io-pgfault.c | 5 ---- drivers/iommu/iommu.c | 8 +++--- 6 files changed, 17 insertions(+), 34 deletions(-)
include/linux/iommu.h +8 -19
@@ -40,7 +40,6 @@ struct iommu_domain_ops;struct iommu_dirty_ops ;struct notifier_block ;struct iommu_sva ; -struct iommu_fault_event ;struct iommu_dma_cookie ;struct iopf_queue ;
@@ -121,6 +120,11 @@ struct iommu_page_response {u32 code; }; +struct iopf_fault { +struct iommu_fault fault; +/* node for pending lists */ +struct list_head list; +};/* iommu fault flags */ #define IOMMU_FAULT_READ 0x0
@@ -553,7 +557,7 @@ struct iommu_ops {int (*dev_disable_feat)(struct device *dev,enum iommu_dev_features f);int (*page_response)(struct device *dev, -struct iommu_fault_event *evt, +struct iopf_fault *evt,struct iommu_page_response *msg);int (*def_domain_type)(struct device *dev);
@@ -654,20 +658,6 @@ struct iommu_device {u32 max_pasids; }; -/** -* struct iommu_fault_event - Generic fault event -* -* Can represent recoverable faults such as a page requests or -* unrecoverable faults such as DMA or IRQ remapping faults. -* -* @fault: fault descriptor -* @list: pending fault event list, used for tracking responses -*/ -struct iommu_fault_event { -struct iommu_fault fault; -struct list_head list; -}; -/** * struct iommu_fault_param - per-device IOMMU fault data * @lock: protect pending faults list
@@ -802,8 +792,7 @@ extern struct iommu_group *iommu_group_get(struct device *dev);extern struct iommu_group *iommu_group_ref_get (struct iommu_group *group);extern void iommu_group_put (struct iommu_group *group); -extern int iommu_report_device_fault (struct device *dev, -struct iommu_fault_event *evt); +extern int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt);extern int iommu_page_response (struct device *dev,struct iommu_page_response *msg);
@@ -1213,7 +1202,7 @@ static inline void iommu_group_put(struct iommu_group *group) }static inline -int iommu_report_device_fault (struct device *dev,struct iommu_fault_event *evt) +int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) {return -ENODEV ; }
drivers/iommu/intel/iommu.h +1 -1
@@ -1079,7 +1079,7 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,void intel_svm_check (struct intel_iommu *iommu);int intel_svm_enable_prq (struct intel_iommu *iommu);int intel_svm_finish_prq (struct intel_iommu *iommu); -int intel_svm_page_response (struct device *dev,struct iommu_fault_event *evt, +int intel_svm_page_response (struct device *dev,struct iopf_fault *evt,struct iommu_page_response *msg);struct iommu_domain *intel_svm_domain_alloc (void );void intel_svm_remove_dev_pasid (struct device *dev,ioasid_t pasid);
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +2 -2
@@ -922,7 +922,7 @@ static int arm_smmu_cmdq_batch_submit(struct arm_smmu_device *smmu, }static int arm_smmu_page_response (struct device *dev, -struct iommu_fault_event *unused, +struct iopf_fault *unused,struct iommu_page_response *resp) {struct arm_smmu_cmdq_ent cmd = {0 };
@@ -1465,7 +1465,7 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt)struct arm_smmu_master *master;bool ssid_valid = evt[0 ] &EVTQ_0_SSV ;u32 sid =FIELD_GET (EVTQ_0_SID , evt[0 ]); -struct iommu_fault_event fault_evt = { }; +struct iopf_fault fault_evt = { };struct iommu_fault *flt = &fault_evt.fault;switch (FIELD_GET (EVTQ_0_ID , evt[0 ])) {
drivers/iommu/intel/svm.c +2 -3
@@ -565,13 +565,12 @@ static int prq_to_iommu_prot(struct page_req_dsc *req)static int intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev,struct page_req_dsc *desc) { -struct iommu_fault_event event; +struct iopf_fault event = { };if (!dev || !dev_is_pci (dev))return -ENODEV ;/* Fill in event data for device specific processing */ -memset (&event,0 ,sizeof (struct iommu_fault_event )); event.fault.type =IOMMU_FAULT_PAGE_REQ ; event.fault.prm.addr = (u64 )desc->addr <<VTD_PAGE_SHIFT ; event.fault.prm.pasid = desc->pasid;
@@ -743,7 +742,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) }int intel_svm_page_response (struct device *dev, -struct iommu_fault_event *evt, +struct iopf_fault *evt,struct iommu_page_response *msg) {struct device_domain_info *info =dev_iommu_priv_get (dev);
drivers/iommu/io-pgfault.c +0 -5
@@ -25,11 +25,6 @@ struct iopf_queue {struct mutex lock; }; -struct iopf_fault { -struct iommu_fault fault; -struct list_head list; -}; -struct iopf_group {struct iopf_fault last_fault;struct list_head faults;
drivers/iommu/iommu.c +4 -4
@@ -1341,10 +1341,10 @@ EXPORT_SYMBOL_GPL(iommu_group_put);* * Return 0 on success, or an error. */ -int iommu_report_device_fault (struct device *dev,struct iommu_fault_event *evt) +int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) {struct dev_iommu *param = dev->iommu; -struct iommu_fault_event *evt_pending =NULL ; +struct iopf_fault *evt_pending =NULL ;struct iommu_fault_param *fparam;int ret =0 ;
@@ -1357,7 +1357,7 @@ int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt)if (evt->fault.type ==IOMMU_FAULT_PAGE_REQ && (evt->fault.prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { - evt_pending =kmemdup (evt,sizeof (struct iommu_fault_event ), + evt_pending =kmemdup (evt,sizeof (struct iopf_fault ),GFP_KERNEL );if (!evt_pending) { ret = -ENOMEM ;
@@ -1386,7 +1386,7 @@ int iommu_page_response(struct device *dev, {bool needs_pasid;int ret = -EINVAL ; -struct iommu_fault_event *evt; +struct iopf_fault *evt;struct iommu_fault_page_request *prm;struct dev_iommu *param = dev->iommu;const struct iommu_ops *ops =dev_iommu_ops (dev);
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 8/16 iommu: Prepare for separating SVA and IOPF
In reply to Lu BaoluMove iopf_group data structure to iommu.h to make it a minimal set of faults that a domain's page fault handler should handle.
Add a new function, iopf_free_group(), to free a fault group after all faults in the group are handled. This function will be made global so that it can be called from other files, such as iommu-sva.c.
Move iopf_queue data structure to iommu.h to allow the workqueue to be scheduled out of this file.
This will simplify the sequential patches.
--- include/linux/iommu.h | 20 +++++++++++++++++++- drivers/iommu/io-pgfault.c | 37 +++++++++++++------------------------ 2 files changed, 32 insertions(+), 25 deletions(-)
include/linux/iommu.h +19 -1
@@ -41,7 +41,6 @@ struct iommu_dirty_ops;struct notifier_block ;struct iommu_sva ;struct iommu_dma_cookie ; -struct iopf_queue ;#define IOMMU_FAULT_PERM_READ (1 << 0)/* read */ #define IOMMU_FAULT_PERM_WRITE (1 << 1)/* write */
@@ -126,6 +125,25 @@ struct iopf_fault {struct list_head list; }; +struct iopf_group { +struct iopf_fault last_fault; +struct list_head faults; +struct work_struct work; +struct device *dev; +}; + +/** +* struct iopf_queue - IO Page Fault queue +* @wq: the fault workqueue +* @devices: devices attached to this queue +* @lock: protects the device list +*/ +struct iopf_queue { +struct workqueue_struct *wq; +struct list_head devices; +struct mutex lock; +}; +/* iommu fault flags */ #define IOMMU_FAULT_READ 0x0#define IOMMU_FAULT_WRITE 0x1
drivers/iommu/io-pgfault.c +13 -24
@@ -13,24 +13,17 @@#include "iommu-sva.h" -/** -* struct iopf_queue - IO Page Fault queue -* @wq: the fault workqueue -* @devices: devices attached to this queue -* @lock: protects the device list -*/ -struct iopf_queue { -struct workqueue_struct *wq; -struct list_head devices; -struct mutex lock; -}; +static void iopf_free_group (struct iopf_group *group) +{ +struct iopf_fault *iopf, *next; -struct iopf_group { -struct iopf_fault last_fault; -struct list_head faults; -struct work_struct work; -struct device *dev; -}; +list_for_each_entry_safe (iopf, next, &group->faults, list) { +if (!(iopf->fault.prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) +kfree (iopf); + } + +kfree (group); +}static int iopf_complete_group (struct device *dev,struct iopf_fault *iopf,enum iommu_page_response_code status)
@@ -50,9 +43,9 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf,static void iopf_handler (struct work_struct *work) { +struct iopf_fault *iopf;struct iopf_group *group;struct iommu_domain *domain; -struct iopf_fault *iopf, *next;enum iommu_page_response_code status =IOMMU_PAGE_RESP_SUCCESS ; group = container_of(work, struct iopf_group, work);
@@ -61,7 +54,7 @@ static void iopf_handler(struct work_struct *work)if (!domain || !domain->iopf_handler) status =IOMMU_PAGE_RESP_INVALID ; -list_for_each_entry_safe (iopf, next, &group->faults, list) { +list_for_each_entry (iopf, &group->faults, list) {/* * For the moment, errors are sticky: don't handle subsequent * faults in the group if there is an error.
@@ -69,14 +62,10 @@ static void iopf_handler(struct work_struct *work)if (status ==IOMMU_PAGE_RESP_SUCCESS ) status = domain->iopf_handler (&iopf->fault, domain->fault_data); - -if (!(iopf->fault.prm.flags & -IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) -kfree (iopf); }iopf_complete_group (group->dev, &group->last_fault, status); -kfree (group); +iopf_free_group (group); }/**
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 9/16 iommu: Make iommu_queue_iopf() more generic
In reply to Lu BaoluMake iommu_queue_iopf() more generic by making the iopf_group a minimal set of iopf's that an iopf handler of domain should handle and respond to. Add domain parameter to struct iopf_group so that the handler can retrieve and use it directly.
Change iommu_queue_iopf() to forward groups of iopf's to the domain's iopf handler. This is also a necessary step to decouple the sva iopf handling code from this interface.
--- include/linux/iommu.h | 4 +-- drivers/iommu/iommu-sva.h | 6 ++-- drivers/iommu/io-pgfault.c | 68 +++++++++++++++++++++++++++++++------- drivers/iommu/iommu-sva.c | 3 +- 4 files changed, 61 insertions(+), 20 deletions(-)
include/linux/iommu.h +2 -2
@@ -130,6 +130,7 @@ struct iopf_group {struct list_head faults;struct work_struct work;struct device *dev; +struct iommu_domain *domain; };/**
@@ -209,8 +210,7 @@ struct iommu_domain {unsigned long pgsize_bitmap;/* Bitmap of page sizes in use */ struct iommu_domain_geometry geometry;struct iommu_dma_cookie *iova_cookie; -enum iommu_page_response_code (*iopf_handler)(struct iommu_fault *fault, -void *data); +int (*iopf_handler)(struct iopf_group *group);void *fault_data; union { struct {
drivers/iommu/iommu-sva.h +2 -4
@@ -22,8 +22,7 @@ int iopf_queue_flush_dev(struct device *dev);struct iopf_queue *iopf_queue_alloc (const char *name);void iopf_queue_free (struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue); -enum iommu_page_response_code -iommu_sva_handle_iopf (struct iommu_fault *fault,void *data); +int iommu_sva_handle_iopf (struct iopf_group *group);#else /* CONFIG_IOMMU_SVA */ static inline int iommu_queue_iopf (struct iommu_fault *fault,struct device *dev)
@@ -62,8 +61,7 @@ static inline int iopf_queue_discard_partial(struct iopf_queue *queue)return -ENODEV ; } -static inline enum iommu_page_response_code -iommu_sva_handle_iopf (struct iommu_fault *fault,void *data) +static inline int iommu_sva_handle_iopf (struct iopf_group *group) {return IOMMU_PAGE_RESP_INVALID ; }
drivers/iommu/io-pgfault.c +56 -12
126 lines not on this page · raw message
drivers/iommu/iommu-sva.c +1 -2
@@ -163,11 +163,10 @@ EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);* I/O page fault handler for SVA */ enum iommu_page_response_code -iommu_sva_handle_iopf (struct iommu_fault *fault,void *data) +iommu_sva_handle_mm (struct iommu_fault *fault,struct mm_struct *mm) {vm_fault_t ret;struct vm_area_struct *vma; -struct mm_struct *mm = data;unsigned int access_flags =0 ;unsigned int fault_flags =FAULT_FLAG_REMOTE ;struct iommu_fault_page_request *prm = &fault->prm;
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 10/16 iommu: Separate SVA and IOPF
In reply to Lu BaoluAdd CONFIG_IOMMU_IOPF for page fault handling framework and select it from its real consumer. Move iopf function declaration from iommu-sva.h to iommu.h and remove iommu-sva.h as it's empty now.
Consolidate all SVA related code into iommu-sva.c:
- Move iommu_sva_domain_alloc() from iommu.c to iommu-sva.c.
- Move sva iopf handling code from io-pgfault.c to iommu-sva.c.
Consolidate iommu_report_device_fault() and iommu_page_response() into io-pgfault.c.
Export iopf_free_group() and iopf_group_response() for iopf handlers implemented in modules. Some functions are renamed with more meaningful names. No other intentional functionality changes.
--- include/linux/iommu.h | 98 ++++++--- drivers/iommu/iommu-sva.h | 69 ------- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 1 - drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 - drivers/iommu/intel/iommu.c | 1 - drivers/iommu/intel/svm.c | 1 - drivers/iommu/io-pgfault.c | 188 +++++++++++++----- drivers/iommu/iommu-sva.c | 68 ++++++- drivers/iommu/iommu.c | 133 ------------- drivers/iommu/Kconfig | 4 + drivers/iommu/Makefile | 3 +- drivers/iommu/intel/Kconfig | 1 + 12 files changed, 277 insertions(+), 291 deletions(-) delete mode 100644 drivers/iommu/iommu-sva.h
include/linux/iommu.h +74 -24
@@ -810,10 +810,6 @@ extern struct iommu_group *iommu_group_get(struct device *dev);extern struct iommu_group *iommu_group_ref_get (struct iommu_group *group);extern void iommu_group_put (struct iommu_group *group); -extern int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); -extern int iommu_page_response (struct device *dev, -struct iommu_page_response *msg); -extern int iommu_group_id (struct iommu_group *group);extern struct iommu_domain *iommu_group_default_domain (struct iommu_group *);
@@ -1029,8 +1025,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group);int iommu_device_claim_dma_owner (struct device *dev,void *owner);void iommu_device_release_dma_owner (struct device *dev); -struct iommu_domain *iommu_sva_domain_alloc (struct device *dev, -struct mm_struct *mm);int iommu_attach_device_pasid (struct iommu_domain *domain,struct device *dev,ioasid_t pasid); void iommu_detach_device_pasid(struct iommu_domain *domain,
@@ -1219,18 +1213,6 @@ static inline void iommu_group_put(struct iommu_group *group) { } -static inline -int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) -{ -return -ENODEV ; -} - -static inline int iommu_page_response (struct device *dev, -struct iommu_page_response *msg) -{ -return -ENODEV ; -} -static inline int iommu_group_id (struct iommu_group *group) {return -ENODEV ;
@@ -1379,12 +1361,6 @@ static inline int iommu_device_claim_dma_owner(struct device *dev, void *owner)return -ENODEV ; } -static inline struct iommu_domain * -iommu_sva_domain_alloc (struct device *dev,struct mm_struct *mm) -{ -return NULL ; -} -static inline int iommu_attach_device_pasid (struct iommu_domain *domain,struct device *dev,ioasid_t pasid) {
@@ -1524,6 +1500,8 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm);void iommu_sva_unbind_device (struct iommu_sva *handle);u32 iommu_sva_get_pasid (struct iommu_sva *handle); +struct iommu_domain *iommu_sva_domain_alloc (struct device *dev, +struct mm_struct *mm);#else static inline struct iommu_sva *iommu_sva_bind_device (struct device *dev,struct mm_struct *mm)
@@ -1548,6 +1526,78 @@ static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) }static inline void mm_pasid_drop (struct mm_struct *mm) {} + +static inline struct iommu_domain * +iommu_sva_domain_alloc (struct device *dev,struct mm_struct *mm) +{ +return NULL ; +}#endif /* CONFIG_IOMMU_SVA */ +#ifdef CONFIG_IOMMU_IOPF +int iopf_queue_add_device (struct iopf_queue *queue,struct device *dev); +int iopf_queue_remove_device (struct iopf_queue *queue,struct device *dev); +int iopf_queue_flush_dev (struct device *dev); +struct iopf_queue *iopf_queue_alloc (const char *name); +void iopf_queue_free (struct iopf_queue *queue); +int iopf_queue_discard_partial (struct iopf_queue *queue); +void iopf_free_group (struct iopf_group *group); +int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); +int iommu_page_response (struct device *dev,struct iommu_page_response *msg); +int iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status); +#else +static inline int +iopf_queue_add_device (struct iopf_queue *queue,struct device *dev) +{ +return -ENODEV ; +} + +static inline int +iopf_queue_remove_device (struct iopf_queue *queue,struct device *dev) +{ +return -ENODEV ; +} + +static inline int iopf_queue_flush_dev (struct device *dev) +{ +return -ENODEV ; +} + +static inline struct iopf_queue *iopf_queue_alloc (const char *name) +{ +return NULL ; +} + +static inline void iopf_queue_free (struct iopf_queue *queue) +{ +} + +static inline int iopf_queue_discard_partial (struct iopf_queue *queue) +{ +return -ENODEV ; +} + +static inline void iopf_free_group (struct iopf_group *group) +{ +} + +static inline int +iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) +{ +return -ENODEV ; +} + +static inline int +iommu_page_response (struct device *dev,struct iommu_page_response *msg) +{ +return -ENODEV ; +} + +static inline int iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status) +{ +return -ENODEV ; +} +#endif /* CONFIG_IOMMU_IOPF */ #endif /* __LINUX_IOMMU_H */
drivers/iommu/iommu-sva.h deleted +0 -69
69 lines not on this page · raw message
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +0 -1
@@ -10,7 +10,6 @@#include <linux/slab.h> #include "arm-smmu-v3.h" -#include "../../iommu-sva.h" #include "../../io-pgtable-arm.h" struct arm_smmu_mmu_notifier {
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +0 -1
@@ -29,7 +29,6 @@#include "arm-smmu-v3.h" #include "../../dma-iommu.h" -#include "../../iommu-sva.h" static bool disable_bypass = true;module_param (disable_bypass, bool,0444 );
drivers/iommu/intel/iommu.c +0 -1
@@ -27,7 +27,6 @@#include "iommu.h" #include "../dma-iommu.h" #include "../irq_remapping.h" -#include "../iommu-sva.h" #include "pasid.h" #include "cap_audit.h" #include "perfmon.h"
drivers/iommu/intel/svm.c +0 -1
@@ -22,7 +22,6 @@#include "iommu.h" #include "pasid.h" #include "perf.h" -#include "../iommu-sva.h" #include "trace.h" static irqreturn_t prq_event_thread (int irq,void *d);
drivers/iommu/io-pgfault.c +136 -52
230 lines not on this page · raw message
drivers/iommu/iommu-sva.c +60 -8
90 lines not on this page · raw message
drivers/iommu/iommu.c +0 -133
151 lines not on this page · raw message
drivers/iommu/Kconfig +4 -0
@@ -163,6 +163,9 @@ config IOMMU_SVA select IOMMU_MM_DATA bool +config IOMMU_IOPF + bool + config FSL_PAMU bool "Freescale IOMMU support" depends on PCI
@@ -398,6 +401,7 @@ config ARM_SMMU_V3_SVA bool "Shared Virtual Addressing support for the ARM SMMUv3" depends on ARM_SMMU_V3 select IOMMU_SVA + select IOMMU_IOPF select MMU_NOTIFIER help Support for sharing process address spaces with devices using the
drivers/iommu/Makefile +2 -1
@@ -26,6 +26,7 @@ obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) += s390-iommu.o obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o -obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o io-pgfault.o +obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o +obj-$(CONFIG_IOMMU_IOPF) += io-pgfault.o obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o obj-$(CONFIG_APPLE_DART) += apple-dart.o
drivers/iommu/intel/Kconfig +1 -0
@@ -51,6 +51,7 @@ config INTEL_IOMMU_SVM depends on X86_64 select MMU_NOTIFIER select IOMMU_SVA + select IOMMU_IOPF help Shared Virtual Memory (SVM) provides a facility for devices to access DMA resources through process address space by
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 11/16 iommu: Refine locking for per-device fault data management
In reply to Lu BaoluThe per-device fault data is a data structure that is used to store information about faults that occur on a device. This data is allocated when IOPF is enabled on the device and freed when IOPF is disabled. The data is used in the paths of iopf reporting, handling, responding, and draining.
The fault data is protected by two locks:
- dev->iommu->lock: This lock is used to protect the allocation and freeing of the fault data.
- dev->iommu->fault_parameter->lock: This lock is used to protect the fault data itself.
Apply the locking mechanism to the fault reporting and responding paths.
The fault_parameter->lock is also added in iopf_queue_discard_partial(). It does not fix any real issue, as iopf_queue_discard_partial() is only used in the VT-d driver's prq_event_thread(), which is a single-threaded path that reports the IOPFs.
--- drivers/iommu/io-pgfault.c | 61 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 31 deletions(-)
drivers/iommu/io-pgfault.c +30 -31
@@ -53,7 +53,7 @@ static struct iommu_domain *get_domain_for_iopf(struct device *dev,/** * iommu_handle_iopf - IO Page Fault handler * @fault: fault event -* @dev: struct device. +* @iopf_param: the fault parameter of the device. * * Add a fault to the device workqueue, to be handled by mm. *
@@ -90,29 +90,21 @@ static struct iommu_domain *get_domain_for_iopf(struct device *dev,* * Return: 0 on success and <0 on error. */ -static int iommu_handle_iopf (struct iommu_fault *fault,struct device *dev) +static int iommu_handle_iopf (struct iommu_fault *fault, +struct iommu_fault_param *iopf_param) {int ret;struct iopf_group *group;struct iommu_domain *domain;struct iopf_fault *iopf, *next; -struct iommu_fault_param *iopf_param; -struct dev_iommu *param = dev->iommu; +struct device *dev = iopf_param->dev; -lockdep_assert_held (¶m->lock); +lockdep_assert_held (&iopf_param->lock);if (fault->type !=IOMMU_FAULT_PAGE_REQ )/* Not a recoverable page fault */ return -EOPNOTSUPP ; -/* -* As long as we're holding param->lock, the queue can't be unlinked -* from the device and therefore cannot disappear. -*/ - iopf_param = param->fault_param; -if (!iopf_param) -return -ENODEV ; -if (!(fault->prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { iopf =kzalloc (sizeof (*iopf),GFP_KERNEL );if (!iopf)
@@ -186,18 +178,19 @@ static int iommu_handle_iopf(struct iommu_fault *fault, struct device *dev)*/ int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) { -struct dev_iommu *param = dev->iommu; +struct iommu_fault_param *fault_param;struct iopf_fault *evt_pending =NULL ; -struct iommu_fault_param *fparam; +struct dev_iommu *param = dev->iommu;int ret =0 ; -if (!param || !evt) -return -EINVAL ; - -/* we only report device fault if there is a handler registered */ mutex_lock (¶m->lock); - fparam = param->fault_param; + fault_param = param->fault_param; +if (!fault_param) { +mutex_unlock (¶m->lock); +return -EINVAL ; + } +mutex_lock (&fault_param->lock);if (evt->fault.type ==IOMMU_FAULT_PAGE_REQ && (evt->fault.prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { evt_pending = kmemdup(evt, sizeof(struct iopf_fault),
@@ -206,20 +199,18 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) ret = -ENOMEM ; goto done_unlock; } -mutex_lock (&fparam->lock); -list_add_tail (&evt_pending->list, &fparam->faults); -mutex_unlock (&fparam->lock); +list_add_tail (&evt_pending->list, &fault_param->faults); } - ret =iommu_handle_iopf (&evt->fault, dev); + ret =iommu_handle_iopf (&evt->fault, fault_param);if (ret && evt_pending) { -mutex_lock (&fparam->lock);list_del (&evt_pending->list); -mutex_unlock (&fparam->lock);kfree (evt_pending); } done_unlock: +mutex_unlock (&fault_param->lock);mutex_unlock (¶m->lock); +return ret; }EXPORT_SYMBOL_GPL (iommu_report_device_fault);
@@ -232,18 +223,23 @@ int iommu_page_response(struct device *dev,struct iopf_fault *evt;struct iommu_fault_page_request *prm;struct dev_iommu *param = dev->iommu; +struct iommu_fault_param *fault_param;const struct iommu_ops *ops =dev_iommu_ops (dev);bool has_pasid = msg->flags &IOMMU_PAGE_RESP_PASID_VALID ;if (!ops->page_response)return -ENODEV ; -if (!param || !param->fault_param) +mutex_lock (¶m->lock); + fault_param = param->fault_param; +if (!fault_param) { +mutex_unlock (¶m->lock);return -EINVAL ; + }/* Only send response if there is a fault report pending */ -mutex_lock (¶m->fault_param->lock); -if (list_empty (¶m->fault_param->faults)) { +mutex_lock (&fault_param->lock); +if (list_empty (&fault_param->faults)) {dev_warn_ratelimited (dev,"no pending PRQ, drop response\n" ); goto done_unlock; }
@@ -251,7 +247,7 @@ int iommu_page_response(struct device *dev,* Check if we have a matching page request pending to respond, * otherwise return -EINVAL */ -list_for_each_entry (evt, ¶m->fault_param->faults, list) { +list_for_each_entry (evt, &fault_param->faults, list) { prm = &evt->fault.prm;if (prm->grpid != msg->grpid)continue ;
@@ -279,7 +275,8 @@ int iommu_page_response(struct device *dev, } done_unlock: -mutex_unlock (¶m->fault_param->lock); +mutex_unlock (&fault_param->lock); +mutex_unlock (¶m->lock);return ret; }EXPORT_SYMBOL_GPL (iommu_page_response);
@@ -362,11 +359,13 @@ int iopf_queue_discard_partial(struct iopf_queue *queue)mutex_lock (&queue->lock);list_for_each_entry (iopf_param, &queue->devices, queue_list) { +mutex_lock (&iopf_param->lock);list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) {list_del (&iopf->list);kfree (iopf); } +mutex_unlock (&iopf_param->lock); }mutex_unlock (&queue->lock);return 0 ;
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 12/16 iommu: Use refcount for fault data access
In reply to Lu BaoluThe per-device fault data structure stores information about faults occurring on a device. Its lifetime spans from IOPF enablement to disablement. Multiple paths, including IOPF reporting, handling, and responding, may access it concurrently.
Previously, a mutex protected the fault data from use after free. But this is not performance friendly due to the critical nature of IOPF handling paths.
Refine this with a refcount-based approach. The fault data pointer is obtained within an RCU read region with a refcount. The fault data pointer is returned for usage only when the pointer is valid and a refcount is successfully obtained. The fault data is freed with kfree_rcu(), ensuring data is only freed after all RCU critical regions complete.
An iopf handling work starts once an iopf group is created. The handling work continues until iommu_page_response() is called to respond to the iopf and the iopf group is freed. During this time, the device fault parameter should always be available. Add a pointer to the device fault parameter in the iopf_group structure and hold the reference until the iopf_group is freed.
Make iommu_page_response() static as it is only used in io-pgfault.c.
--- include/linux/iommu.h | 17 +++-- drivers/iommu/io-pgfault.c | 127 +++++++++++++++++++++++-------------- drivers/iommu/iommu-sva.c | 2 +- 3 files changed, 88 insertions(+), 58 deletions(-)
include/linux/iommu.h +8 -9
@@ -41,6 +41,7 @@ struct iommu_dirty_ops;struct notifier_block ;struct iommu_sva ;struct iommu_dma_cookie ; +struct iommu_fault_param ;#define IOMMU_FAULT_PERM_READ (1 << 0)/* read */ #define IOMMU_FAULT_PERM_WRITE (1 << 1)/* write */
@@ -129,8 +130,9 @@ struct iopf_group {struct iopf_fault last_fault;struct list_head faults;struct work_struct work; -struct device *dev;struct iommu_domain *domain; +/* The device's fault data parameter. */ +struct iommu_fault_param *fault_param; };/**
@@ -679,6 +681,8 @@ struct iommu_device {/** * struct iommu_fault_param - per-device IOMMU fault data * @lock: protect pending faults list +* @users: user counter to manage the lifetime of the data +* @ruc: rcu head for kfree_rcu() * @dev: the device that owns this param * @queue: IOPF queue * @queue_list: index into queue->devices
@@ -688,6 +692,8 @@ struct iommu_device {*/ struct iommu_fault_param {struct mutex lock; +refcount_t users; +struct rcu_head rcu;struct device *dev;struct iopf_queue *queue;
@@ -715,7 +721,7 @@ struct iommu_fault_param {*/ struct dev_iommu {struct mutex lock; -struct iommu_fault_param *fault_param; +struct iommu_fault_param __rcu *fault_param;struct iommu_fwspec *fwspec;struct iommu_device *iommu_dev;void *priv;
@@ -1543,7 +1549,6 @@ void iopf_queue_free(struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group);int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); -int iommu_page_response (struct device *dev,struct iommu_page_response *msg);int iopf_group_response (struct iopf_group *group,enum iommu_page_response_code status);#else
@@ -1588,12 +1593,6 @@ iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)return -ENODEV ; } -static inline int -iommu_page_response (struct device *dev,struct iommu_page_response *msg) -{ -return -ENODEV ; -} -static inline int iopf_group_response (struct iopf_group *group,enum iommu_page_response_code status) {
drivers/iommu/io-pgfault.c +79 -48
239 lines not on this page · raw message
drivers/iommu/iommu-sva.c +1 -1
@@ -251,7 +251,7 @@ static void iommu_sva_handle_iopf(struct work_struct *work)static int iommu_sva_iopf_handler (struct iopf_group *group) { -struct iommu_fault_param *fault_param = group->dev->iommu->fault_param; +struct iommu_fault_param *fault_param = group->fault_param;INIT_WORK (&group->work, iommu_sva_handle_iopf);if (!queue_work (fault_param->queue->wq, &group->work))
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 13/16 iommu: Improve iopf_queue_remove_device()
In reply to Lu BaoluConvert iopf_queue_remove_device() to return void instead of an error code, as the return value is never used. This removal helper is designed to be never-failed, so there's no need for error handling.
Ack all outstanding page requests from the device with the response code of IOMMU_PAGE_RESP_INVALID, indicating device should not attempt any retry.
Add comments to this helper explaining the steps involved in removing a device from the iopf queue and disabling its PRI.
--- include/linux/iommu.h | 5 ++-- drivers/iommu/intel/iommu.c | 7 +---- drivers/iommu/io-pgfault.c | 59 ++++++++++++++++++++++++------------- 3 files changed, 41 insertions(+), 30 deletions(-)
include/linux/iommu.h +2 -3
@@ -1542,7 +1542,7 @@ iommu_sva_domain_alloc(struct device *dev, struct mm_struct *mm)#ifdef CONFIG_IOMMU_IOPF int iopf_queue_add_device (struct iopf_queue *queue,struct device *dev); -int iopf_queue_remove_device (struct iopf_queue *queue,struct device *dev); +void iopf_queue_remove_device (struct iopf_queue *queue,struct device *dev);int iopf_queue_flush_dev (struct device *dev);struct iopf_queue *iopf_queue_alloc (const char *name);void iopf_queue_free (struct iopf_queue *queue);
@@ -1558,10 +1558,9 @@ iopf_queue_add_device(struct iopf_queue *queue, struct device *dev)return -ENODEV ; } -static inline int +static inline void iopf_queue_remove_device (struct iopf_queue *queue,struct device *dev) { -return -ENODEV ; }static inline int iopf_queue_flush_dev (struct device *dev)
drivers/iommu/intel/iommu.c +1 -6
@@ -4455,12 +4455,7 @@ static int intel_iommu_disable_iopf(struct device *dev)*/ pci_disable_pri (to_pci_dev (dev)); info->pri_enabled =0 ; - -/* -* With PRI disabled and outstanding PRQs drained, removing device -* from iopf queue should never fail. -*/ -WARN_ON (iopf_queue_remove_device (iommu->iopf_queue, dev)); +iopf_queue_remove_device (iommu->iopf_queue, dev);return 0 ; }
drivers/iommu/io-pgfault.c +38 -21
88 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 14/16 iommu: Track iopf group instead of last fault
In reply to Lu BaoluPreviously, before a group of page faults was passed to the domain's iopf handler, the last page fault of the group was kept in the list of iommu_fault_param::faults. In the page fault response path, the group's last page fault was used to look up the list, and the page faults were responded to device only if there was a matched fault.
The previous approach seems unnecessarily complex and not performance friendly. Put the page fault group itself to the outstanding fault list. It can be removed in the page fault response path or in the iopf_queue_remove_device() path. The pending list is protected by iommu_fault_param::lock. To allow checking for the group's presence in the list using list_empty(), the iopf group should be removed from the list with list_del_init().
--- include/linux/iommu.h | 2 + drivers/iommu/io-pgfault.c | 237 +++++++++++++------------------------ 2 files changed, 87 insertions(+), 152 deletions(-)
include/linux/iommu.h +2 -0
@@ -129,6 +129,8 @@ struct iopf_fault {struct iopf_group {struct iopf_fault last_fault;struct list_head faults; +/* list node for iommu_fault_param::faults */ +struct list_head pending_node;struct work_struct work;struct iommu_domain *domain;/* The device's fault data parameter. */
drivers/iommu/io-pgfault.c +85 -152
334 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v10 15/16 iommu: Make iopf_group_response() return void
In reply to Lu BaoluThe iopf_group_response() should return void, as nothing can do anything with the failure. This implies that ops->page_response() must also return void; this is consistent with what the drivers do. The failure paths, which are all integrity validations of the fault, should be WARN_ON'd, not return codes.
If the iommu core fails to enqueue the fault, it should respond the fault directly by calling ops->page_response() instead of returning an error number and relying on the iommu drivers to do so. Consolidate the error fault handling code in the core.
--- include/linux/iommu.h | 14 +-- drivers/iommu/intel/iommu.h | 4 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 50 +++----- drivers/iommu/intel/svm.c | 18 +-- drivers/iommu/io-pgfault.c | 132 +++++++++++--------- 5 files changed, 99 insertions(+), 119 deletions(-)
include/linux/iommu.h +6 -8
@@ -578,9 +578,8 @@ struct iommu_ops {int (*dev_enable_feat)(struct device *dev,enum iommu_dev_features f);int (*dev_disable_feat)(struct device *dev,enum iommu_dev_features f); -int (*page_response)(struct device *dev, -struct iopf_fault *evt, -struct iommu_page_response *msg); +void (*page_response)(struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg);int (*def_domain_type)(struct device *dev);void (*remove_dev_pasid)(struct device *dev,ioasid_t pasid);
@@ -1551,8 +1550,8 @@ void iopf_queue_free(struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group);int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); -int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status); +void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status);#else static inline int iopf_queue_add_device (struct iopf_queue *queue,struct device *dev)
@@ -1594,10 +1593,9 @@ iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)return -ENODEV ; } -static inline int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status) +static inline void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status) { -return -ENODEV ; }#endif /* CONFIG_IOMMU_IOPF */ #endif /* __LINUX_IOMMU_H */
drivers/iommu/intel/iommu.h +2 -2
@@ -1079,8 +1079,8 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,void intel_svm_check (struct intel_iommu *iommu);int intel_svm_enable_prq (struct intel_iommu *iommu);int intel_svm_finish_prq (struct intel_iommu *iommu); -int intel_svm_page_response (struct device *dev,struct iopf_fault *evt, -struct iommu_page_response *msg); +void intel_svm_page_response (struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg);struct iommu_domain *intel_svm_domain_alloc (void );void intel_svm_remove_dev_pasid (struct device *dev,ioasid_t pasid);void intel_drain_pasid_prq (struct device *dev,u32 pasid);
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +18 -32
73 lines not on this page · raw message
drivers/iommu/intel/svm.c +2 -16
@@ -740,9 +740,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)return IRQ_RETVAL (handled); } -int intel_svm_page_response (struct device *dev, -struct iopf_fault *evt, -struct iommu_page_response *msg) +void intel_svm_page_response (struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;
@@ -751,7 +750,6 @@ int intel_svm_page_response(struct device *dev,bool private_present;bool pasid_present;bool last_page; -int ret =0 ;u16 sid; prm = &evt->fault.prm;
@@ -760,16 +758,6 @@ int intel_svm_page_response(struct device *dev, private_present = prm->flags &IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA ; last_page = prm->flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; -if (!pasid_present) { - ret = -EINVAL ; - goto out; - } - -if (prm->pasid ==0 || prm->pasid >=PASID_MAX ) { - ret = -EINVAL ; - goto out; - } -/* * Per VT-d spec. v3.0 ch7.7, system software must respond * with page group response if private data is present (PDP)
@@ -798,8 +786,6 @@ int intel_svm_page_response(struct device *dev,qi_submit_sync (iommu, &desc,1 ,0 ); } -out: -return ret; } static int intel_svm_set_dev_pasid(struct iommu_domain *domain,
drivers/iommu/io-pgfault.c +71 -61
203 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v10 15/16] iommu: Make iopf_group_response() return void
Quoted 390 lines · Lu Baolu
The
iopf_group_response()should return void, as nothing can do anything with the failure. This implies thatops->page_response()must also return void; this is consistent with what the drivers do. The failure paths, which are all integrity validations of the fault, should be WARN_ON'd, not return codes.If the iommu core fails to enqueue the fault, it should respond the fault directly by calling
ops->page_response()instead of returning an error number and relying on the iommu drivers to do so. Consolidate the error fault handling code in the core.Co-developed-by Jason Gunthorpe <[email protected]>Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- include/linux/iommu.h | 14 +-- drivers/iommu/intel/iommu.h | 4 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 50 +++----- drivers/iommu/intel/svm.c | 18 +-- drivers/iommu/io-pgfault.c | 132 +++++++++++--------- 5 files changed, 99 insertions(+), 119 deletions(-)include/linux/iommu.h +6
-8@@ -578,9 +578,8 @@ struct iommu_ops {int (*dev_enable_feat)(struct device *dev,enum iommu_dev_features f);int (*dev_disable_feat)(struct device *dev,enum iommu_dev_features f); -int (*page_response)(struct device *dev, -struct iopf_fault *evt, -struct iommu_page_response *msg); +void (*page_response)(struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg);int (*def_domain_type)(struct device *dev);void (*remove_dev_pasid)(struct device *dev,ioasid_t pasid);@@ -1551,8 +1550,8 @@ void iopf_queue_free(struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group);int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); -int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status); +void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status);#else static inline int iopf_queue_add_device (struct iopf_queue *queue,struct device *dev)@@ -1594,10 +1593,9 @@ iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)return -ENODEV ; } -static inline int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status) +static inline void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status) { -return -ENODEV ; }#endif /* CONFIG_IOMMU_IOPF */ #endif /* __LINUX_IOMMU_H */ drivers/iommu/intel/iommu.h +2
-2@@ -1079,8 +1079,8 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,void intel_svm_check (struct intel_iommu *iommu);int intel_svm_enable_prq (struct intel_iommu *iommu);int intel_svm_finish_prq (struct intel_iommu *iommu); -int intel_svm_page_response (struct device *dev,struct iopf_fault *evt, -struct iommu_page_response *msg); +void intel_svm_page_response (struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg);struct iommu_domain *intel_svm_domain_alloc (void );void intel_svm_remove_dev_pasid (struct device *dev,ioasid_t pasid);void intel_drain_pasid_prq (struct device *dev,u32 pasid);drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +18
-32@@ -920,31 +920,29 @@ static int arm_smmu_cmdq_batch_submit(struct arm_smmu_device *smmu,return arm_smmu_cmdq_issue_cmdlist (smmu, cmds->cmds, cmds->num, true); } -static int arm_smmu_page_response (struct device *dev, -struct iopf_fault *unused, -struct iommu_page_response *resp) +static void arm_smmu_page_response (struct device *dev,struct iopf_fault *unused, +struct iommu_page_response *resp) {struct arm_smmu_cmdq_ent cmd = {0 };struct arm_smmu_master *master =dev_iommu_priv_get (dev);int sid = master->streams[0 ].id; -if (master->stall_enabled) { - cmd.opcode =CMDQ_OP_RESUME ; - cmd.resume.sid = sid; - cmd.resume.stag = resp->grpid; -switch (resp->code) { -case IOMMU_PAGE_RESP_INVALID : -case IOMMU_PAGE_RESP_FAILURE : - cmd.resume.resp =CMDQ_RESUME_0_RESP_ABORT ; -break ; -case IOMMU_PAGE_RESP_SUCCESS : - cmd.resume.resp =CMDQ_RESUME_0_RESP_RETRY ; -break ; -default : -return -EINVAL ; - } - }else { -return -ENODEV ; +if (WARN_ON (!master->stall_enabled)) +return ; + + cmd.opcode =CMDQ_OP_RESUME ; + cmd.resume.sid = sid; + cmd.resume.stag = resp->grpid; +switch (resp->code) { +case IOMMU_PAGE_RESP_INVALID : +case IOMMU_PAGE_RESP_FAILURE : + cmd.resume.resp =CMDQ_RESUME_0_RESP_ABORT ; +break ; +case IOMMU_PAGE_RESP_SUCCESS : + cmd.resume.resp =CMDQ_RESUME_0_RESP_RETRY ; +break ; +default : +break ; }arm_smmu_cmdq_issue_cmd (master->smmu, &cmd);@@ -954,8 +952,6 @@ static int arm_smmu_page_response(struct device *dev,* terminated... at some point in the future. PRI_RESP is fire and * forget. */ - -return 0 ; }/* Context descriptor manipulation functions */ @@ -1516,16 +1512,6 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) } ret =iommu_report_device_fault (master->dev, &fault_evt); -if (ret && flt->type ==IOMMU_FAULT_PAGE_REQ ) { -/* Nobody cared, abort the access */ -struct iommu_page_response resp = { - .pasid = flt->prm.pasid, - .grpid = flt->prm.grpid, - .code =IOMMU_PAGE_RESP_FAILURE , - }; -arm_smmu_page_response (master->dev, &fault_evt, &resp); - } - out_unlock:mutex_unlock (&smmu->streams_mutex);return ret;drivers/iommu/intel/svm.c +2
-16@@ -740,9 +740,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)return IRQ_RETVAL (handled); } -int intel_svm_page_response (struct device *dev, -struct iopf_fault *evt, -struct iommu_page_response *msg) +void intel_svm_page_response (struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;@@ -751,7 +750,6 @@ int intel_svm_page_response(struct device *dev,bool private_present;bool pasid_present;bool last_page; -int ret =0 ;u16 sid; prm = &evt->fault.prm;@@ -760,16 +758,6 @@ int intel_svm_page_response(struct device *dev, private_present = prm->flags &IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA ; last_page = prm->flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; -if (!pasid_present) { - ret = -EINVAL ; - goto out; - } - -if (prm->pasid ==0 || prm->pasid >=PASID_MAX ) { - ret = -EINVAL ; - goto out; - } -/* * Per VT-d spec. v3.0 ch7.7, system software must respond * with page group response if private data is present (PDP) @@ -798,8 +786,6 @@ int intel_svm_page_response(struct device *dev,qi_submit_sync (iommu, &desc,1 ,0 ); } -out: -return ret; } static int intel_svm_set_dev_pasid(struct iommu_domain *domain,drivers/iommu/io-pgfault.c +68
-55@@ -39,7 +39,7 @@ static void iopf_put_dev_fault_param(struct iommu_fault_param *fault_param)kfree_rcu (fault_param, rcu); } -void iopf_free_group (struct iopf_group *group) +static void __iopf_free_group (struct iopf_group *group) {struct iopf_fault *iopf, *next;@@ -50,6 +50,11 @@ void iopf_free_group(struct iopf_group *group)/* Pair with iommu_report_device_fault(). */ iopf_put_dev_fault_param (group->fault_param); +} + +void iopf_free_group (struct iopf_group *group) +{ +__iopf_free_group (group);kfree (group); }EXPORT_SYMBOL_GPL (iopf_free_group);@@ -97,14 +102,49 @@ static int report_partial_fault(struct iommu_fault_param *fault_param,return 0 ; } +static struct iopf_group *iopf_group_alloc (struct iommu_fault_param *iopf_param, +struct iopf_fault *evt, +struct iopf_group *abort_group) +{ +struct iopf_fault *iopf, *next; +struct iopf_group *group; + + group =kzalloc (sizeof (*group),GFP_KERNEL ); +if (!group) { +/* +* We always need to construct the group as we need it to abort +* the request at the driver if it cfan't be handled. +*/ + group = abort_group; + } + + group->fault_param = iopf_param; + group->last_fault.fault = evt->fault; +INIT_LIST_HEAD (&group->faults); +INIT_LIST_HEAD (&group->pending_node); +list_add (&group->last_fault.list, &group->faults); + +/* See if we have partial faults for this group */ +mutex_lock (&iopf_param->lock); +list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) { +if (iopf->fault.prm.grpid == evt->fault.prm.grpid) +/* Insert *before* the last fault */ +list_move (&iopf->list, &group->faults); + } +list_add (&group->pending_node, &iopf_param->faults); +mutex_unlock (&iopf_param->lock); + +return group; +} +/** * iommu_report_device_fault() - Report fault event to device driver * @dev: the device * @evt: fault event data * * Called by IOMMU drivers when a fault is detected, typically in a threaded IRQ -* handler. When this function fails and the fault is recoverable, it is the -* caller's responsibility to complete the fault. +* handler. If this function fails then ops->page_response() was called to +* complete evt if required. * * This module doesn't handle PCI PASID Stop Marker; IOMMU drivers must discard * them before reporting faults. A PASID Stop Marker (LRW = 0b100) doesn't @@ -143,22 +183,18 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) {struct iommu_fault *fault = &evt->fault;struct iommu_fault_param *iopf_param; -struct iopf_fault *iopf, *next; -struct iommu_domain *domain; +struct iopf_group abort_group = {};struct iopf_group *group;int ret; -if (fault->type !=IOMMU_FAULT_PAGE_REQ ) -return -EOPNOTSUPP ; - iopf_param =iopf_get_dev_fault_param (dev); -if (!iopf_param) +if (WARN_ON (!iopf_param))return -ENODEV ;if (!(fault->prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { ret =report_partial_fault (iopf_param, fault);iopf_put_dev_fault_param (iopf_param); - +/* A request that is not the last does not need to be ack'd */ return ret; }@@ -170,56 +206,33 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)* will send a response to the hardware. We need to clean up before * leaving, otherwise partial faults will be stuck. */ - domain =get_domain_for_iopf (dev, fault); -if (!domain) { + group =iopf_group_alloc (iopf_param, evt, &abort_group); +if (group == &abort_group) { + ret = -ENOMEM ; + goto err_abort; + } + + group->domain =get_domain_for_iopf (dev, fault); +if (!group->domain) { ret = -EINVAL ; - goto cleanup_partial; + goto err_abort; } - group =kzalloc (sizeof (*group),GFP_KERNEL ); -if (!group) { - ret = -ENOMEM ; - goto cleanup_partial; - } - - group->fault_param = iopf_param; - group->last_fault.fault = *fault; -INIT_LIST_HEAD (&group->faults); -INIT_LIST_HEAD (&group->pending_node); - group->domain = domain; -list_add (&group->last_fault.list, &group->faults); - -/* See if we have partial faults for this group */ -mutex_lock (&iopf_param->lock); -list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) { -if (iopf->fault.prm.grpid == fault->prm.grpid) -/* Insert *before* the last fault */ -list_move (&iopf->list, &group->faults); - } -list_add (&group->pending_node, &iopf_param->faults); -mutex_unlock (&iopf_param->lock); +/* +* On success iopf_handler must call iopf_group_response() and +* iopf_free_group() +*/ + ret = group->domain->iopf_handler (group); +if (ret) + goto err_abort; +return 0 ; - ret = domain->iopf_handler (group); -if (ret) { -mutex_lock (&iopf_param->lock); -list_del_init (&group->pending_node); -mutex_unlock (&iopf_param->lock); +err_abort: +iopf_group_response (group,IOMMU_PAGE_RESP_FAILURE ); +if (group == &abort_group) +__iopf_free_group (group); +else iopf_free_group (group); - } - -return ret; - -cleanup_partial: -mutex_lock (&iopf_param->lock); -list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) { -if (iopf->fault.prm.grpid == fault->prm.grpid) { -list_del (&iopf->list); -kfree (iopf); - } - } -mutex_unlock (&iopf_param->lock); -iopf_put_dev_fault_param (iopf_param); -return ret; }EXPORT_SYMBOL_GPL (iommu_report_device_fault);
drivers/iommu/io-pgfault.c EXPORT_SYMBOL_GPL(iopf_queue_flush_dev); · line 277
Quoted 3 lines
drivers/iommu/io-pgfault.c +0
-0@@ -262,8 +275,8 @@ EXPORT_SYMBOL_GPL(iopf_queue_flush_dev);* * Return 0 on success and <0 on error. */
Should you adjust the docs as well?
Quoted 32 lines
drivers/iommu/io-pgfault.c +3
-6-int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status) +void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status) {struct iommu_fault_param *fault_param = group->fault_param;struct iopf_fault *iopf = &group->last_fault;@@ -274,7 +287,6 @@ int iopf_group_response(struct iopf_group *group, .grpid = iopf->fault.prm.grpid, .code = status, }; -int ret = -EINVAL ;if ((iopf->fault.prm.flags &IOMMU_FAULT_PAGE_REQUEST_PASID_VALID ) && (iopf->fault.prm.flags &IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID ))@@ -283,12 +295,10 @@ int iopf_group_response(struct iopf_group *group,/* Only send response if there is a fault report pending */ mutex_lock (&fault_param->lock);if (!list_empty (&group->pending_node)) { - ret = ops->page_response (dev, &group->last_fault, &resp); + ops->page_response (dev, &group->last_fault, &resp);list_del_init (&group->pending_node); }mutex_unlock (&fault_param->lock); - -return ret; }EXPORT_SYMBOL_GPL (iopf_group_response);Signature · 1 line
2.34.1
Signature · 1 line
Joel Granados
Baolu Lu
maintainerRe: [PATCH v10 15/16] iommu: Make iopf_group_response() return void
Quoted 387 lines · Joel Granados
Quoted 386 lines · Lu Baolu
The
iopf_group_response()should return void, as nothing can do anything with the failure. This implies thatops->page_response()must also return void; this is consistent with what the drivers do. The failure paths, which are all integrity validations of the fault, should be WARN_ON'd, not return codes.If the iommu core fails to enqueue the fault, it should respond the fault directly by calling
ops->page_response()instead of returning an error number and relying on the iommu drivers to do so. Consolidate the error fault handling code in the core.Co-developed-by Jason Gunthorpe<[email protected]>Signed-off-by Jason Gunthorpe<[email protected]>Signed-off-by Lu Baolu<[email protected]>--- include/linux/iommu.h | 14 +-- drivers/iommu/intel/iommu.h | 4 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 50 +++----- drivers/iommu/intel/svm.c | 18 +-- drivers/iommu/io-pgfault.c | 132 +++++++++++--------- 5 files changed, 99 insertions(+), 119 deletions(-)include/linux/iommu.h +6
-8@@ -578,9 +578,8 @@ struct iommu_ops {int (*dev_enable_feat)(struct device *dev,enum iommu_dev_features f);int (*dev_disable_feat)(struct device *dev,enum iommu_dev_features f); -int (*page_response)(struct device *dev, -struct iopf_fault *evt, -struct iommu_page_response *msg); +void (*page_response)(struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg);int (*def_domain_type)(struct device *dev);void (*remove_dev_pasid)(struct device *dev,ioasid_t pasid);@@ -1551,8 +1550,8 @@ void iopf_queue_free(struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group);int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); -int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status); +void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status);#else static inline int iopf_queue_add_device (struct iopf_queue *queue,struct device *dev)@@ -1594,10 +1593,9 @@ iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)return -ENODEV ; } -static inline int iopf_group_response (struct iopf_group *group, -enum iommu_page_response_code status) +static inline void iopf_group_response (struct iopf_group *group, +enum iommu_page_response_code status) { -return -ENODEV ; }#endif /* CONFIG_IOMMU_IOPF */ #endif /* __LINUX_IOMMU_H */ drivers/iommu/intel/iommu.h +2
-2@@ -1079,8 +1079,8 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,void intel_svm_check (struct intel_iommu *iommu);int intel_svm_enable_prq (struct intel_iommu *iommu);int intel_svm_finish_prq (struct intel_iommu *iommu); -int intel_svm_page_response (struct device *dev,struct iopf_fault *evt, -struct iommu_page_response *msg); +void intel_svm_page_response (struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg);struct iommu_domain *intel_svm_domain_alloc (void );void intel_svm_remove_dev_pasid (struct device *dev,ioasid_t pasid);void intel_drain_pasid_prq (struct device *dev,u32 pasid);drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +18
-32@@ -920,31 +920,29 @@ static int arm_smmu_cmdq_batch_submit(struct arm_smmu_device *smmu,return arm_smmu_cmdq_issue_cmdlist (smmu, cmds->cmds, cmds->num, true); } -static int arm_smmu_page_response (struct device *dev, -struct iopf_fault *unused, -struct iommu_page_response *resp) +static void arm_smmu_page_response (struct device *dev,struct iopf_fault *unused, +struct iommu_page_response *resp) {struct arm_smmu_cmdq_ent cmd = {0 };struct arm_smmu_master *master =dev_iommu_priv_get (dev);int sid = master->streams[0 ].id; -if (master->stall_enabled) { - cmd.opcode =CMDQ_OP_RESUME ; - cmd.resume.sid = sid; - cmd.resume.stag = resp->grpid; -switch (resp->code) { -case IOMMU_PAGE_RESP_INVALID : -case IOMMU_PAGE_RESP_FAILURE : - cmd.resume.resp =CMDQ_RESUME_0_RESP_ABORT ; -break ; -case IOMMU_PAGE_RESP_SUCCESS : - cmd.resume.resp =CMDQ_RESUME_0_RESP_RETRY ; -break ; -default : -return -EINVAL ; - } - }else { -return -ENODEV ; +if (WARN_ON (!master->stall_enabled)) +return ; + + cmd.opcode =CMDQ_OP_RESUME ; + cmd.resume.sid = sid; + cmd.resume.stag = resp->grpid; +switch (resp->code) { +case IOMMU_PAGE_RESP_INVALID : +case IOMMU_PAGE_RESP_FAILURE : + cmd.resume.resp =CMDQ_RESUME_0_RESP_ABORT ; +break ; +case IOMMU_PAGE_RESP_SUCCESS : + cmd.resume.resp =CMDQ_RESUME_0_RESP_RETRY ; +break ; +default : +break ; }arm_smmu_cmdq_issue_cmd (master->smmu, &cmd);@@ -954,8 +952,6 @@ static int arm_smmu_page_response(struct device *dev,* terminated... at some point in the future. PRI_RESP is fire and * forget. */ - -return 0 ; }/* Context descriptor manipulation functions */ @@ -1516,16 +1512,6 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) } ret =iommu_report_device_fault (master->dev, &fault_evt); -if (ret && flt->type ==IOMMU_FAULT_PAGE_REQ ) { -/* Nobody cared, abort the access */ -struct iommu_page_response resp = { - .pasid = flt->prm.pasid, - .grpid = flt->prm.grpid, - .code =IOMMU_PAGE_RESP_FAILURE , - }; -arm_smmu_page_response (master->dev, &fault_evt, &resp); - } - out_unlock:mutex_unlock (&smmu->streams_mutex);return ret;drivers/iommu/intel/svm.c +2
-16@@ -740,9 +740,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)return IRQ_RETVAL (handled); } -int intel_svm_page_response (struct device *dev, -struct iopf_fault *evt, -struct iommu_page_response *msg) +void intel_svm_page_response (struct device *dev,struct iopf_fault *evt, +struct iommu_page_response *msg) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;@@ -751,7 +750,6 @@ int intel_svm_page_response(struct device *dev,bool private_present;bool pasid_present;bool last_page; -int ret =0 ;u16 sid; prm = &evt->fault.prm;@@ -760,16 +758,6 @@ int intel_svm_page_response(struct device *dev, private_present = prm->flags &IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA ; last_page = prm->flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE ; -if (!pasid_present) { - ret = -EINVAL ; - goto out; - } - -if (prm->pasid ==0 || prm->pasid >=PASID_MAX ) { - ret = -EINVAL ; - goto out; - } -/* * Per VT-d spec. v3.0 ch7.7, system software must respond * with page group response if private data is present (PDP) @@ -798,8 +786,6 @@ int intel_svm_page_response(struct device *dev,qi_submit_sync (iommu, &desc,1 ,0 ); } -out: -return ret; } static int intel_svm_set_dev_pasid(struct iommu_domain *domain,drivers/iommu/io-pgfault.c +68
-55@@ -39,7 +39,7 @@ static void iopf_put_dev_fault_param(struct iommu_fault_param *fault_param)kfree_rcu (fault_param, rcu); } -void iopf_free_group (struct iopf_group *group) +static void __iopf_free_group (struct iopf_group *group) {struct iopf_fault *iopf, *next;@@ -50,6 +50,11 @@ void iopf_free_group(struct iopf_group *group)/* Pair with iommu_report_device_fault(). */ iopf_put_dev_fault_param (group->fault_param); +} + +void iopf_free_group (struct iopf_group *group) +{ +__iopf_free_group (group);kfree (group); }EXPORT_SYMBOL_GPL (iopf_free_group);@@ -97,14 +102,49 @@ static int report_partial_fault(struct iommu_fault_param *fault_param,return 0 ; } +static struct iopf_group *iopf_group_alloc (struct iommu_fault_param *iopf_param, +struct iopf_fault *evt, +struct iopf_group *abort_group) +{ +struct iopf_fault *iopf, *next; +struct iopf_group *group; + + group =kzalloc (sizeof (*group),GFP_KERNEL ); +if (!group) { +/* +* We always need to construct the group as we need it to abort +* the request at the driver if it cfan't be handled. +*/ + group = abort_group; + } + + group->fault_param = iopf_param; + group->last_fault.fault = evt->fault; +INIT_LIST_HEAD (&group->faults); +INIT_LIST_HEAD (&group->pending_node); +list_add (&group->last_fault.list, &group->faults); + +/* See if we have partial faults for this group */ +mutex_lock (&iopf_param->lock); +list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) { +if (iopf->fault.prm.grpid == evt->fault.prm.grpid) +/* Insert*before* the last fault */ +list_move (&iopf->list, &group->faults); + } +list_add (&group->pending_node, &iopf_param->faults); +mutex_unlock (&iopf_param->lock); + +return group; +} +/** * iommu_report_device_fault() - Report fault event to device driver * @dev: the device * @evt: fault event data * * Called by IOMMU drivers when a fault is detected, typically in a threaded IRQ -* handler. When this function fails and the fault is recoverable, it is the -* caller's responsibility to complete the fault. +* handler. If this function fails then ops->page_response() was called to +* complete evt if required. * * This module doesn't handle PCI PASID Stop Marker; IOMMU drivers must discard * them before reporting faults. A PASID Stop Marker (LRW = 0b100) doesn't @@ -143,22 +183,18 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) {struct iommu_fault *fault = &evt->fault;struct iommu_fault_param *iopf_param; -struct iopf_fault *iopf, *next; -struct iommu_domain *domain; +struct iopf_group abort_group = {};struct iopf_group *group;int ret; -if (fault->type !=IOMMU_FAULT_PAGE_REQ ) -return -EOPNOTSUPP ; - iopf_param =iopf_get_dev_fault_param (dev); -if (!iopf_param) +if (WARN_ON (!iopf_param))return -ENODEV ;if (!(fault->prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { ret =report_partial_fault (iopf_param, fault);iopf_put_dev_fault_param (iopf_param); - +/* A request that is not the last does not need to be ack'd */ return ret; }@@ -170,56 +206,33 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)* will send a response to the hardware. We need to clean up before * leaving, otherwise partial faults will be stuck. */ - domain =get_domain_for_iopf (dev, fault); -if (!domain) { + group =iopf_group_alloc (iopf_param, evt, &abort_group); +if (group == &abort_group) { + ret = -ENOMEM ; + goto err_abort; + } + + group->domain =get_domain_for_iopf (dev, fault); +if (!group->domain) { ret = -EINVAL ; - goto cleanup_partial; + goto err_abort; } - group =kzalloc (sizeof (*group),GFP_KERNEL ); -if (!group) { - ret = -ENOMEM ; - goto cleanup_partial; - } - - group->fault_param = iopf_param; - group->last_fault.fault = *fault; -INIT_LIST_HEAD (&group->faults); -INIT_LIST_HEAD (&group->pending_node); - group->domain = domain; -list_add (&group->last_fault.list, &group->faults); - -/* See if we have partial faults for this group */ -mutex_lock (&iopf_param->lock); -list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) { -if (iopf->fault.prm.grpid == fault->prm.grpid) -/* Insert*before* the last fault */ -list_move (&iopf->list, &group->faults); - } -list_add (&group->pending_node, &iopf_param->faults); -mutex_unlock (&iopf_param->lock); +/* +* On success iopf_handler must call iopf_group_response() and +* iopf_free_group() +*/ + ret = group->domain->iopf_handler (group); +if (ret) + goto err_abort; +return 0 ; - ret = domain->iopf_handler (group); -if (ret) { -mutex_lock (&iopf_param->lock); -list_del_init (&group->pending_node); -mutex_unlock (&iopf_param->lock); +err_abort: +iopf_group_response (group,IOMMU_PAGE_RESP_FAILURE ); +if (group == &abort_group) +__iopf_free_group (group); +else iopf_free_group (group); - } - -return ret; - -cleanup_partial: -mutex_lock (&iopf_param->lock); -list_for_each_entry_safe (iopf, next, &iopf_param->partial, list) { -if (iopf->fault.prm.grpid == fault->prm.grpid) { -list_del (&iopf->list); -kfree (iopf); - } - } -mutex_unlock (&iopf_param->lock); -iopf_put_dev_fault_param (iopf_param); -
Quoted 8 lines
drivers/iommu/io-pgfault.c EXPORT_SYMBOL_GPL(iopf_queue_flush_dev); · line 277
Quoted 7 lines
drivers/iommu/io-pgfault.c +0
-0return ret; }EXPORT_SYMBOL_GPL (iommu_report_device_fault);@@ -262,8 +275,8 @@ EXPORT_SYMBOL_GPL(iopf_queue_flush_dev);* * Return 0 on success and <0 on error. */ Should you adjust the docs as well?
Yes. Will do.
Best regards,
baolu
Re: [PATCH v10 15/16] iommu: Make iopf_group_response() return void
In reply to Lu BaoluQuoted 14 lines · Lu Baolu
The
iopf_group_response()should return void, as nothing can do anything with the failure. This implies thatops->page_response()must also return void; this is consistent with what the drivers do. The failure paths, which are all integrity validations of the fault, should be WARN_ON'd, not return codes.If the iommu core fails to enqueue the fault, it should respond the fault directly by calling
ops->page_response()instead of returning an error number and relying on the iommu drivers to do so. Consolidate the error fault handling code in the core.Co-developed-by Jason Gunthorpe <[email protected]>Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Lu Baolu <[email protected]>
Quoted 7 lines
--- include/linux/iommu.h | 14 +-- drivers/iommu/intel/iommu.h | 4 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 50 +++----- drivers/iommu/intel/svm.c | 18 +-- drivers/iommu/io-pgfault.c | 132 +++++++++++--------- 5 files changed, 99 insertions(+), 119 deletions(-)
drivers/iommu/io-pgfault.c static int report_partial_fault(struct iommu_fault_param *fault_param, · line 116
Quoted 13 lines
drivers/iommu/io-pgfault.c +12
-0+static struct iopf_group *iopf_group_alloc (struct iommu_fault_param *iopf_param, +struct iopf_fault *evt, +struct iopf_group *abort_group) +{ +struct iopf_fault *iopf, *next; +struct iopf_group *group; + + group =kzalloc (sizeof (*group),GFP_KERNEL ); +if (!group) { +/* +* We always need to construct the group as we need it to abort +* the request at the driver if it cfan't be handled.
^^^^^^ can't
Jason
Lu Baolu
maintainerPATCH v10 16/16 iommu: Make iommu_report_device_fault() reutrn void
In reply to Lu BaoluAs the iommu_report_device_fault() has been converted to auto-respond a page fault if it fails to enqueue it, there's no need to return a code in any case. Make it return void.
--- include/linux/iommu.h | 5 ++--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- drivers/iommu/intel/svm.c | 19 +++++++---------- drivers/iommu/io-pgfault.c | 23 +++++++-------------- 4 files changed, 19 insertions(+), 32 deletions(-)
include/linux/iommu.h +2 -3
@@ -1549,7 +1549,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name);void iopf_queue_free (struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group); -int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); +void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt);void iopf_group_response (struct iopf_group *group,enum iommu_page_response_code status);#else
@@ -1587,10 +1587,9 @@ static inline void iopf_free_group(struct iopf_group *group) { } -static inline int +static inline void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) { -return -ENODEV ; } static inline void iopf_group_response(struct iopf_group *group,
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +2 -2
@@ -1455,7 +1455,7 @@ arm_smmu_find_master(struct arm_smmu_device *smmu, u32 sid)/* IRQ and event handlers */ static int arm_smmu_handle_evt (struct arm_smmu_device *smmu,u64 *evt) { -int ret; +int ret =0 ;u32 perm =0 ;struct arm_smmu_master *master;bool ssid_valid = evt[0 ] &EVTQ_0_SSV ;
@@ -1511,7 +1511,7 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) goto out_unlock; } - ret =iommu_report_device_fault (master->dev, &fault_evt); +iommu_report_device_fault (master->dev, &fault_evt); out_unlock:mutex_unlock (&smmu->streams_mutex);return ret;
drivers/iommu/intel/svm.c +7 -12
@@ -561,14 +561,11 @@ static int prq_to_iommu_prot(struct page_req_dsc *req)return prot; } -static int intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev, -struct page_req_dsc *desc) +static void intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev, +struct page_req_dsc *desc) {struct iopf_fault event = { }; -if (!dev || !dev_is_pci (dev)) -return -ENODEV ; -/* Fill in event data for device specific processing */ event.fault.type =IOMMU_FAULT_PAGE_REQ ; event.fault.prm.addr = (u64 )desc->addr <<VTD_PAGE_SHIFT ;
@@ -601,7 +598,7 @@ static int intel_svm_prq_report(struct intel_iommu *iommu, struct device *dev, event.fault.prm.private_data[0 ] =ktime_to_ns (ktime_get ()); } -return iommu_report_device_fault (dev, &event); +iommu_report_device_fault (dev, &event); } static void handle_bad_prq_event(struct intel_iommu *iommu,
@@ -704,12 +701,10 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!pdev) goto bad_req; -if (intel_svm_prq_report (iommu, &pdev->dev, req)) -handle_bad_prq_event (iommu, req,QI_RESP_INVALID ); -else -trace_prq_report (iommu, &pdev->dev, req->qw_0, req->qw_1, - req->priv_data[0 ], req->priv_data[1 ], - iommu->prq_seq_number++); +intel_svm_prq_report (iommu, &pdev->dev, req); +trace_prq_report (iommu, &pdev->dev, req->qw_0, req->qw_1, + req->priv_data[0 ], req->priv_data[1 ], + iommu->prq_seq_number++);pci_dev_put (pdev); prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ;
drivers/iommu/io-pgfault.c +8 -15
@@ -179,23 +179,21 @@ static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param,* * Return: 0 on success and <0 on error. */ -int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) +void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) {struct iommu_fault *fault = &evt->fault;struct iommu_fault_param *iopf_param;struct iopf_group abort_group = {};struct iopf_group *group; -int ret; iopf_param =iopf_get_dev_fault_param (dev);if (WARN_ON (!iopf_param)) -return -ENODEV ; +return ;if (!(fault->prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { - ret =report_partial_fault (iopf_param, fault); +report_partial_fault (iopf_param, fault);iopf_put_dev_fault_param (iopf_param);/* A request that is not the last does not need to be ack'd */ -return ret; }/*
@@ -207,25 +205,21 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)* leaving, otherwise partial faults will be stuck. */ group =iopf_group_alloc (iopf_param, evt, &abort_group); -if (group == &abort_group) { - ret = -ENOMEM ; +if (group == &abort_group) goto err_abort; - } group->domain =get_domain_for_iopf (dev, fault); -if (!group->domain) { - ret = -EINVAL ; +if (!group->domain) goto err_abort; - }/* * On success iopf_handler must call iopf_group_response() and * iopf_free_group() */ - ret = group->domain->iopf_handler (group); -if (ret) +if (group->domain->iopf_handler (group)) goto err_abort; -return 0 ; + +return ; err_abort:iopf_group_response (group,IOMMU_PAGE_RESP_FAILURE );
@@ -233,7 +227,6 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)__iopf_free_group (group); elseiopf_free_group (group ); -return ret; }EXPORT_SYMBOL_GPL (iommu_report_device_fault);
Signature · 1 line
2.34.1
Re: [PATCH v10 16/16] iommu: Make iommu_report_device_fault() reutrn void
Quoted 112 lines · Lu Baolu
As the
iommu_report_device_fault()has been converted to auto-respond a page fault if it fails to enqueue it, there's no need to return a code in any case. Make it return void.Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- include/linux/iommu.h | 5 ++--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- drivers/iommu/intel/svm.c | 19 +++++++---------- drivers/iommu/io-pgfault.c | 23 +++++++-------------- 4 files changed, 19 insertions(+), 32 deletions(-)include/linux/iommu.h +2
-3@@ -1549,7 +1549,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name);void iopf_queue_free (struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group); -int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); +void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt);void iopf_group_response (struct iopf_group *group,enum iommu_page_response_code status);#else @@ -1587,10 +1587,9 @@ static inline void iopf_free_group(struct iopf_group *group) { } -static inline int +static inline void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) { -return -ENODEV ; } static inline void iopf_group_response(struct iopf_group *group,drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +2
-2@@ -1455,7 +1455,7 @@ arm_smmu_find_master(struct arm_smmu_device *smmu, u32 sid)/* IRQ and event handlers */ static int arm_smmu_handle_evt (struct arm_smmu_device *smmu,u64 *evt) { -int ret; +int ret =0 ;u32 perm =0 ;struct arm_smmu_master *master;bool ssid_valid = evt[0 ] &EVTQ_0_SSV ;@@ -1511,7 +1511,7 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) goto out_unlock; } - ret =iommu_report_device_fault (master->dev, &fault_evt); +iommu_report_device_fault (master->dev, &fault_evt); out_unlock:mutex_unlock (&smmu->streams_mutex);return ret;drivers/iommu/intel/svm.c +7
-12@@ -561,14 +561,11 @@ static int prq_to_iommu_prot(struct page_req_dsc *req)return prot; } -static int intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev, -struct page_req_dsc *desc) +static void intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev, +struct page_req_dsc *desc) {struct iopf_fault event = { }; -if (!dev || !dev_is_pci (dev)) -return -ENODEV ; -/* Fill in event data for device specific processing */ event.fault.type =IOMMU_FAULT_PAGE_REQ ; event.fault.prm.addr = (u64 )desc->addr <<VTD_PAGE_SHIFT ;@@ -601,7 +598,7 @@ static int intel_svm_prq_report(struct intel_iommu *iommu, struct device *dev, event.fault.prm.private_data[0 ] =ktime_to_ns (ktime_get ()); } -return iommu_report_device_fault (dev, &event); +iommu_report_device_fault (dev, &event); } static void handle_bad_prq_event(struct intel_iommu *iommu,@@ -704,12 +701,10 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!pdev) goto bad_req; -if (intel_svm_prq_report (iommu, &pdev->dev, req)) -handle_bad_prq_event (iommu, req,QI_RESP_INVALID ); -else -trace_prq_report (iommu, &pdev->dev, req->qw_0, req->qw_1, - req->priv_data[0 ], req->priv_data[1 ], - iommu->prq_seq_number++); +intel_svm_prq_report (iommu, &pdev->dev, req); +trace_prq_report (iommu, &pdev->dev, req->qw_0, req->qw_1, + req->priv_data[0 ], req->priv_data[1 ], + iommu->prq_seq_number++);pci_dev_put (pdev); prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ;drivers/iommu/io-pgfault.c +0
-0
drivers/iommu/io-pgfault.c static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param, · line 181
Quoted 3 lines
drivers/iommu/io-pgfault.c +0
-0@@ -179,23 +179,21 @@ static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param,* * Return: 0 on success and <0 on error. */
Should you remove the documentation that describes the return also?
Quoted 65 lines
drivers/iommu/io-pgfault.c +8
-15-int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) +void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) {struct iommu_fault *fault = &evt->fault;struct iommu_fault_param *iopf_param;struct iopf_group abort_group = {};struct iopf_group *group; -int ret; iopf_param =iopf_get_dev_fault_param (dev);if (WARN_ON (!iopf_param)) -return -ENODEV ; +return ;if (!(fault->prm.flags &IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE )) { - ret =report_partial_fault (iopf_param, fault); +report_partial_fault (iopf_param, fault);iopf_put_dev_fault_param (iopf_param);/* A request that is not the last does not need to be ack'd */ -return ret; }/* @@ -207,25 +205,21 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)* leaving, otherwise partial faults will be stuck. */ group =iopf_group_alloc (iopf_param, evt, &abort_group); -if (group == &abort_group) { - ret = -ENOMEM ; +if (group == &abort_group) goto err_abort; - } group->domain =get_domain_for_iopf (dev, fault); -if (!group->domain) { - ret = -EINVAL ; +if (!group->domain) goto err_abort; - }/* * On success iopf_handler must call iopf_group_response() and * iopf_free_group() */ - ret = group->domain->iopf_handler (group); -if (ret) +if (group->domain->iopf_handler (group)) goto err_abort; -return 0 ; + +return ; err_abort:iopf_group_response (group,IOMMU_PAGE_RESP_FAILURE );@@ -233,7 +227,6 @@ int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)__iopf_free_group (group); elseiopf_free_group (group ); -return ret; }EXPORT_SYMBOL_GPL (iommu_report_device_fault);Signature · 1 line
2.34.1
Signature · 1 line
Joel Granados
Baolu Lu
maintainerRe: [PATCH v10 16/16] iommu: Make iommu_report_device_fault() reutrn void
Quoted 109 lines · Joel Granados
Quoted 108 lines · Lu Baolu
As the
iommu_report_device_fault()has been converted to auto-respond a page fault if it fails to enqueue it, there's no need to return a code in any case. Make it return void.Suggested-by Jason Gunthorpe<[email protected]>Signed-off-by Lu Baolu<[email protected]>--- include/linux/iommu.h | 5 ++--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- drivers/iommu/intel/svm.c | 19 +++++++---------- drivers/iommu/io-pgfault.c | 23 +++++++-------------- 4 files changed, 19 insertions(+), 32 deletions(-)include/linux/iommu.h +2
-3@@ -1549,7 +1549,7 @@ struct iopf_queue *iopf_queue_alloc(const char *name);void iopf_queue_free (struct iopf_queue *queue);int iopf_queue_discard_partial (struct iopf_queue *queue);void iopf_free_group (struct iopf_group *group); -int iommu_report_device_fault (struct device *dev,struct iopf_fault *evt); +void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt);void iopf_group_response (struct iopf_group *group,enum iommu_page_response_code status);#else @@ -1587,10 +1587,9 @@ static inline void iopf_free_group(struct iopf_group *group) { } -static inline int +static inline void iommu_report_device_fault (struct device *dev,struct iopf_fault *evt) { -return -ENODEV ; } static inline void iopf_group_response(struct iopf_group *group,drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +2
-2@@ -1455,7 +1455,7 @@ arm_smmu_find_master(struct arm_smmu_device *smmu, u32 sid)/* IRQ and event handlers */ static int arm_smmu_handle_evt (struct arm_smmu_device *smmu,u64 *evt) { -int ret; +int ret =0 ;u32 perm =0 ;struct arm_smmu_master *master;bool ssid_valid = evt[0 ] &EVTQ_0_SSV ;@@ -1511,7 +1511,7 @@ static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) goto out_unlock; } - ret =iommu_report_device_fault (master->dev, &fault_evt); +iommu_report_device_fault (master->dev, &fault_evt); out_unlock:mutex_unlock (&smmu->streams_mutex);return ret;drivers/iommu/intel/svm.c +7
-12@@ -561,14 +561,11 @@ static int prq_to_iommu_prot(struct page_req_dsc *req)return prot; } -static int intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev, -struct page_req_dsc *desc) +static void intel_svm_prq_report (struct intel_iommu *iommu,struct device *dev, +struct page_req_dsc *desc) {struct iopf_fault event = { }; -if (!dev || !dev_is_pci (dev)) -return -ENODEV ; -/* Fill in event data for device specific processing */ event.fault.type =IOMMU_FAULT_PAGE_REQ ; event.fault.prm.addr = (u64 )desc->addr <<VTD_PAGE_SHIFT ;@@ -601,7 +598,7 @@ static int intel_svm_prq_report(struct intel_iommu *iommu, struct device *dev, event.fault.prm.private_data[0 ] =ktime_to_ns (ktime_get ()); } -return iommu_report_device_fault (dev, &event); +iommu_report_device_fault (dev, &event); } static void handle_bad_prq_event(struct intel_iommu *iommu,@@ -704,12 +701,10 @@ static irqreturn_t prq_event_thread(int irq, void *d)if (!pdev) goto bad_req; -if (intel_svm_prq_report (iommu, &pdev->dev, req)) -handle_bad_prq_event (iommu, req,QI_RESP_INVALID ); -else -trace_prq_report (iommu, &pdev->dev, req->qw_0, req->qw_1, - req->priv_data[0 ], req->priv_data[1 ], - iommu->prq_seq_number++); +intel_svm_prq_report (iommu, &pdev->dev, req); +trace_prq_report (iommu, &pdev->dev, req->qw_0, req->qw_1, + req->priv_data[0 ], req->priv_data[1 ], + iommu->prq_seq_number++);pci_dev_put (pdev); prq_advance: head = (head +sizeof (*req)) &PRQ_RING_MASK ;drivers/iommu/io-pgfault.c +0
-0
Quoted 8 lines
drivers/iommu/io-pgfault.c static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param, · line 181
Quoted 7 lines
index
6e63e5a02884..b64229dab976100644drivers/iommu/io-pgfault.c +0
-0@@ -179,23 +179,21 @@ static struct iopf_group *iopf_group_alloc(struct iommu_fault_param *iopf_param,* * Return: 0 on success and <0 on error. */ Should you remove the documentation that describes the return also?
Yes. Will do.
Best regards,
baolu
Re: [PATCH v10 16/16] iommu: Make iommu_report_device_fault() reutrn void
In reply to Lu BaoluQuoted 4 lines · Lu Baolu
As the
iommu_report_device_fault()has been converted to auto-respond a page fault if it fails to enqueue it, there's no need to return a code in any case. Make it return void.
Quoted 8 lines
Suggested-by Jason Gunthorpe <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- include/linux/iommu.h | 5 ++--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- drivers/iommu/intel/svm.c | 19 +++++++---------- drivers/iommu/io-pgfault.c | 23 +++++++-------------- 4 files changed, 19 insertions(+), 32 deletions(-)
Typo in subject 'reutrn' -> 'return'
Jason