vfio-ccw patches for 5.8
Subsystems (6)
The following changes since commit e1750a3d9abbea2ece29cac8dc5a6f5bc19c1492:
s390/pci: Log new handle in clp_disable_fh() (2020-05-28 12:26:03 +0200)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw tags/vfio-ccw-20200603-v2
for you to fetch changes up to b2dd9a44a1098c96935c495570b663bd223a087e:
vfio-ccw: Add trace for CRW event (2020-06-03 11:28:19 +0200)
----------------------------------------------------------------
vfio-ccw updates:
- accept requests without the prefetch bit set
- enable path handling via two new regions
----------------------------------------------------------------
Changes v1->v2:
- add padding to struct ccw_crw_region
- rebase to s390 features branch
Cornelia Huck (1):
vfio-ccw: document possible errors
Eric Farman (3):
vfio-ccw: Refactor the unregister of the async regions
vfio-ccw: Refactor IRQ handlers
vfio-ccw: Add trace for CRW event
Farhan Ali (5):
vfio-ccw: Introduce new helper functions to free/destroy regions
vfio-ccw: Register a chp_event callback for vfio-ccw
vfio-ccw: Introduce a new schib region
vfio-ccw: Introduce a new CRW region
vfio-ccw: Wire up the CRW irq and CRW region
Jared Rossi (1):
vfio-ccw: Enable transparent CCW IPL from DASD
Documentation/s390/vfio-ccw.rst | 100 ++++++++++++++++- drivers/s390/cio/Makefile | 2 +- drivers/s390/cio/vfio_ccw_chp.c | 148 +++++++++++++++++++++++++ drivers/s390/cio/vfio_ccw_cp.c | 19 ++-- drivers/s390/cio/vfio_ccw_drv.c | 165 ++++++++++++++++++++++++++-- drivers/s390/cio/vfio_ccw_ops.c | 65 ++++++++--- drivers/s390/cio/vfio_ccw_private.h | 16 +++ drivers/s390/cio/vfio_ccw_trace.c | 1 + drivers/s390/cio/vfio_ccw_trace.h | 30 +++++ include/uapi/linux/vfio.h | 3 + include/uapi/linux/vfio_ccw.h | 19 ++++ 11 files changed, 531 insertions(+), 37 deletions(-) create mode 100644 drivers/s390/cio/vfio_ccw_chp.c
Signature · 1 line
2.25.4
[PULL v2 01/10] vfio-ccw: Enable transparent CCW IPL from DASD
From: Jared Rossi <[email protected]>
Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.
It is expected that all ORBs issued by Linux will request prefetch. Although non-prefetching ORBs are not rejected, they will prefetch nonetheless. A warning is issued up to once per 5 seconds when a forced prefetch occurs.
A non-prefetch ORB does not necessarily result in an error, however frequent encounters with non-prefetch ORBs indicate that channel programs are being executed in a way that is inconsistent with what the guest is requesting. While there is currently no known case of an error caused by forced prefetch, it is possible in theory that forced prefetch could result in an error if applied to a channel program that is dependent on non-prefetch.
Message-Id: <[email protected]>
--- Documentation/s390/vfio-ccw.rst | 6 ++++++ drivers/s390/cio/vfio_ccw_cp.c | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)
Documentation/s390/vfio-ccw.rst +6 -0
@@ -335,6 +335,12 @@ device. The current code allows the guest to start channel programs via START SUBCHANNEL, and to issue HALT SUBCHANNEL and CLEAR SUBCHANNEL. +Currently all channel programs are prefetched, regardless of the +p-bit setting in the ORB. As a result, self modifying channel +programs are not supported. For this reason, IPL has to be handled as +a special case by a userspace/guest program; this has been implemented +in QEMU's s390-ccw bios as of QEMU 4.1. + vfio-ccw supports classic (command mode) channel I/O only. Transport mode (HPF) is not supported.
drivers/s390/cio/vfio_ccw_cp.c +12 -7
@@ -8,6 +8,7 @@* Xiao Feng Ren <[email protected]> */ +#include <linux/ratelimit.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/iommu.h>
@@ -625,23 +626,27 @@ static int ccwchain_fetch_one(struct ccwchain *chain,* the target channel program from @orb->cmd.iova to the new ccwchain(s). * * Limitations: -* 1. Supports only prefetch enabled mode. -* 2. Supports idal(c64) ccw chaining. -* 3. Supports 4k idaw. +* 1. Supports idal(c64) ccw chaining. +* 2. Supports 4k idaw. * * Returns: * %0 on success and a negative error value on failure. */ int cp_init (struct channel_program *cp,struct device *mdev,union orb *orb) { +/* custom ratelimit used to avoid flood during guest IPL */ + static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 1);int ret;/* -* XXX: -* Only support prefetch enable mode now. +* We only support prefetching the channel program. We assume all channel +* programs executed by supported guests likewise support prefetching. +* Executing a channel program that does not specify prefetching will +* typically not cause an error, but a warning is issued to help identify +* the problem if something does break. */ -if (!orb->cmd.pfch) -return -EOPNOTSUPP ; +if (!orb->cmd.pfch &&__ratelimit (&ratelimit_state)) +dev_warn (mdev,"Prefetching channel program even though prefetch not specified in ORB" );INIT_LIST_HEAD (&cp->ccwchain_list);memcpy (&cp->orb, orb,sizeof (*orb));
Signature · 1 line
2.25.4
[PULL v2 03/10] vfio-ccw: Introduce new helper functions to free/destroy regions
In reply to Cornelia HuckFrom: Farhan Ali <[email protected]>
Consolidate some of the cleanup code for the regions, so that as more are added we reduce code duplication.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_drv.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +18 -10
@@ -116,6 +116,14 @@ static void vfio_ccw_sch_irq(struct subchannel *sch)vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_INTERRUPT ); } +static void vfio_ccw_free_regions (struct vfio_ccw_private *private) +{ +if (private->cmd_region) +kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region); +if (private->io_region) +kmem_cache_free (vfio_ccw_io_region, private->io_region); +} +static int vfio_ccw_sch_probe (struct subchannel *sch) {struct pmcw *pmcw = &sch->schib.pmcw;
@@ -181,10 +189,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)cio_disable_subchannel (sch); out_free:dev_set_drvdata (&sch->dev,NULL ); -if (private->cmd_region) -kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region); -if (private->io_region) -kmem_cache_free (vfio_ccw_io_region, private->io_region); +vfio_ccw_free_regions (private);kfree (private->cp.guest_cp);kfree (private);return ret;
@@ -200,8 +205,7 @@ static int vfio_ccw_sch_remove(struct subchannel *sch)dev_set_drvdata (&sch->dev,NULL ); -kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region); -kmem_cache_free (vfio_ccw_io_region, private->io_region); +vfio_ccw_free_regions (private);kfree (private->cp.guest_cp);kfree (private);
@@ -304,6 +308,12 @@ static void vfio_ccw_debug_exit(void)debug_unregister (vfio_ccw_debug_trace_id); } +static void vfio_ccw_destroy_regions (void ) +{ +kmem_cache_destroy (vfio_ccw_cmd_region); +kmem_cache_destroy (vfio_ccw_io_region); +} +static int __init vfio_ccw_sch_init (void ) {int ret;
@@ -346,8 +356,7 @@ static int __init vfio_ccw_sch_init(void)return ret; out_err: -kmem_cache_destroy (vfio_ccw_cmd_region); -kmem_cache_destroy (vfio_ccw_io_region); +vfio_ccw_destroy_regions ();destroy_workqueue (vfio_ccw_work_q);vfio_ccw_debug_exit ();return ret;
@@ -357,8 +366,7 @@ static void __exit vfio_ccw_sch_exit(void) {css_driver_unregister (&vfio_ccw_sch_driver);isc_unregister (VFIO_CCW_ISC ); -kmem_cache_destroy (vfio_ccw_io_region); -kmem_cache_destroy (vfio_ccw_cmd_region); +vfio_ccw_destroy_regions ();destroy_workqueue (vfio_ccw_work_q);vfio_ccw_debug_exit (); }
Signature · 1 line
2.25.4
[PULL v2 04/10] vfio-ccw: Register a chp_event callback for vfio-ccw
In reply to Cornelia HuckFrom: Farhan Ali <[email protected]>
Register the chp_event callback to receive channel path related events for the subchannels managed by vfio-ccw.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_drv.c | 47 +++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
drivers/s390/cio/vfio_ccw_drv.c +47 -0
@@ -19,6 +19,7 @@#include <asm/isc.h> +#include "chp.h" #include "ioasm.h" #include "css.h" #include "vfio_ccw_private.h"
@@ -262,6 +263,51 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)return rc; } +static int vfio_ccw_chp_event (struct subchannel *sch, +struct chp_link *link,int event) +{ +struct vfio_ccw_private *private =dev_get_drvdata (&sch->dev); +int mask =chp_ssd_get_mask (&sch->ssd_info, link); +int retry =255 ; + +if (!private || !mask) +return 0 ; + +VFIO_CCW_MSG_EVENT (2 ,"%pUl (%x.%x.%04x): mask=0x%x event=%d\n" , +mdev_uuid (private->mdev), sch->schid.cssid, + sch->schid.ssid, sch->schid.sch_no, + mask, event); + +if (cio_update_schib (sch)) +return -ENODEV ; + +switch (event) { +case CHP_VARY_OFF : +/* Path logically turned off */ + sch->opm &= ~mask; + sch->lpm &= ~mask; +if (sch->schib.pmcw.lpum & mask) +cio_cancel_halt_clear (sch, &retry); +break ; +case CHP_OFFLINE : +/* Path is gone */ +if (sch->schib.pmcw.lpum & mask) +cio_cancel_halt_clear (sch, &retry); +break ; +case CHP_VARY_ON : +/* Path logically turned on */ + sch->opm |= mask; + sch->lpm |= mask; +break ; +case CHP_ONLINE : +/* Path became available */ + sch->lpm |= mask & sch->opm; +break ; + } + +return 0 ; +} +static struct css_device_id vfio_ccw_sch_ids[] = { { .match_flags =0x1 , .type =SUBCHANNEL_TYPE_IO , }, {/* end of list */ },
@@ -279,6 +325,7 @@ static struct css_driver vfio_ccw_sch_driver = { .remove = vfio_ccw_sch_remove, .shutdown = vfio_ccw_sch_shutdown, .sch_event = vfio_ccw_sch_event, + .chp_event = vfio_ccw_chp_event, };static int __init vfio_ccw_debug_init (void )
Signature · 1 line
2.25.4
[PULL v2 02/10] vfio-ccw: document possible errors
In reply to Cornelia HuckInteracting with the I/O and the async regions can yield a number of errors, which had been undocumented so far. These are part of the api, so remedy that.
Message-Id: <[email protected]>
--- Documentation/s390/vfio-ccw.rst | 56 +++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-)
Documentation/s390/vfio-ccw.rst +54 -2
@@ -204,15 +204,44 @@ definition of the region is:: __u32 ret_code; } __packed; +This region is always available. + While starting an I/O request, orb_area should be filled with the guest ORB, and scsw_area should be filled with the SCSW of the Virtual Subchannel. irb_area stores the I/O result. -ret_code stores a return code for each access of the region. +ret_code stores a return code for each access of the region. The following +values may occur: + +``0`` + The operation was successful. + +``-EOPNOTSUPP`` + The orb specified transport mode or an unidentified IDAW format, or the + scsw specified a function other than the start function. + +``-EIO`` + A request was issued while the device was not in a state ready to accept + requests, or an internal error occurred. + +``-EBUSY`` + The subchannel was status pending or busy, or a request is already active. + +``-EAGAIN`` + A request was being processed, and the caller should retry. + +``-EACCES`` + The channel path(s) used for the I/O were found to be not operational. + +``-ENODEV`` + The device was found to be not operational. + +``-EINVAL`` + The orb specified a chain longer than 255 ccws, or an internal error + occurred. -This region is always available. vfio-ccw cmd region -------------------
@@ -231,6 +260,29 @@ This region is exposed via region type VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD. Currently, CLEAR SUBCHANNEL and HALT SUBCHANNEL use this region. +command specifies the command to be issued; ret_code stores a return code +for each access of the region. The following values may occur: + +``0`` + The operation was successful. + +``-ENODEV`` + The device was found to be not operational. + +``-EINVAL`` + A command other than halt or clear was specified. + +``-EIO`` + A request was issued while the device was not in a state ready to accept + requests. + +``-EAGAIN`` + A request was being processed, and the caller should retry. + +``-EBUSY`` + The subchannel was status pending or busy while processing a halt request. + + vfio-ccw operation details --------------------------
Signature · 1 line
2.25.4
[PULL v2 05/10] vfio-ccw: Refactor the unregister of the async regions
In reply to Cornelia HuckFrom: Eric Farman <[email protected]>
This is mostly for the purposes of a later patch, since we'll need to do the same thing later.
While we are at it, move the resulting function call to ahead of the unregistering of the IOMMU notifier, so that it's done in the reverse order of how it was created.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_ops.c | 20 ++++++++++++-------- drivers/s390/cio/vfio_ccw_private.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/s390/cio/vfio_ccw_ops.c +12 -8
@@ -181,7 +181,6 @@ static void vfio_ccw_mdev_release(struct mdev_device *mdev) {struct vfio_ccw_private *private =dev_get_drvdata (mdev_parent_dev (mdev)); -int i;if ((private->state !=VFIO_CCW_STATE_NOT_OPER ) && (private->state !=VFIO_CCW_STATE_STANDBY )) {
@@ -191,15 +190,9 @@ static void vfio_ccw_mdev_release(struct mdev_device *mdev) }cp_free (&private->cp); +vfio_ccw_unregister_dev_regions (private);vfio_unregister_notifier (mdev_dev (mdev),VFIO_IOMMU_NOTIFY , &private->nb); - -for (i =0 ; i < private->num_regions; i++) - private->region[i].ops->release (private, &private->region[i]); - - private->num_regions =0 ; -kfree (private->region); - private->region =NULL ; } static ssize_t vfio_ccw_mdev_read_io_region(struct vfio_ccw_private *private,
@@ -482,6 +475,17 @@ int vfio_ccw_register_dev_region(struct vfio_ccw_private *private,return 0 ; } +void vfio_ccw_unregister_dev_regions (struct vfio_ccw_private *private) +{ +int i; + +for (i =0 ; i < private->num_regions; i++) + private->region[i].ops->release (private, &private->region[i]); + private->num_regions =0 ; +kfree (private->region); + private->region =NULL ; +} +static ssize_t vfio_ccw_mdev_ioctl (struct mdev_device *mdev,unsigned int cmd,unsigned long arg)
drivers/s390/cio/vfio_ccw_private.h +1 -0
@@ -53,6 +53,7 @@ int vfio_ccw_register_dev_region(struct vfio_ccw_private *private,unsigned int subtype, const struct vfio_ccw_regops *ops, size_t size, u32 flags, void *data); +void vfio_ccw_unregister_dev_regions (struct vfio_ccw_private *private);int vfio_ccw_register_async_dev_regions (struct vfio_ccw_private *private);
Signature · 1 line
2.25.4
[PULL v2 06/10] vfio-ccw: Introduce a new schib region
In reply to Cornelia HuckFrom: Farhan Ali <[email protected]>
The schib region can be used by userspace to get the subchannel- information block (SCHIB) for the passthrough subchannel. This can be useful to get information such as channel path information via the SCHIB.PMCW fields.
Message-Id: <[email protected]>
--- Documentation/s390/vfio-ccw.rst | 18 ++++++- drivers/s390/cio/Makefile | 2 +- drivers/s390/cio/vfio_ccw_chp.c | 76 +++++++++++++++++++++++++++++ drivers/s390/cio/vfio_ccw_drv.c | 20 ++++++++ drivers/s390/cio/vfio_ccw_ops.c | 14 +++++- drivers/s390/cio/vfio_ccw_private.h | 3 ++ include/uapi/linux/vfio.h | 1 + include/uapi/linux/vfio_ccw.h | 10 ++++ 8 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 drivers/s390/cio/vfio_ccw_chp.c
Documentation/s390/vfio-ccw.rst +17 -1
@@ -282,6 +282,21 @@ for each access of the region. The following values may occur: ``-EBUSY`` The subchannel was status pending or busy while processing a halt request. +vfio-ccw schib region +--------------------- + +The vfio-ccw schib region is used to return Subchannel-Information +Block (SCHIB) data to userspace:: + + struct ccw_schib_region { + #define SCHIB_AREA_SIZE 52 + __u8 schib_area[SCHIB_AREA_SIZE]; + } __packed; + +This region is exposed via region type VFIO_REGION_SUBTYPE_CCW_SCHIB. + +Reading this region triggers a STORE SUBCHANNEL to be issued to the +associated hardware. vfio-ccw operation details --------------------------
@@ -385,7 +400,8 @@ through DASD/ECKD device online in a guest now and use it as a block device. The current code allows the guest to start channel programs via -START SUBCHANNEL, and to issue HALT SUBCHANNEL and CLEAR SUBCHANNEL. +START SUBCHANNEL, and to issue HALT SUBCHANNEL, CLEAR SUBCHANNEL, +and STORE SUBCHANNEL. Currently all channel programs are prefetched, regardless of the p-bit setting in the ORB. As a result, self modifying channel
drivers/s390/cio/Makefile +1 -1
@@ -21,5 +21,5 @@ qdio-objs := qdio_main.o qdio_thinint.o qdio_debug.o qdio_setup.o obj-$(CONFIG_QDIO) += qdio.o vfio_ccw-objs += vfio_ccw_drv.o vfio_ccw_cp.o vfio_ccw_ops.o vfio_ccw_fsm.o \ - vfio_ccw_async.o vfio_ccw_trace.o + vfio_ccw_async.o vfio_ccw_trace.o vfio_ccw_chp.o obj-$(CONFIG_VFIO_CCW) += vfio_ccw.o
drivers/s390/cio/vfio_ccw_chp.c new file +76 -0
76 lines not on this page · raw message
drivers/s390/cio/vfio_ccw_drv.c +20 -0
@@ -27,6 +27,7 @@struct workqueue_struct *vfio_ccw_work_q;static struct kmem_cache *vfio_ccw_io_region;static struct kmem_cache *vfio_ccw_cmd_region; +static struct kmem_cache *vfio_ccw_schib_region;debug_info_t *vfio_ccw_debug_msg_id;debug_info_t *vfio_ccw_debug_trace_id;
@@ -119,6 +120,8 @@ static void vfio_ccw_sch_irq(struct subchannel *sch)static void vfio_ccw_free_regions (struct vfio_ccw_private *private) { +if (private->schib_region) +kmem_cache_free (vfio_ccw_schib_region, private->schib_region);if (private->cmd_region)kmem_cache_free (vfio_ccw_cmd_region, private->cmd_region);if (private->io_region)
@@ -156,6 +159,12 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)if (!private->cmd_region) goto out_free; + private->schib_region =kmem_cache_zalloc (vfio_ccw_schib_region, +GFP_KERNEL |GFP_DMA ); + +if (!private->schib_region) + goto out_free; + private->sch = sch;dev_set_drvdata (&sch->dev, private);mutex_init (&private->io_mutex);
@@ -357,6 +366,7 @@ static void vfio_ccw_debug_exit(void)static void vfio_ccw_destroy_regions (void ) { +kmem_cache_destroy (vfio_ccw_schib_region);kmem_cache_destroy (vfio_ccw_cmd_region);kmem_cache_destroy (vfio_ccw_io_region); }
@@ -393,6 +403,16 @@ static int __init vfio_ccw_sch_init(void) goto out_err; } + vfio_ccw_schib_region =kmem_cache_create_usercopy ("vfio_ccw_schib_region" , +sizeof (struct ccw_schib_region ),0 , +SLAB_ACCOUNT ,0 , +sizeof (struct ccw_schib_region ),NULL ); + +if (!vfio_ccw_schib_region) { + ret = -ENOMEM ; + goto out_err; + } +isc_register (VFIO_CCW_ISC ); ret =css_driver_register (&vfio_ccw_sch_driver);if (ret) {
drivers/s390/cio/vfio_ccw_ops.c +12 -2
@@ -172,8 +172,18 @@ static int vfio_ccw_mdev_open(struct mdev_device *mdev) ret =vfio_ccw_register_async_dev_regions (private);if (ret) -vfio_unregister_notifier (mdev_dev (mdev),VFIO_IOMMU_NOTIFY , - &private->nb); + goto out_unregister; + + ret =vfio_ccw_register_schib_dev_regions (private); +if (ret) + goto out_unregister; + +return ret; + +out_unregister: +vfio_ccw_unregister_dev_regions (private); +vfio_unregister_notifier (mdev_dev (mdev),VFIO_IOMMU_NOTIFY , + &private->nb);return ret; }
drivers/s390/cio/vfio_ccw_private.h +3 -0
@@ -56,6 +56,7 @@ int vfio_ccw_register_dev_region(struct vfio_ccw_private *private,void vfio_ccw_unregister_dev_regions (struct vfio_ccw_private *private);int vfio_ccw_register_async_dev_regions (struct vfio_ccw_private *private); +int vfio_ccw_register_schib_dev_regions (struct vfio_ccw_private *private);/** * struct vfio_ccw_private
@@ -69,6 +70,7 @@ int vfio_ccw_register_async_dev_regions(struct vfio_ccw_private *private);* @io_mutex: protect against concurrent update of I/O regions * @region: additional regions for other subchannel operations * @cmd_region: MMIO region for asynchronous I/O commands other than START +* @schib_region: MMIO region for SCHIB information * @num_regions: number of additional regions * @cp: channel program for the current I/O operation * @irb: irb info received from interrupt
@@ -87,6 +89,7 @@ struct vfio_ccw_private {struct mutex io_mutex;struct vfio_ccw_region *region;struct ccw_cmd_region *cmd_region; +struct ccw_schib_region *schib_region;int num_regions;struct channel_program cp;
include/uapi/linux/vfio.h +1 -0
@@ -378,6 +378,7 @@ struct vfio_region_gfx_edid {/* sub-types for VFIO_REGION_TYPE_CCW */ #define VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD (1) +#define VFIO_REGION_SUBTYPE_CCW_SCHIB (2)/* * The MSIX mappable capability informs that MSIX data of a BAR can be mmapped
include/uapi/linux/vfio_ccw.h +10 -0
@@ -34,4 +34,14 @@ struct ccw_cmd_region { __u32 ret_code; } __packed; +/* +* Used for processing commands that read the subchannel-information block +* Reading this region triggers a stsch() to hardware +* Note: this is controlled by a capability +*/ +struct ccw_schib_region { +#define SCHIB_AREA_SIZE 52 +__u8 schib_area[SCHIB_AREA_SIZE ]; +} __packed; +#endif
Signature · 1 line
2.25.4
[PULL v2 07/10] vfio-ccw: Refactor IRQ handlers
In reply to Cornelia HuckFrom: Eric Farman <[email protected]>
To simplify future expansion.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_ops.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/s390/cio/vfio_ccw_ops.c +17 -6
@@ -387,17 +387,21 @@ static int vfio_ccw_mdev_get_region_info(struct vfio_region_info *info,static int vfio_ccw_mdev_get_irq_info (struct vfio_irq_info *info) { -if (info->index !=VFIO_CCW_IO_IRQ_INDEX ) +switch (info->index) { +case VFIO_CCW_IO_IRQ_INDEX : + info->count =1 ; + info->flags =VFIO_IRQ_INFO_EVENTFD ; +break ; +default :return -EINVAL ; - - info->count =1 ; - info->flags =VFIO_IRQ_INFO_EVENTFD ; + }return 0 ; }static int vfio_ccw_mdev_set_irqs (struct mdev_device *mdev,uint32_t flags, +uint32_t index,void __user *data) {struct vfio_ccw_private *private;
@@ -407,7 +411,14 @@ static int vfio_ccw_mdev_set_irqs(struct mdev_device *mdev,return -EINVAL ; private =dev_get_drvdata (mdev_parent_dev (mdev)); - ctx = &private->io_trigger; + +switch (index) { +case VFIO_CCW_IO_IRQ_INDEX : + ctx = &private->io_trigger; +break ; +default : +return -EINVAL ; + }switch (flags &VFIO_IRQ_SET_DATA_TYPE_MASK ) {case VFIO_IRQ_SET_DATA_NONE :
@@ -579,7 +590,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,return ret; data = (void __user *)(arg + minsz); -return vfio_ccw_mdev_set_irqs (mdev, hdr.flags, data); +return vfio_ccw_mdev_set_irqs (mdev, hdr.flags, hdr.index, data); }case VFIO_DEVICE_RESET :return vfio_ccw_mdev_reset (mdev);
Signature · 1 line
2.25.4
[PULL v2 08/10] vfio-ccw: Introduce a new CRW region
In reply to Cornelia HuckFrom: Farhan Ali <[email protected]>
This region provides a mechanism to pass a Channel Report Word that affect vfio-ccw devices, and needs to be passed to the guest for its awareness and/or processing.
The base driver (see crw_collect_info()) provides space for two CRWs, as a subchannel event may have two CRWs chained together (one for the ssid, one for the subchannel). As vfio-ccw will deal with everything at the subchannel level, provide space for a single CRW to be transferred in one shot.
Message-Id: <[email protected]>
--- Documentation/s390/vfio-ccw.rst | 20 +++++++++++ drivers/s390/cio/vfio_ccw_chp.c | 55 +++++++++++++++++++++++++++++ drivers/s390/cio/vfio_ccw_drv.c | 20 +++++++++++ drivers/s390/cio/vfio_ccw_ops.c | 8 +++++ drivers/s390/cio/vfio_ccw_private.h | 4 +++ include/uapi/linux/vfio.h | 2 ++ include/uapi/linux/vfio_ccw.h | 9 +++++ 7 files changed, 118 insertions(+)
Documentation/s390/vfio-ccw.rst +20 -0
@@ -298,6 +298,26 @@ This region is exposed via region type VFIO_REGION_SUBTYPE_CCW_SCHIB. Reading this region triggers a STORE SUBCHANNEL to be issued to the associated hardware. +vfio-ccw crw region +--------------------- + +The vfio-ccw crw region is used to return Channel Report Word (CRW) +data to userspace:: + + struct ccw_crw_region { + __u32 crw; + __u32 pad; + } __packed; + +This region is exposed via region type VFIO_REGION_SUBTYPE_CCW_CRW. + +Reading this region returns a CRW if one that is relevant for this +subchannel (e.g. one reporting changes in channel path state) is +pending, or all zeroes if not. If multiple CRWs are pending (including +possibly chained CRWs), reading this region again will return the next +one, until no more CRWs are pending and zeroes are returned. This is +similar to how STORE CHANNEL REPORT WORD works. + vfio-ccw operation details --------------------------
drivers/s390/cio/vfio_ccw_chp.c +55 -0
58 lines not on this page · raw message
drivers/s390/cio/vfio_ccw_drv.c +20 -0
@@ -28,6 +28,7 @@ struct workqueue_struct *vfio_ccw_work_q;static struct kmem_cache *vfio_ccw_io_region;static struct kmem_cache *vfio_ccw_cmd_region;static struct kmem_cache *vfio_ccw_schib_region; +static struct kmem_cache *vfio_ccw_crw_region;debug_info_t *vfio_ccw_debug_msg_id;debug_info_t *vfio_ccw_debug_trace_id;
@@ -120,6 +121,8 @@ static void vfio_ccw_sch_irq(struct subchannel *sch)static void vfio_ccw_free_regions (struct vfio_ccw_private *private) { +if (private->crw_region) +kmem_cache_free (vfio_ccw_crw_region, private->crw_region);if (private->schib_region)kmem_cache_free (vfio_ccw_schib_region, private->schib_region);if (private->cmd_region)
@@ -165,6 +168,12 @@ static int vfio_ccw_sch_probe(struct subchannel *sch)if (!private->schib_region) goto out_free; + private->crw_region =kmem_cache_zalloc (vfio_ccw_crw_region, +GFP_KERNEL |GFP_DMA ); + +if (!private->crw_region) + goto out_free; + private->sch = sch;dev_set_drvdata (&sch->dev, private);mutex_init (&private->io_mutex);
@@ -366,6 +375,7 @@ static void vfio_ccw_debug_exit(void)static void vfio_ccw_destroy_regions (void ) { +kmem_cache_destroy (vfio_ccw_crw_region);kmem_cache_destroy (vfio_ccw_schib_region);kmem_cache_destroy (vfio_ccw_cmd_region);kmem_cache_destroy (vfio_ccw_io_region);
@@ -413,6 +423,16 @@ static int __init vfio_ccw_sch_init(void) goto out_err; } + vfio_ccw_crw_region =kmem_cache_create_usercopy ("vfio_ccw_crw_region" , +sizeof (struct ccw_crw_region ),0 , +SLAB_ACCOUNT ,0 , +sizeof (struct ccw_crw_region ),NULL ); + +if (!vfio_ccw_crw_region) { + ret = -ENOMEM ; + goto out_err; + } +isc_register (VFIO_CCW_ISC ); ret =css_driver_register (&vfio_ccw_sch_driver);if (ret) {
drivers/s390/cio/vfio_ccw_ops.c +8 -0
@@ -178,6 +178,10 @@ static int vfio_ccw_mdev_open(struct mdev_device *mdev)if (ret) goto out_unregister; + ret =vfio_ccw_register_crw_dev_regions (private); +if (ret) + goto out_unregister; +return ret; out_unregister:
@@ -389,6 +393,7 @@ static int vfio_ccw_mdev_get_irq_info(struct vfio_irq_info *info) {switch (info->index) {case VFIO_CCW_IO_IRQ_INDEX : +case VFIO_CCW_CRW_IRQ_INDEX : info->count =1 ; info->flags =VFIO_IRQ_INFO_EVENTFD ;break ;
@@ -416,6 +421,9 @@ static int vfio_ccw_mdev_set_irqs(struct mdev_device *mdev,case VFIO_CCW_IO_IRQ_INDEX : ctx = &private->io_trigger;break ; +case VFIO_CCW_CRW_IRQ_INDEX : + ctx = &private->crw_trigger; +break ;default :return -EINVAL ; }
drivers/s390/cio/vfio_ccw_private.h +4 -0
@@ -57,6 +57,7 @@ void vfio_ccw_unregister_dev_regions(struct vfio_ccw_private *private);int vfio_ccw_register_async_dev_regions (struct vfio_ccw_private *private);int vfio_ccw_register_schib_dev_regions (struct vfio_ccw_private *private); +int vfio_ccw_register_crw_dev_regions (struct vfio_ccw_private *private);/** * struct vfio_ccw_private
@@ -71,6 +72,7 @@ int vfio_ccw_register_schib_dev_regions(struct vfio_ccw_private *private);* @region: additional regions for other subchannel operations * @cmd_region: MMIO region for asynchronous I/O commands other than START * @schib_region: MMIO region for SCHIB information +* @crw_region: MMIO region for getting channel report words * @num_regions: number of additional regions * @cp: channel program for the current I/O operation * @irb: irb info received from interrupt
@@ -90,6 +92,7 @@ struct vfio_ccw_private {struct vfio_ccw_region *region;struct ccw_cmd_region *cmd_region;struct ccw_schib_region *schib_region; +struct ccw_crw_region *crw_region;int num_regions;struct channel_program cp;
@@ -97,6 +100,7 @@ struct vfio_ccw_private {union scsw scsw;struct eventfd_ctx *io_trigger; +struct eventfd_ctx *crw_trigger;struct work_struct io_work; }__aligned(8) ;
include/uapi/linux/vfio.h +2 -0
@@ -379,6 +379,7 @@ struct vfio_region_gfx_edid {/* sub-types for VFIO_REGION_TYPE_CCW */ #define VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD (1)#define VFIO_REGION_SUBTYPE_CCW_SCHIB (2) +#define VFIO_REGION_SUBTYPE_CCW_CRW (3)/* * The MSIX mappable capability informs that MSIX data of a BAR can be mmapped
@@ -578,6 +579,7 @@ enum {enum {VFIO_CCW_IO_IRQ_INDEX , +VFIO_CCW_CRW_IRQ_INDEX ,VFIO_CCW_NUM_IRQS };
include/uapi/linux/vfio_ccw.h +9 -0
@@ -44,4 +44,13 @@ struct ccw_schib_region { __u8 schib_area[SCHIB_AREA_SIZE]; } __packed; +/* +* Used for returning a Channel Report Word to userspace. +* Note: this is controlled by a capability +*/ +struct ccw_crw_region { +__u32 crw; +__u32 pad; +} __packed; +#endif
Signature · 1 line
2.25.4
[PULL v2 10/10] vfio-ccw: Add trace for CRW event
In reply to Cornelia HuckFrom: Eric Farman <[email protected]>
Since CRW events are (should be) rare, let's put a trace in that routine too.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_drv.c | 1 + drivers/s390/cio/vfio_ccw_trace.c | 1 + drivers/s390/cio/vfio_ccw_trace.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+)
drivers/s390/cio/vfio_ccw_drv.c +1 -0
@@ -336,6 +336,7 @@ static int vfio_ccw_chp_event(struct subchannel *sch,if (!private || !mask)return 0 ; +trace_vfio_ccw_chp_event (private->sch->schid, mask, event); VFIO_CCW_MSG_EVENT(2, "%pUl (%x.%x.%04x): mask=0x%x event=%d\n", mdev_uuid(private->mdev), sch->schid.cssid, sch->schid.ssid, sch->schid.sch_no,
drivers/s390/cio/vfio_ccw_trace.c +1 -0
@@ -9,6 +9,7 @@#define CREATE_TRACE_POINTS #include "vfio_ccw_trace.h" +EXPORT_TRACEPOINT_SYMBOL (vfio_ccw_chp_event);EXPORT_TRACEPOINT_SYMBOL (vfio_ccw_fsm_async_request);EXPORT_TRACEPOINT_SYMBOL (vfio_ccw_fsm_event);EXPORT_TRACEPOINT_SYMBOL (vfio_ccw_fsm_io_request);
drivers/s390/cio/vfio_ccw_trace.h +30 -0
@@ -17,6 +17,36 @@#include <linux/tracepoint.h> +TRACE_EVENT (vfio_ccw_chp_event, + TP_PROTO(struct subchannel_id schid, + int mask, + int event), +TP_ARGS (schid, mask, event), + +TP_STRUCT__entry ( + __field(u8, cssid) + __field(u8, ssid) + __field(u16, sch_no) + __field(int, mask) +__field (int, event) + ), + +TP_fast_assign ( + __entry->cssid = schid.cssid; + __entry->ssid = schid.ssid; + __entry->sch_no = schid.sch_no; + __entry->mask = mask; + __entry->event = event; + ), + +TP_printk ("schid=%x.%x.%04x mask=0x%x event=%d" , + __entry->cssid, + __entry->ssid, + __entry->sch_no, + __entry->mask, + __entry->event) +); + TRACE_EVENT(vfio_ccw_fsm_async_request, TP_PROTO(struct subchannel_id schid, int command,
Signature · 1 line
2.25.4
[PULL v2 09/10] vfio-ccw: Wire up the CRW irq and CRW region
In reply to Cornelia HuckFrom: Farhan Ali <[email protected]>
Use the IRQ to notify userspace that there is a CRW pending in the region, related to path-availability changes on the passthrough subchannel.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_chp.c | 17 ++++++++++ drivers/s390/cio/vfio_ccw_drv.c | 49 +++++++++++++++++++++++++++++ drivers/s390/cio/vfio_ccw_private.h | 8 +++++ 3 files changed, 74 insertions(+)
drivers/s390/cio/vfio_ccw_chp.c +17 -0
@@ -82,14 +82,24 @@ static ssize_t vfio_ccw_crw_region_read(struct vfio_ccw_private *private,unsigned int i =VFIO_CCW_OFFSET_TO_INDEX (*ppos) -VFIO_CCW_NUM_REGIONS ;loff_t pos = *ppos &VFIO_CCW_OFFSET_MASK ;struct ccw_crw_region *region; +struct vfio_ccw_crw *crw;int ret;if (pos + count >sizeof (*region))return -EINVAL ; + crw =list_first_entry_or_null (&private->crw, + struct vfio_ccw_crw, next); + +if (crw) +list_del (&crw->next); +mutex_lock (&private->io_mutex); region = private->region[i].data; +if (crw) +memcpy (®ion->crw, &crw->crw,sizeof (region->crw)); +if (copy_to_user (buf, (void *)region + pos, count)) ret = -EFAULT ;else
@@ -98,6 +108,13 @@ static ssize_t vfio_ccw_crw_region_read(struct vfio_ccw_private *private, region->crw =0 ;mutex_unlock (&private->io_mutex); + +kfree (crw); + +/* Notify the guest if more CRWs are on our queue */ +if (!list_empty (&private->crw) && private->crw_trigger) +eventfd_signal (private->crw_trigger,1 ); +return ret; }
drivers/s390/cio/vfio_ccw_drv.c +49 -0
89 lines not on this page · raw message
drivers/s390/cio/vfio_ccw_private.h +8 -0
@@ -17,6 +17,7 @@#include <linux/eventfd.h> #include <linux/workqueue.h> #include <linux/vfio_ccw.h> +#include <asm/crw.h> #include <asm/debug.h> #include "css.h"
@@ -59,6 +60,11 @@ int vfio_ccw_register_async_dev_regions(struct vfio_ccw_private *private);int vfio_ccw_register_schib_dev_regions (struct vfio_ccw_private *private);int vfio_ccw_register_crw_dev_regions (struct vfio_ccw_private *private); +struct vfio_ccw_crw { +struct list_head next; +struct crw crw; +}; +/** * struct vfio_ccw_private * @sch: pointer to the subchannel
@@ -98,10 +104,12 @@ struct vfio_ccw_private {struct channel_program cp;struct irb irb;union scsw scsw; +struct list_head crw;struct eventfd_ctx *io_trigger;struct eventfd_ctx *crw_trigger;struct work_struct io_work; +struct work_struct crw_work; }__aligned(8) ;extern int vfio_ccw_mdev_reg (struct subchannel *sch);
Signature · 1 line
2.25.4
Quoted 8 lines · Cornelia Huck
The following changes since commit
e1750a3d9abbea2ece29cac8dc5a6f5bc19c1492:s390/pci: Log new handle in
clp_disable_fh()(2020-05-28 12:26:03 +0200)are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw tags/vfio-ccw-20200603-v2
Quoted 8 lines
for you to fetch changes up to
b2dd9a44a1098c96935c495570b663bd223a087e:vfio-ccw: Add trace for CRW event (2020-06-03 11:28:19 +0200)
----------------------------------------------------------------
vfio-ccw updates:
- accept requests without the prefetch bit set
- enable path handling via two new regions
Merged into features, thank you.
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/log/?h=features
Vasily Gorbik
maintainerPATCH 1/1 vfio-ccw: make vfio_ccw_regops variables declarations static
In reply to Cornelia HuckFixes the following sparse warnings:drivers/s390/cio/vfio_ccw_chp.c:62:30: warning: symbol 'vfio_ccw_schib_region_ops' was not declared. Should it be static? drivers/s390/cio/vfio_ccw_chp.c:117:30: warning: symbol 'vfio_ccw_crw_region_ops' was not declared. Should it be static?
--- drivers/s390/cio/vfio_ccw_chp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/cio/vfio_ccw_chp.c +2 -2
@@ -59,7 +59,7 @@ static void vfio_ccw_schib_region_release(struct vfio_ccw_private *private, } -const struct vfio_ccw_regops vfio_ccw_schib_region_ops = { +static const struct vfio_ccw_regops vfio_ccw_schib_region_ops = { .read = vfio_ccw_schib_region_read, .write = vfio_ccw_schib_region_write, .release = vfio_ccw_schib_region_release,
@@ -131,7 +131,7 @@ static void vfio_ccw_crw_region_release(struct vfio_ccw_private *private, } -const struct vfio_ccw_regops vfio_ccw_crw_region_ops = { +static const struct vfio_ccw_regops vfio_ccw_crw_region_ops = { .read = vfio_ccw_crw_region_read, .write = vfio_ccw_crw_region_write, .release = vfio_ccw_crw_region_release,
Signature · 1 line
2.21.0
Re: [PATCH] vfio-ccw: make vfio_ccw_regops variables declarations static
Quoted 23 lines · On Thu, 4 Jun 2020 13:20:45 +0200 Vasily Gorbik <[email protected]> wrote:
Fixes the following sparse warnings:
drivers/s390/cio/vfio_ccw_chp.c:62:30: warning: symbol 'vfio_ccw_schib_region_ops' was not declared. Should it be static?drivers/s390/cio/vfio_ccw_chp.c:117:30: warning: symbol 'vfio_ccw_crw_region_ops' was not declared. Should it be static?Signed-off-by Vasily Gorbik <[email protected]>--- drivers/s390/cio/vfio_ccw_chp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/s390/cio/vfio_ccw_chp.c +1
-1@@ -59,7 +59,7 @@ static void vfio_ccw_schib_region_release(struct vfio_ccw_private *private, } -const struct vfio_ccw_regops vfio_ccw_schib_region_ops = { +static const struct vfio_ccw_regops vfio_ccw_schib_region_ops = { .read = vfio_ccw_schib_region_read, .write = vfio_ccw_schib_region_write, .release = vfio_ccw_schib_region_release,
drivers/s390/cio/vfio_ccw_chp.c static void vfio_ccw_crw_region_release(struct vfio_ccw_private *private, · line 137
Quoted 8 lines
drivers/s390/cio/vfio_ccw_chp.c +1
-1@@ -131,7 +131,7 @@ static void vfio_ccw_crw_region_release(struct vfio_ccw_private *private, } -const struct vfio_ccw_regops vfio_ccw_crw_region_ops = { +static const struct vfio_ccw_regops vfio_ccw_crw_region_ops = { .read = vfio_ccw_crw_region_read, .write = vfio_ccw_crw_region_write, .release = vfio_ccw_crw_region_release,
Oops.
Feel free to merge this directly.