s390/css: handle CCW_FLAG_SKIP
RFC PATCH v3 1/1 s390/css: handle CCW_FLAG_SKIP
If a ccw has CCW_FLAG_SKIP set, and the command is of type read, read backwards, or sense, no data should be written to the guest for that command.
---
v2 -> v3: fixed checks even more [Pierre]
v1 -> v2: fixed checks for command type [Eric]
--- hw/s390x/css.c | 22 ++++++++++++++++++---- include/hw/s390x/css.h | 1 + 2 files changed, 19 insertions(+), 4 deletions(-)
hw/s390x/css.c +18 -4
@@ -830,8 +830,12 @@ static int ccw_dstream_rw_noflags(CcwDataStream *cds, void *buff, int len,if (op ==CDS_OP_A ) { goto incr; } - ret =address_space_rw (&address_space_memory, cds->cda, -MEMTXATTRS_UNSPECIFIED , buff, len, op); +if (!cds->do_skip) { + ret =address_space_rw (&address_space_memory, cds->cda, +MEMTXATTRS_UNSPECIFIED , buff, len, op); + }else { + ret =0 ; + }if (ret !=MEMTX_OK ) { cds->flags |=CDS_F_STREAM_BROKEN ;return -EINVAL ;
@@ -928,8 +932,13 @@ static int ccw_dstream_rw_ida(CcwDataStream *cds, void *buff, int len, do { iter_len = MIN(len, cont_left); if (op != CDS_OP_A) { - ret = address_space_rw(&address_space_memory, cds->cda, - MEMTXATTRS_UNSPECIFIED, buff, iter_len, op); + if (!cds->do_skip) { + ret = address_space_rw(&address_space_memory, cds->cda, + MEMTXATTRS_UNSPECIFIED, buff, iter_len, + op); + } else { + ret = 0; + } if (ret != MEMTX_OK) { /* assume inaccessible address */ ret = -EINVAL; /* channel program check */
@@ -968,6 +977,11 @@ void ccw_dstream_init(CcwDataStream *cds, CCW1 const *ccw, ORB const *orb) cds->count = ccw->count; cds->cda_orig = ccw->cda; +/* skip is only effective for read, read backwards, or sense commands */ + cds->do_skip = (ccw->flags &CCW_FLAG_SKIP ) && + ((ccw->cmd_code &0x0f ) ==CCW_CMD_BASIC_SENSE || + (ccw->cmd_code &0x03 ) ==0x02 /* read */ || + (ccw->cmd_code &0x0f ) ==0x0c /* read backwards */ );ccw_dstream_rewind (cds);if (!(cds->flags &CDS_F_IDA )) { cds->op_handler = ccw_dstream_rw_noflags;
include/hw/s390x/css.h +1 -0
@@ -97,6 +97,7 @@ typedef struct CcwDataStream {int (*op_handler)(struct CcwDataStream *cds,void *buff,int len,CcwDataStreamOp op);hwaddr cda; +bool do_skip; } CcwDataStream;/*
Signature · 1 line
2.20.1
Quoted 20 lines · Cornelia Huck
If a ccw has
CCW_FLAG_SKIPset, and the command is of type read, read backwards, or sense, no data should be written to the guest for that command.Signed-off-by Cornelia Huck <[email protected]>---
v2 -> v3: fixed checks even more [Pierre]
v1 -> v2: fixed checks for command type [Eric]--- hw/s390x/css.c | 22 ++++++++++++++++++---- include/hw/s390x/css.h | 1 + 2 files changed, 19 insertions(+), 4 deletions(-)hw/s390x/css.c +0
-0
hw/s390x/css.c static int ccw_dstream_rw_noflags(CcwDataStream *cds, void *buff, int len, · line 837
Quoted 10 lines
hw/s390x/css.c +5
-2@@ -830,8 +830,12 @@ static int ccw_dstream_rw_noflags(CcwDataStream *cds, void *buff, int len,if (op ==CDS_OP_A ) { goto incr; } - ret =address_space_rw (&address_space_memory, cds->cda, -MEMTXATTRS_UNSPECIFIED , buff, len, op); +if (!cds->do_skip) { + ret =address_space_rw (&address_space_memory, cds->cda, +MEMTXATTRS_UNSPECIFIED , buff, len, op); + }else { + ret =0 ;
Maybe set this to MEMTX_OK (defined as zero), just so it's clear based on the existing check below?
Quoted 6 lines
hw/s390x/css.c +1
-0+ }if (ret !=MEMTX_OK ) { cds->flags |=CDS_F_STREAM_BROKEN ;return -EINVAL ;@@ -928,8 +932,13 @@ static int ccw_dstream_rw_ida(CcwDataStream *cds, void *buff, int len, do {
hw/s390x/css.c static int ccw_dstream_rw_ida(CcwDataStream *cds, void *buff, int len, · line 940
Quoted 10 lines
hw/s390x/css.c +6
-2iter_len =MIN (len, cont_left);if (op !=CDS_OP_A ) { - ret =address_space_rw (&address_space_memory, cds->cda, -MEMTXATTRS_UNSPECIFIED , buff, iter_len, op); +if (!cds->do_skip) { + ret =address_space_rw (&address_space_memory, cds->cda, +MEMTXATTRS_UNSPECIFIED , buff, iter_len, + op); + }else { + ret =0 ;
(here too)
Either way, this seems reasonable to me.
Quoted 29 lines
hw/s390x/css.c +6
-0+ }if (ret !=MEMTX_OK ) {/* assume inaccessible address */ ret = -EINVAL ;/* channel program check */ @@ -968,6 +977,11 @@ void ccw_dstream_init(CcwDataStream *cds, CCW1 const *ccw, ORB const *orb) cds->count = ccw->count; cds->cda_orig = ccw->cda; +/* skip is only effective for read, read backwards, or sense commands */ + cds->do_skip = (ccw->flags &CCW_FLAG_SKIP ) && + ((ccw->cmd_code &0x0f ) ==CCW_CMD_BASIC_SENSE || + (ccw->cmd_code &0x03 ) ==0x02 /* read */ || + (ccw->cmd_code &0x0f ) ==0x0c /* read backwards */ );ccw_dstream_rewind (cds);if (!(cds->flags &CDS_F_IDA )) { cds->op_handler = ccw_dstream_rw_noflags;include/hw/s390x/css.h +1
-0@@ -97,6 +97,7 @@ typedef struct CcwDataStream {int (*op_handler)(struct CcwDataStream *cds,void *buff,int len,CcwDataStreamOp op);hwaddr cda; +bool do_skip; } CcwDataStream;/*