vfio-ccw: support async command subregion
PATCH v6 1/1 vfio-ccw: support async command subregion
A vfio-ccw device may provide an async command subregion for issuing halt/clear subchannel requests. If it is present, use it for sending halt/clear request to the device; if not, fall back to emulation (as done today).
---
v5->v6:
- plug a memory leak [Farhan]
v4->v5:
- It seems we need to take the indirection via the class for the callbacks after all :(
- Dropped Eric's R-b: for that reason
--- hw/s390x/css.c | 27 +++++++-- hw/s390x/s390-ccw.c | 20 +++++++ hw/vfio/ccw.c | 113 +++++++++++++++++++++++++++++++++++- include/hw/s390x/css.h | 3 + include/hw/s390x/s390-ccw.h | 2 + 5 files changed, 159 insertions(+), 6 deletions(-)
hw/s390x/css.c +23 -4
@@ -22,6 +22,7 @@#include "trace.h" #include "hw/s390x/s390_flic.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/s390-ccw.h" typedef struct CrwContainer { CRW crw;
@@ -1205,6 +1206,26 @@ static void sch_handle_start_func_virtual(SubchDev *sch) } +static void sch_handle_halt_func_passthrough (SubchDev *sch) +{ +int ret; + + ret =s390_ccw_halt (sch); +if (ret == -ENOSYS ) { +sch_handle_halt_func (sch); + } +} + +static void sch_handle_clear_func_passthrough (SubchDev *sch) +{ +int ret; + + ret =s390_ccw_clear (sch); +if (ret == -ENOSYS ) { +sch_handle_clear_func (sch); + } +} +static IOInstEnding sch_handle_start_func_passthrough (SubchDev *sch) {SCHIB *schib = &sch->curr_status;
@@ -1244,11 +1265,9 @@ IOInstEnding do_subchannel_work_passthrough(SubchDev *sch)SCHIB *schib = &sch->curr_status;if (schib->scsw.ctrl &SCSW_FCTL_CLEAR_FUNC ) { -/* TODO: Clear handling */ -sch_handle_clear_func (sch); +sch_handle_clear_func_passthrough (sch); }else if (schib->scsw.ctrl &SCSW_FCTL_HALT_FUNC ) { -/* TODO: Halt handling */ -sch_handle_halt_func (sch); +sch_handle_halt_func_passthrough (sch); }else if (schib->scsw.ctrl &SCSW_FCTL_START_FUNC ) {return sch_handle_start_func_passthrough (sch); }
hw/s390x/s390-ccw.c +20 -0
@@ -30,6 +30,26 @@ IOInstEnding s390_ccw_cmd_request(SubchDev *sch)return cdc->handle_request (sch); } +int s390_ccw_halt (SubchDev *sch) +{ +S390CCWDeviceClass *cdc =S390_CCW_DEVICE_GET_CLASS (sch->driver_data); + +if (!cdc->handle_halt) { +return -ENOSYS ; + } +return cdc->handle_halt (sch); +} + +int s390_ccw_clear (SubchDev *sch) +{ +S390CCWDeviceClass *cdc =S390_CCW_DEVICE_GET_CLASS (sch->driver_data); + +if (!cdc->handle_clear) { +return -ENOSYS ; + } +return cdc->handle_clear (sch); +} +static void s390_ccw_get_dev_info (S390CCWDevice *cdev,char *sysfsdev,Error **errp)
hw/vfio/ccw.c +111 -2
158 lines not on this page · raw message
include/hw/s390x/css.h +3 -0
@@ -215,6 +215,9 @@ IOInstEnding s390_ccw_cmd_request(SubchDev *sch);IOInstEnding do_subchannel_work_virtual (SubchDev *sub);IOInstEnding do_subchannel_work_passthrough (SubchDev *sub); +int s390_ccw_halt (SubchDev *sch); +int s390_ccw_clear (SubchDev *sch); + typedef enum { CSS_IO_ADAPTER_VIRTIO = 0, CSS_IO_ADAPTER_PCI = 1,
include/hw/s390x/s390-ccw.h +2 -0
@@ -35,6 +35,8 @@ typedef struct S390CCWDeviceClass {void (*realize)(S390CCWDevice *dev,char *sysfsdev,Error **errp);void (*unrealize)(S390CCWDevice *dev,Error **errp);IOInstEnding (*handle_request) (SubchDev *sch); +int (*handle_halt) (SubchDev *sch); + int (*handle_clear) (SubchDev *sch); } S390CCWDeviceClass;#endif
Signature · 1 line
2.20.1
Quoted 17 lines · On Thu, 13 Jun 2019 11:25:42 +0200 Cornelia Huck <[email protected]> wrote:
A vfio-ccw device may provide an async command subregion for issuing halt/clear subchannel requests. If it is present, use it for sending halt/clear request to the device; if not, fall back to emulation (as done today).
Reviewed-by Farhan Ali <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
v5->v6:
- plug a memory leak [Farhan]
v4->v5:
- It seems we need to take the indirection via the class for the callbacks after all :(
- Dropped Eric's R-b: for that reason
Quoted 7 lines
--- hw/s390x/css.c | 27 +++++++-- hw/s390x/s390-ccw.c | 20 +++++++ hw/vfio/ccw.c | 113 +++++++++++++++++++++++++++++++++++- include/hw/s390x/css.h | 3 + include/hw/s390x/s390-ccw.h | 2 + 5 files changed, 159 insertions(+), 6 deletions(-)
Anyone else? I'd like to queue this.
Quoted 9 lines · Cornelia Huck
A vfio-ccw device may provide an async command subregion for issuing halt/clear subchannel requests. If it is present, use it for sending halt/clear request to the device; if not, fall back to emulation (as done today).
Reviewed-by Farhan Ali <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
Quoted 7 lines
v5->v6:
- plug a memory leak [Farhan]
v4->v5:
- It seems we need to take the indirection via the class for the callbacks after all :(
- Dropped Eric's R-b: for that reason
I've finally looked over this version, and think it looks good. Feel free to add this back:
Cornelia Huck
AppliedQuoted 18 lines · On Wed, 19 Jun 2019 15:05:25 -0400 Eric Farman <[email protected]> wrote:
Quoted 9 lines · Cornelia Huck
A vfio-ccw device may provide an async command subregion for issuing halt/clear subchannel requests. If it is present, use it for sending halt/clear request to the device; if not, fall back to emulation (as done today).
Reviewed-by Farhan Ali <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
Quoted 7 lines
v5->v6:
- plug a memory leak [Farhan]
v4->v5:
- It seems we need to take the indirection via the class for the callbacks after all :(
- Dropped Eric's R-b: for that reason
Quoted 5 lines
I've finally looked over this version, and think it looks good. Feel free to add this back:
Reviewed-by Eric Farman <[email protected]>
Thanks!
Queued to s390-next.