| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7e088129-866a-499d-8105-ba245c744f14@intel.com>
Date: Mon, 4 Dec 2023 20:40:32 +0800
From: Yi Liu <yi.l.liu@...el.com>
To: Lu Baolu <baolu.lu@...ux.intel.com>,
Joerg Roedel <joro@...tes.org>,
"Will Deacon" <will@...nel.org>,
Robin Murphy <robin.murphy@....com>,
"Jason Gunthorpe" <jgg@...pe.ca>,
Kevin Tian <kevin.tian@...el.com>,
"Jean-Philippe Brucker" <jean-philippe@...aro.org>,
Nicolin Chen <nicolinc@...dia.com>
CC: Jacob Pan <jacob.jun.pan@...ux.intel.com>,
Yan Zhao <yan.y.zhao@...el.com>, <iommu@...ts.linux.dev>,
<kvm@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v7 07/12] iommu: Merge iommu_fault_event and iopf_fault
On 2023/11/15 11:02, Lu Baolu wrote:
> The 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.
>
> Signed-off-by: Lu Baolu <baolu.lu@...ux.intel.com>
> Reviewed-by: Kevin Tian <kevin.tian@...el.com>
> Tested-by: Yan Zhao <yan.y.zhao@...el.com>
> ---
> 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(-)
Reviewed-by: Yi Liu <yi.l.liu@...el.com>
> diff --git a/include/linux/iommu.h b/include/linux/iommu.h
> index a45d92cc31ec..42b62bc8737a 100644
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@ -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
> @@ -480,7 +484,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);
> @@ -572,20 +576,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
> @@ -720,8 +710,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);
>
> @@ -1128,7 +1117,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;
> }
> diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
> index 65d37a138c75..a1ddd5132aae 100644
> --- a/drivers/iommu/intel/iommu.h
> +++ b/drivers/iommu/intel/iommu.h
> @@ -905,7 +905,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);
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> index 505400538a2e..46780793b743 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> @@ -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};
> @@ -1467,7 +1467,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])) {
> diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
> index 50a481c895b8..9de349ea215c 100644
> --- a/drivers/iommu/intel/svm.c
> +++ b/drivers/iommu/intel/svm.c
> @@ -543,13 +543,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;
> @@ -721,7 +720,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 iommu_fault_page_request *prm;
> diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c
> index 31832aeacdba..c45977bb7da3 100644
> --- a/drivers/iommu/io-pgfault.c
> +++ b/drivers/iommu/io-pgfault.c
> @@ -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;
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 0c6700b6659a..36b597bb8a09 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -1312,10 +1312,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;
>
> @@ -1328,7 +1328,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;
> @@ -1357,7 +1357,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);
--
Regards,
Yi Liu
Powered by blists - more mailing lists