d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyperv/vmbus: Busdma-fy channel bufring.

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft OSTC
Differential Revision:	https://reviews.freebsd.org/D7140
This commit is contained in:
Sepherosa Ziehau 2016-07-15 05:51:58 +00:00
parent 9ab42c2138
commit 29bf5462b5
2 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/hyperv/include/hyperv.h
View File

@ -257,13 +257,6 @@ typedef struct hv_vmbus_channel {
int ch_montrig_idx; /* MNF trig index */
uint32_t ch_montrig_mask;/* MNF trig mask */
uint32_t ring_buffer_gpadl_handle;
/*
* Allocated memory for ring buffer
*/
void* ring_buffer_pages;
unsigned long ring_buffer_size;
uint32_t ring_buffer_page_count;
/*
* send to parent
*/
@ -312,6 +305,10 @@ typedef struct hv_vmbus_channel {
void *hv_chan_priv2;
void *hv_chan_priv3;
void *ch_bufring; /* TX+RX bufrings */
struct hyperv_dma ch_bufring_dma;
uint32_t ch_bufring_gpadl;
struct task ch_detach_task;
TAILQ_ENTRY(hv_vmbus_channel) ch_prilink; /* primary chan link */
uint32_t ch_subidx; /* subchan index */

88
sys/dev/hyperv/vmbus/hv_channel.c
View File

@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <dev/hyperv/include/hyperv_busdma.h>
#include <dev/hyperv/vmbus/hv_vmbus_priv.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
#include <dev/hyperv/vmbus/vmbus_reg.h>
@ -202,7 +203,7 @@ hv_vmbus_channel_open(
struct vmbus_msghc *mh;
uint32_t status;
int ret = 0;
void *in, *out;
uint8_t *br;
if (user_data_len > VMBUS_CHANMSG_CHOPEN_UDATA_SIZE) {
device_printf(sc->vmbus_dev,
@ -210,6 +211,10 @@ hv_vmbus_channel_open(
user_data_len, new_channel->ch_id);
return EINVAL;
}
KASSERT((send_ring_buffer_size & PAGE_MASK) == 0,
("send bufring size is not multiple page"));
KASSERT((recv_ring_buffer_size & PAGE_MASK) == 0,
("recv bufring size is not multiple page"));
if (atomic_testandset_int(&new_channel->ch_stflags,
VMBUS_CHAN_ST_OPENED_SHIFT))
@ -230,46 +235,43 @@ hv_vmbus_channel_open(
vmbus_chan_task_nobatch, new_channel);
}
/* Allocate the ring buffer */
out = contigmalloc((send_ring_buffer_size + recv_ring_buffer_size),
M_DEVBUF, M_ZERO, 0UL, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
KASSERT(out != NULL,
("Error VMBUS: contigmalloc failed to allocate Ring Buffer!"));
if (out == NULL) {
/*
* Allocate the TX+RX bufrings.
* XXX should use ch_dev dtag
*/
br = hyperv_dmamem_alloc(bus_get_dma_tag(sc->vmbus_dev),
PAGE_SIZE, 0, send_ring_buffer_size + recv_ring_buffer_size,
&new_channel->ch_bufring_dma, BUS_DMA_WAITOK | BUS_DMA_ZERO);
if (br == NULL) {
device_printf(sc->vmbus_dev, "bufring allocation failed\n");
ret = ENOMEM;
goto failed;
}
new_channel->ch_bufring = br;
in = ((uint8_t *) out + send_ring_buffer_size);
new_channel->ring_buffer_pages = out;
new_channel->ring_buffer_page_count = (send_ring_buffer_size +
recv_ring_buffer_size) >> PAGE_SHIFT;
new_channel->ring_buffer_size = send_ring_buffer_size +
recv_ring_buffer_size;
hv_vmbus_ring_buffer_init(
&new_channel->outbound,
out,
send_ring_buffer_size);
hv_vmbus_ring_buffer_init(
&new_channel->inbound,
in,
recv_ring_buffer_size);
/* TX bufring comes first */
hv_vmbus_ring_buffer_init(&new_channel->outbound,
br, send_ring_buffer_size);
/* RX bufring immediately follows TX bufring */
hv_vmbus_ring_buffer_init(&new_channel->inbound,
br + send_ring_buffer_size, recv_ring_buffer_size);
/* Create sysctl tree for this channel */
vmbus_channel_sysctl_create(new_channel);
/**
* Establish the gpadl for the ring buffer
/*
* Connect the bufrings, both RX and TX, to this channel.
*/
new_channel->ring_buffer_gpadl_handle = 0;
ret = hv_vmbus_channel_establish_gpadl(new_channel,
new_channel->outbound.ring_buffer,
ret = vmbus_chan_gpadl_connect(new_channel,
new_channel->ch_bufring_dma.hv_paddr,
send_ring_buffer_size + recv_ring_buffer_size,
&new_channel->ring_buffer_gpadl_handle);
&new_channel->ch_bufring_gpadl);
if (ret != 0) {
device_printf(sc->vmbus_dev,
"failed to connect bufring GPADL to chan%u\n",
new_channel->ch_id);
goto failed;
}
/*
* Open channel w/ the bufring GPADL on the target CPU.
@ -287,7 +289,7 @@ hv_vmbus_channel_open(
req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHOPEN;
req->chm_chanid = new_channel->ch_id;
req->chm_openid = new_channel->ch_id;
req->chm_gpadl = new_channel->ring_buffer_gpadl_handle;
req->chm_gpadl = new_channel->ch_bufring_gpadl;
req->chm_vcpuid = new_channel->target_vcpu;
req->chm_rxbr_pgofs = send_ring_buffer_size >> PAGE_SHIFT;
if (user_data_len)
@ -321,6 +323,16 @@ hv_vmbus_channel_open(
ret = ENXIO;
failed:
if (new_channel->ch_bufring_gpadl) {
hv_vmbus_channel_teardown_gpdal(new_channel,
new_channel->ch_bufring_gpadl);
new_channel->ch_bufring_gpadl = 0;
}
if (new_channel->ch_bufring != NULL) {
hyperv_dmamem_free(&new_channel->ch_bufring_dma,
new_channel->ch_bufring);
new_channel->ch_bufring = NULL;
}
atomic_clear_int(&new_channel->ch_stflags, VMBUS_CHAN_ST_OPENED);
return ret;
}
@ -554,9 +566,10 @@ hv_vmbus_channel_close_internal(hv_vmbus_channel *channel)
}
/* Tear down the gpadl for the channel's ring buffer */
if (channel->ring_buffer_gpadl_handle) {
if (channel->ch_bufring_gpadl) {
hv_vmbus_channel_teardown_gpdal(channel,
channel->ring_buffer_gpadl_handle);
channel->ch_bufring_gpadl);
channel->ch_bufring_gpadl = 0;
}
/* TODO: Send a msg to release the childRelId */
@ -565,8 +578,11 @@ hv_vmbus_channel_close_internal(hv_vmbus_channel *channel)
hv_ring_buffer_cleanup(&channel->outbound);
hv_ring_buffer_cleanup(&channel->inbound);
contigfree(channel->ring_buffer_pages, channel->ring_buffer_size,
M_DEVBUF);
if (channel->ch_bufring != NULL) {
hyperv_dmamem_free(&channel->ch_bufring_dma,
channel->ch_bufring);
channel->ch_bufring = NULL;
}
}
/*