Skip to content

Commit

Permalink
Staging: hv: Rename struct storvsc_request_extension
Browse files Browse the repository at this point in the history 
Now that all duplicate state has been eliminated from
struct hv_storvsc_request and all needed state has been moved
to struct storvsc_request_extension, get rid of
struct hv_storvsc_request and rename struct storvsc_request_extension
as struct hv_storvsc_request. Cleanup and consolidation
of I/O request state is now complete.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent e9e936c commit d7a1bdb
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 82 deletions.
60 changes: 30 additions & 30 deletions drivers/staging/hv/blkvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,9 @@ static int blkvsc_do_flush(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.extension.data_buffer.pfn_array[0] = 0;
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 0;
blkvsc_req->request.data_buffer.pfn_array[0] = 0;
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 0;

blkvsc_req->cmnd[0] = SYNCHRONIZE_CACHE;
blkvsc_req->cmd_len = 10;
Expand Down Expand Up @@ -569,10 +569,10 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.extension.data_buffer.pfn_array[0] =
blkvsc_req->request.data_buffer.pfn_array[0] =
page_to_pfn(page_buf);
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 64;
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 64;

blkvsc_req->cmnd[0] = INQUIRY;
blkvsc_req->cmnd[1] = 0x1; /* Get product data */
Expand Down Expand Up @@ -653,16 +653,16 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev)
return -ENOMEM;
}

vm_srb = &blkvsc_req->request.extension.vstor_packet.vm_srb;
vm_srb = &blkvsc_req->request.vstor_packet.vm_srb;
init_waitqueue_head(&blkvsc_req->wevent);
blkvsc_req->dev = blkdev;
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.extension.data_buffer.pfn_array[0] =
blkvsc_req->request.data_buffer.pfn_array[0] =
page_to_pfn(page_buf);
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 8;
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 8;

blkvsc_req->cmnd[0] = READ_CAPACITY;
blkvsc_req->cmd_len = 16;
Expand Down Expand Up @@ -727,7 +727,7 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
return -ENOMEM;

memset(blkvsc_req, 0, sizeof(struct blkvsc_request));
vm_srb = &blkvsc_req->request.extension.vstor_packet.vm_srb;
vm_srb = &blkvsc_req->request.vstor_packet.vm_srb;
page_buf = alloc_page(GFP_KERNEL);
if (!page_buf) {
kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);
Expand All @@ -739,10 +739,10 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
blkvsc_req->req = NULL;
blkvsc_req->write = 0;

blkvsc_req->request.extension.data_buffer.pfn_array[0] =
blkvsc_req->request.data_buffer.pfn_array[0] =
page_to_pfn(page_buf);
blkvsc_req->request.extension.data_buffer.offset = 0;
blkvsc_req->request.extension.data_buffer.len = 12;
blkvsc_req->request.data_buffer.offset = 0;
blkvsc_req->request.data_buffer.len = 12;

