Skip to content

Commit

Permalink
vfio-ccw: make it safe to access channel programs
Browse files Browse the repository at this point in the history
When we get a solicited interrupt, the start function may have
been cleared by a csch, but we still have a channel program
structure allocated. Make it safe to call the cp accessors in
any case, so we can call them unconditionally.

While at it, also make sure that functions called from other parts
of the code return gracefully if the channel program structure
has not been initialized (even though that is a bug in the caller).

Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
  • Loading branch information
Cornelia Huck committed Apr 24, 2019
1 parent 1c410fd commit 71189f2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
21 changes: 20 additions & 1 deletion drivers/s390/cio/vfio_ccw_cp.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ static void cp_unpin_free(struct channel_program *cp)
struct ccwchain *chain, *temp;
int i;

cp->initialized = false;
list_for_each_entry_safe(chain, temp, &cp->ccwchain_list, next) {
for (i = 0; i < chain->ch_len; i++) {
pfn_array_table_unpin_free(chain->ch_pat + i,
Expand Down Expand Up @@ -732,6 +733,9 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
*/
cp->orb.cmd.c64 = 1;

if (!ret)
cp->initialized = true;

return ret;
}

Expand All @@ -746,7 +750,8 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
*/
void cp_free(struct channel_program *cp)
{
cp_unpin_free(cp);
if (cp->initialized)
cp_unpin_free(cp);
}

/**
Expand Down Expand Up @@ -791,6 +796,10 @@ int cp_prefetch(struct channel_program *cp)
struct ccwchain *chain;
int len, idx, ret;

/* this is an error in the caller */
if (!cp->initialized)
return -EINVAL;

list_for_each_entry(chain, &cp->ccwchain_list, next) {
len = chain->ch_len;
for (idx = 0; idx < len; idx++) {
Expand Down Expand Up @@ -826,6 +835,10 @@ union orb *cp_get_orb(struct channel_program *cp, u32 intparm, u8 lpm)
struct ccwchain *chain;
struct ccw1 *cpa;

/* this is an error in the caller */
if (!cp->initialized)
return NULL;

orb = &cp->orb;

orb->cmd.intparm = intparm;
Expand Down Expand Up @@ -862,6 +875,9 @@ void cp_update_scsw(struct channel_program *cp, union scsw *scsw)
u32 cpa = scsw->cmd.cpa;
u32 ccw_head;

if (!cp->initialized)
return;

/*
* LATER:
* For now, only update the cmd.cpa part. We may need to deal with
Expand Down Expand Up @@ -898,6 +914,9 @@ bool cp_iova_pinned(struct channel_program *cp, u64 iova)
struct ccwchain *chain;
int i;

if (!cp->initialized)
return false;

list_for_each_entry(chain, &cp->ccwchain_list, next) {
for (i = 0; i < chain->ch_len; i++)
if (pfn_array_table_iova_pinned(chain->ch_pat + i,
Expand Down
2 changes: 2 additions & 0 deletions drivers/s390/cio/vfio_ccw_cp.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* @ccwchain_list: list head of ccwchains
* @orb: orb for the currently processed ssch request
* @mdev: the mediated device to perform page pinning/unpinning
* @initialized: whether this instance is actually initialized
*
* @ccwchain_list is the head of a ccwchain list, that contents the
* translated result of the guest channel program that pointed out by
Expand All @@ -30,6 +31,7 @@ struct channel_program {
struct list_head ccwchain_list;
union orb orb;
struct device *mdev;
bool initialized;
};

extern int cp_init(struct channel_program *cp, struct device *mdev,
Expand Down
5 changes: 5 additions & 0 deletions drivers/s390/cio/vfio_ccw_fsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ static int fsm_io_helper(struct vfio_ccw_private *private)
private->state = VFIO_CCW_STATE_BUSY;

orb = cp_get_orb(&private->cp, (u32)(addr_t)sch, sch->lpm);
if (!orb) {
ret = -EIO;
goto out;
}

/* Issue "Start Subchannel" */
ccode = ssch(sch->schid, orb);
Expand Down Expand Up @@ -64,6 +68,7 @@ static int fsm_io_helper(struct vfio_ccw_private *private)
default:
ret = ccode;
}
out:
spin_unlock_irqrestore(sch->lock, flags);
return ret;
}
Expand Down

0 comments on commit 71189f2

Please sign in to comment.