*/
-#include "include/osd.h"
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include "osd.h"
#include "include/logging.h"
#include "VmbusPrivate.h"
#define MAX_NUM_DEVICE_CLASSES_SUPPORTED 4
-const GUID gSupportedDeviceClasses[MAX_NUM_DEVICE_CLASSES_SUPPORTED]= {
+static const struct hv_guid gSupportedDeviceClasses[MAX_NUM_DEVICE_CLASSES_SUPPORTED] = {
/* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */
- {.Data = {0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d, 0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f}},/* Storage - SCSI */
+ /* Storage - SCSI */
+ {
+ .data = {
+ 0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
+ 0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f
+ }
+ },
+
/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
- {.Data = {0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E}}, /* Network */
+ /* Network */
+ {
+ .data = {
+ 0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
+ 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
+ }
+ },
+
/* {CFA8B69E-5B4A-4cc0-B98B-8BA1A1F3F95A} */
- {.Data = {0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c, 0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A}}, /* Input */
- /* {32412632-86cb-44a2-9b5c-50d1417354f5} */
- {.Data = {0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44, 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5}}, /* IDE */
+ /* Input */
+ {
+ .data = {
+ 0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c,
+ 0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A
+ }
+ },
+ /* {32412632-86cb-44a2-9b5c-50d1417354f5} */
+ /* IDE */
+ {
+ .data = {
+ 0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
+ 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
+ }
+ },
};
/* Channel message dispatch table */
-VMBUS_CHANNEL_MESSAGE_TABLE_ENTRY gChannelMessageTable[ChannelMessageCount]= {
+static VMBUS_CHANNEL_MESSAGE_TABLE_ENTRY gChannelMessageTable[ChannelMessageCount]= {
{ChannelMessageInvalid, NULL},
{ChannelMessageOfferChannel, VmbusChannelOnOffer},
{ChannelMessageRescindChannelOffer, VmbusChannelOnOfferRescind},
Allocate and initialize a vmbus channel object
--*/
-VMBUS_CHANNEL* AllocVmbusChannel(void)
+struct vmbus_channel *AllocVmbusChannel(void)
{
- VMBUS_CHANNEL* channel;
+ struct vmbus_channel *channel;
- channel = kzalloc(sizeof(VMBUS_CHANNEL), GFP_ATOMIC);
+ channel = kzalloc(sizeof(*channel), GFP_ATOMIC);
if (!channel)
{
return NULL;
spin_lock_init(&channel->inbound_lock);
- channel->PollTimer = TimerCreate(VmbusChannelOnTimer, channel);
- if (!channel->PollTimer)
- {
- kfree(channel);
- return NULL;
- }
+ init_timer(&channel->poll_timer);
+ channel->poll_timer.data = (unsigned long)channel;
+ channel->poll_timer.function = VmbusChannelOnTimer;
/* channel->dataWorkQueue = WorkQueueCreate("data"); */
- channel->ControlWQ = WorkQueueCreate("control");
+ channel->ControlWQ = create_workqueue("hv_vmbus_ctl");
if (!channel->ControlWQ)
{
- TimerClose(channel->PollTimer);
kfree(channel);
return NULL;
}
--*/
static inline void ReleaseVmbusChannel(void* Context)
{
- VMBUS_CHANNEL* channel = (VMBUS_CHANNEL*)Context;
+ struct vmbus_channel *channel = Context;
DPRINT_ENTER(VMBUS);
DPRINT_DBG(VMBUS, "releasing channel (%p)", channel);
- WorkQueueClose(channel->ControlWQ);
+ destroy_workqueue(channel->ControlWQ);
DPRINT_DBG(VMBUS, "channel released (%p)", channel);
kfree(channel);
Release the resources used by the vmbus channel object
--*/
-void FreeVmbusChannel(VMBUS_CHANNEL* Channel)
+void FreeVmbusChannel(struct vmbus_channel *Channel)
{
- TimerClose(Channel->PollTimer);
+ del_timer(&Channel->poll_timer);
/* We have to release the channel's workqueue/thread in the vmbus's workqueue/thread context */
/* ie we can't destroy ourselves. */
- WorkQueueQueueWorkItem(gVmbusConnection.WorkQueue, ReleaseVmbusChannel, (void*)Channel);
+ osd_schedule_callback(gVmbusConnection.WorkQueue, ReleaseVmbusChannel,
+ (void *)Channel);
}
)
{
int ret=0;
- VMBUS_CHANNEL* newChannel=(VMBUS_CHANNEL*)context;
+ struct vmbus_channel *newChannel = context;
+ struct vmbus_channel *channel;
LIST_ENTRY* anchor;
LIST_ENTRY* curr;
bool fNew = true;
- VMBUS_CHANNEL* channel;
unsigned long flags;
DPRINT_ENTER(VMBUS);
ITERATE_LIST_ENTRIES(anchor, curr, &gVmbusConnection.ChannelList)
{
- channel = CONTAINING_RECORD(curr, VMBUS_CHANNEL, ListEntry);
+ channel = CONTAINING_RECORD(curr, struct vmbus_channel, ListEntry);
- if (!memcmp(&channel->OfferMsg.Offer.InterfaceType, &newChannel->OfferMsg.Offer.InterfaceType,sizeof(GUID)) &&
- !memcmp(&channel->OfferMsg.Offer.InterfaceInstance, &newChannel->OfferMsg.Offer.InterfaceInstance, sizeof(GUID)))
+ if (!memcmp(&channel->OfferMsg.Offer.InterfaceType, &newChannel->OfferMsg.Offer.InterfaceType,sizeof(struct hv_guid)) &&
+ !memcmp(&channel->OfferMsg.Offer.InterfaceInstance, &newChannel->OfferMsg.Offer.InterfaceInstance, sizeof(struct hv_guid)))
{
fNew = false;
break;
/* Start the process of binding this offer to the driver */
/* We need to set the DeviceObject field before calling VmbusChildDeviceAdd() */
newChannel->DeviceObject = VmbusChildDeviceCreate(
- newChannel->OfferMsg.Offer.InterfaceType,
- newChannel->OfferMsg.Offer.InterfaceInstance,
+ &newChannel->OfferMsg.Offer.InterfaceType,
+ &newChannel->OfferMsg.Offer.InterfaceInstance,
newChannel);
DPRINT_DBG(VMBUS, "child device object allocated - %p", newChannel->DeviceObject);
void * context
)
{
- VMBUS_CHANNEL* channel=(VMBUS_CHANNEL*)context;
+ struct vmbus_channel *channel = context;
DPRINT_ENTER(VMBUS);
)
{
VMBUS_CHANNEL_OFFER_CHANNEL* offer = (VMBUS_CHANNEL_OFFER_CHANNEL*)hdr;
- VMBUS_CHANNEL* newChannel;
+ struct vmbus_channel *newChannel;
- GUID *guidType;
- GUID *guidInstance;
+ struct hv_guid *guidType;
+ struct hv_guid *guidInstance;
int i;
int fSupported=0;
for (i=0; i<MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++)
{
- if (memcmp(&offer->Offer.InterfaceType, &gSupportedDeviceClasses[i], sizeof(GUID)) == 0)
+ if (memcmp(&offer->Offer.InterfaceType, &gSupportedDeviceClasses[i], sizeof(struct hv_guid)) == 0)
{
fSupported = 1;
break;
offer->ChildRelId,
offer->MonitorId,
offer->MonitorAllocated,
- guidType->Data[3], guidType->Data[2], guidType->Data[1], guidType->Data[0], guidType->Data[5], guidType->Data[4], guidType->Data[7], guidType->Data[6], guidType->Data[8], guidType->Data[9], guidType->Data[10], guidType->Data[11], guidType->Data[12], guidType->Data[13], guidType->Data[14], guidType->Data[15],
- guidInstance->Data[3], guidInstance->Data[2], guidInstance->Data[1], guidInstance->Data[0], guidInstance->Data[5], guidInstance->Data[4], guidInstance->Data[7], guidInstance->Data[6], guidInstance->Data[8], guidInstance->Data[9], guidInstance->Data[10], guidInstance->Data[11], guidInstance->Data[12], guidInstance->Data[13], guidInstance->Data[14], guidInstance->Data[15]);
+ guidType->data[3], guidType->data[2], guidType->data[1], guidType->data[0],
+ guidType->data[5], guidType->data[4], guidType->data[7], guidType->data[6],
+ guidType->data[8], guidType->data[9], guidType->data[10], guidType->data[11],
+ guidType->data[12], guidType->data[13], guidType->data[14], guidType->data[15],
+ guidInstance->data[3], guidInstance->data[2], guidInstance->data[1], guidInstance->data[0],
+ guidInstance->data[5], guidInstance->data[4], guidInstance->data[7], guidInstance->data[6],
+ guidInstance->data[8], guidInstance->data[9], guidInstance->data[10], guidInstance->data[11],
+ guidInstance->data[12], guidInstance->data[13], guidInstance->data[14], guidInstance->data[15]);
/* Allocate the channel object and save this offer. */
newChannel = AllocVmbusChannel();
newChannel->MonitorBit = (u8)offer->MonitorId % 32;
/* TODO: Make sure the offer comes from our parent partition */
- WorkQueueQueueWorkItem(newChannel->ControlWQ, VmbusChannelProcessOffer, newChannel);
+ osd_schedule_callback(newChannel->ControlWQ, VmbusChannelProcessOffer,
+ newChannel);
DPRINT_EXIT(VMBUS);
}
)
{
VMBUS_CHANNEL_RESCIND_OFFER* rescind = (VMBUS_CHANNEL_RESCIND_OFFER*)hdr;
- VMBUS_CHANNEL* channel;
+ struct vmbus_channel *channel;
DPRINT_ENTER(VMBUS);
return;
}
- WorkQueueQueueWorkItem(channel->ControlWQ, VmbusChannelProcessRescindOffer, channel);
+ osd_schedule_callback(channel->ControlWQ,
+ VmbusChannelProcessRescindOffer,
+ channel);
DPRINT_EXIT(VMBUS);
}
VMBUS_CHANNEL_OPEN_RESULT* result = (VMBUS_CHANNEL_OPEN_RESULT*)hdr;
LIST_ENTRY* anchor;
LIST_ENTRY* curr;
- VMBUS_CHANNEL_MSGINFO* msgInfo;
+ struct vmbus_channel_msginfo *msgInfo;
VMBUS_CHANNEL_MESSAGE_HEADER* requestHeader;
VMBUS_CHANNEL_OPEN_CHANNEL* openMsg;
unsigned long flags;
ITERATE_LIST_ENTRIES(anchor, curr, &gVmbusConnection.ChannelMsgList)
{
- msgInfo = (VMBUS_CHANNEL_MSGINFO*) curr;
+ msgInfo = (struct vmbus_channel_msginfo *)curr;
requestHeader = (VMBUS_CHANNEL_MESSAGE_HEADER*)msgInfo->Msg;
if (requestHeader->MessageType == ChannelMessageOpenChannel)
openMsg->OpenId == result->OpenId)
{
memcpy(&msgInfo->Response.OpenResult, result, sizeof(VMBUS_CHANNEL_OPEN_RESULT));
- WaitEventSet(msgInfo->WaitEvent);
+ osd_WaitEventSet(msgInfo->WaitEvent);
break;
}
}
VMBUS_CHANNEL_GPADL_CREATED *gpadlCreated = (VMBUS_CHANNEL_GPADL_CREATED*)hdr;
LIST_ENTRY *anchor;
LIST_ENTRY *curr;
- VMBUS_CHANNEL_MSGINFO *msgInfo;
+ struct vmbus_channel_msginfo *msgInfo;
VMBUS_CHANNEL_MESSAGE_HEADER *requestHeader;
VMBUS_CHANNEL_GPADL_HEADER *gpadlHeader;
unsigned long flags;
ITERATE_LIST_ENTRIES(anchor, curr, &gVmbusConnection.ChannelMsgList)
{
- msgInfo = (VMBUS_CHANNEL_MSGINFO*) curr;
+ msgInfo = (struct vmbus_channel_msginfo *)curr;
requestHeader = (VMBUS_CHANNEL_MESSAGE_HEADER*)msgInfo->Msg;
if (requestHeader->MessageType == ChannelMessageGpadlHeader)
(gpadlCreated->Gpadl == gpadlHeader->Gpadl))
{
memcpy(&msgInfo->Response.GpadlCreated, gpadlCreated, sizeof(VMBUS_CHANNEL_GPADL_CREATED));
- WaitEventSet(msgInfo->WaitEvent);
+ osd_WaitEventSet(msgInfo->WaitEvent);
break;
}
}
VMBUS_CHANNEL_GPADL_TORNDOWN* gpadlTorndown = (VMBUS_CHANNEL_GPADL_TORNDOWN*)hdr;
LIST_ENTRY* anchor;
LIST_ENTRY* curr;
- VMBUS_CHANNEL_MSGINFO* msgInfo;
+ struct vmbus_channel_msginfo *msgInfo;
VMBUS_CHANNEL_MESSAGE_HEADER *requestHeader;
VMBUS_CHANNEL_GPADL_TEARDOWN *gpadlTeardown;
unsigned long flags;
ITERATE_LIST_ENTRIES(anchor, curr, &gVmbusConnection.ChannelMsgList)
{
- msgInfo = (VMBUS_CHANNEL_MSGINFO*) curr;
+ msgInfo = (struct vmbus_channel_msginfo *)curr;
requestHeader = (VMBUS_CHANNEL_MESSAGE_HEADER*)msgInfo->Msg;
if (requestHeader->MessageType == ChannelMessageGpadlTeardown)
if (gpadlTorndown->Gpadl == gpadlTeardown->Gpadl)
{
memcpy(&msgInfo->Response.GpadlTorndown, gpadlTorndown, sizeof(VMBUS_CHANNEL_GPADL_TORNDOWN));
- WaitEventSet(msgInfo->WaitEvent);
+ osd_WaitEventSet(msgInfo->WaitEvent);
break;
}
}
{
LIST_ENTRY* anchor;
LIST_ENTRY* curr;
- VMBUS_CHANNEL_MSGINFO *msgInfo;
+ struct vmbus_channel_msginfo *msgInfo;
VMBUS_CHANNEL_MESSAGE_HEADER *requestHeader;
VMBUS_CHANNEL_INITIATE_CONTACT *initiate;
VMBUS_CHANNEL_VERSION_RESPONSE *versionResponse = (VMBUS_CHANNEL_VERSION_RESPONSE*)hdr;
ITERATE_LIST_ENTRIES(anchor, curr, &gVmbusConnection.ChannelMsgList)
{
- msgInfo = (VMBUS_CHANNEL_MSGINFO*) curr;
+ msgInfo = (struct vmbus_channel_msginfo *)curr;
requestHeader = (VMBUS_CHANNEL_MESSAGE_HEADER*)msgInfo->Msg;
if (requestHeader->MessageType == ChannelMessageInitiateContact)
{
initiate = (VMBUS_CHANNEL_INITIATE_CONTACT*)requestHeader;
memcpy(&msgInfo->Response.VersionResponse, versionResponse, sizeof(VMBUS_CHANNEL_VERSION_RESPONSE));
- WaitEventSet(msgInfo->WaitEvent);
+ osd_WaitEventSet(msgInfo->WaitEvent);
}
}
spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
This is invoked in the vmbus worker thread context.
--*/
-void
-VmbusOnChannelMessage(
- void *Context
- )
+void VmbusOnChannelMessage(void *Context)
{
HV_MESSAGE *msg=(HV_MESSAGE*)Context;
VMBUS_CHANNEL_MESSAGE_HEADER* hdr;
Send a request to get all our pending offers.
--*/
-int
-VmbusChannelRequestOffers(
- void
- )
+int VmbusChannelRequestOffers(void)
{
int ret=0;
VMBUS_CHANNEL_MESSAGE_HEADER* msg;
- VMBUS_CHANNEL_MSGINFO* msgInfo;
+ struct vmbus_channel_msginfo *msgInfo;
DPRINT_ENTER(VMBUS);
- msgInfo = kmalloc(sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_MESSAGE_HEADER), GFP_KERNEL);
+ msgInfo = kmalloc(sizeof(*msgInfo) + sizeof(VMBUS_CHANNEL_MESSAGE_HEADER), GFP_KERNEL);
ASSERT(msgInfo != NULL);
- msgInfo->WaitEvent = WaitEventCreate();
+ msgInfo->WaitEvent = osd_WaitEventCreate();
msg = (VMBUS_CHANNEL_MESSAGE_HEADER*)msgInfo->Msg;
msg->MessageType = ChannelMessageRequestOffers;
goto Cleanup;
}
- /* WaitEventWait(msgInfo->waitEvent); */
+ /* osd_WaitEventWait(msgInfo->waitEvent); */
/*SpinlockAcquire(gVmbusConnection.channelMsgLock);
REMOVE_ENTRY_LIST(&msgInfo->msgListEntry);
Cleanup:
if (msgInfo)
{
- WaitEventClose(msgInfo->WaitEvent);
+ kfree(msgInfo->WaitEvent);
kfree(msgInfo);
}
Release channels that are unattached/unconnected ie (no drivers associated)
--*/
-void
-VmbusChannelReleaseUnattachedChannels(
- void
- )
+void VmbusChannelReleaseUnattachedChannels(void)
{
LIST_ENTRY *entry;
- VMBUS_CHANNEL *channel;
- VMBUS_CHANNEL *start=NULL;
+ struct vmbus_channel *channel;
+ struct vmbus_channel *start = NULL;
unsigned long flags;
spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
while (!IsListEmpty(&gVmbusConnection.ChannelList))
{
entry = TOP_LIST_ENTRY(&gVmbusConnection.ChannelList);
- channel = CONTAINING_RECORD(entry, VMBUS_CHANNEL, ListEntry);
+ channel = CONTAINING_RECORD(entry, struct vmbus_channel, ListEntry);
if (channel == start)
break;
projects / ~andy / linux / blobdiff