From: Jean-Philippe Brucker <jean-philippe@linaro.org>
To: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>,
Ashok Raj <ashok.raj@intel.com>,
Robin Murphy <robin.murphy@arm.com>,
linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Jean-Philippe Brucker <jean-philippe@linaro.com>,
iommu@lists.linux-foundation.org,
Jacob jun Pan <jacob.jun.pan@intel.com>,
Jason Gunthorpe <jgg@nvidia.com>, Will Deacon <will@kernel.org>
Subject: Re: [PATCH RFC 08/11] iommu: Handle IO page faults directly
Date: Mon, 21 Mar 2022 11:35:38 +0000 [thread overview]
Message-ID: <YjhjCsrcTNDsFRwm@myrica> (raw)
In-Reply-To: <20220320064030.2936936-9-baolu.lu@linux.intel.com>
On Sun, Mar 20, 2022 at 02:40:27PM +0800, Lu Baolu wrote:
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index c0966fc9b686..4f90b71c6f6e 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -27,6 +27,8 @@
> #include <linux/cc_platform.h>
> #include <trace/events/iommu.h>
>
> +#include "iommu-sva-lib.h"
> +
> static struct kset *iommu_group_kset;
> static DEFINE_IDA(iommu_group_ida);
>
> @@ -1177,10 +1179,9 @@ int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt)
> if (!param || !evt)
> return -EINVAL;
>
> - /* we only report device fault if there is a handler registered */
> mutex_lock(¶m->lock);
> fparam = param->fault_param;
> - if (!fparam || !fparam->handler) {
> + if (!fparam) {
> ret = -EINVAL;
> goto done_unlock;
> }
> @@ -1198,7 +1199,11 @@ int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt)
> mutex_unlock(&fparam->lock);
> }
>
> - ret = fparam->handler(&evt->fault, fparam->data);
> + if (fparam->handler)
> + ret = fparam->handler(&evt->fault, fparam->data);
> + else
> + ret = iommu_queue_iopf(&evt->fault, fparam->data);
> +
I like the change, but we'll need to consolidate this, because now if the
driver registers a fault handler it disables IOPF. We could instead
prevent registration if an IOPF param is present. We could also just merge
fparam->handler but eventually I'd like to make IOPF fall back to the
fault handler registered by device driver, in case of invalid page faults.
I have a couple patches for this but am still missing some bits.
Thanks,
Jean
> if (ret && evt_pending) {
> mutex_lock(&fparam->lock);
> list_del(&evt_pending->list);
> --
> 2.25.1
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-03-21 11:36 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-20 6:40 [PATCH RFC 00/11] iommu: SVA and IOPF refactoring Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 01/11] iommu: Add pasid_bits field in struct dev_iommu Lu Baolu
2022-03-21 7:01 ` Tian, Kevin
2022-03-21 10:22 ` Lu Baolu
2022-03-22 0:26 ` Tian, Kevin
2022-03-22 0:48 ` Lu Baolu
2022-03-21 11:22 ` Jean-Philippe Brucker
2022-03-22 0:45 ` Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 02/11] iommu: Add iommu_domain type for SVA Lu Baolu
2022-03-21 7:06 ` Tian, Kevin
2022-03-21 10:23 ` Lu Baolu
2022-03-21 11:47 ` Jason Gunthorpe via iommu
2022-03-22 0:54 ` Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 03/11] iommu: Add attach/detach_dev_pasid domain ops Lu Baolu
2022-03-21 7:13 ` Tian, Kevin
2022-03-21 10:27 ` Lu Baolu
2022-03-21 11:53 ` Jason Gunthorpe via iommu
2022-03-20 6:40 ` [PATCH RFC 04/11] iommu/vt-d: Add SVA domain support Lu Baolu
2022-03-21 7:45 ` Tian, Kevin
2022-03-21 10:37 ` Lu Baolu
2022-03-21 11:56 ` Jason Gunthorpe via iommu
2022-03-22 4:25 ` Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 05/11] arm-smmu-v3/sva: " Lu Baolu
2022-03-21 11:31 ` Jean-Philippe Brucker
2022-03-21 11:58 ` Jason Gunthorpe via iommu
2022-03-20 6:40 ` [PATCH RFC 06/11] iommu/sva: Use attach/detach_pasid_dev in SVA interfaces Lu Baolu
2022-03-21 8:04 ` Tian, Kevin
2022-03-21 11:01 ` Lu Baolu
2022-03-21 12:03 ` Jason Gunthorpe via iommu
2022-03-21 11:33 ` Jean-Philippe Brucker
2022-03-22 4:29 ` Lu Baolu
2022-03-21 12:05 ` Jason Gunthorpe via iommu
2022-03-22 4:31 ` Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 07/11] iommu: Remove SVA related callbacks from iommu ops Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 08/11] iommu: Handle IO page faults directly Lu Baolu
2022-03-21 11:35 ` Jean-Philippe Brucker [this message]
2022-03-22 0:39 ` Tian, Kevin
2022-03-20 6:40 ` [PATCH RFC 09/11] iommu: Add iommu_get_domain_for_dev_pasid() Lu Baolu
2022-03-21 12:40 ` Jason Gunthorpe via iommu
2022-03-22 4:50 ` Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 10/11] iommu: Make IOPF handling framework generic Lu Baolu
2022-03-21 8:09 ` Tian, Kevin
2022-03-21 11:42 ` Jean-Philippe Brucker
2022-03-21 12:43 ` Jason Gunthorpe via iommu
2022-03-22 5:03 ` Lu Baolu
2022-03-22 10:02 ` Jean-Philippe Brucker
2022-03-22 12:15 ` Jason Gunthorpe via iommu
2022-03-22 1:00 ` Tian, Kevin
2022-03-22 10:06 ` Jean-Philippe Brucker
2022-03-22 10:24 ` Tian, Kevin
2022-03-22 10:50 ` Jean-Philippe Brucker
2022-03-21 11:39 ` Jean-Philippe Brucker
2022-03-22 5:28 ` Lu Baolu
2022-03-21 12:50 ` Jason Gunthorpe via iommu
2022-03-22 5:48 ` Lu Baolu
2022-03-20 6:40 ` [PATCH RFC 11/11] iommu: Rename iommu-sva-lib.{c,h} Lu Baolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YjhjCsrcTNDsFRwm@myrica \
--to=jean-philippe@linaro.org \
--cc=ashok.raj@intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@intel.com \
--cc=jean-philippe@linaro.com \
--cc=jgg@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).