On Thu, 30 Apr 2020 17:29:59 -0400 Jared Rossi <jrossi@xxxxxxxxxxxxx> wrote: > Remove the explicit prefetch check when using vfio-ccw devices. > This check is not needed in practice as all Linux channel programs s/is not needed/does not trigger/ ? > 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 indicates that channel s/indicates/indicate/ > programs are being executed in a way that is inconsistent with what > the guest is requesting. While there are currently no known errors > caused by forced prefetch, it is possible in theory that forced "While there is currently no known case of an error caused by forced prefetch, ..." ? > prefetch could result in an error if applied to a channel program > that is dependent on non-prefetch. > > Signed-off-by: Jared Rossi <jrossi@xxxxxxxxxxxxx> > --- > Documentation/s390/vfio-ccw.rst | 4 ++++ > drivers/s390/cio/vfio_ccw_cp.c | 16 +++++++--------- > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/Documentation/s390/vfio-ccw.rst b/Documentation/s390/vfio-ccw.rst > index fca9c4f5bd9c..8f71071f4403 100644 > --- a/Documentation/s390/vfio-ccw.rst > +++ b/Documentation/s390/vfio-ccw.rst > @@ -335,6 +335,10 @@ 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 (IPL is handled as a special case). "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. > > diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c > index 3645d1720c4b..48802e9827b6 100644 > --- a/drivers/s390/cio/vfio_ccw_cp.c > +++ b/drivers/s390/cio/vfio_ccw_cp.c > @@ -8,6 +8,7 @@ > * Xiao Feng Ren <renxiaof@xxxxxxxxxxxxxxxxxx> > */ > > +#include <linux/ratelimit.h> > #include <linux/mm.h> > #include <linux/slab.h> > #include <linux/iommu.h> > @@ -625,23 +626,20 @@ 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) > { > + static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 1); > int ret; > > - /* > - * XXX: > - * Only support prefetch enable mode now. > - */ > - if (!orb->cmd.pfch) > - return -EOPNOTSUPP; > + /* All Linux channel programs are expected to support prefetching */ I think we want a longer comment here as well, not only in the patch description. "We only support prefetching the channel program. We assume all channel programs executed by supported guests (i.e. Linux) to support prefetching. If prefetching is not specified, executing the channel program may still work without problems; but log a message to give at least a hint if something goes wrong." ? > + if (!orb->cmd.pfch && __ratelimit(&ratelimit_state)) > + printk(KERN_WARNING "vfio_ccw_cp: prefetch will be forced\n"); "prefetch will be forced" is a bit misleading: the code does not force the p bit in the orb to be on, it's just the vfio-ccw cp translation code that relies on prefetching. Maybe rather "executing unsupported channel program without prefetch, things may break"? Also, this message does not mention the affected device, which makes it hard to locate the issuer in the guest. Maybe use dev_warn_ratelimited() instead of the home-grown ratelimiting? Or did you already try the generic ratelimiting? > > INIT_LIST_HEAD(&cp->ccwchain_list); > memcpy(&cp->orb, orb, sizeof(*orb));