vfio-ccw fixes for 5.20
Subsystems (4)
Eric Farman
maintainerv3 cover vfio-ccw fixes for 5.20
Matt, Alex,
Here are the (hopefully last) patches for the DMA UNMAP thing.
Changelog:v2->v3:
- [MR] Add r-b to Patch 1, 3 (Thank you!)
- [MR] s/unsigned long/u64/
- [EF] Add brackets to for(i) loop
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/
Eric Farman (3):
vfio/ccw: Add length to DMA_UNMAP checks vfio/ccw: Remove FSM Close from remove handlers vfio/ccw: Check return code from subchannel quiesce
drivers/s390/cio/vfio_ccw_cp.c | 16 +++++++++++----- drivers/s390/cio/vfio_ccw_cp.h | 2 +- drivers/s390/cio/vfio_ccw_drv.c | 1 - drivers/s390/cio/vfio_ccw_fsm.c | 2 +- drivers/s390/cio/vfio_ccw_ops.c | 4 +--- 5 files changed, 14 insertions(+), 11 deletions(-)
Signature · 1 line
2.34.1
Eric Farman
maintainerPATCH v3 1/3 vfio/ccw: Add length to DMA_UNMAP checks
As pointed out with the simplification of the VFIO_IOMMU_NOTIFY_DMA_UNMAP notifier [1], the length parameter was never used to check against the pinned pages.
Let's correct that, and see if a page is within the affected range instead of simply the first page of the range.
[1] https://lore.kernel.org/kvm/[email protected]/
--- drivers/s390/cio/vfio_ccw_cp.c | 16 +++++++++++----- drivers/s390/cio/vfio_ccw_cp.h | 2 +- drivers/s390/cio/vfio_ccw_ops.c | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-)
drivers/s390/cio/vfio_ccw_cp.c +11 -5
@@ -170,13 +170,18 @@ static void page_array_unpin_free(struct page_array *pa, struct vfio_device *vdekfree (pa->pa_iova); } -static bool page_array_iova_pinned (struct page_array *pa,unsigned long iova) +static bool page_array_iova_pinned (struct page_array *pa,u64 iova,u64 length) { +u64 iova_pfn_start = iova >>PAGE_SHIFT ; +u64 iova_pfn_end = (iova + length -1 ) >>PAGE_SHIFT ; +u64 pfn;int i; -for (i =0 ; i < pa->pa_nr; i++) -if (pa->pa_iova[i] == iova) +for (i =0 ; i < pa->pa_nr; i++) { + pfn = pa->pa_iova[i] >>PAGE_SHIFT ; +if (pfn >= iova_pfn_start && pfn <= iova_pfn_end)return true; + }return false; }
@@ -899,11 +904,12 @@ void cp_update_scsw(struct channel_program *cp, union scsw *scsw)* cp_iova_pinned() - check if an iova is pinned for a ccw chain. * @cp: channel_program on which to perform the operation * @iova: the iova to check +* @length: the length to check from @iova * * If the @iova is currently pinned for the ccw chain, return true; * else return false. */ -bool cp_iova_pinned (struct channel_program *cp,u64 iova) +bool cp_iova_pinned (struct channel_program *cp,u64 iova,u64 length) {struct ccwchain *chain;int i;
@@ -913,7 +919,7 @@ bool cp_iova_pinned(struct channel_program *cp, u64 iova)list_for_each_entry (chain, &cp->ccwchain_list, next) {for (i =0 ; i < chain->ch_len; i++) -if (page_array_iova_pinned (chain->ch_pa + i, iova)) +if (page_array_iova_pinned (chain->ch_pa + i, iova, length))return true; }
drivers/s390/cio/vfio_ccw_cp.h +1 -1
@@ -46,6 +46,6 @@ void cp_free(struct channel_program *cp);int cp_prefetch (struct channel_program *cp);union orb *cp_get_orb (struct channel_program *cp,u32 intparm,u8 lpm);void cp_update_scsw (struct channel_program *cp,union scsw *scsw); -bool cp_iova_pinned (struct channel_program *cp,u64 iova); +bool cp_iova_pinned (struct channel_program *cp,u64 iova,u64 length);#endif
drivers/s390/cio/vfio_ccw_ops.c +1 -1
@@ -39,7 +39,7 @@ static void vfio_ccw_dma_unmap(struct vfio_device *vdev, u64 iova, u64 length) container_of(vdev, struct vfio_ccw_private, vdev);/* Drivers MUST unpin pages in response to an invalidation. */ -if (!cp_iova_pinned (&private->cp, iova)) +if (!cp_iova_pinned (&private->cp, iova, length))return ;vfio_ccw_mdev_reset (private);
Signature · 1 line
2.34.1
Re: [PATCH v3 1/3] vfio/ccw: Add length to DMA_UNMAP checks
Quoted 11 lines · Eric Farman
As pointed out with the simplification of the
VFIO_IOMMU_NOTIFY_DMA_UNMAPnotifier [1], the length parameter was never used to check against the pinned pages.Let's correct that, and see if a page is within the affected range instead of simply the first page of the range.
Quoted 7 lines
Signed-off-by Eric Farman <[email protected]>Reviewed-by Matthew Rosato <[email protected]>--- drivers/s390/cio/vfio_ccw_cp.c | 16 +++++++++++----- drivers/s390/cio/vfio_ccw_cp.h | 2 +- drivers/s390/cio/vfio_ccw_ops.c | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-)
Jason
Eric Farman
maintainerPATCH v3 2/3 vfio/ccw: Remove FSM Close from remove handlers
In reply to Eric FarmanNow that neither vfio_ccw_sch_probe() nor vfio_ccw_mdev_probe() affect the FSM state, it doesn't make sense for their _remove() counterparts try to revert things in this way. Since the FSM open and close are handled alongside MDEV open/close, these are unnecessary.
--- drivers/s390/cio/vfio_ccw_drv.c | 1 - drivers/s390/cio/vfio_ccw_ops.c | 2 -- 2 files changed, 3 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +0 -1
@@ -241,7 +241,6 @@ static void vfio_ccw_sch_remove(struct subchannel *sch) {struct vfio_ccw_private *private =dev_get_drvdata (&sch->dev); -vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_CLOSE );mdev_unregister_device (&sch->dev);dev_set_drvdata (&sch->dev,NULL );
drivers/s390/cio/vfio_ccw_ops.c +0 -2
@@ -130,8 +130,6 @@ static void vfio_ccw_mdev_remove(struct mdev_device *mdev)vfio_unregister_group_dev (&private->vdev); -vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_CLOSE ); -vfio_uninit_group_dev (&private->vdev);atomic_inc (&private->avail); }
Signature · 1 line
2.34.1
Re: [PATCH v3 2/3] vfio/ccw: Remove FSM Close from remove handlers
Quoted 6 lines · Eric Farman
Now that neither
vfio_ccw_sch_probe()norvfio_ccw_mdev_probe()affect the FSM state, it doesn't make sense for their_remove()counterparts try to revert things in this way. Since the FSM open and close are handled alongside MDEV open/close, these are unnecessary.
Quoted 6 lines
Signed-off-by Eric Farman <[email protected]>Reviewed-by Matthew Rosato <[email protected]>--- drivers/s390/cio/vfio_ccw_drv.c | 1 - drivers/s390/cio/vfio_ccw_ops.c | 2 -- 2 files changed, 3 deletions(-)
When I first saw this I wondered if the CLOSE might be to expedite the userspace closing the FD or something, but we have ops->request() which is supposed to be doing that, so it doesn't really make sense even if that was the issue.
Jason
Eric Farman
maintainerPATCH v3 3/3 vfio/ccw: Check return code from subchannel quiesce
In reply to Eric FarmanIf a subchannel is busy when a close is performed, the subchannel needs to be quiesced and left nice and tidy, so nothing unexpected (like a solicited interrupt) shows up while in the closed state. Unfortunately, the return code from this call isn't checked, so any busy subchannel is treated as a failing one.
Fix that, so that the close on a busy subchannel happens normally.
--- drivers/s390/cio/vfio_ccw_fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_fsm.c +1 -1
@@ -407,7 +407,7 @@ static void fsm_close(struct vfio_ccw_private *private, ret =cio_disable_subchannel (sch);if (ret == -EBUSY ) -vfio_ccw_sch_quiesce (sch); + ret =vfio_ccw_sch_quiesce (sch);if (ret) goto err_unlock;
Signature · 1 line
2.34.1
Re: [PATCH v3 3/3] vfio/ccw: Check return code from subchannel quiesce
Quoted 6 lines · Eric Farman
If a subchannel is busy when a close is performed, the subchannel needs to be quiesced and left nice and tidy, so nothing unexpected (like a solicited interrupt) shows up while in the closed state. Unfortunately, the return code from this call isn't checked, so any busy subchannel is treated as a failing one.
Quoted 7 lines
Fix that, so that the close on a busy subchannel happens normally.
Signed-off-by Eric Farman <[email protected]>Reviewed-by Matthew Rosato <[email protected]>--- drivers/s390/cio/vfio_ccw_fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Jason
Alex Williamson
AppliedQuoted 17 lines · On Thu, 28 Jul 2022 22:49:11 +0200 Eric Farman <[email protected]> wrote:
Matt, Alex,
Here are the (hopefully last) patches for the DMA UNMAP thing.
Changelog:
v2->v3:
- [MR] Add r-b to Patch 1, 3 (Thank you!)
- [MR] s/unsigned long/u64/
- [EF] Add brackets to for(i) loop
v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/Eric Farman (3):
vfio/ccw: Add length toDMA_UNMAPchecks vfio/ccw: Remove FSM Close from remove handlers vfio/ccw: Check return code from subchannel quiesce
Quoted 7 lines
drivers/s390/cio/vfio_ccw_cp.c | 16 +++++++++++----- drivers/s390/cio/vfio_ccw_cp.h | 2 +- drivers/s390/cio/vfio_ccw_drv.c | 1 - drivers/s390/cio/vfio_ccw_fsm.c | 2 +- drivers/s390/cio/vfio_ccw_ops.c | 4 +--- 5 files changed, 14 insertions(+), 11 deletions(-)
Applied to vfio next branch for v5.20/v6.0. Thanks,
Alex