scsi: Use 'SCSIRequest' directly
PATCH 1/1 scsi: Use 'SCSIRequest' directly
Currently the SCSIRequest structure is abstracted away and cannot accessed directly from the driver. This requires the handler to do a lookup on an abstract 'tag' which identifies the SCSIRequest structure.
With this patch the SCSIRequest structure is exposed to the driver. This allows use to use it directly as an argument to the SCSIDeviceInfo callback functions and remove the lookup.
Two new callback functions 'alloc_req' and 'free_req' are introduced, which serve to allocate a new request and to free up resources after use.
--- hw/esp.c | 20 ++++--- hw/lsi53c895a.c | 26 +++++---- hw/scsi-bus.c | 15 +----- hw/scsi-disk.c | 147 ++++++++++++++++------------------------------------ hw/scsi-generic.c | 119 ++++++++++++++----------------------------- hw/scsi.h | 20 ++++--- hw/usb-msd.c | 23 +++++---- 7 files changed, 136 insertions(+), 234 deletions(-)
hw/esp.c +12 -8
@@ -65,6 +65,7 @@ struct ESPState {uint32_t dma;SCSIBus bus;SCSIDevice *current_dev; +SCSIRequest *current_req;uint8_t cmdbuf[TI_BUFSZ ];uint32_t cmdlen;uint32_t do_cmd;
@@ -209,7 +210,7 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf)if (s->current_dev) {/* Started a new command before the old one finished. Cancel it. */ - s->current_dev->info->cancel_io (s->current_dev,0 ); + s->current_dev->info->cancel_io (s->current_req); s->async_len =0 ; }
@@ -232,7 +233,8 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid)DPRINTF ("do_busid_cmd: busid 0x%x\n" , busid); lun = busid &7 ; - datalen = s->current_dev->info->send_command (s->current_dev,0 , buf, lun); + s->current_req = s->current_dev->info->alloc_req (s->current_dev,0 , lun); + datalen = s->current_dev->info->send_command (s->current_req, buf); s->ti_size = datalen;if (datalen !=0 ) { s->rregs[ESP_RSTAT ] =STAT_TC ;
@@ -240,10 +242,10 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid) s->dma_counter =0 ;if (datalen >0 ) { s->rregs[ESP_RSTAT ] |=STAT_DI ; - s->current_dev->info->read_data (s->current_dev,0 ); + s->current_dev->info->read_data (s->current_req); }else { s->rregs[ESP_RSTAT ] |=STAT_DO ; - s->current_dev->info->write_data (s->current_dev,0 ); + s->current_dev->info->write_data (s->current_req); } } s->rregs[ESP_RINTR ] =INTR_BS |INTR_FC ;
@@ -372,9 +374,9 @@ static void esp_do_dma(ESPState *s)if (s->async_len ==0 ) {if (to_device) {// ti_size is negative - s->current_dev->info->write_data (s->current_dev,0 ); + s->current_dev->info->write_data (s->current_req); }else { - s->current_dev->info->read_data (s->current_dev,0 ); + s->current_dev->info->read_data (s->current_req);/* If there is still data to be read from the device then complete the DMA operation immediately. Otherwise defer until the scsi layer has completed. */
@@ -388,7 +390,7 @@ static void esp_do_dma(ESPState *s) } } -static void esp_command_complete (SCSIBus *bus,int reason,uint32_t tag, +static void esp_command_complete (SCSIBus *bus,int reason,SCSIRequest *req,uint32_t arg) {ESPState *s =DO_UPCAST (ESPState, busdev.qdev, bus->qbus.parent);
@@ -405,11 +407,13 @@ static void esp_command_complete(SCSIBus *bus, int reason, uint32_t tag, s->sense = arg; s->rregs[ESP_RSTAT ] =STAT_ST ;esp_dma_done (s); + req->dev->info->free_req (req); + s->current_req =NULL ; s->current_dev =NULL ; }else {DPRINTF ("transfer %d/%d\n" , s->dma_left, s->ti_size); s->async_len = arg; - s->async_buf = s->current_dev->info->get_buf (s->current_dev,0 ); + s->async_buf = s->current_dev->info->get_buf (req);if (s->dma_left) {esp_do_dma (s); }else if (s->dma_counter !=0 && s->ti_size <=0 ) {
hw/lsi53c895a.c +15 -11
@@ -174,6 +174,7 @@ do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__);} while (0)#define LSI_TAG_VALID (1 << 16) typedef struct lsi_request { + SCSIRequest *req; uint32_t tag; uint32_t dma_len; uint8_t *dma_buf;
@@ -569,7 +570,7 @@ static void lsi_do_dma(LSIState *s, int out) s->dbc -= count;if (s->current->dma_buf ==NULL ) { - s->current->dma_buf = dev->info->get_buf (dev, s->current->tag); + s->current->dma_buf = dev->info->get_buf (s->current->req); }/* ??? Set SFBR to first data byte. */
@@ -583,10 +584,10 @@ static void lsi_do_dma(LSIState *s, int out) s->current->dma_buf =NULL ;if (out) {/* Write the data. */ - dev->info->write_data (dev, s->current->tag); + dev->info->write_data (s->current->req); }else {/* Request any remaining data. */ - dev->info->read_data (dev, s->current->tag); + dev->info->read_data (s->current->req); } }else { s->current->dma_buf += count;
@@ -687,7 +688,7 @@ static int lsi_queue_tag(LSIState *s, uint32_t tag, uint32_t arg) }/* Callback to indicate that the SCSI layer has completed a transfer. */ -static void lsi_command_complete (SCSIBus *bus,int reason,uint32_t tag, +static void lsi_command_complete (SCSIBus *bus,int reason,SCSIRequest *req,uint32_t arg) {LSIState *s =DO_UPCAST (LSIState, dev.qdev, bus->qbus.parent);
@@ -704,7 +705,8 @@ static void lsi_command_complete(SCSIBus *bus, int reason, uint32_t tag, }else {lsi_set_phase (s,PHASE_ST ); } - + req->dev->info->free_req (req); + s->current->req =NULL ;qemu_free (s->current); s->current =NULL ;
@@ -712,14 +714,14 @@ static void lsi_command_complete(SCSIBus *bus, int reason, uint32_t tag,return ; } -if (s->waiting ==1 || !s->current || tag != s->current->tag || +if (s->waiting ==1 || !s->current || req->tag != s->current->tag || (lsi_irq_on_rsl (s) && !(s->scntl1 &LSI_SCNTL1_CON ))) { -if (lsi_queue_tag (s, tag, arg)) +if (lsi_queue_tag (s, req->tag, arg))return ; }/* host adapter (re)connected */ -DPRINTF ("Data ready tag=0x%x len=%d\n" , tag, arg); +DPRINTF ("Data ready tag=0x%x len=%d\n" , req->tag, arg); s->current->dma_len = arg; s->command_complete =1 ;if (!s->waiting)
@@ -755,14 +757,16 @@ static void lsi_do_command(LSIState *s)assert (s->current ==NULL ); s->current =qemu_mallocz (sizeof (lsi_request)); s->current->tag = s->select_tag; + s->current->req = dev->info->alloc_req (dev, s->current->tag, + s->current_lun); - n = dev->info->send_command (dev, s->current->tag, buf, s->current_lun); + n = dev->info->send_command (s->current->req, buf);if (n >0 ) {lsi_set_phase (s,PHASE_DI ); - dev->info->read_data (dev, s->current->tag); + dev->info->read_data (s->current->req); }else if (n <0 ) {lsi_set_phase (s,PHASE_DO ); - dev->info->write_data (dev, s->current->tag); + dev->info->write_data (s->current->req); }if (!s->command_complete) {
hw/scsi-bus.c +1 -14
@@ -138,18 +138,6 @@ SCSIRequest *scsi_req_alloc(size_t size, SCSIDevice *d, uint32_t tag, uint32_t lreturn req; } -SCSIRequest *scsi_req_find (SCSIDevice *d,uint32_t tag) -{ -SCSIRequest *req; - - QTAILQ_FOREACH(req, &d->requests, next) { -if (req->tag == tag) { -return req; - } - } -return NULL ; -} -static void scsi_req_dequeue (SCSIRequest *req) {if (req->enqueued) {
@@ -607,6 +595,5 @@ void scsi_req_complete(SCSIRequest *req)assert (req->status !=-1 );scsi_req_dequeue (req); req->bus->complete (req->bus,SCSI_REASON_DONE , - req->tag, - req->status); + req, req->status); }
hw/scsi-disk.c +45 -102
288 lines not on this page · raw message
hw/scsi-generic.c +39 -80
218 lines not on this page · raw message
hw/scsi.h +11 -9
@@ -17,7 +17,8 @@ enum scsi_reason {typedef struct SCSIBus SCSIBus ;typedef struct SCSIDevice SCSIDevice ;typedef struct SCSIDeviceInfo SCSIDeviceInfo ; -typedef void (*scsi_completionfn )(SCSIBus *bus,int reason,uint32_t tag, +typedef struct SCSIRequest SCSIRequest ; +typedef void (*scsi_completionfn )(SCSIBus *bus,int reason,SCSIRequest *req,uint32_t arg);enum SCSIXferMode {
@@ -32,7 +33,7 @@ typedef struct SCSISense {uint8_t ascq; } SCSISense; -typedef struct SCSIRequest { +struct SCSIRequest {SCSIBus *bus;SCSIDevice *dev;uint32_t tag;
@@ -48,7 +49,7 @@ typedef struct SCSIRequest {BlockDriverAIOCB *aiocb;bool enqueued;QTAILQ_ENTRY (SCSIRequest) next; -} SCSIRequest; +};struct SCSIDevice {
@@ -71,12 +72,13 @@ struct SCSIDeviceInfo {DeviceInfo qdev;scsi_qdev_initfn init;void (*destroy)(SCSIDevice *s); -int32_t (*send_command)(SCSIDevice *s,uint32_t tag,uint8_t *buf, -int lun); -void (*read_data)(SCSIDevice *s,uint32_t tag); -int (*write_data)(SCSIDevice *s,uint32_t tag); -void (*cancel_io)(SCSIDevice *s,uint32_t tag); -uint8_t *(*get_buf)(SCSIDevice *s,uint32_t tag); +SCSIRequest *(*alloc_req)(SCSIDevice *s,uint32_t tag,uint32_t lun); +void (*free_req)(SCSIRequest *req); +int32_t (*send_command)(SCSIRequest *req,uint8_t *buf); +void (*read_data)(SCSIRequest *req); +int (*write_data)(SCSIRequest *req); +void (*cancel_io)(SCSIRequest *req); +uint8_t *(*get_buf)(SCSIRequest *req); }; typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv,
hw/usb-msd.c +13 -10
@@ -47,6 +47,7 @@ typedef struct {uint32_t data_len;uint32_t residue;uint32_t tag; +SCSIRequest *req;SCSIBus bus;BlockConf conf;SCSIDevice *scsi_dev;
@@ -155,9 +156,9 @@ static void usb_msd_copy_data(MSDState *s) s->data_len -= len;if (s->scsi_len ==0 ) {if (s->mode ==USB_MSDM_DATAIN ) { - s->scsi_dev->info->read_data (s->scsi_dev, s->tag); + s->scsi_dev->info->read_data (s->req); }else if (s->mode ==USB_MSDM_DATAOUT ) { - s->scsi_dev->info->write_data (s->scsi_dev, s->tag); + s->scsi_dev->info->write_data (s->req); } } }
@@ -173,14 +174,14 @@ static void usb_msd_send_status(MSDState *s)memcpy (s->usb_buf, &csw,13 ); } -static void usb_msd_command_complete (SCSIBus *bus,int reason,uint32_t tag, +static void usb_msd_command_complete (SCSIBus *bus,int reason,SCSIRequest *req,uint32_t arg) {MSDState *s =DO_UPCAST (MSDState, dev.qdev, bus->qbus.parent);USBPacket *p = s->packet; -if (tag != s->tag) { -fprintf (stderr,"usb-msd: Unexpected SCSI Tag 0x%x\n" , tag); +if (req->tag != s->tag) { +fprintf (stderr,"usb-msd: Unexpected SCSI Tag 0x%x\n" , req->tag); }if (reason ==SCSI_REASON_DONE ) {DPRINTF ("Command complete %d\n" , arg);
@@ -207,10 +208,11 @@ static void usb_msd_command_complete(SCSIBus *bus, int reason, uint32_t tag, }else if (s->data_len ==0 ) { s->mode =USB_MSDM_CSW ; } + s->scsi_dev->info->free_req (req);return ; } s->scsi_len = arg; - s->scsi_buf = s->scsi_dev->info->get_buf (s->scsi_dev, tag); + s->scsi_buf = s->scsi_dev->info->get_buf (req);if (p) {usb_msd_copy_data (s);if (s->usb_len ==0 ) {
@@ -348,7 +350,7 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value,static void usb_msd_cancel_io (USBPacket *p,void *opaque) {MSDState *s = opaque; - s->scsi_dev->info->cancel_io (s->scsi_dev, s->tag); + s->scsi_dev->info->cancel_io (s->req); s->packet =NULL ; s->scsi_len =0 ; }
@@ -396,14 +398,15 @@ static int usb_msd_handle_data(USBDevice *dev, USBPacket *p)DPRINTF ("Command tag 0x%x flags %08x len %d data %d\n" , s->tag, cbw.flags, cbw.cmd_len, s->data_len); s->residue =0 ; - s->scsi_dev->info->send_command (s->scsi_dev, s->tag, cbw.cmd,0 ); + s->req = s->scsi_dev->info->alloc_req (s->scsi_dev, s->tag,0 ); + s->scsi_dev->info->send_command (s->req, cbw.cmd);/* ??? Should check that USB and SCSI data transfer directions match. */ if (s->residue ==0 ) {if (s->mode ==USB_MSDM_DATAIN ) { - s->scsi_dev->info->read_data (s->scsi_dev, s->tag); + s->scsi_dev->info->read_data (s->req); }else if (s->mode ==USB_MSDM_DATAOUT ) { - s->scsi_dev->info->write_data (s->scsi_dev, s->tag); + s->scsi_dev->info->write_data (s->req); } } ret = len;
Signature · 1 line
1.6.0.2
Quoted 12 lines · Hannes Reinecke
Currently the SCSIRequest structure is abstracted away and cannot accessed directly from the driver. This requires the handler to do a lookup on an abstract 'tag' which identifies the SCSIRequest structure.
With this patch the SCSIRequest structure is exposed to the driver. This allows use to use it directly as an argument to the SCSIDeviceInfo callback functions and remove the lookup.
Two new callback functions 'alloc_req' and 'free_req' are introduced, which serve to allocate a new request and to free up resources after use.
I still think having the implementations of the method named different than the method name is a bad idea.
Otherwise looks good.