Skip to content

L
linux
Commit 068c5df2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: hv: coding style cleanups for StorVsc.c 

Some one owes me a lot of beer, or a nice bottle of rum for
all of this crud cleanup...

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b1f1d272
Show whitespace changes
Inline Side-by-side
Showing with 311 additions and 424 deletions
drivers/staging/hv/StorVsc.c
View file @ 068c5df2
/*
*
* Copyright (c) 2009, Microsoft Corporation.
*
* This program is free software; you can redistribute it and/or modify it
......@@ -18,9 +17,7 @@
* Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com>
*
*/
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
......@@ -32,12 +29,6 @@
#include "vstorage.h"
/* #defines */
/* Data types */
struct storvsc_request_extension {
/* LIST_ENTRY ListEntry; */
......@@ -50,12 +41,12 @@ struct storvsc_request_extension {
struct vstor_packet VStorPacket;
};
/* A storvsc device is a device object that contains a vmbus channel */
struct storvsc_device {
struct hv_device *Device;
atomic_t RefCount; /* 0 indicates the device is being destroyed */
/* 0 indicates the device is being destroyed */
atomic_t RefCount;
atomic_t NumOutstandingRequests;
......@@ -74,14 +65,10 @@ struct storvsc_device {
/* Used for vsc/vsp channel reset process */
struct storvsc_request_extension InitRequest;
struct storvsc_request_extension ResetRequest;
};
/* Globals */
static const char* gDriverName="storvsc";
static const char *gDriverName = "storvsc";
/* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */
static const struct hv_guid gStorVscDeviceType = {
......@@ -92,58 +79,20 @@ static const struct hv_guid gStorVscDeviceType = {
};
/* Internal routines */
static int
StorVscOnDeviceAdd(
struct hv_device *Device,
void *AdditionalInfo
);
static int
StorVscOnDeviceRemove(
struct hv_device *Device
);
static int
StorVscOnIORequest(
struct hv_device *Device,
struct hv_storvsc_request *Request
);
static int
StorVscOnHostReset(
struct hv_device *Device
);
static void
StorVscOnCleanup(
struct hv_driver *Device
);
static void
StorVscOnChannelCallback(
void * Context
);
static void
StorVscOnIOCompletion(
struct hv_device *Device,
static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo);
static int StorVscOnDeviceRemove(struct hv_device *Device);
static int StorVscOnIORequest(struct hv_device *Device,
struct hv_storvsc_request *Request);
static int StorVscOnHostReset(struct hv_device *Device);
static void StorVscOnCleanup(struct hv_driver *Device);
static void StorVscOnChannelCallback(void *Context);
static void StorVscOnIOCompletion(struct hv_device *Device,
struct vstor_packet *VStorPacket,
struct storvsc_request_extension *RequestExt
);
static void
StorVscOnReceive(
struct hv_device *Device,
struct storvsc_request_extension *RequestExt);
static void StorVscOnReceive(struct hv_device *Device,
struct vstor_packet *VStorPacket,
struct storvsc_request_extension *RequestExt
);
static int
StorVscConnectToVsp(
struct hv_device *Device
);
struct storvsc_request_extension *RequestExt);
static int StorVscConnectToVsp(struct hv_device *Device);
static inline struct storvsc_device *AllocStorDevice(struct hv_device *Device)
{
......@@ -165,12 +114,12 @@ static inline struct storvsc_device *AllocStorDevice(struct hv_device *Device)
static inline void FreeStorDevice(struct storvsc_device *Device)
{
ASSERT( atomic_read(&Device->RefCount) == 0);
ASSERT(atomic_read(&Device->RefCount) == 0);
kfree(Device);
}
/* Get the stordevice object iff exists and its refcount > 1 */
static inline struct storvsc_device* GetStorDevice(struct hv_device *Device)
static inline struct storvsc_device *GetStorDevice(struct hv_device *Device)
{
struct storvsc_device *storDevice;
......@@ -218,15 +167,14 @@ static inline struct storvsc_device *ReleaseStorDevice(struct hv_device *Device)
/* Busy wait until the ref drop to 2, then set it to 1 */
while (atomic_cmpxchg(&storDevice->RefCount, 2, 1) != 2)
{
udelay(100);
}
return storDevice;
}
/* Drop ref count to 0. No one can use StorDevice object. */
static inline struct storvsc_device *FinalReleaseStorDevice(struct hv_device *Device)
static inline struct storvsc_device *FinalReleaseStorDevice(
struct hv_device *Device)
{
struct storvsc_device *storDevice;
......@@ -235,42 +183,38 @@ static inline struct storvsc_device *FinalReleaseStorDevice(struct hv_device *De
/* Busy wait until the ref drop to 1, then set it to 0 */
while (atomic_cmpxchg(&storDevice->RefCount, 1, 0) != 1)
{
udelay(100);
}
Device->Extension = NULL;
return storDevice;
}
/*++;
Name:
StorVscInitialize()
Description:
Main entry point
--*/
int
StorVscInitialize(
struct hv_driver *Driver
)
/**
* StorVscInitialize - Main entry point
*/
int StorVscInitialize(struct hv_driver *Driver)
{
struct storvsc_driver_object *storDriver = (struct storvsc_driver_object *)Driver;
int ret=0;
struct storvsc_driver_object *storDriver;
DPRINT_ENTER(STORVSC);
DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd sizeof(struct storvsc_request_extension)=%zd sizeof(struct vstor_packet)=%zd, sizeof(struct vmscsi_request)=%zd",
sizeof(struct hv_storvsc_request), sizeof(struct storvsc_request_extension), sizeof(struct vstor_packet), sizeof(struct vmscsi_request));
storDriver = (struct storvsc_driver_object *)Driver;
DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd "
"sizeof(struct storvsc_request_extension)=%zd "
"sizeof(struct vstor_packet)=%zd, "
"sizeof(struct vmscsi_request)=%zd",
sizeof(struct hv_storvsc_request),
sizeof(struct storvsc_request_extension),
sizeof(struct vstor_packet),
sizeof(struct vmscsi_request));
/* Make sure we are at least 2 pages since 1 page is used for control */
ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1));
Driver->name = gDriverName;
memcpy(&Driver->deviceType, &gStorVscDeviceType, sizeof(struct hv_guid));
memcpy(&Driver->deviceType, &gStorVscDeviceType,
sizeof(struct hv_guid));
storDriver->RequestExtSize = sizeof(struct storvsc_request_extension);
......@@ -281,9 +225,14 @@ StorVscInitialize(
* VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER + struct vstor_packet + u64)
*/
storDriver->MaxOutstandingRequestsPerChannel =
((storDriver->RingBufferSize - PAGE_SIZE) / ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET + sizeof(struct vstor_packet) + sizeof(u64),sizeof(u64)));
((storDriver->RingBufferSize - PAGE_SIZE) /
ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET +
sizeof(struct vstor_packet) + sizeof(u64),
sizeof(u64)));
DPRINT_INFO(STORVSC, "max io %u, currently %u\n", storDriver->MaxOutstandingRequestsPerChannel, STORVSC_MAX_IO_REQUESTS);
DPRINT_INFO(STORVSC, "max io %u, currently %u\n",
storDriver->MaxOutstandingRequestsPerChannel,
STORVSC_MAX_IO_REQUESTS);
/* Setup the dispatch table */
storDriver->Base.OnDeviceAdd = StorVscOnDeviceAdd;
......@@ -295,40 +244,31 @@ StorVscInitialize(
DPRINT_EXIT(STORVSC);
return ret;
return 0;
}
/*++
Name:
StorVscOnDeviceAdd()
Description:
Callback when the device belonging to this driver is added
--*/
static int
StorVscOnDeviceAdd(
struct hv_device *Device,
void *AdditionalInfo
)
/**
* StorVscOnDeviceAdd - Callback when the device belonging to this driver is added
*/
static int StorVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
{
int ret=0;
struct storvsc_device *storDevice;
/* struct vmstorage_channel_properties *props; */
struct storvsc_device_info *deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
struct storvsc_device_info *deviceInfo;
int ret = 0;
DPRINT_ENTER(STORVSC);
deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
storDevice = AllocStorDevice(Device);
if (!storDevice)
{
if (!storDevice) {
ret = -1;
goto Cleanup;
}
/* Save the channel properties to our storvsc channel */
/* props = (struct vmstorage_channel_properties *) channel->offerMsg.Offer.u.Standard.UserDefined; */
/* props = (struct vmstorage_channel_properties *)
* channel->offerMsg.Offer.u.Standard.UserDefined; */
/* FIXME: */
/*
......@@ -349,7 +289,9 @@ StorVscOnDeviceAdd(
deviceInfo->PathId = storDevice->PathId;
deviceInfo->TargetId = storDevice->TargetId;
DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u\n", storDevice->PortNumber, storDevice->PathId, storDevice->TargetId);
DPRINT_DBG(STORVSC, "assigned port %u, path %u target %u\n",
storDevice->PortNumber, storDevice->PathId,
storDevice->TargetId);
Cleanup:
DPRINT_EXIT(STORVSC);
......@@ -359,15 +301,15 @@ StorVscOnDeviceAdd(
static int StorVscChannelInit(struct hv_device *Device)
{
int ret=0;
struct storvsc_device *storDevice;
struct storvsc_request_extension *request;
struct vstor_packet *vstorPacket;
int ret;
storDevice = GetStorDevice(Device);
if (!storDevice)
{
DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
if (!storDevice) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
"device being destroyed?");
DPRINT_EXIT(STORVSC);
return -1;
}
......@@ -375,8 +317,10 @@ static int StorVscChannelInit(struct hv_device *Device)
request = &storDevice->InitRequest;
vstorPacket = &request->VStorPacket;
/* Now, initiate the vsc/vsp initialization protocol on the open channel */
/*
* Now, initiate the vsc/vsp initialization protocol on the open
* channel
*/
memset(request, sizeof(struct storvsc_request_extension), 0);
request->WaitEvent = osd_WaitEventCreate();
......@@ -395,17 +339,19 @@ static int StorVscChannelInit(struct hv_device *Device)
(unsigned long)request,
VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if ( ret != 0)
{
DPRINT_ERR(STORVSC, "unable to send BEGIN_INITIALIZATION_OPERATION");
if (ret != 0) {
DPRINT_ERR(STORVSC,
"unable to send BEGIN_INITIALIZATION_OPERATION");
goto Cleanup;
}
osd_WaitEventWait(request->WaitEvent);
if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
{
DPRINT_ERR(STORVSC, "BEGIN_INITIALIZATION_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
if (vstorPacket->Operation != VStorOperationCompleteIo ||
vstorPacket->Status != 0) {
DPRINT_ERR(STORVSC, "BEGIN_INITIALIZATION_OPERATION failed "
"(op %d status 0x%x)",
vstorPacket->Operation, vstorPacket->Status);
goto Cleanup;
}
......@@ -425,18 +371,20 @@ static int StorVscChannelInit(struct hv_device *Device)
(unsigned long)request,
VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if ( ret != 0)
{
DPRINT_ERR(STORVSC, "unable to send BEGIN_INITIALIZATION_OPERATION");
if (ret != 0) {
DPRINT_ERR(STORVSC,
"unable to send BEGIN_INITIALIZATION_OPERATION");
goto Cleanup;
}
osd_WaitEventWait(request->WaitEvent);
/* TODO: Check returned version */
if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
{
DPRINT_ERR(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
if (vstorPacket->Operation != VStorOperationCompleteIo ||
vstorPacket->Status != 0) {
DPRINT_ERR(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION failed "
"(op %d status 0x%x)",
vstorPacket->Operation, vstorPacket->Status);
goto Cleanup;
}
......@@ -446,7 +394,8 @@ static int StorVscChannelInit(struct hv_device *Device)
memset(vstorPacket, sizeof(struct vstor_packet), 0);
vstorPacket->Operation = VStorOperationQueryProperties;
vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
vstorPacket->StorageChannelProperties.PortNumber = storDevice->PortNumber;
vstorPacket->StorageChannelProperties.PortNumber =
storDevice->PortNumber;
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket,
......@@ -455,26 +404,29 @@ static int StorVscChannelInit(struct hv_device *Device)
VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if ( ret != 0)
{
DPRINT_ERR(STORVSC, "unable to send QUERY_PROPERTIES_OPERATION");
if (ret != 0) {
DPRINT_ERR(STORVSC,
"unable to send QUERY_PROPERTIES_OPERATION");
goto Cleanup;
}
osd_WaitEventWait(request->WaitEvent);
/* TODO: Check returned version */
if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
{
DPRINT_ERR(STORVSC, "QUERY_PROPERTIES_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
if (vstorPacket->Operation != VStorOperationCompleteIo ||
vstorPacket->Status != 0) {
DPRINT_ERR(STORVSC, "QUERY_PROPERTIES_OPERATION failed "
"(op %d status 0x%x)",
vstorPacket->Operation, vstorPacket->Status);
goto Cleanup;
}
/* storDevice->PortNumber = vstorPacket->StorageChannelProperties.PortNumber; */
storDevice->PathId = vstorPacket->StorageChannelProperties.PathId;
storDevice->TargetId = vstorPacket->StorageChannelProperties.TargetId;
DPRINT_DBG(STORVSC, "channel flag 0x%x, max xfer len 0x%x", vstorPacket->StorageChannelProperties.Flags, vstorPacket->StorageChannelProperties.MaxTransferBytes);
DPRINT_DBG(STORVSC, "channel flag 0x%x, max xfer len 0x%x",
vstorPacket->StorageChannelProperties.Flags,
vstorPacket->StorageChannelProperties.MaxTransferBytes);
DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION...");
......@@ -489,28 +441,27 @@ static int StorVscChannelInit(struct hv_device *Device)
VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if ( ret != 0)
{
DPRINT_ERR(STORVSC, "unable to send END_INITIALIZATION_OPERATION");
if (ret != 0) {
DPRINT_ERR(STORVSC,
"unable to send END_INITIALIZATION_OPERATION");
goto Cleanup;
}
osd_WaitEventWait(request->WaitEvent);
if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status != 0)
{
DPRINT_ERR(STORVSC, "END_INITIALIZATION_OPERATION failed (op %d status 0x%x)", vstorPacket->Operation, vstorPacket->Status);
if (vstorPacket->Operation != VStorOperationCompleteIo ||
vstorPacket->Status != 0) {
DPRINT_ERR(STORVSC, "END_INITIALIZATION_OPERATION failed "
"(op %d status 0x%x)",
vstorPacket->Operation, vstorPacket->Status);
goto Cleanup;
}
DPRINT_INFO(STORVSC, "**** storage channel up and running!! ****");
Cleanup:
if (request->WaitEvent)
{
kfree(request->WaitEvent);
request->WaitEvent = NULL;
}
PutStorDevice(Device);
......@@ -518,17 +469,13 @@ static int StorVscChannelInit(struct hv_device *Device)
return ret;
}
static int
StorVscConnectToVsp(
struct hv_device *Device
)
static int StorVscConnectToVsp(struct hv_device *Device)
{
int ret=0;
struct vmstorage_channel_properties props;
struct storvsc_driver_object *storDriver;
int ret;
struct storvsc_driver_object *storDriver = (struct storvsc_driver_object *)Device->Driver;;
storDriver = (struct storvsc_driver_object *)Device->Driver;
memset(&props, sizeof(struct vmstorage_channel_properties), 0);
/* Open the channel */
......@@ -538,13 +485,12 @@ StorVscConnectToVsp(
(void *)&props,
sizeof(struct vmstorage_channel_properties),
StorVscOnChannelCallback,
Device
);
Device);
DPRINT_DBG(STORVSC, "storage props: path id %d, tgt id %d, max xfer %d", props.PathId, props.TargetId, props.MaxTransferBytes);
DPRINT_DBG(STORVSC, "storage props: path id %d, tgt id %d, max xfer %d",
props.PathId, props.TargetId, props.MaxTransferBytes);
if (ret != 0)
{
if (ret != 0) {
DPRINT_ERR(STORVSC, "unable to open channel: %d", ret);
return -1;
}
......@@ -555,26 +501,17 @@ StorVscConnectToVsp(
}
/*++
Name:
StorVscOnDeviceRemove()
Description:
Callback when the our device is being removed
--*/
static int
StorVscOnDeviceRemove(
struct hv_device *Device
)
/**
* StorVscOnDeviceRemove - Callback when the our device is being removed
*/
static int StorVscOnDeviceRemove(struct hv_device *Device)
{
struct storvsc_device *storDevice;
int ret=0;
DPRINT_ENTER(STORVSC);
DPRINT_INFO(STORVSC, "disabling storage device (%p)...", Device->Extension);
DPRINT_INFO(STORVSC, "disabling storage device (%p)...",
Device->Extension);
storDevice = ReleaseStorDevice(Device);
......@@ -583,14 +520,14 @@ StorVscOnDeviceRemove(
* only allow inbound traffic (responses) to proceed so that
* outstanding requests can be completed.
*/
while (atomic_read(&storDevice->NumOutstandingRequests))
{
DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", atomic_read(&storDevice->NumOutstandingRequests));
while (atomic_read(&storDevice->NumOutstandingRequests)) {
DPRINT_INFO(STORVSC, "waiting for %d requests to complete...",
atomic_read(&storDevice->NumOutstandingRequests));
udelay(100);
}
DPRINT_INFO(STORVSC, "removing storage device (%p)...", Device->Extension);
DPRINT_INFO(STORVSC, "removing storage device (%p)...",
Device->Extension);
storDevice = FinalReleaseStorDevice(Device);
......@@ -602,46 +539,24 @@ StorVscOnDeviceRemove(
FreeStorDevice(storDevice);
DPRINT_EXIT(STORVSC);
return ret;
return 0;
}
/* ***************
static void
StorVscOnTargetRescan(
void *Context
)
static int StorVscOnHostReset(struct hv_device *Device)
{
struct hv_device *device=(struct hv_device *)Context;
struct storvsc_driver_object *storDriver;
DPRINT_ENTER(STORVSC);
storDriver = (struct storvsc_driver_object*) device->Driver;
storDriver->OnHostRescan(device);
DPRINT_EXIT(STORVSC);
}
*********** */
static int
StorVscOnHostReset(
struct hv_device *Device
)
{
int ret=0;
struct storvsc_device *storDevice;
struct storvsc_request_extension *request;
struct vstor_packet *vstorPacket;
int ret;
DPRINT_ENTER(STORVSC);
DPRINT_INFO(STORVSC, "resetting host adapter...");
storDevice = GetStorDevice(Device);
if (!storDevice)
{
DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
if (!storDevice) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
"device being destroyed?");
DPRINT_EXIT(STORVSC);
return -1;
}
......@@ -661,9 +576,9 @@ StorVscOnHostReset(
(unsigned long)&storDevice->ResetRequest,
VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0)
{
DPRINT_ERR(STORVSC, "Unable to send reset packet %p ret %d", vstorPacket, ret);
if (ret != 0) {
DPRINT_ERR(STORVSC, "Unable to send reset packet %p ret %d",
vstorPacket, ret);
goto Cleanup;
}
......@@ -684,44 +599,41 @@ StorVscOnHostReset(
return ret;
}
/*++
Name:
StorVscOnIORequest()
Description:
Callback to initiate an I/O request
--*/
static int
StorVscOnIORequest(
struct hv_device *Device,
struct hv_storvsc_request *Request
)
/**
* StorVscOnIORequest - Callback to initiate an I/O request
*/
static int StorVscOnIORequest(struct hv_device *Device,
struct hv_storvsc_request *Request)
{
struct storvsc_device *storDevice;
struct storvsc_request_extension* requestExtension = (struct storvsc_request_extension*) Request->Extension;
struct vstor_packet *vstorPacket =&requestExtension->VStorPacket;
int ret=0;
struct storvsc_request_extension *requestExtension;
struct vstor_packet *vstorPacket;
int ret = 0;
DPRINT_ENTER(STORVSC);
requestExtension =
(struct storvsc_request_extension *)Request->Extension;
vstorPacket = &requestExtension->VStorPacket;
storDevice = GetStorDevice(Device);
DPRINT_DBG(STORVSC, "enter - Device %p, DeviceExt %p, Request %p, Extension %p",
Device, storDevice, Request, requestExtension);
DPRINT_DBG(STORVSC, "enter - Device %p, DeviceExt %p, Request %p, "
"Extension %p", Device, storDevice, Request,
requestExtension);
DPRINT_DBG(STORVSC, "req %p len %d bus %d, target %d, lun %d cdblen %d",
Request, Request->DataBuffer.Length, Request->Bus, Request->TargetId, Request->LunId, Request->CdbLen);
Request, Request->DataBuffer.Length, Request->Bus,
Request->TargetId, Request->LunId, Request->CdbLen);
if (!storDevice)
{
DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
if (!storDevice) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
"device being destroyed?");
DPRINT_EXIT(STORVSC);
return -2;
}
/* print_hex_dump_bytes("", DUMP_PREFIX_NONE, Request->Cdb, Request->CdbLen); */
/* print_hex_dump_bytes("", DUMP_PREFIX_NONE, Request->Cdb,
* Request->CdbLen); */
requestExtension->Request = Request;
requestExtension->Device = Device;
......@@ -748,7 +660,8 @@ StorVscOnIORequest(
vstorPacket->Operation = VStorOperationExecuteSRB;
DPRINT_DBG(STORVSC, "srb - len %d port %d, path %d, target %d, lun %d senselen %d cdblen %d",
DPRINT_DBG(STORVSC, "srb - len %d port %d, path %d, target %d, "
"lun %d senselen %d cdblen %d",
vstorPacket->VmSrb.Length,
vstorPacket->VmSrb.PortNumber,
vstorPacket->VmSrb.PathId,
......@@ -757,16 +670,14 @@ StorVscOnIORequest(
vstorPacket->VmSrb.SenseInfoLength,
vstorPacket->VmSrb.CdbLength);
if (requestExtension->Request->DataBuffer.Length)
{
ret = Device->Driver->VmbusChannelInterface.SendPacketMultiPageBuffer(Device,
if (requestExtension->Request->DataBuffer.Length) {
ret = Device->Driver->VmbusChannelInterface.
SendPacketMultiPageBuffer(Device,
&requestExtension->Request->DataBuffer,
vstorPacket,
sizeof(struct vstor_packet),
(unsigned long)requestExtension);
}
else
{
} else {
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket,
sizeof(struct vstor_packet),
......@@ -775,9 +686,9 @@ StorVscOnIORequest(
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
}
if (ret != 0)
{
DPRINT_DBG(STORVSC, "Unable to send packet %p ret %d", vstorPacket, ret);
if (ret != 0) {
DPRINT_DBG(STORVSC, "Unable to send packet %p ret %d",
vstorPacket, ret);
}
atomic_inc(&storDevice->NumOutstandingRequests);
......@@ -788,31 +699,18 @@ StorVscOnIORequest(
return ret;
}
/*++
Name:
StorVscOnCleanup()
Description:
Perform any cleanup when the driver is removed
--*/
static void
StorVscOnCleanup(
struct hv_driver *Driver
)
/**
* StorVscOnCleanup - Perform any cleanup when the driver is removed
*/
static void StorVscOnCleanup(struct hv_driver *Driver)
{
DPRINT_ENTER(STORVSC);
DPRINT_EXIT(STORVSC);
}
static void
StorVscOnIOCompletion(
struct hv_device *Device,
static void StorVscOnIOCompletion(struct hv_device *Device,
struct vstor_packet *VStorPacket,
struct storvsc_request_extension *RequestExt
)
struct storvsc_request_extension *RequestExt)
{
struct hv_storvsc_request *request;
struct storvsc_device *storDevice;
......@@ -820,15 +718,16 @@ StorVscOnIOCompletion(
DPRINT_ENTER(STORVSC);
storDevice = MustGetStorDevice(Device);
if (!storDevice)
{
DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
if (!storDevice) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
"device being destroyed?");
DPRINT_EXIT(STORVSC);
return;
}
DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request extension %p completed bytes xfer %u",
RequestExt, VStorPacket->VmSrb.DataTransferLength);
DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION - request extension %p "
"completed bytes xfer %u", RequestExt,
VStorPacket->VmSrb.DataTransferLength);
ASSERT(RequestExt != NULL);
ASSERT(RequestExt->Request != NULL);
......@@ -840,27 +739,29 @@ StorVscOnIOCompletion(
/* Copy over the status...etc */
request->Status = VStorPacket->VmSrb.ScsiStatus;
if (request->Status != 0 || VStorPacket->VmSrb.SrbStatus != 1)
{
DPRINT_WARN(STORVSC, "cmd 0x%x scsi status 0x%x srb status 0x%x\n",
request->Cdb[0],
VStorPacket->VmSrb.ScsiStatus,
if (request->Status != 0 || VStorPacket->VmSrb.SrbStatus != 1) {
DPRINT_WARN(STORVSC,
"cmd 0x%x scsi status 0x%x srb status 0x%x\n",
request->Cdb[0], VStorPacket->VmSrb.ScsiStatus,
VStorPacket->VmSrb.SrbStatus);
}
if ((request->Status & 0xFF) == 0x02) /* CHECK_CONDITION */
{
if (VStorPacket->VmSrb.SrbStatus & 0x80) /* autosense data available */
{
DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data valid - len %d\n",
RequestExt, VStorPacket->VmSrb.SenseInfoLength);
if ((request->Status & 0xFF) == 0x02) {
/* CHECK_CONDITION */
if (VStorPacket->VmSrb.SrbStatus & 0x80) {
/* autosense data available */
DPRINT_WARN(STORVSC, "storvsc pkt %p autosense data "
"valid - len %d\n", RequestExt,
VStorPacket->VmSrb.SenseInfoLength);
ASSERT(VStorPacket->VmSrb.SenseInfoLength <= request->SenseBufferSize);
ASSERT(VStorPacket->VmSrb.SenseInfoLength <=
request->SenseBufferSize);
memcpy(request->SenseBuffer,
VStorPacket->VmSrb.SenseData,
VStorPacket->VmSrb.SenseInfoLength);
request->SenseBufferSize = VStorPacket->VmSrb.SenseInfoLength;
request->SenseBufferSize =
VStorPacket->VmSrb.SenseInfoLength;
}
}
......@@ -877,97 +778,83 @@ StorVscOnIOCompletion(
}
static void
StorVscOnReceive(
struct hv_device *Device,
static void StorVscOnReceive(struct hv_device *Device,
struct vstor_packet *VStorPacket,
struct storvsc_request_extension *RequestExt
)
struct storvsc_request_extension *RequestExt)
{
switch(VStorPacket->Operation)
{
switch (VStorPacket->Operation) {
case VStorOperationCompleteIo:
DPRINT_DBG(STORVSC, "IO_COMPLETE_OPERATION");
StorVscOnIOCompletion(Device, VStorPacket, RequestExt);
break;
/* case ENUMERATE_DEVICE_OPERATION: */
/* DPRINT_INFO(STORVSC, "ENUMERATE_DEVICE_OPERATION"); */
/* StorVscOnTargetRescan(Device); */
/* break; */
case VStorOperationRemoveDevice:
DPRINT_INFO(STORVSC, "REMOVE_DEVICE_OPERATION");
/* TODO: */
break;
default:
DPRINT_INFO(STORVSC, "Unknown operation received - %d", VStorPacket->Operation);
DPRINT_INFO(STORVSC, "Unknown operation received - %d",
VStorPacket->Operation);
break;
}
}
static void
StorVscOnChannelCallback(
void * Context
)
static void StorVscOnChannelCallback(void *context)
{
int ret=0;
struct hv_device *device = (struct hv_device*)Context;
struct hv_device *device = (struct hv_device *)context;
struct storvsc_device *storDevice;
u32 bytesRecvd;
u64 requestId;
unsigned char packet[ALIGN_UP(sizeof(struct vstor_packet),8)];
unsigned char packet[ALIGN_UP(sizeof(struct vstor_packet), 8)];
struct storvsc_request_extension *request;
int ret;
DPRINT_ENTER(STORVSC);
ASSERT(device);
storDevice = MustGetStorDevice(device);
if (!storDevice)
{
DPRINT_ERR(STORVSC, "unable to get stor device...device being destroyed?");
if (!storDevice) {
DPRINT_ERR(STORVSC, "unable to get stor device..."
"device being destroyed?");
DPRINT_EXIT(STORVSC);
return;
}
do
{
do {
ret = device->Driver->VmbusChannelInterface.RecvPacket(device,
packet,
ALIGN_UP(sizeof(struct vstor_packet),8),
&bytesRecvd,
&requestId);
if (ret == 0 && bytesRecvd > 0)
{
DPRINT_DBG(STORVSC, "receive %d bytes - tid %llx", bytesRecvd, requestId);
ALIGN_UP(sizeof(struct vstor_packet), 8),
&bytesRecvd, &requestId);
if (ret == 0 && bytesRecvd > 0) {
DPRINT_DBG(STORVSC, "receive %d bytes - tid %llx",
bytesRecvd, requestId);
/* ASSERT(bytesRecvd == sizeof(struct vstor_packet)); */
request = (struct storvsc_request_extension*)(unsigned long)requestId;
request = (struct storvsc_request_extension *)
(unsigned long)requestId;
ASSERT(request);
/* if (vstorPacket.Flags & SYNTHETIC_FLAG) */
if ((request == &storDevice->InitRequest) || (request == &storDevice->ResetRequest))
{
/* DPRINT_INFO(STORVSC, "reset completion - operation %u status %u", vstorPacket.Operation, vstorPacket.Status); */
if ((request == &storDevice->InitRequest) ||
(request == &storDevice->ResetRequest)) {
/* DPRINT_INFO(STORVSC,
* "reset completion - operation "
* "%u status %u",
* vstorPacket.Operation,
* vstorPacket.Status); */
memcpy(&request->VStorPacket, packet, sizeof(struct vstor_packet));
memcpy(&request->VStorPacket, packet,
sizeof(struct vstor_packet));
osd_WaitEventSet(request->WaitEvent);
} else {
StorVscOnReceive(device,
(struct vstor_packet *)packet,
request);
}
else
{
StorVscOnReceive(device, (struct vstor_packet *)packet, request);
}
}
else
{
} else {
/* DPRINT_DBG(STORVSC, "nothing else to read..."); */
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7