Skip to content

L
linux
Commit 85799a37 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman
Browse files
Options

staging: hv: Convert camel cased variables in netvsc.c to lower cases 

Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e1b8a37e
Show whitespace changes
Inline Side-by-side
Showing with 445 additions and 407 deletions
drivers/staging/hv/netvsc.c
View file @ 85799a37
...@@ -31,141 +31,141 @@ ...@@ -31,141 +31,141 @@
/* Globals */ /* Globals */
static const char *gDriverName = "netvsc"; static const char *driver_name = "netvsc";
/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */ /* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
static const struct hv_guid gNetVscDeviceType = { static const struct hv_guid netvsc_device_type = {
.data = { .data = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, 0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
} }
}; };
static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo); static int NetVscOnDeviceAdd(struct hv_device *device, void *additional_info);
static int NetVscOnDeviceRemove(struct hv_device *Device); static int NetVscOnDeviceRemove(struct hv_device *device);
static void NetVscOnCleanup(struct hv_driver *Driver); static void NetVscOnCleanup(struct hv_driver *driver);
static void NetVscOnChannelCallback(void *context); static void NetVscOnChannelCallback(void *context);
static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device); static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *device);
static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device); static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *device);
static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice); static int NetVscDestroySendBuffer(struct netvsc_device *net_device);
static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice); static int NetVscDestroyReceiveBuffer(struct netvsc_device *net_device);
static int NetVscConnectToVsp(struct hv_device *Device); static int NetVscConnectToVsp(struct hv_device *device);
static void NetVscOnSendCompletion(struct hv_device *Device, static void NetVscOnSendCompletion(struct hv_device *device,
struct vmpacket_descriptor *Packet); struct vmpacket_descriptor *packet);
static int NetVscOnSend(struct hv_device *Device, static int NetVscOnSend(struct hv_device *device,
struct hv_netvsc_packet *Packet); struct hv_netvsc_packet *packet);
static void NetVscOnReceive(struct hv_device *Device, static void NetVscOnReceive(struct hv_device *device,
struct vmpacket_descriptor *Packet); struct vmpacket_descriptor *packet);
static void NetVscOnReceiveCompletion(void *Context); static void NetVscOnReceiveCompletion(void *context);
static void NetVscSendReceiveCompletion(struct hv_device *Device, static void NetVscSendReceiveCompletion(struct hv_device *device,
u64 TransactionId); u64 transaction_id);
static struct netvsc_device *AllocNetDevice(struct hv_device *Device) static struct netvsc_device *AllocNetDevice(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
netDevice = kzalloc(sizeof(struct netvsc_device), GFP_KERNEL); net_device = kzalloc(sizeof(struct netvsc_device), GFP_KERNEL);
if (!netDevice) if (!net_device)
return NULL; return NULL;
/* Set to 2 to allow both inbound and outbound traffic */ /* Set to 2 to allow both inbound and outbound traffic */
atomic_cmpxchg(&netDevice->RefCount, 0, 2); atomic_cmpxchg(&net_device->RefCount, 0, 2);
netDevice->Device = Device; net_device->Device = device;
Device->Extension = netDevice; device->Extension = net_device;
return netDevice; return net_device;
} }
static void FreeNetDevice(struct netvsc_device *Device) static void FreeNetDevice(struct netvsc_device *device)
{ {
WARN_ON(atomic_read(&Device->RefCount) == 0); WARN_ON(atomic_read(&device->RefCount) == 0);
Device->Device->Extension = NULL; device->Device->Extension = NULL;
kfree(Device); kfree(device);
} }
/* Get the net device object iff exists and its refcount > 1 */ /* Get the net device object iff exists and its refcount > 1 */
static struct netvsc_device *GetOutboundNetDevice(struct hv_device *Device) static struct netvsc_device *GetOutboundNetDevice(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
netDevice = Device->Extension; net_device = device->Extension;
if (netDevice && atomic_read(&netDevice->RefCount) > 1) if (net_device && atomic_read(&net_device->RefCount) > 1)
atomic_inc(&netDevice->RefCount); atomic_inc(&net_device->RefCount);
else else
netDevice = NULL; net_device = NULL;
return netDevice; return net_device;
} }
/* Get the net device object iff exists and its refcount > 0 */ /* Get the net device object iff exists and its refcount > 0 */
static struct netvsc_device *GetInboundNetDevice(struct hv_device *Device) static struct netvsc_device *GetInboundNetDevice(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
netDevice = Device->Extension; net_device = device->Extension;
if (netDevice && atomic_read(&netDevice->RefCount)) if (net_device && atomic_read(&net_device->RefCount))
atomic_inc(&netDevice->RefCount); atomic_inc(&net_device->RefCount);
else else
netDevice = NULL; net_device = NULL;
return netDevice; return net_device;
} }
static void PutNetDevice(struct hv_device *Device) static void PutNetDevice(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
netDevice = Device->Extension; net_device = device->Extension;
/* ASSERT(netDevice); */ /* ASSERT(netDevice); */
atomic_dec(&netDevice->RefCount); atomic_dec(&net_device->RefCount);
} }
static struct netvsc_device *ReleaseOutboundNetDevice(struct hv_device *Device) static struct netvsc_device *ReleaseOutboundNetDevice(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
netDevice = Device->Extension; net_device = device->Extension;
if (netDevice == NULL) if (net_device == NULL)
return NULL; return NULL;
/* Busy wait until the ref drop to 2, then set it to 1 */ /* Busy wait until the ref drop to 2, then set it to 1 */
while (atomic_cmpxchg(&netDevice->RefCount, 2, 1) != 2) while (atomic_cmpxchg(&net_device->RefCount, 2, 1) != 2)
udelay(100); udelay(100);
return netDevice; return net_device;
} }
static struct netvsc_device *ReleaseInboundNetDevice(struct hv_device *Device) static struct netvsc_device *ReleaseInboundNetDevice(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
netDevice = Device->Extension; net_device = device->Extension;
if (netDevice == NULL) if (net_device == NULL)
return NULL; return NULL;
/* Busy wait until the ref drop to 1, then set it to 0 */ /* Busy wait until the ref drop to 1, then set it to 0 */
while (atomic_cmpxchg(&netDevice->RefCount, 1, 0) != 1) while (atomic_cmpxchg(&net_device->RefCount, 1, 0) != 1)
udelay(100); udelay(100);
Device->Extension = NULL; device->Extension = NULL;
return netDevice; return net_device;
} }
/* /*
...@@ -185,8 +185,8 @@ int NetVscInitialize(struct hv_driver *drv) ...@@ -185,8 +185,8 @@ int NetVscInitialize(struct hv_driver *drv)
/* Make sure we are at least 2 pages since 1 page is used for control */ /* Make sure we are at least 2 pages since 1 page is used for control */
/* ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1)); */ /* ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1)); */
drv->name = gDriverName; drv->name = driver_name;
memcpy(&drv->deviceType, &gNetVscDeviceType, sizeof(struct hv_guid)); memcpy(&drv->deviceType, &netvsc_device_type, sizeof(struct hv_guid));
/* Make sure it is set by the caller */ /* Make sure it is set by the caller */
/* FIXME: These probably should still be tested in some way */ /* FIXME: These probably should still be tested in some way */
...@@ -204,14 +204,14 @@ int NetVscInitialize(struct hv_driver *drv) ...@@ -204,14 +204,14 @@ int NetVscInitialize(struct hv_driver *drv)
return 0; return 0;
} }
static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *device)
{ {
int ret = 0; int ret = 0;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct nvsp_message *initPacket; struct nvsp_message *init_packet;
netDevice = GetOutboundNetDevice(Device); net_device = GetOutboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "unable to get net device..." DPRINT_ERR(NETVSC, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return -1; return -1;
...@@ -220,12 +220,12 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) ...@@ -220,12 +220,12 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
/* page-size grandularity */ /* page-size grandularity */
/* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */ /* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */
netDevice->ReceiveBuffer = net_device->ReceiveBuffer =
osd_page_alloc(netDevice->ReceiveBufferSize >> PAGE_SHIFT); osd_page_alloc(net_device->ReceiveBufferSize >> PAGE_SHIFT);
if (!netDevice->ReceiveBuffer) { if (!net_device->ReceiveBuffer) {
DPRINT_ERR(NETVSC, DPRINT_ERR(NETVSC,
"unable to allocate receive buffer of size %d", "unable to allocate receive buffer of size %d",
netDevice->ReceiveBufferSize); net_device->ReceiveBufferSize);
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
...@@ -240,9 +240,9 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) ...@@ -240,9 +240,9 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
* channel. Note: This call uses the vmbus connection rather * channel. Note: This call uses the vmbus connection rather
* than the channel to establish the gpadl handle. * than the channel to establish the gpadl handle.
*/ */
ret = vmbus_establish_gpadl(Device->channel, netDevice->ReceiveBuffer, ret = vmbus_establish_gpadl(device->channel, net_device->ReceiveBuffer,
netDevice->ReceiveBufferSize, net_device->ReceiveBufferSize,
&netDevice->ReceiveBufferGpadlHandle); &net_device->ReceiveBufferGpadlHandle);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(NETVSC, DPRINT_ERR(NETVSC,
"unable to establish receive buffer's gpadl"); "unable to establish receive buffer's gpadl");
...@@ -254,18 +254,20 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) ...@@ -254,18 +254,20 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
/* Notify the NetVsp of the gpadl handle */ /* Notify the NetVsp of the gpadl handle */
DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendReceiveBuffer..."); DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendReceiveBuffer...");
initPacket = &netDevice->ChannelInitPacket; init_packet = &net_device->ChannelInitPacket;
memset(initPacket, 0, sizeof(struct nvsp_message)); memset(init_packet, 0, sizeof(struct nvsp_message));
initPacket->Header.MessageType = NvspMessage1TypeSendReceiveBuffer; init_packet->Header.MessageType = NvspMessage1TypeSendReceiveBuffer;
initPacket->Messages.Version1Messages.SendReceiveBuffer.GpadlHandle = netDevice->ReceiveBufferGpadlHandle; init_packet->Messages.Version1Messages.SendReceiveBuffer.
initPacket->Messages.Version1Messages.SendReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID; GpadlHandle = net_device->ReceiveBufferGpadlHandle;
init_packet->Messages.Version1Messages.
SendReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID;
/* Send the gpadl notification request */ /* Send the gpadl notification request */
ret = vmbus_sendpacket(Device->channel, initPacket, ret = vmbus_sendpacket(device->channel, init_packet,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)initPacket, (unsigned long)init_packet,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) { if (ret != 0) {
...@@ -274,13 +276,15 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) ...@@ -274,13 +276,15 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
goto Cleanup; goto Cleanup;
} }
osd_waitevent_wait(netDevice->ChannelInitEvent); osd_waitevent_wait(net_device->ChannelInitEvent);
/* Check the response */ /* Check the response */
if (initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status != NvspStatusSuccess) { if (init_packet->Messages.Version1Messages.
SendReceiveBufferComplete.Status != NvspStatusSuccess) {
DPRINT_ERR(NETVSC, "Unable to complete receive buffer " DPRINT_ERR(NETVSC, "Unable to complete receive buffer "
"initialzation with NetVsp - status %d", "initialzation with NetVsp - status %d",
initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status); init_packet->Messages.Version1Messages.
SendReceiveBufferComplete.Status);
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
...@@ -289,32 +293,36 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) ...@@ -289,32 +293,36 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
/* ASSERT(netDevice->ReceiveSectionCount == 0); */ /* ASSERT(netDevice->ReceiveSectionCount == 0); */
/* ASSERT(netDevice->ReceiveSections == NULL); */ /* ASSERT(netDevice->ReceiveSections == NULL); */
netDevice->ReceiveSectionCount = initPacket->Messages.Version1Messages.SendReceiveBufferComplete.NumSections; net_device->ReceiveSectionCount = init_packet->Messages.
Version1Messages.SendReceiveBufferComplete.NumSections;
netDevice->ReceiveSections = kmalloc(netDevice->ReceiveSectionCount * sizeof(struct nvsp_1_receive_buffer_section), GFP_KERNEL); net_device->ReceiveSections = kmalloc(net_device->ReceiveSectionCount
if (netDevice->ReceiveSections == NULL) { * sizeof(struct nvsp_1_receive_buffer_section), GFP_KERNEL);
if (net_device->ReceiveSections == NULL) {
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
memcpy(netDevice->ReceiveSections, memcpy(net_device->ReceiveSections,
initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Sections, init_packet->Messages.Version1Messages.
netDevice->ReceiveSectionCount * sizeof(struct nvsp_1_receive_buffer_section)); SendReceiveBufferComplete.Sections,
net_device->ReceiveSectionCount *
sizeof(struct nvsp_1_receive_buffer_section));
DPRINT_INFO(NETVSC, "Receive sections info (count %d, offset %d, " DPRINT_INFO(NETVSC, "Receive sections info (count %d, offset %d, "
"endoffset %d, suballoc size %d, num suballocs %d)", "endoffset %d, suballoc size %d, num suballocs %d)",
netDevice->ReceiveSectionCount, net_device->ReceiveSectionCount,
netDevice->ReceiveSections[0].Offset, net_device->ReceiveSections[0].Offset,
netDevice->ReceiveSections[0].EndOffset, net_device->ReceiveSections[0].EndOffset,
netDevice->ReceiveSections[0].SubAllocationSize, net_device->ReceiveSections[0].SubAllocationSize,
netDevice->ReceiveSections[0].NumSubAllocations); net_device->ReceiveSections[0].NumSubAllocations);
/* /*
* For 1st release, there should only be 1 section that represents the * For 1st release, there should only be 1 section that represents the
* entire receive buffer * entire receive buffer
*/ */
if (netDevice->ReceiveSectionCount != 1 || if (net_device->ReceiveSectionCount != 1 ||
netDevice->ReceiveSections->Offset != 0) { net_device->ReceiveSections->Offset != 0) {
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
...@@ -322,26 +330,26 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) ...@@ -322,26 +330,26 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)
goto Exit; goto Exit;
Cleanup: Cleanup:
NetVscDestroyReceiveBuffer(netDevice); NetVscDestroyReceiveBuffer(net_device);
Exit: Exit:
PutNetDevice(Device); PutNetDevice(device);
return ret; return ret;
} }
static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *device)
{ {
int ret = 0; int ret = 0;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct nvsp_message *initPacket; struct nvsp_message *init_packet;
netDevice = GetOutboundNetDevice(Device); net_device = GetOutboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "unable to get net device..." DPRINT_ERR(NETVSC, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return -1; return -1;
} }
if (netDevice->SendBufferSize <= 0) { if (net_device->SendBufferSize <= 0) {
ret = -EINVAL; ret = -EINVAL;
goto Cleanup; goto Cleanup;
} }
...@@ -349,11 +357,11 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) ...@@ -349,11 +357,11 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
/* page-size grandularity */ /* page-size grandularity */
/* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */ /* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */
netDevice->SendBuffer = net_device->SendBuffer =
osd_page_alloc(netDevice->SendBufferSize >> PAGE_SHIFT); osd_page_alloc(net_device->SendBufferSize >> PAGE_SHIFT);
if (!netDevice->SendBuffer) { if (!net_device->SendBuffer) {
DPRINT_ERR(NETVSC, "unable to allocate send buffer of size %d", DPRINT_ERR(NETVSC, "unable to allocate send buffer of size %d",
netDevice->SendBufferSize); net_device->SendBufferSize);
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
...@@ -367,9 +375,9 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) ...@@ -367,9 +375,9 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
* channel. Note: This call uses the vmbus connection rather * channel. Note: This call uses the vmbus connection rather
* than the channel to establish the gpadl handle. * than the channel to establish the gpadl handle.
*/ */
ret = vmbus_establish_gpadl(Device->channel, netDevice->SendBuffer, ret = vmbus_establish_gpadl(device->channel, net_device->SendBuffer,
netDevice->SendBufferSize, net_device->SendBufferSize,
&netDevice->SendBufferGpadlHandle); &net_device->SendBufferGpadlHandle);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(NETVSC, "unable to establish send buffer's gpadl"); DPRINT_ERR(NETVSC, "unable to establish send buffer's gpadl");
goto Cleanup; goto Cleanup;
...@@ -380,18 +388,20 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) ...@@ -380,18 +388,20 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
/* Notify the NetVsp of the gpadl handle */ /* Notify the NetVsp of the gpadl handle */
DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendSendBuffer..."); DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendSendBuffer...");
initPacket = &netDevice->ChannelInitPacket; init_packet = &net_device->ChannelInitPacket;
memset(initPacket, 0, sizeof(struct nvsp_message)); memset(init_packet, 0, sizeof(struct nvsp_message));
initPacket->Header.MessageType = NvspMessage1TypeSendSendBuffer; init_packet->Header.MessageType = NvspMessage1TypeSendSendBuffer;
initPacket->Messages.Version1Messages.SendReceiveBuffer.GpadlHandle = netDevice->SendBufferGpadlHandle; init_packet->Messages.Version1Messages.SendReceiveBuffer.
initPacket->Messages.Version1Messages.SendReceiveBuffer.Id = NETVSC_SEND_BUFFER_ID; GpadlHandle = net_device->SendBufferGpadlHandle;
init_packet->Messages.Version1Messages.SendReceiveBuffer.Id =
NETVSC_SEND_BUFFER_ID;
/* Send the gpadl notification request */ /* Send the gpadl notification request */
ret = vmbus_sendpacket(Device->channel, initPacket, ret = vmbus_sendpacket(device->channel, init_packet,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)initPacket, (unsigned long)init_packet,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) { if (ret != 0) {
...@@ -400,32 +410,35 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) ...@@ -400,32 +410,35 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)
goto Cleanup; goto Cleanup;
} }
osd_waitevent_wait(netDevice->ChannelInitEvent); osd_waitevent_wait(net_device->ChannelInitEvent);
/* Check the response */ /* Check the response */
if (initPacket->Messages.Version1Messages.SendSendBufferComplete.Status != NvspStatusSuccess) { if (init_packet->Messages.Version1Messages.
SendSendBufferComplete.Status != NvspStatusSuccess) {
DPRINT_ERR(NETVSC, "Unable to complete send buffer " DPRINT_ERR(NETVSC, "Unable to complete send buffer "
"initialzation with NetVsp - status %d", "initialzation with NetVsp - status %d",
initPacket->Messages.Version1Messages.SendSendBufferComplete.Status); init_packet->Messages.Version1Messages.
SendSendBufferComplete.Status);
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
netDevice->SendSectionSize = initPacket->Messages.Version1Messages.SendSendBufferComplete.SectionSize; net_device->SendSectionSize = init_packet->
Messages.Version1Messages.SendSendBufferComplete.SectionSize;
goto Exit; goto Exit;
Cleanup: Cleanup:
NetVscDestroySendBuffer(netDevice); NetVscDestroySendBuffer(net_device);
Exit: Exit:
PutNetDevice(Device); PutNetDevice(device);
return ret; return ret;
} }
static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) static int NetVscDestroyReceiveBuffer(struct netvsc_device *net_device)
{ {
struct nvsp_message *revokePacket; struct nvsp_message *revoke_packet;
int ret = 0; int ret = 0;
/* /*
...@@ -434,20 +447,23 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) ...@@ -434,20 +447,23 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
* NvspMessage1TypeSendReceiveBuffer msg) therefore, we need * NvspMessage1TypeSendReceiveBuffer msg) therefore, we need
* to send a revoke msg here * to send a revoke msg here
*/ */
if (NetDevice->ReceiveSectionCount) { if (net_device->ReceiveSectionCount) {
DPRINT_INFO(NETVSC, DPRINT_INFO(NETVSC,
"Sending NvspMessage1TypeRevokeReceiveBuffer..."); "Sending NvspMessage1TypeRevokeReceiveBuffer...");
/* Send the revoke receive buffer */ /* Send the revoke receive buffer */
revokePacket = &NetDevice->RevokePacket; revoke_packet = &net_device->RevokePacket;
memset(revokePacket, 0, sizeof(struct nvsp_message)); memset(revoke_packet, 0, sizeof(struct nvsp_message));
revokePacket->Header.MessageType = NvspMessage1TypeRevokeReceiveBuffer; revoke_packet->Header.MessageType =
revokePacket->Messages.Version1Messages.RevokeReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID; NvspMessage1TypeRevokeReceiveBuffer;
revoke_packet->Messages.Version1Messages.
RevokeReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID;
ret = vmbus_sendpacket(NetDevice->Device->channel, revokePacket, ret = vmbus_sendpacket(net_device->Device->channel,
revoke_packet,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)revokePacket, (unsigned long)revoke_packet,
VmbusPacketTypeDataInBand, 0); VmbusPacketTypeDataInBand, 0);
/* /*
* If we failed here, we might as well return and * If we failed here, we might as well return and
...@@ -461,11 +477,11 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) ...@@ -461,11 +477,11 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
} }
/* Teardown the gpadl on the vsp end */ /* Teardown the gpadl on the vsp end */
if (NetDevice->ReceiveBufferGpadlHandle) { if (net_device->ReceiveBufferGpadlHandle) {
DPRINT_INFO(NETVSC, "Tearing down receive buffer's GPADL..."); DPRINT_INFO(NETVSC, "Tearing down receive buffer's GPADL...");
ret = vmbus_teardown_gpadl(NetDevice->Device->channel, ret = vmbus_teardown_gpadl(net_device->Device->channel,
NetDevice->ReceiveBufferGpadlHandle); net_device->ReceiveBufferGpadlHandle);
/* If we failed here, we might as well return and have a leak rather than continue and a bugchk */ /* If we failed here, we might as well return and have a leak rather than continue and a bugchk */
if (ret != 0) { if (ret != 0) {
...@@ -473,30 +489,30 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) ...@@ -473,30 +489,30 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)
"unable to teardown receive buffer's gpadl"); "unable to teardown receive buffer's gpadl");
return -1; return -1;
} }
NetDevice->ReceiveBufferGpadlHandle = 0; net_device->ReceiveBufferGpadlHandle = 0;
} }
if (NetDevice->ReceiveBuffer) { if (net_device->ReceiveBuffer) {
DPRINT_INFO(NETVSC, "Freeing up receive buffer..."); DPRINT_INFO(NETVSC, "Freeing up receive buffer...");
/* Free up the receive buffer */ /* Free up the receive buffer */
osd_page_free(NetDevice->ReceiveBuffer, osd_page_free(net_device->ReceiveBuffer,
NetDevice->ReceiveBufferSize >> PAGE_SHIFT); net_device->ReceiveBufferSize >> PAGE_SHIFT);
NetDevice->ReceiveBuffer = NULL; net_device->ReceiveBuffer = NULL;
} }
if (NetDevice->ReceiveSections) { if (net_device->ReceiveSections) {
NetDevice->ReceiveSectionCount = 0; net_device->ReceiveSectionCount = 0;
kfree(NetDevice->ReceiveSections); kfree(net_device->ReceiveSections);
NetDevice->ReceiveSections = NULL; net_device->ReceiveSections = NULL;
} }
return ret; return ret;
} }
static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) static int NetVscDestroySendBuffer(struct netvsc_device *net_device)
{ {
struct nvsp_message *revokePacket; struct nvsp_message *revoke_packet;
int ret = 0; int ret = 0;
/* /*
...@@ -505,20 +521,23 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) ...@@ -505,20 +521,23 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
* NvspMessage1TypeSendReceiveBuffer msg) therefore, we need * NvspMessage1TypeSendReceiveBuffer msg) therefore, we need
* to send a revoke msg here * to send a revoke msg here
*/ */
if (NetDevice->SendSectionSize) { if (net_device->SendSectionSize) {
DPRINT_INFO(NETVSC, DPRINT_INFO(NETVSC,
"Sending NvspMessage1TypeRevokeSendBuffer..."); "Sending NvspMessage1TypeRevokeSendBuffer...");
/* Send the revoke send buffer */ /* Send the revoke send buffer */
revokePacket = &NetDevice->RevokePacket; revoke_packet = &net_device->RevokePacket;
memset(revokePacket, 0, sizeof(struct nvsp_message)); memset(revoke_packet, 0, sizeof(struct nvsp_message));
revokePacket->Header.MessageType = NvspMessage1TypeRevokeSendBuffer; revoke_packet->Header.MessageType =
revokePacket->Messages.Version1Messages.RevokeSendBuffer.Id = NETVSC_SEND_BUFFER_ID; NvspMessage1TypeRevokeSendBuffer;
revoke_packet->Messages.Version1Messages.
RevokeSendBuffer.Id = NETVSC_SEND_BUFFER_ID;
ret = vmbus_sendpacket(NetDevice->Device->channel, revokePacket, ret = vmbus_sendpacket(net_device->Device->channel,
revoke_packet,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)revokePacket, (unsigned long)revoke_packet,
VmbusPacketTypeDataInBand, 0); VmbusPacketTypeDataInBand, 0);
/* /*
* If we failed here, we might as well return and have a leak * If we failed here, we might as well return and have a leak
...@@ -532,10 +551,10 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) ...@@ -532,10 +551,10 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
} }
/* Teardown the gpadl on the vsp end */ /* Teardown the gpadl on the vsp end */
if (NetDevice->SendBufferGpadlHandle) { if (net_device->SendBufferGpadlHandle) {
DPRINT_INFO(NETVSC, "Tearing down send buffer's GPADL..."); DPRINT_INFO(NETVSC, "Tearing down send buffer's GPADL...");
ret = vmbus_teardown_gpadl(NetDevice->Device->channel, ret = vmbus_teardown_gpadl(net_device->Device->channel,
NetDevice->SendBufferGpadlHandle); net_device->SendBufferGpadlHandle);
/* /*
* If we failed here, we might as well return and have a leak * If we failed here, we might as well return and have a leak
...@@ -546,49 +565,51 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) ...@@ -546,49 +565,51 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)
"gpadl"); "gpadl");
return -1; return -1;
} }
NetDevice->SendBufferGpadlHandle = 0; net_device->SendBufferGpadlHandle = 0;
} }
if (NetDevice->SendBuffer) { if (net_device->SendBuffer) {
DPRINT_INFO(NETVSC, "Freeing up send buffer..."); DPRINT_INFO(NETVSC, "Freeing up send buffer...");
/* Free up the receive buffer */ /* Free up the receive buffer */
osd_page_free(NetDevice->SendBuffer, osd_page_free(net_device->SendBuffer,
NetDevice->SendBufferSize >> PAGE_SHIFT); net_device->SendBufferSize >> PAGE_SHIFT);
NetDevice->SendBuffer = NULL; net_device->SendBuffer = NULL;
} }
return ret; return ret;
} }
static int NetVscConnectToVsp(struct hv_device *Device) static int NetVscConnectToVsp(struct hv_device *device)
{ {
int ret; int ret;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct nvsp_message *initPacket; struct nvsp_message *init_packet;
int ndisVersion; int ndis_version;
netDevice = GetOutboundNetDevice(Device); net_device = GetOutboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "unable to get net device..." DPRINT_ERR(NETVSC, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return -1; return -1;
} }
initPacket = &netDevice->ChannelInitPacket; init_packet = &net_device->ChannelInitPacket;
memset(initPacket, 0, sizeof(struct nvsp_message)); memset(init_packet, 0, sizeof(struct nvsp_message));
initPacket->Header.MessageType = NvspMessageTypeInit; init_packet->Header.MessageType = NvspMessageTypeInit;
initPacket->Messages.InitMessages.Init.MinProtocolVersion = NVSP_MIN_PROTOCOL_VERSION; init_packet->Messages.InitMessages.Init.MinProtocolVersion =
initPacket->Messages.InitMessages.Init.MaxProtocolVersion = NVSP_MAX_PROTOCOL_VERSION; NVSP_MIN_PROTOCOL_VERSION;
init_packet->Messages.InitMessages.Init.MaxProtocolVersion =
NVSP_MAX_PROTOCOL_VERSION;
DPRINT_INFO(NETVSC, "Sending NvspMessageTypeInit..."); DPRINT_INFO(NETVSC, "Sending NvspMessageTypeInit...");
/* Send the init request */ /* Send the init request */
ret = vmbus_sendpacket(Device->channel, initPacket, ret = vmbus_sendpacket(device->channel, init_packet,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)initPacket, (unsigned long)init_packet,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
...@@ -597,47 +618,52 @@ static int NetVscConnectToVsp(struct hv_device *Device) ...@@ -597,47 +618,52 @@ static int NetVscConnectToVsp(struct hv_device *Device)
goto Cleanup; goto Cleanup;
} }
osd_waitevent_wait(netDevice->ChannelInitEvent); osd_waitevent_wait(net_device->ChannelInitEvent);
/* Now, check the response */ /* Now, check the response */
/* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */ /* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */
DPRINT_INFO(NETVSC, "NvspMessageTypeInit status(%d) max mdl chain (%d)", DPRINT_INFO(NETVSC, "NvspMessageTypeInit status(%d) max mdl chain (%d)",
initPacket->Messages.InitMessages.InitComplete.Status, init_packet->Messages.InitMessages.InitComplete.Status,
initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength); init_packet->Messages.InitMessages.
InitComplete.MaximumMdlChainLength);
if (initPacket->Messages.InitMessages.InitComplete.Status != if (init_packet->Messages.InitMessages.InitComplete.Status !=
NvspStatusSuccess) { NvspStatusSuccess) {
DPRINT_ERR(NETVSC, DPRINT_ERR(NETVSC,
"unable to initialize with netvsp (status 0x%x)", "unable to initialize with netvsp (status 0x%x)",
initPacket->Messages.InitMessages.InitComplete.Status); init_packet->Messages.InitMessages.InitComplete.Status);
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
if (initPacket->Messages.InitMessages.InitComplete.NegotiatedProtocolVersion != NVSP_PROTOCOL_VERSION_1) { if (init_packet->Messages.InitMessages.InitComplete.
NegotiatedProtocolVersion != NVSP_PROTOCOL_VERSION_1) {
DPRINT_ERR(NETVSC, "unable to initialize with netvsp " DPRINT_ERR(NETVSC, "unable to initialize with netvsp "
"(version expected 1 got %d)", "(version expected 1 got %d)",
initPacket->Messages.InitMessages.InitComplete.NegotiatedProtocolVersion); init_packet->Messages.InitMessages.
InitComplete.NegotiatedProtocolVersion);
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendNdisVersion..."); DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendNdisVersion...");
/* Send the ndis version */ /* Send the ndis version */
memset(initPacket, 0, sizeof(struct nvsp_message)); memset(init_packet, 0, sizeof(struct nvsp_message));
ndisVersion = 0x00050000; ndis_version = 0x00050000;
initPacket->Header.MessageType = NvspMessage1TypeSendNdisVersion; init_packet->Header.MessageType = NvspMessage1TypeSendNdisVersion;
initPacket->Messages.Version1Messages.SendNdisVersion.NdisMajorVersion = init_packet->Messages.Version1Messages.
(ndisVersion & 0xFFFF0000) >> 16; SendNdisVersion.NdisMajorVersion =
initPacket->Messages.Version1Messages.SendNdisVersion.NdisMinorVersion = (ndis_version & 0xFFFF0000) >> 16;
ndisVersion & 0xFFFF; init_packet->Messages.Version1Messages.
SendNdisVersion.NdisMinorVersion =
ndis_version & 0xFFFF;
/* Send the init request */ /* Send the init request */
ret = vmbus_sendpacket(Device->channel, initPacket, ret = vmbus_sendpacket(device->channel, init_packet,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)initPacket, (unsigned long)init_packet,
VmbusPacketTypeDataInBand, 0); VmbusPacketTypeDataInBand, 0);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(NETVSC, DPRINT_ERR(NETVSC,
...@@ -654,48 +680,48 @@ static int NetVscConnectToVsp(struct hv_device *Device) ...@@ -654,48 +680,48 @@ static int NetVscConnectToVsp(struct hv_device *Device)
/* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */ /* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */
/* Post the big receive buffer to NetVSP */ /* Post the big receive buffer to NetVSP */
ret = NetVscInitializeReceiveBufferWithNetVsp(Device); ret = NetVscInitializeReceiveBufferWithNetVsp(device);
if (ret == 0) if (ret == 0)
ret = NetVscInitializeSendBufferWithNetVsp(Device); ret = NetVscInitializeSendBufferWithNetVsp(device);
Cleanup: Cleanup:
PutNetDevice(Device); PutNetDevice(device);
return ret; return ret;
} }
static void NetVscDisconnectFromVsp(struct netvsc_device *NetDevice) static void NetVscDisconnectFromVsp(struct netvsc_device *net_device)
{ {
NetVscDestroyReceiveBuffer(NetDevice); NetVscDestroyReceiveBuffer(net_device);
NetVscDestroySendBuffer(NetDevice); NetVscDestroySendBuffer(net_device);
} }
/* /*
* NetVscOnDeviceAdd - Callback when the device belonging to this driver is added * NetVscOnDeviceAdd - Callback when the device belonging to this driver is added
*/ */
static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) static int NetVscOnDeviceAdd(struct hv_device *device, void *additional_info)
{ {
int ret = 0; int ret = 0;
int i; int i;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct hv_netvsc_packet *packet, *pos; struct hv_netvsc_packet *packet, *pos;
struct netvsc_driver *netDriver = struct netvsc_driver *net_driver =
(struct netvsc_driver *)Device->Driver; (struct netvsc_driver *)device->Driver;
netDevice = AllocNetDevice(Device); net_device = AllocNetDevice(device);
if (!netDevice) { if (!net_device) {
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
DPRINT_DBG(NETVSC, "netvsc channel object allocated - %p", netDevice); DPRINT_DBG(NETVSC, "netvsc channel object allocated - %p", net_device);
/* Initialize the NetVSC channel extension */ /* Initialize the NetVSC channel extension */
netDevice->ReceiveBufferSize = NETVSC_RECEIVE_BUFFER_SIZE; net_device->ReceiveBufferSize = NETVSC_RECEIVE_BUFFER_SIZE;
spin_lock_init(&netDevice->receive_packet_list_lock); spin_lock_init(&net_device->receive_packet_list_lock);
netDevice->SendBufferSize = NETVSC_SEND_BUFFER_SIZE; net_device->SendBufferSize = NETVSC_SEND_BUFFER_SIZE;
INIT_LIST_HEAD(&netDevice->ReceivePacketList); INIT_LIST_HEAD(&net_device->ReceivePacketList);
for (i = 0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) { for (i = 0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) {
packet = kzalloc(sizeof(struct hv_netvsc_packet) + packet = kzalloc(sizeof(struct hv_netvsc_packet) +
...@@ -708,18 +734,18 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) ...@@ -708,18 +734,18 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
break; break;
} }
list_add_tail(&packet->ListEntry, list_add_tail(&packet->ListEntry,
&netDevice->ReceivePacketList); &net_device->ReceivePacketList);
} }
netDevice->ChannelInitEvent = osd_waitevent_create(); net_device->ChannelInitEvent = osd_waitevent_create();
if (!netDevice->ChannelInitEvent) { if (!net_device->ChannelInitEvent) {
ret = -ENOMEM; ret = -ENOMEM;
goto Cleanup; goto Cleanup;
} }
/* Open the channel */ /* Open the channel */
ret = vmbus_open(Device->channel, netDriver->RingBufferSize, ret = vmbus_open(device->channel, net_driver->RingBufferSize,
netDriver->RingBufferSize, NULL, 0, net_driver->RingBufferSize, NULL, 0,
NetVscOnChannelCallback, Device); NetVscOnChannelCallback, device);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(NETVSC, "unable to open channel: %d", ret); DPRINT_ERR(NETVSC, "unable to open channel: %d", ret);
...@@ -731,7 +757,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) ...@@ -731,7 +757,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
DPRINT_INFO(NETVSC, "*** NetVSC channel opened successfully! ***"); DPRINT_INFO(NETVSC, "*** NetVSC channel opened successfully! ***");
/* Connect with the NetVsp */ /* Connect with the NetVsp */
ret = NetVscConnectToVsp(Device); ret = NetVscConnectToVsp(device);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(NETVSC, "unable to connect to NetVSP - %d", ret); DPRINT_ERR(NETVSC, "unable to connect to NetVSP - %d", ret);
ret = -1; ret = -1;
...@@ -745,24 +771,24 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) ...@@ -745,24 +771,24 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
close: close:
/* Now, we can close the channel safely */ /* Now, we can close the channel safely */
vmbus_close(Device->channel); vmbus_close(device->channel);
Cleanup: Cleanup:
if (netDevice) { if (net_device) {
kfree(netDevice->ChannelInitEvent); kfree(net_device->ChannelInitEvent);
list_for_each_entry_safe(packet, pos, list_for_each_entry_safe(packet, pos,
&netDevice->ReceivePacketList, &net_device->ReceivePacketList,
ListEntry) { ListEntry) {
list_del(&packet->ListEntry); list_del(&packet->ListEntry);
kfree(packet); kfree(packet);
} }
ReleaseOutboundNetDevice(Device); ReleaseOutboundNetDevice(device);
ReleaseInboundNetDevice(Device); ReleaseInboundNetDevice(device);
FreeNetDevice(netDevice); FreeNetDevice(net_device);
} }
return ret; return ret;
...@@ -771,53 +797,53 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) ...@@ -771,53 +797,53 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
/* /*
* NetVscOnDeviceRemove - Callback when the root bus device is removed * NetVscOnDeviceRemove - Callback when the root bus device is removed
*/ */
static int NetVscOnDeviceRemove(struct hv_device *Device) static int NetVscOnDeviceRemove(struct hv_device *device)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct hv_netvsc_packet *netvscPacket, *pos; struct hv_netvsc_packet *netvsc_packet, *pos;
DPRINT_INFO(NETVSC, "Disabling outbound traffic on net device (%p)...", DPRINT_INFO(NETVSC, "Disabling outbound traffic on net device (%p)...",
Device->Extension); device->Extension);
/* Stop outbound traffic ie sends and receives completions */ /* Stop outbound traffic ie sends and receives completions */
netDevice = ReleaseOutboundNetDevice(Device); net_device = ReleaseOutboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "No net device present!!"); DPRINT_ERR(NETVSC, "No net device present!!");
return -1; return -1;
} }
/* Wait for all send completions */ /* Wait for all send completions */
while (atomic_read(&netDevice->NumOutstandingSends)) { while (atomic_read(&net_device->NumOutstandingSends)) {
DPRINT_INFO(NETVSC, "waiting for %d requests to complete...", DPRINT_INFO(NETVSC, "waiting for %d requests to complete...",
atomic_read(&netDevice->NumOutstandingSends)); atomic_read(&net_device->NumOutstandingSends));
udelay(100); udelay(100);
} }
DPRINT_INFO(NETVSC, "Disconnecting from netvsp..."); DPRINT_INFO(NETVSC, "Disconnecting from netvsp...");
NetVscDisconnectFromVsp(netDevice); NetVscDisconnectFromVsp(net_device);
DPRINT_INFO(NETVSC, "Disabling inbound traffic on net device (%p)...", DPRINT_INFO(NETVSC, "Disabling inbound traffic on net device (%p)...",
Device->Extension); device->Extension);
/* Stop inbound traffic ie receives and sends completions */ /* Stop inbound traffic ie receives and sends completions */
netDevice = ReleaseInboundNetDevice(Device); net_device = ReleaseInboundNetDevice(device);
/* At this point, no one should be accessing netDevice except in here */ /* At this point, no one should be accessing netDevice except in here */
DPRINT_INFO(NETVSC, "net device (%p) safe to remove", netDevice); DPRINT_INFO(NETVSC, "net device (%p) safe to remove", net_device);
/* Now, we can close the channel safely */ /* Now, we can close the channel safely */
vmbus_close(Device->channel); vmbus_close(device->channel);
/* Release all resources */ /* Release all resources */
list_for_each_entry_safe(netvscPacket, pos, list_for_each_entry_safe(netvsc_packet, pos,
&netDevice->ReceivePacketList, ListEntry) { &net_device->ReceivePacketList, ListEntry) {
list_del(&netvscPacket->ListEntry); list_del(&netvsc_packet->ListEntry);
kfree(netvscPacket); kfree(netvsc_packet);
} }
kfree(netDevice->ChannelInitEvent); kfree(net_device->ChannelInitEvent);
FreeNetDevice(netDevice); FreeNetDevice(net_device);
return 0; return 0;
} }
...@@ -828,69 +854,72 @@ static void NetVscOnCleanup(struct hv_driver *drv) ...@@ -828,69 +854,72 @@ static void NetVscOnCleanup(struct hv_driver *drv)
{ {
} }
static void NetVscOnSendCompletion(struct hv_device *Device, static void NetVscOnSendCompletion(struct hv_device *device,
struct vmpacket_descriptor *Packet) struct vmpacket_descriptor *packet)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct nvsp_message *nvspPacket; struct nvsp_message *nvsp_packet;
struct hv_netvsc_packet *nvscPacket; struct hv_netvsc_packet *nvsc_packet;
netDevice = GetInboundNetDevice(Device); net_device = GetInboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "unable to get net device..." DPRINT_ERR(NETVSC, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return; return;
} }
nvspPacket = (struct nvsp_message *)((unsigned long)Packet + (Packet->DataOffset8 << 3)); nvsp_packet = (struct nvsp_message *)((unsigned long)packet +
(packet->DataOffset8 << 3));
DPRINT_DBG(NETVSC, "send completion packet - type %d", DPRINT_DBG(NETVSC, "send completion packet - type %d",
nvspPacket->Header.MessageType); nvsp_packet->Header.MessageType);
if ((nvspPacket->Header.MessageType == NvspMessageTypeInitComplete) || if ((nvsp_packet->Header.MessageType == NvspMessageTypeInitComplete) ||
(nvspPacket->Header.MessageType == (nvsp_packet->Header.MessageType ==
NvspMessage1TypeSendReceiveBufferComplete) || NvspMessage1TypeSendReceiveBufferComplete) ||
(nvspPacket->Header.MessageType == (nvsp_packet->Header.MessageType ==
NvspMessage1TypeSendSendBufferComplete)) { NvspMessage1TypeSendSendBufferComplete)) {
/* Copy the response back */ /* Copy the response back */
memcpy(&netDevice->ChannelInitPacket, nvspPacket, memcpy(&net_device->ChannelInitPacket, nvsp_packet,
sizeof(struct nvsp_message)); sizeof(struct nvsp_message));
osd_waitevent_set(netDevice->ChannelInitEvent); osd_waitevent_set(net_device->ChannelInitEvent);
} else if (nvspPacket->Header.MessageType == } else if (nvsp_packet->Header.MessageType ==
NvspMessage1TypeSendRNDISPacketComplete) { NvspMessage1TypeSendRNDISPacketComplete) {
/* Get the send context */ /* Get the send context */
nvscPacket = (struct hv_netvsc_packet *)(unsigned long)Packet->TransactionId; nvsc_packet = (struct hv_netvsc_packet *)(unsigned long)
packet->TransactionId;
/* ASSERT(nvscPacket); */ /* ASSERT(nvscPacket); */
/* Notify the layer above us */ /* Notify the layer above us */
nvscPacket->Completion.Send.OnSendCompletion(nvscPacket->Completion.Send.SendCompletionContext); nvsc_packet->Completion.Send.OnSendCompletion(
nvsc_packet->Completion.Send.SendCompletionContext);
atomic_dec(&netDevice->NumOutstandingSends); atomic_dec(&net_device->NumOutstandingSends);
} else { } else {
DPRINT_ERR(NETVSC, "Unknown send completion packet type - " DPRINT_ERR(NETVSC, "Unknown send completion packet type - "
"%d received!!", nvspPacket->Header.MessageType); "%d received!!", nvsp_packet->Header.MessageType);
} }
PutNetDevice(Device); PutNetDevice(device);
} }
static int NetVscOnSend(struct hv_device *Device, static int NetVscOnSend(struct hv_device *device,
struct hv_netvsc_packet *Packet) struct hv_netvsc_packet *packet)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
int ret = 0; int ret = 0;
struct nvsp_message sendMessage; struct nvsp_message sendMessage;
netDevice = GetOutboundNetDevice(Device); net_device = GetOutboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "net device (%p) shutting down..." DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
"ignoring outbound packets", netDevice); "ignoring outbound packets", net_device);
return -2; return -2;
} }
sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket; sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket;
if (Packet->IsDataPacket) { if (packet->IsDataPacket) {
/* 0 is RMC_DATA; */ /* 0 is RMC_DATA; */
sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType = 0; sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType = 0;
} else { } else {
...@@ -902,17 +931,17 @@ static int NetVscOnSend(struct hv_device *Device, ...@@ -902,17 +931,17 @@ static int NetVscOnSend(struct hv_device *Device,
sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex = 0xFFFFFFFF; sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex = 0xFFFFFFFF;
sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize = 0; sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize = 0;
if (Packet->PageBufferCount) { if (packet->PageBufferCount) {
ret = vmbus_sendpacket_pagebuffer(Device->channel, ret = vmbus_sendpacket_pagebuffer(device->channel,
Packet->PageBuffers, packet->PageBuffers,
Packet->PageBufferCount, packet->PageBufferCount,
&sendMessage, &sendMessage,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)Packet); (unsigned long)packet);
} else { } else {
ret = vmbus_sendpacket(Device->channel, &sendMessage, ret = vmbus_sendpacket(device->channel, &sendMessage,
sizeof(struct nvsp_message), sizeof(struct nvsp_message),
(unsigned long)Packet, (unsigned long)packet,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
...@@ -920,31 +949,31 @@ static int NetVscOnSend(struct hv_device *Device, ...@@ -920,31 +949,31 @@ static int NetVscOnSend(struct hv_device *Device,
if (ret != 0) if (ret != 0)
DPRINT_ERR(NETVSC, "Unable to send packet %p ret %d", DPRINT_ERR(NETVSC, "Unable to send packet %p ret %d",
Packet, ret); packet, ret);
atomic_inc(&netDevice->NumOutstandingSends); atomic_inc(&net_device->NumOutstandingSends);
PutNetDevice(Device); PutNetDevice(device);
return ret; return ret;
} }
static void NetVscOnReceive(struct hv_device *Device, static void NetVscOnReceive(struct hv_device *device,
struct vmpacket_descriptor *Packet) struct vmpacket_descriptor *packet)
{ {
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct vmtransfer_page_packet_header *vmxferpagePacket; struct vmtransfer_page_packet_header *vmxferpage_packet;
struct nvsp_message *nvspPacket; struct nvsp_message *nvsp_packet;
struct hv_netvsc_packet *netvscPacket = NULL; struct hv_netvsc_packet *netvsc_packet = NULL;
unsigned long start; unsigned long start;
unsigned long end, endVirtual; unsigned long end, end_virtual;
/* struct netvsc_driver *netvscDriver; */ /* struct netvsc_driver *netvscDriver; */
struct xferpage_packet *xferpagePacket = NULL; struct xferpage_packet *xferpage_packet = NULL;
int i, j; int i, j;
int count = 0, bytesRemain = 0; int count = 0, bytes_remain = 0;
unsigned long flags; unsigned long flags;
LIST_HEAD(listHead); LIST_HEAD(listHead);
netDevice = GetInboundNetDevice(Device); net_device = GetInboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "unable to get net device..." DPRINT_ERR(NETVSC, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return; return;
...@@ -954,39 +983,40 @@ static void NetVscOnReceive(struct hv_device *Device, ...@@ -954,39 +983,40 @@ static void NetVscOnReceive(struct hv_device *Device,
* All inbound packets other than send completion should be xfer page * All inbound packets other than send completion should be xfer page
* packet * packet
*/ */
if (Packet->Type != VmbusPacketTypeDataUsingTransferPages) { if (packet->Type != VmbusPacketTypeDataUsingTransferPages) {
DPRINT_ERR(NETVSC, "Unknown packet type received - %d", DPRINT_ERR(NETVSC, "Unknown packet type received - %d",
Packet->Type); packet->Type);
PutNetDevice(Device); PutNetDevice(device);
return; return;
} }
nvspPacket = (struct nvsp_message *)((unsigned long)Packet + nvsp_packet = (struct nvsp_message *)((unsigned long)packet +
(Packet->DataOffset8 << 3)); (packet->DataOffset8 << 3));
/* Make sure this is a valid nvsp packet */ /* Make sure this is a valid nvsp packet */
if (nvspPacket->Header.MessageType != NvspMessage1TypeSendRNDISPacket) { if (nvsp_packet->Header.MessageType !=
NvspMessage1TypeSendRNDISPacket) {
DPRINT_ERR(NETVSC, "Unknown nvsp packet type received - %d", DPRINT_ERR(NETVSC, "Unknown nvsp packet type received - %d",
nvspPacket->Header.MessageType); nvsp_packet->Header.MessageType);
PutNetDevice(Device); PutNetDevice(device);
return; return;
} }
DPRINT_DBG(NETVSC, "NVSP packet received - type %d", DPRINT_DBG(NETVSC, "NVSP packet received - type %d",
nvspPacket->Header.MessageType); nvsp_packet->Header.MessageType);
vmxferpagePacket = (struct vmtransfer_page_packet_header *)Packet; vmxferpage_packet = (struct vmtransfer_page_packet_header *)packet;
if (vmxferpagePacket->TransferPageSetId != NETVSC_RECEIVE_BUFFER_ID) { if (vmxferpage_packet->TransferPageSetId != NETVSC_RECEIVE_BUFFER_ID) {
DPRINT_ERR(NETVSC, "Invalid xfer page set id - " DPRINT_ERR(NETVSC, "Invalid xfer page set id - "
"expecting %x got %x", NETVSC_RECEIVE_BUFFER_ID, "expecting %x got %x", NETVSC_RECEIVE_BUFFER_ID,
vmxferpagePacket->TransferPageSetId); vmxferpage_packet->TransferPageSetId);
PutNetDevice(Device); PutNetDevice(device);
return; return;
} }
DPRINT_DBG(NETVSC, "xfer page - range count %d", DPRINT_DBG(NETVSC, "xfer page - range count %d",
vmxferpagePacket->RangeCount); vmxferpage_packet->RangeCount);
/* /*
* Grab free packets (range count + 1) to represent this xfer * Grab free packets (range count + 1) to represent this xfer
...@@ -994,13 +1024,13 @@ static void NetVscOnReceive(struct hv_device *Device, ...@@ -994,13 +1024,13 @@ static void NetVscOnReceive(struct hv_device *Device,
* We grab it here so that we know exactly how many we can * We grab it here so that we know exactly how many we can
* fulfil * fulfil
*/ */
spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags); spin_lock_irqsave(&net_device->receive_packet_list_lock, flags);
while (!list_empty(&netDevice->ReceivePacketList)) { while (!list_empty(&net_device->ReceivePacketList)) {
list_move_tail(netDevice->ReceivePacketList.next, &listHead); list_move_tail(net_device->ReceivePacketList.next, &listHead);
if (++count == vmxferpagePacket->RangeCount + 1) if (++count == vmxferpage_packet->RangeCount + 1)
break; break;
} }
spin_unlock_irqrestore(&netDevice->receive_packet_list_lock, flags); spin_unlock_irqrestore(&net_device->receive_packet_list_lock, flags);
/* /*
* We need at least 2 netvsc pkts (1 to represent the xfer * We need at least 2 netvsc pkts (1 to represent the xfer
...@@ -1010,129 +1040,137 @@ static void NetVscOnReceive(struct hv_device *Device, ...@@ -1010,129 +1040,137 @@ static void NetVscOnReceive(struct hv_device *Device,
if (count < 2) { if (count < 2) {
DPRINT_ERR(NETVSC, "Got only %d netvsc pkt...needed %d pkts. " DPRINT_ERR(NETVSC, "Got only %d netvsc pkt...needed %d pkts. "
"Dropping this xfer page packet completely!", "Dropping this xfer page packet completely!",
count, vmxferpagePacket->RangeCount + 1); count, vmxferpage_packet->RangeCount + 1);
/* Return it to the freelist */ /* Return it to the freelist */
spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags); spin_lock_irqsave(&net_device->receive_packet_list_lock, flags);
for (i = count; i != 0; i--) { for (i = count; i != 0; i--) {
list_move_tail(listHead.next, list_move_tail(listHead.next,
&netDevice->ReceivePacketList); &net_device->ReceivePacketList);
} }
spin_unlock_irqrestore(&netDevice->receive_packet_list_lock, spin_unlock_irqrestore(&net_device->receive_packet_list_lock,
flags); flags);
NetVscSendReceiveCompletion(Device, NetVscSendReceiveCompletion(device,
vmxferpagePacket->d.TransactionId); vmxferpage_packet->d.TransactionId);
PutNetDevice(Device); PutNetDevice(device);
return; return;
} }
/* Remove the 1st packet to represent the xfer page packet itself */ /* Remove the 1st packet to represent the xfer page packet itself */
xferpagePacket = (struct xferpage_packet *)listHead.next; xferpage_packet = (struct xferpage_packet *)listHead.next;
list_del(&xferpagePacket->ListEntry); list_del(&xferpage_packet->ListEntry);
/* This is how much we can satisfy */ /* This is how much we can satisfy */
xferpagePacket->Count = count - 1; xferpage_packet->Count = count - 1;
/* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */ /* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */
/* vmxferpagePacket->RangeCount); */ /* vmxferpagePacket->RangeCount); */
if (xferpagePacket->Count != vmxferpagePacket->RangeCount) { if (xferpage_packet->Count != vmxferpage_packet->RangeCount) {
DPRINT_INFO(NETVSC, "Needed %d netvsc pkts to satisy this xfer " DPRINT_INFO(NETVSC, "Needed %d netvsc pkts to satisy this xfer "
"page...got %d", vmxferpagePacket->RangeCount, "page...got %d", vmxferpage_packet->RangeCount,
xferpagePacket->Count); xferpage_packet->Count);
} }
/* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */ /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
for (i = 0; i < (count - 1); i++) { for (i = 0; i < (count - 1); i++) {
netvscPacket = (struct hv_netvsc_packet *)listHead.next; netvsc_packet = (struct hv_netvsc_packet *)listHead.next;
list_del(&netvscPacket->ListEntry); list_del(&netvsc_packet->ListEntry);
/* Initialize the netvsc packet */ /* Initialize the netvsc packet */
netvscPacket->XferPagePacket = xferpagePacket; netvsc_packet->XferPagePacket = xferpage_packet;
netvscPacket->Completion.Recv.OnReceiveCompletion = netvsc_packet->Completion.Recv.OnReceiveCompletion =
NetVscOnReceiveCompletion; NetVscOnReceiveCompletion;
netvscPacket->Completion.Recv.ReceiveCompletionContext = netvsc_packet->Completion.Recv.ReceiveCompletionContext =
netvscPacket; netvsc_packet;
netvscPacket->Device = Device; netvsc_packet->Device = device;
/* Save this so that we can send it back */ /* Save this so that we can send it back */
netvscPacket->Completion.Recv.ReceiveCompletionTid = netvsc_packet->Completion.Recv.ReceiveCompletionTid =
vmxferpagePacket->d.TransactionId; vmxferpage_packet->d.TransactionId;
netvscPacket->TotalDataBufferLength = netvsc_packet->TotalDataBufferLength =
vmxferpagePacket->Ranges[i].ByteCount; vmxferpage_packet->Ranges[i].ByteCount;
netvscPacket->PageBufferCount = 1; netvsc_packet->PageBufferCount = 1;
/* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */ /* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */
/* vmxferpagePacket->Ranges[i].ByteCount < */ /* vmxferpagePacket->Ranges[i].ByteCount < */
/* netDevice->ReceiveBufferSize); */ /* netDevice->ReceiveBufferSize); */
netvscPacket->PageBuffers[0].Length = netvsc_packet->PageBuffers[0].Length =
vmxferpagePacket->Ranges[i].ByteCount; vmxferpage_packet->Ranges[i].ByteCount;
start = virt_to_phys((void *)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset)); start = virt_to_phys((void *)((unsigned long)net_device->
ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset));
netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT; netvsc_packet->PageBuffers[0].Pfn = start >> PAGE_SHIFT;
endVirtual = (unsigned long)netDevice->ReceiveBuffer end_virtual = (unsigned long)net_device->ReceiveBuffer
+ vmxferpagePacket->Ranges[i].ByteOffset + vmxferpage_packet->Ranges[i].ByteOffset
+ vmxferpagePacket->Ranges[i].ByteCount - 1; + vmxferpage_packet->Ranges[i].ByteCount - 1;
end = virt_to_phys((void *)endVirtual); end = virt_to_phys((void *)end_virtual);
/* Calculate the page relative offset */ /* Calculate the page relative offset */
netvscPacket->PageBuffers[0].Offset = netvsc_packet->PageBuffers[0].Offset =
vmxferpagePacket->Ranges[i].ByteOffset & (PAGE_SIZE - 1); vmxferpage_packet->Ranges[i].ByteOffset &
(PAGE_SIZE - 1);
if ((end >> PAGE_SHIFT) != (start >> PAGE_SHIFT)) { if ((end >> PAGE_SHIFT) != (start >> PAGE_SHIFT)) {
/* Handle frame across multiple pages: */ /* Handle frame across multiple pages: */
netvscPacket->PageBuffers[0].Length = netvsc_packet->PageBuffers[0].Length =
(netvscPacket->PageBuffers[0].Pfn << PAGE_SHIFT) (netvsc_packet->PageBuffers[0].Pfn <<
PAGE_SHIFT)
+ PAGE_SIZE - start; + PAGE_SIZE - start;
bytesRemain = netvscPacket->TotalDataBufferLength - bytes_remain = netvsc_packet->TotalDataBufferLength -
netvscPacket->PageBuffers[0].Length; netvsc_packet->PageBuffers[0].Length;
for (j = 1; j < NETVSC_PACKET_MAXPAGE; j++) { for (j = 1; j < NETVSC_PACKET_MAXPAGE; j++) {
netvscPacket->PageBuffers[j].Offset = 0; netvsc_packet->PageBuffers[j].Offset = 0;
if (bytesRemain <= PAGE_SIZE) { if (bytes_remain <= PAGE_SIZE) {
netvscPacket->PageBuffers[j].Length = bytesRemain; netvsc_packet->PageBuffers[j].Length =
bytesRemain = 0; bytes_remain;
bytes_remain = 0;
} else { } else {
netvscPacket->PageBuffers[j].Length = PAGE_SIZE; netvsc_packet->PageBuffers[j].Length =
bytesRemain -= PAGE_SIZE; PAGE_SIZE;
} bytes_remain -= PAGE_SIZE;
netvscPacket->PageBuffers[j].Pfn = }
virt_to_phys((void *)(endVirtual - bytesRemain)) >> PAGE_SHIFT; netvsc_packet->PageBuffers[j].Pfn =
netvscPacket->PageBufferCount++; virt_to_phys((void *)(end_virtual -
if (bytesRemain == 0) bytes_remain)) >> PAGE_SHIFT;
netvsc_packet->PageBufferCount++;
if (bytes_remain == 0)
break; break;
} }
/* ASSERT(bytesRemain == 0); */ /* ASSERT(bytesRemain == 0); */
} }
DPRINT_DBG(NETVSC, "[%d] - (abs offset %u len %u) => " DPRINT_DBG(NETVSC, "[%d] - (abs offset %u len %u) => "
"(pfn %llx, offset %u, len %u)", i, "(pfn %llx, offset %u, len %u)", i,
vmxferpagePacket->Ranges[i].ByteOffset, vmxferpage_packet->Ranges[i].ByteOffset,
vmxferpagePacket->Ranges[i].ByteCount, vmxferpage_packet->Ranges[i].ByteCount,
netvscPacket->PageBuffers[0].Pfn, netvsc_packet->PageBuffers[0].Pfn,
netvscPacket->PageBuffers[0].Offset, netvsc_packet->PageBuffers[0].Offset,
netvscPacket->PageBuffers[0].Length); netvsc_packet->PageBuffers[0].Length);
/* Pass it to the upper layer */ /* Pass it to the upper layer */
((struct netvsc_driver *)Device->Driver)->OnReceiveCallback(Device, netvscPacket); ((struct netvsc_driver *)device->Driver)->
OnReceiveCallback(device, netvsc_packet);
NetVscOnReceiveCompletion(netvscPacket->Completion.Recv.ReceiveCompletionContext); NetVscOnReceiveCompletion(netvsc_packet->
Completion.Recv.ReceiveCompletionContext);
} }
/* ASSERT(list_empty(&listHead)); */ /* ASSERT(list_empty(&listHead)); */
PutNetDevice(Device); PutNetDevice(device);
} }
static void NetVscSendReceiveCompletion(struct hv_device *Device, static void NetVscSendReceiveCompletion(struct hv_device *device,
u64 TransactionId) u64 transaction_id)
{ {
struct nvsp_message recvcompMessage; struct nvsp_message recvcompMessage;
int retries = 0; int retries = 0;
int ret; int ret;
DPRINT_DBG(NETVSC, "Sending receive completion pkt - %llx", DPRINT_DBG(NETVSC, "Sending receive completion pkt - %llx",
TransactionId); transaction_id);
recvcompMessage.Header.MessageType = recvcompMessage.Header.MessageType =
NvspMessage1TypeSendRNDISPacketComplete; NvspMessage1TypeSendRNDISPacketComplete;
...@@ -1142,8 +1180,8 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device, ...@@ -1142,8 +1180,8 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device,
retry_send_cmplt: retry_send_cmplt:
/* Send the completion */ /* Send the completion */
ret = vmbus_sendpacket(Device->channel, &recvcompMessage, ret = vmbus_sendpacket(device->channel, &recvcompMessage,
sizeof(struct nvsp_message), TransactionId, sizeof(struct nvsp_message), transaction_id,
VmbusPacketTypeCompletion, 0); VmbusPacketTypeCompletion, 0);
if (ret == 0) { if (ret == 0) {
/* success */ /* success */
...@@ -1152,7 +1190,7 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device, ...@@ -1152,7 +1190,7 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device,
/* no more room...wait a bit and attempt to retry 3 times */ /* no more room...wait a bit and attempt to retry 3 times */
retries++; retries++;
DPRINT_ERR(NETVSC, "unable to send receive completion pkt " DPRINT_ERR(NETVSC, "unable to send receive completion pkt "
"(tid %llx)...retrying %d", TransactionId, retries); "(tid %llx)...retrying %d", transaction_id, retries);
if (retries < 4) { if (retries < 4) {
udelay(100); udelay(100);
...@@ -1160,22 +1198,22 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device, ...@@ -1160,22 +1198,22 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device,
} else { } else {
DPRINT_ERR(NETVSC, "unable to send receive completion " DPRINT_ERR(NETVSC, "unable to send receive completion "
"pkt (tid %llx)...give up retrying", "pkt (tid %llx)...give up retrying",
TransactionId); transaction_id);
} }
} else { } else {
DPRINT_ERR(NETVSC, "unable to send receive completion pkt - " DPRINT_ERR(NETVSC, "unable to send receive completion pkt - "
"%llx", TransactionId); "%llx", transaction_id);
} }
} }
/* Send a receive completion packet to RNDIS device (ie NetVsp) */ /* Send a receive completion packet to RNDIS device (ie NetVsp) */
static void NetVscOnReceiveCompletion(void *Context) static void NetVscOnReceiveCompletion(void *context)
{ {
struct hv_netvsc_packet *packet = Context; struct hv_netvsc_packet *packet = context;
struct hv_device *device = (struct hv_device *)packet->Device; struct hv_device *device = (struct hv_device *)packet->Device;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
u64 transactionId = 0; u64 transaction_id = 0;
bool fSendReceiveComp = false; bool fsend_receive_comp = false;
unsigned long flags; unsigned long flags;
/* ASSERT(packet->XferPagePacket); */ /* ASSERT(packet->XferPagePacket); */
...@@ -1185,15 +1223,15 @@ static void NetVscOnReceiveCompletion(void *Context) ...@@ -1185,15 +1223,15 @@ static void NetVscOnReceiveCompletion(void *Context)
* send out receive completion, we are using GetInboundNetDevice() * send out receive completion, we are using GetInboundNetDevice()
* since we may have disable outbound traffic already. * since we may have disable outbound traffic already.
*/ */
netDevice = GetInboundNetDevice(device); net_device = GetInboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "unable to get net device..." DPRINT_ERR(NETVSC, "unable to get net device..."
"device being destroyed?"); "device being destroyed?");
return; return;
} }
/* Overloading use of the lock. */ /* Overloading use of the lock. */
spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags); spin_lock_irqsave(&net_device->receive_packet_list_lock, flags);
/* ASSERT(packet->XferPagePacket->Count > 0); */ /* ASSERT(packet->XferPagePacket->Count > 0); */
packet->XferPagePacket->Count--; packet->XferPagePacket->Count--;
...@@ -1203,31 +1241,31 @@ static void NetVscOnReceiveCompletion(void *Context) ...@@ -1203,31 +1241,31 @@ static void NetVscOnReceiveCompletion(void *Context)
* Return the xfer page packet itself to the freelist * Return the xfer page packet itself to the freelist
*/ */
if (packet->XferPagePacket->Count == 0) { if (packet->XferPagePacket->Count == 0) {
fSendReceiveComp = true; fsend_receive_comp = true;
transactionId = packet->Completion.Recv.ReceiveCompletionTid; transaction_id = packet->Completion.Recv.ReceiveCompletionTid;
list_add_tail(&packet->XferPagePacket->ListEntry, list_add_tail(&packet->XferPagePacket->ListEntry,
&netDevice->ReceivePacketList); &net_device->ReceivePacketList);
} }
/* Put the packet back */ /* Put the packet back */
list_add_tail(&packet->ListEntry, &netDevice->ReceivePacketList); list_add_tail(&packet->ListEntry, &net_device->ReceivePacketList);
spin_unlock_irqrestore(&netDevice->receive_packet_list_lock, flags); spin_unlock_irqrestore(&net_device->receive_packet_list_lock, flags);
/* Send a receive completion for the xfer page packet */ /* Send a receive completion for the xfer page packet */
if (fSendReceiveComp) if (fsend_receive_comp)
NetVscSendReceiveCompletion(device, transactionId); NetVscSendReceiveCompletion(device, transaction_id);
PutNetDevice(device); PutNetDevice(device);
} }
static void NetVscOnChannelCallback(void *Context) static void NetVscOnChannelCallback(void *context)
{ {
int ret; int ret;
struct hv_device *device = Context; struct hv_device *device = context;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
u32 bytesRecvd; u32 bytes_recvd;
u64 requestId; u64 request_id;
unsigned char *packet; unsigned char *packet;
struct vmpacket_descriptor *desc; struct vmpacket_descriptor *desc;
unsigned char *buffer; unsigned char *buffer;
...@@ -1241,20 +1279,20 @@ static void NetVscOnChannelCallback(void *Context) ...@@ -1241,20 +1279,20 @@ static void NetVscOnChannelCallback(void *Context)
return; return;
buffer = packet; buffer = packet;
netDevice = GetInboundNetDevice(device); net_device = GetInboundNetDevice(device);
if (!netDevice) { if (!net_device) {
DPRINT_ERR(NETVSC, "net device (%p) shutting down..." DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
"ignoring inbound packets", netDevice); "ignoring inbound packets", net_device);
goto out; goto out;
} }
do { do {
ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen, ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen,
&bytesRecvd, &requestId); &bytes_recvd, &request_id);
if (ret == 0) { if (ret == 0) {
if (bytesRecvd > 0) { if (bytes_recvd > 0) {
DPRINT_DBG(NETVSC, "receive %d bytes, tid %llx", DPRINT_DBG(NETVSC, "receive %d bytes, tid %llx",
bytesRecvd, requestId); bytes_recvd, request_id);
desc = (struct vmpacket_descriptor *)buffer; desc = (struct vmpacket_descriptor *)buffer;
switch (desc->Type) { switch (desc->Type) {
...@@ -1270,8 +1308,8 @@ static void NetVscOnChannelCallback(void *Context) ...@@ -1270,8 +1308,8 @@ static void NetVscOnChannelCallback(void *Context)
DPRINT_ERR(NETVSC, DPRINT_ERR(NETVSC,
"unhandled packet type %d, " "unhandled packet type %d, "
"tid %llx len %d\n", "tid %llx len %d\n",
desc->Type, requestId, desc->Type, request_id,
bytesRecvd); bytes_recvd);
break; break;
} }
...@@ -1293,16 +1331,16 @@ static void NetVscOnChannelCallback(void *Context) ...@@ -1293,16 +1331,16 @@ static void NetVscOnChannelCallback(void *Context)
} }
} else if (ret == -2) { } else if (ret == -2) {
/* Handle large packet */ /* Handle large packet */
buffer = kmalloc(bytesRecvd, GFP_ATOMIC); buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
if (buffer == NULL) { if (buffer == NULL) {
/* Try again next time around */ /* Try again next time around */
DPRINT_ERR(NETVSC, DPRINT_ERR(NETVSC,
"unable to allocate buffer of size " "unable to allocate buffer of size "
"(%d)!!", bytesRecvd); "(%d)!!", bytes_recvd);
break; break;
} }
bufferlen = bytesRecvd; bufferlen = bytes_recvd;
} }
} while (1); } while (1);
......
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