From eb23bc01db6c270fbe2d9cdadd84917c09b41a83 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Sat, 1 Dec 2012 06:46:48 -0800 Subject: [PATCH] --- yaml --- r: 354991 b: refs/heads/master c: abbf3b2aa090b4a6bf22c935924b6467990266da h: refs/heads/master i: 354989: 2ceb2232c166e938346daa272316cca445e509a3 354987: 4d98c78466b4da2f5e4b7cd3076cc1f44571a079 354983: bf98116766ee2780b1f19f2c387cc9dc41571e9f 354975: 7095a53d320f8b409bc8f6a844d97bebfe0f7ca3 v: v3 --- [refs] | 2 +- trunk/drivers/hv/channel.c | 2 +- trunk/drivers/hv/channel_mgmt.c | 2 ++ trunk/include/linux/hyperv.h | 21 +++++++++++++++++++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9ec92dd19749..3f82f8f0857f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 917ea427c78670958488f7f304e4629c325969a4 +refs/heads/master: abbf3b2aa090b4a6bf22c935924b6467990266da diff --git a/trunk/drivers/hv/channel.c b/trunk/drivers/hv/channel.c index 70a34daa04c1..9303252b2e19 100644 --- a/trunk/drivers/hv/channel.c +++ b/trunk/drivers/hv/channel.c @@ -181,7 +181,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, open_msg->ringbuffer_gpadlhandle = newchannel->ringbuffer_gpadlhandle; open_msg->downstream_ringbuffer_pageoffset = send_ringbuffer_size >> PAGE_SHIFT; - open_msg->server_contextarea_gpadlhandle = 0; + open_msg->target_vp = newchannel->target_vp; if (userdatalen > MAX_USER_DEFINED_BYTES) { err = -EINVAL; diff --git a/trunk/drivers/hv/channel_mgmt.c b/trunk/drivers/hv/channel_mgmt.c index f4d990285d99..56ed45c74d01 100644 --- a/trunk/drivers/hv/channel_mgmt.c +++ b/trunk/drivers/hv/channel_mgmt.c @@ -302,6 +302,8 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr) offer->connection_id; } + newchannel->target_vp = 0; + memcpy(&newchannel->offermsg, offer, sizeof(struct vmbus_channel_offer_channel)); newchannel->monitor_grp = (u8)offer->monitorid / 32; diff --git a/trunk/include/linux/hyperv.h b/trunk/include/linux/hyperv.h index c6e2c44a1be9..8c3cb1fc34d4 100644 --- a/trunk/include/linux/hyperv.h +++ b/trunk/include/linux/hyperv.h @@ -732,8 +732,15 @@ struct vmbus_channel_open_channel { /* GPADL for the channel's ring buffer. */ u32 ringbuffer_gpadlhandle; - /* GPADL for the channel's server context save area. */ - u32 server_contextarea_gpadlhandle; + /* + * Starting with win8, this field will be used to specify + * the target virtual processor on which to deliver the interrupt for + * the host to guest communication. + * Prior to win8, incoming channel interrupts would only + * be delivered on cpu 0. Setting this value to 0 would + * preserve the earlier behavior. + */ + u32 target_vp; /* * The upstream ring buffer begins at offset zero in the memory @@ -971,6 +978,16 @@ struct vmbus_channel { bool is_dedicated_interrupt; struct hv_input_signal_event_buffer sig_buf; struct hv_input_signal_event *sig_event; + + /* + * Starting with win8, this field will be used to specify + * the target virtual processor on which to deliver the interrupt for + * the host to guest communication. + * Prior to win8, incoming channel interrupts would only + * be delivered on cpu 0. Setting this value to 0 would + * preserve the earlier behavior. + */ + u32 target_vp; }; static inline void set_channel_read_state(struct vmbus_channel *c, bool state)