blkvsc_req->cmnd[0] = 0x9E; /* READ_CAPACITY16; */
blkvsc_req->cmd_len = 16;
Expand Down Expand Up @@ -931,8 +931,8 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
(blkvsc_req->write) ? "WRITE" : "READ",
(unsigned long) blkvsc_req->sector_start,
blkvsc_req->sector_count,
blkvsc_req->request.extension.data_buffer.offset,
blkvsc_req->request.extension.data_buffer.len);
blkvsc_req->request.data_buffer.offset,
blkvsc_req->request.data_buffer.len);
#if 0
for (i = 0; i < (blkvsc_req->request.data_buffer.len >> 12); i++) {
DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - "
Expand All @@ -943,12 +943,12 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
#endif

storvsc_req = &blkvsc_req->request;
vm_srb = &storvsc_req->extension.vstor_packet.vm_srb;
vm_srb = &storvsc_req->vstor_packet.vm_srb;

vm_srb->data_in = blkvsc_req->write ? WRITE_TYPE : READ_TYPE;

storvsc_req->extension.on_io_completion = request_completion;
storvsc_req->extension.context = blkvsc_req;
storvsc_req->on_io_completion = request_completion;
storvsc_req->context = blkvsc_req;

vm_srb->port_number = blkdev->port;
vm_srb->path_id = blkdev->path;
Expand All @@ -959,7 +959,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,

memcpy(vm_srb->cdb, blkvsc_req->cmnd, vm_srb->cdb_length);

storvsc_req->extension.sense_buffer = blkvsc_req->sense_buffer;
storvsc_req->sense_buffer = blkvsc_req->sense_buffer;

ret = storvsc_drv_obj->on_io_request(blkdev->device_ctx,
&blkvsc_req->request);
Expand Down Expand Up @@ -1059,10 +1059,10 @@ static int blkvsc_do_request(struct block_device_context *blkdev,

blkvsc_req->dev = blkdev;
blkvsc_req->req = req;
blkvsc_req->request.extension.
blkvsc_req->request.
data_buffer.offset
= bvec->bv_offset;
blkvsc_req->request.extension.
blkvsc_req->request.
data_buffer.len = 0;

/* Add to the group */
Expand All @@ -1077,10 +1077,10 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
}

/* Add the curr bvec/segment to the curr blkvsc_req */
blkvsc_req->request.extension.data_buffer.
blkvsc_req->request.data_buffer.
pfn_array[databuf_idx]
= page_to_pfn(bvec->bv_page);
blkvsc_req->request.extension.data_buffer.len
blkvsc_req->request.data_buffer.len
+= bvec->bv_len;

prev_bvec = bvec;
Expand Down Expand Up @@ -1146,7 +1146,7 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
static void blkvsc_cmd_completion(struct hv_storvsc_request *request)
{
struct blkvsc_request *blkvsc_req =
(struct blkvsc_request *)request->extension.context;
(struct blkvsc_request *)request->context;
struct block_device_context *blkdev =
(struct block_device_context *)blkvsc_req->dev;
struct scsi_sense_hdr sense_hdr;
Expand All @@ -1155,7 +1155,7 @@ static void blkvsc_cmd_completion(struct hv_storvsc_request *request)
DPRINT_DBG(BLKVSC_DRV, "blkvsc_cmd_completion() - req %p\n",
blkvsc_req);

vm_srb = &blkvsc_req->request.extension.vstor_packet.vm_srb;
vm_srb = &blkvsc_req->request.vstor_packet.vm_srb;
blkdev->num_outstanding_reqs--;

if (vm_srb->scsi_status)
Expand All @@ -1170,7 +1170,7 @@ static void blkvsc_cmd_completion(struct hv_storvsc_request *request)
static void blkvsc_request_completion(struct hv_storvsc_request *request)
{
struct blkvsc_request *blkvsc_req =
(struct blkvsc_request *)request->extension.context;
(struct blkvsc_request *)request->context;
struct block_device_context *blkdev =
(struct block_device_context *)blkvsc_req->dev;
unsigned long flags;
Expand All @@ -1186,7 +1186,7 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request)
(blkvsc_req->write) ? "WRITE" : "READ",
(unsigned long)blkvsc_req->sector_start,
blkvsc_req->sector_count,
blkvsc_req->request.extension.data_buffer.len,
blkvsc_req->request.data_buffer.len,
blkvsc_req->group->outstanding,
blkdev->num_outstanding_reqs);

Expand All @@ -1213,7 +1213,7 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request)
list_del(&comp_req->req_entry);

vm_srb =
&comp_req->request.extension.vstor_packet.vm_srb;
&comp_req->request.vstor_packet.vm_srb;
if (!__blk_end_request(comp_req->req,
(!vm_srb->scsi_status ? 0 : -EIO),
comp_req->sector_count * blkdev->sector_size)) {
Expand Down Expand Up @@ -1274,7 +1274,7 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev)

