upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hyperv/vmbus: Add flags field into hv_vmbus_channel for MNF indication

Browse source 
This prepares to remove the unnecessary offer message embedding in
hv_vmbus_channel.

MFC after:	1 week
Sponsored by:	Microsoft OSTC
Differential Revision:	https://reviews.freebsd.org/D7019
This commit is contained in:
Sepherosa Ziehau 2016-07-13 04:31:08 +00:00
parent 4ac0a9bf1e
commit d74e22ed4a
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/dev/hyperv/include/hyperv.h
View file

@ -538,6 +538,7 @@ typedef struct hv_vmbus_channel {
struct vmbus_softc *vmbus_sc;
hv_vmbus_channel_state state;
hv_vmbus_channel_offer_channel offer_msg;
uint32_t ch_flags; /* VMBUS_CHAN_FLAG_ */
uint32_t ch_id; /* channel id */
/*
* These are based on the offer_msg.monitor_id.
@ -636,6 +637,8 @@ typedef struct hv_vmbus_channel {
#define HV_VMBUS_CHAN_ISPRIMARY(chan) ((chan)->primary_channel == NULL)
#define VMBUS_CHAN_FLAG_HASMNF 0x0001
static inline void
hv_set_channel_read_state(hv_vmbus_channel* channel, boolean_t state)
{

4
sys/dev/hyperv/vmbus/hv_channel.c
View file

@ -67,7 +67,7 @@ vmbus_channel_set_event(hv_vmbus_channel *channel)
atomic_set_long(&sc->vmbus_tx_evtflags[chanid >> VMBUS_EVTFLAG_SHIFT],
1UL << (chanid & VMBUS_EVTFLAG_MASK));
if (channel->offer_msg.monitor_allocated) {
if (channel->ch_flags & VMBUS_CHAN_FLAG_HASMNF) {
hv_vmbus_monitor_page *monitor_page;
monitor_page = sc->vmbus_mnf2;
@ -86,7 +86,7 @@ vmbus_channel_sysctl_monalloc(SYSCTL_HANDLER_ARGS)
struct hv_vmbus_channel *chan = arg1;
int alloc = 0;
if (chan->offer_msg.monitor_allocated)
if (chan->ch_flags & VMBUS_CHAN_FLAG_HASMNF)
alloc = 1;
return sysctl_handle_int(oidp, &alloc, 0, req);
}

2
sys/dev/hyperv/vmbus/hv_channel_mgmt.c
View file

@ -294,6 +294,8 @@ vmbus_channel_on_offer_internal(struct vmbus_softc *sc,
new_channel = hv_vmbus_allocate_channel(sc);
new_channel->ch_id = offer->child_rel_id;
new_channel->ch_subidx = offer->offer.sub_channel_index;
if (offer->monitor_allocated)
new_channel->ch_flags |= VMBUS_CHAN_FLAG_HASMNF;
/*
* By default we setup state to enable batched