vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/css: only suspend when enabled by orb 

We must not allow a channel program to suspend if the suspend
control bit in the orb had not been specified.

Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
master
Cornelia Huck 2016-02-22 16:43:04 +01:00
parent d90527178c
commit ce350f32e4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/s390x/css.c
View File

@ -342,7 +342,8 @@ static CCW1 copy_ccw_from_guest(hwaddr addr, bool fmt1)
return ret; return ret;
} }
static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr) static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr,
bool suspend_allowed)
{ {
int ret; int ret;
bool check_len; bool check_len;
@ -370,7 +371,7 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
} }
if (ccw.flags & CCW_FLAG_SUSPEND) { if (ccw.flags & CCW_FLAG_SUSPEND) {
return -EINPROGRESS; return suspend_allowed ? -EINPROGRESS : -EINVAL;
} }
check_len = !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_DC)); check_len = !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_DC));
@ -468,6 +469,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
SCSW *s = &sch->curr_status.scsw; SCSW *s = &sch->curr_status.scsw;
int path; int path;
int ret; int ret;
bool suspend_allowed;
/* Path management: In our simple css, we always choose the only path. */ /* Path management: In our simple css, we always choose the only path. */
path = 0x80; path = 0x80;
@ -487,12 +489,15 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
} }
sch->ccw_fmt_1 = !!(orb->ctrl0 & ORB_CTRL0_MASK_FMT); sch->ccw_fmt_1 = !!(orb->ctrl0 & ORB_CTRL0_MASK_FMT);
sch->ccw_no_data_cnt = 0; sch->ccw_no_data_cnt = 0;
suspend_allowed = !!(orb->ctrl0 & ORB_CTRL0_MASK_SPND);
} else { } else {
s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND); s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND);
/* The channel program had been suspended before. */
suspend_allowed = true;
} }
sch->last_cmd_valid = false; sch->last_cmd_valid = false;
do { do {
ret = css_interpret_ccw(sch, sch->channel_prog); ret = css_interpret_ccw(sch, sch->channel_prog, suspend_allowed);
switch (ret) { switch (ret) {
case -EAGAIN: case -EAGAIN:
/* ccw chain, continue processing */ /* ccw chain, continue processing */