Page MenuHomeFreeBSD
Files F148339481

D7090.diff
No OneTemporary
Actions

D7090.diff
View Options

Index: head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
===================================================================
--- head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
+++ head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
@@ -47,10 +47,10 @@
static void vmbus_channel_on_offer(struct vmbus_softc *,
const struct vmbus_message *);
-static void vmbus_channel_on_offer_rescind(struct vmbus_softc *,
- const struct vmbus_message *);
static void vmbus_channel_on_offers_delivered(struct vmbus_softc *,
const struct vmbus_message *);
+static void vmbus_chan_msgproc_chrescind(struct vmbus_softc *,
+ const struct vmbus_message *);
/**
* Channel message dispatch table
@@ -60,7 +60,7 @@
[HV_CHANNEL_MESSAGE_OFFER_CHANNEL] =
vmbus_channel_on_offer,
[HV_CHANNEL_MESSAGE_RESCIND_CHANNEL_OFFER] =
- vmbus_channel_on_offer_rescind,
+ vmbus_chan_msgproc_chrescind,
[HV_CHANNEL_MESSAGE_ALL_OFFERS_DELIVERED] =
vmbus_channel_on_offers_delivered,
[HV_CHANNEL_MESSAGE_OPEN_CHANNEL_RESULT] =
@@ -326,33 +326,34 @@
vmbus_channel_process_offer(new_channel);
}
-/**
- * @brief Rescind offer handler.
- *
- * We queue a work item to process this offer
- * synchronously.
- *
+/*
* XXX pretty broken; need rework.
*/
static void
-vmbus_channel_on_offer_rescind(struct vmbus_softc *sc,
+vmbus_chan_msgproc_chrescind(struct vmbus_softc *sc,
const struct vmbus_message *msg)
{
- const hv_vmbus_channel_rescind_offer *rescind;
- hv_vmbus_channel* channel;
+ const struct vmbus_chanmsg_chrescind *note;
+ struct hv_vmbus_channel *chan;
+
+ note = (const struct vmbus_chanmsg_chrescind *)msg->msg_data;
+ if (note->chm_chanid > VMBUS_CHAN_MAX) {
+ device_printf(sc->vmbus_dev, "invalid rescinded chan%u\n",
+ note->chm_chanid);
+ return;
+ }
- rescind = (const hv_vmbus_channel_rescind_offer *)msg->msg_data;
if (bootverbose) {
- device_printf(sc->vmbus_dev, "chan%u rescind\n",
- rescind->child_rel_id);
+ device_printf(sc->vmbus_dev, "chan%u rescinded\n",
+ note->chm_chanid);
}
- channel = sc->vmbus_chmap[rescind->child_rel_id];
- if (channel == NULL)
- return;
- sc->vmbus_chmap[rescind->child_rel_id] = NULL;
+ chan = sc->vmbus_chmap[note->chm_chanid];
+ if (chan == NULL)
+ return;
+ sc->vmbus_chmap[note->chm_chanid] = NULL;
- taskqueue_enqueue(taskqueue_thread, &channel->ch_detach_task);
+ taskqueue_enqueue(taskqueue_thread, &chan->ch_detach_task);
}
static void
Index: head/sys/dev/hyperv/vmbus/vmbus_reg.h
===================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_reg.h
+++ head/sys/dev/hyperv/vmbus/vmbus_reg.h
@@ -117,10 +117,11 @@
/*
* Channel messages
- * - Embedded in vmbus_message.msg_data, e.g. response.
+ * - Embedded in vmbus_message.msg_data, e.g. response and notification.
* - Embedded in hypercall_postmsg_in.hc_data, e.g. request.
*/
+#define VMBUS_CHANMSG_TYPE_CHRESCIND 2 /* NOTE */
#define VMBUS_CHANMSG_TYPE_CHREQUEST 3 /* REQ */
#define VMBUS_CHANMSG_TYPE_CHOPEN 5 /* REQ */
#define VMBUS_CHANMSG_TYPE_CHOPEN_RESP 6 /* RESP */
@@ -241,4 +242,10 @@
uint32_t chm_chanid;
} __packed;
+/* VMBUS_CHANMSG_TYPE_CHRESCIND */
+struct vmbus_chanmsg_chrescind {
+ struct vmbus_chanmsg_hdr chm_hdr;
+ uint32_t chm_chanid;
+} __packed;
+
#endif /* !_VMBUS_REG_H_ */

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 6:03 AM (5 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29863941
Default Alt Text
D7090.diff (3 KB)

Event Timeline