if (comp_req->req) {
vm_srb =
&comp_req->request.extension.vstor_packet.
&comp_req->request.vstor_packet.
vm_srb;
ret = __blk_end_request(comp_req->req,
(!vm_srb->scsi_status ? 0 : -EIO),
Expand Down
49 changes: 21 additions & 28 deletions drivers/staging/hv/storvsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static inline struct storvsc_device *final_release_stor_device(
static int stor_vsc_channel_init(struct hv_device *device)
{
struct storvsc_device *stor_device;
struct storvsc_request_extension *request;
struct hv_storvsc_request *request;
struct vstor_packet *vstor_packet;
int ret, t;

Expand All @@ -123,7 +123,7 @@ static int stor_vsc_channel_init(struct hv_device *device)
* Now, initiate the vsc/vsp initialization protocol on the open
* channel
*/
memset(request, 0, sizeof(struct storvsc_request_extension));
memset(request, 0, sizeof(struct hv_storvsc_request));
init_completion(&request->wait_event);
vstor_packet->operation = VSTOR_OPERATION_BEGIN_INITIALIZATION;
vstor_packet->flags = REQUEST_COMPLETION_FLAG;
Expand Down Expand Up @@ -276,9 +276,8 @@ static int stor_vsc_channel_init(struct hv_device *device)

static void stor_vsc_on_io_completion(struct hv_device *device,
struct vstor_packet *vstor_packet,
struct storvsc_request_extension *request_ext)
struct hv_storvsc_request *request)
{
struct hv_storvsc_request *request;
struct storvsc_device *stor_device;

stor_device = must_get_stor_device(device);
Expand All @@ -288,11 +287,10 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
return;
}

DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request extension %p "
"completed bytes xfer %u", request_ext,
DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request %p "
"completed bytes xfer %u", request,
vstor_packet->vm_srb.data_transfer_length);

request = request_ext->request;


/* Copy over the status...etc */
Expand All @@ -311,18 +309,18 @@ static void stor_vsc_on_io_completion(struct hv_device *device,
if (vstor_packet->vm_srb.srb_status & 0x80) {
/* autosense data available */
DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data "
"valid - len %d\n", request_ext,
"valid - len %d\n", request,
vstor_packet->vm_srb.sense_info_length);

memcpy(request->extension.sense_buffer,
memcpy(request->sense_buffer,
vstor_packet->vm_srb.sense_data,
vstor_packet->vm_srb.sense_info_length);

}
}


request->extension.on_io_completion(request);
request->on_io_completion(request);

atomic_dec(&stor_device->num_outstanding_req);

Expand All @@ -331,12 +329,12 @@ static void stor_vsc_on_io_completion(struct hv_device *device,

static void stor_vsc_on_receive(struct hv_device *device,
struct vstor_packet *vstor_packet,
struct storvsc_request_extension *request_ext)
struct hv_storvsc_request *request)
{
switch (vstor_packet->operation) {
case VSTOR_OPERATION_COMPLETE_IO:
DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION");
stor_vsc_on_io_completion(device, vstor_packet, request_ext);
stor_vsc_on_io_completion(device, vstor_packet, request);
break;
case VSTOR_OPERATION_REMOVE_DEVICE:
DPRINT_INFO(STORVSC, "REMOVE_DEVICE_OPERATION");
Expand All @@ -357,7 +355,7 @@ static void stor_vsc_on_channel_callback(void *context)
u32 bytes_recvd;
u64 request_id;
unsigned char packet[ALIGN(sizeof(struct vstor_packet), 8)];
struct storvsc_request_extension *request;
struct hv_storvsc_request *request;
int ret;


Expand All @@ -377,7 +375,7 @@ static void stor_vsc_on_channel_callback(void *context)
bytes_recvd, request_id);


request = (struct storvsc_request_extension *)
request = (struct hv_storvsc_request *)
(unsigned long)request_id;

if ((request == &stor_device->init_request) ||
Expand Down Expand Up @@ -516,20 +514,17 @@ int stor_vsc_on_io_request(struct hv_device *device,
struct hv_storvsc_request *request)
{
struct storvsc_device *stor_device;
struct storvsc_request_extension *request_extension;
struct vstor_packet *vstor_packet;
int ret = 0;

request_extension = &request->extension;
vstor_packet = &request_extension->vstor_packet;
vstor_packet = &request->vstor_packet;
stor_device = get_stor_device(device);

DPRINT_DBG(STORVSC, "enter - Device %p, DeviceExt %p, Request %p, "
"Extension %p", device, stor_device, request,
request_extension);
, device, stor_device, request);

DPRINT_DBG(STORVSC, "req %p len %d",
request, request->extension.data_buffer.len);
request, request->data_buffer.len);

if (!stor_device) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
Expand All @@ -538,8 +533,7 @@ int stor_vsc_on_io_request(struct hv_device *device,
}


request_extension->request = request;
request_extension->device = device;
request->device = device;

vstor_packet->flags |= REQUEST_COMPLETION_FLAG;

Expand All @@ -550,7 +544,7 @@ int stor_vsc_on_io_request(struct hv_device *device,


vstor_packet->vm_srb.data_transfer_length =
request->extension.data_buffer.len;
request->data_buffer.len;

vstor_packet->operation = VSTOR_OPERATION_EXECUTE_SRB;

Expand All @@ -564,17 +558,16 @@ int stor_vsc_on_io_request(struct hv_device *device,
vstor_packet->vm_srb.sense_info_length,
vstor_packet->vm_srb.cdb_length);

if (request_extension->request->extension.data_buffer.len) {
if (request->data_buffer.len) {
ret = vmbus_sendpacket_multipagebuffer(device->channel,
&request_extension->request->extension.
data_buffer,
&request->data_buffer,
vstor_packet,
sizeof(struct vstor_packet),
(unsigned long)request_extension);
(unsigned long)request);
} else {
ret = vmbus_sendpacket(device->channel, vstor_packet,
sizeof(struct vstor_packet),
(unsigned long)request_extension,
(unsigned long)request,
VM_PKT_DATA_INBAND,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
}
Expand Down
11 changes: 3 additions & 8 deletions drivers/staging/hv/storvsc_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum storvsc_request_type{
};


struct storvsc_request_extension {
struct hv_storvsc_request {
struct hv_storvsc_request *request;
struct hv_device *device;

Expand All @@ -70,11 +70,6 @@ struct storvsc_request_extension {
struct vstor_packet vstor_packet;
};

struct hv_storvsc_request {

struct storvsc_request_extension extension;

};

/* Represents the block vsc driver */
struct storvsc_driver_object {
Expand Down Expand Up @@ -116,8 +111,8 @@ struct storvsc_device {
unsigned char target_id;

/* Used for vsc/vsp channel reset process */
struct storvsc_request_extension init_request;
struct storvsc_request_extension reset_request;
struct hv_storvsc_request init_request;
struct hv_storvsc_request reset_request;
};


Expand Down
Loading

0 comments on commit d7a1bdb

Please sign in to comment.