On Mon, 24 Feb 2020 19:23:58 +0100 Jean-Philippe Brucker <jean-philippe@xxxxxxxxxx> wrote: > From: Jean-Philippe Brucker <jean-philippe.brucker@xxxxxxx> > > The SMMU provides a Stall model for handling page faults in platform > devices. It is similar to PCI PRI, but doesn't require devices to have > their own translation cache. Instead, faulting transactions are parked and > the OS is given a chance to fix the page tables and retry the transaction. > > Enable stall for devices that support it (opt-in by firmware). When an > event corresponds to a translation error, call the IOMMU fault handler. If > the fault is recoverable, it will call us back to terminate or continue > the stall. > > Signed-off-by: Jean-Philippe Brucker <jean-philippe@xxxxxxxxxx> One question inline. Thanks, > --- > drivers/iommu/arm-smmu-v3.c | 271 ++++++++++++++++++++++++++++++++++-- > drivers/iommu/of_iommu.c | 5 +- > include/linux/iommu.h | 2 + > 3 files changed, 269 insertions(+), 9 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index 6a5987cce03f..da5dda5ba26a 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -374,6 +374,13 @@ > +/* > + * arm_smmu_flush_evtq - wait until all events currently in the queue have been > + * consumed. > + * > + * Wait until the evtq thread finished a batch, or until the queue is empty. > + * Note that we don't handle overflows on q->batch. If it occurs, just wait for > + * the queue to be empty. > + */ > +static int arm_smmu_flush_evtq(void *cookie, struct device *dev, int pasid) > +{ > + int ret; > + u64 batch; > + struct arm_smmu_device *smmu = cookie; > + struct arm_smmu_queue *q = &smmu->evtq.q; > + > + spin_lock(&q->wq.lock); > + if (queue_sync_prod_in(q) == -EOVERFLOW) > + dev_err(smmu->dev, "evtq overflow detected -- requests lost\n"); > + > + batch = q->batch; So this is trying to be sure we have advanced the queue 2 spots? Is there a potential race here? q->batch could have updated before we take a local copy. > + ret = wait_event_interruptible_locked(q->wq, queue_empty(&q->llq) || > + q->batch >= batch + 2); > + spin_unlock(&q->wq.lock); > + > + return ret; > +} > + ...