X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=ea998af582ad40afc75ba39beadef620d33b7b86;hp=f68d3df88456ce27a6046af309d04dffdb92a83a;hb=abccb1c104baffd2bfd901cf8b3ed48b44615dd4;hpb=d287b841e1a6f753fe57a01a5e11b8a069844b2a diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c index f68d3df..ea998af 100644 --- a/palacios/src/devices/lnx_virtio_nic.c +++ b/palacios/src/devices/lnx_virtio_nic.c @@ -7,13 +7,13 @@ * and the University of New Mexico. You can find out more at * http://www.v3vee.org * - * Copyright (c) 2008, Jack Lange * Copyright (c) 2008, Lei Xia + * Copyright (c) 2008, Cui Zheng * Copyright (c) 2008, The V3VEE Project * All rights reserved. * - * Author: Jack Lange - * Lei Xia + * Author: Lei Xia + * Cui Zheng * * * This is free software. You are permitted to use, @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -34,6 +35,8 @@ #define PrintDebug(fmt, args...) #endif +//#define VIRTIO_NIC_PROFILE + /* The feature bitmap for virtio net */ #define VIRTIO_NET_F_CSUM 0 /* Host handles pkts w/ partial csum */ #define VIRTIO_NET_F_GUEST_CSUM 1 /* Guest handles pkts w/ partial csum */ @@ -71,7 +74,7 @@ struct virtio_net_hdr { }__attribute__((packed)); -#define QUEUE_SIZE 256 +#define QUEUE_SIZE 4096 #define CTRL_QUEUE_SIZE 64 #define ETH_ALEN 6 @@ -103,15 +106,23 @@ struct virtio_net_state { void * backend_data; struct virtio_dev_state * virtio_dev; struct list_head dev_link; + + ulong_t pkt_sent, pkt_recv, pkt_drop; }; -#if 1 -//Temporarly for debug + +#ifdef CONFIG_DEBUG_VIRTIO_NET + static void print_packet(uchar_t *pkt, int size) { - PrintDebug("Vnet: print_data_packet: size: %d\n", size); + PrintDebug("Virtio Nic: print_data_packet: size: %d\n", size); v3_hexdump(pkt, size, NULL, 0); } +#endif + +#if 0 +//Temporarly for debug + static struct virtio_net_state *temp_net_states[3]; static int net_idx = 0; @@ -119,12 +130,20 @@ static int __virtio_dev_send(uchar_t * buf, uint32_t size, void *private_data); static int send(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev) { - PrintDebug("Virito NIC: In sending stub, guest %p\n", private_data); - print_packet(buf, count); + PrintDebug("Virito NIC: In sending stub, guest %p, count %d\n", private_data, count); + +#ifdef CONFIG_DEBUG_VIRTIO_NET + print_packet(buf, 20); +#endif + struct virtio_net_state *virtio_state = (struct virtio_net_state *)private_data; if (virtio_state == temp_net_states[0]) - __virtio_dev_send(buf, count, temp_net_states[1]); + __virtio_dev_send(buf, count, temp_net_states[1]); + + if (virtio_state == temp_net_states[1]){ //return a RARP packet + __virtio_dev_send(buf, count, temp_net_states[0]); + } return count; } @@ -179,7 +198,7 @@ static int pkt_write(struct virtio_net_state * virtio, struct vring_desc * buf_d uint8_t * buf = NULL; uint32_t len = buf_desc->length; - PrintDebug("Handling Virtio Net write, net_state: %p\n", virtio); + PrintDebug("Virtio NIC: Handling Virtio Write, net_state: %p\n", virtio); if (guest_pa_to_host_va(virtio->virtio_dev->vm, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { PrintError("Could not translate buffer address\n"); @@ -187,8 +206,8 @@ static int pkt_write(struct virtio_net_state * virtio, struct vring_desc * buf_d } PrintDebug("Length=%d\n", buf_desc->length); - PrintDebug("Buffer Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d, buf address: %p, send address: %p\n", buf_desc, - (void *)(buf_desc->addr_gpa), buf_desc->length, buf_desc->flags, buf_desc->next, buf, virtio->net_ops->send); + //PrintDebug("Buffer Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d, buf address: %p, send address: %p\n", buf_desc, + //(void *)(buf_desc->addr_gpa), buf_desc->length, buf_desc->flags, buf_desc->next, buf, virtio->net_ops->send); if (virtio->net_ops->send(buf, len, (void *)virtio, NULL) == -1) { return -1; @@ -223,11 +242,8 @@ static int copy_data_to_desc(struct virtio_net_state * virtio_state, struct vrin } len = (desc->length < buf_len)?desc->length:buf_len; - memcpy(desc_buf, buf, len); - PrintDebug("Length=%d\n", len); - return len; } @@ -240,14 +256,13 @@ static int send_pkt_to_guest(struct virtio_net_state * virtio, uchar_t * buf, ui uint32_t hdr_len = sizeof(struct virtio_net_hdr); uint32_t data_len = size; uint32_t offset = 0; + + PrintDebug("VIRTIO NIC: sending packet to virtio nic %p, size:%d", virtio, size); - PrintDebug("VIRTIO NIC: Handle RX: cur_index=%d (mod=%d), avail_index=%d\n", - q->cur_avail_idx, q->cur_avail_idx % q->queue_size, q->avail->index); - - PrintDebug("VIRTIO NIC: sending packet to net_state %p, size:%d", virtio, size); - + virtio->pkt_recv ++; + if (!raw) { - data_len -= hdr_len; + data_len -= hdr_len; } build_receive_header(&hdr, buf, 1); @@ -258,48 +273,66 @@ static int send_pkt_to_guest(struct virtio_net_state * virtio, uchar_t * buf, ui return -1; } - - if (q->cur_avail_idx < q->avail->index) { + if (q->last_avail_idx > q->avail->index) + q->idx_overflow = true; + q->last_avail_idx = q->avail->index; + + if (q->cur_avail_idx < q->avail->index || (q->idx_overflow && q->cur_avail_idx < q->avail->index+65536)){ addr_t hdr_addr = 0; uint16_t hdr_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; uint16_t buf_idx = 0; struct vring_desc * hdr_desc = NULL; - PrintDebug("Descriptor index=%d\n", q->cur_avail_idx % q->queue_size); - hdr_desc = &(q->desc[hdr_idx]); - - PrintDebug("Header Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", hdr_desc, - (void *)(hdr_desc->addr_gpa), hdr_desc->length, hdr_desc->flags, hdr_desc->next); - if (guest_pa_to_host_va(virtio->virtio_dev->vm, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { PrintError("Could not translate receive buffer address\n"); return -1; } - //copy header to the header descriptor memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr)); - //copy data to the next descriptors - for (buf_idx = 0; offset < data_len; buf_idx = q->desc[hdr_idx].next) { + if (offset >= data_len) { + hdr_desc->flags &= ~VIRTIO_NEXT_FLAG; + } + + for (buf_idx = hdr_desc->next; offset < data_len; buf_idx = q->desc[hdr_idx].next) { struct vring_desc * buf_desc = &(q->desc[buf_idx]); uint32_t len = 0; - buf_desc->flags = VIRTIO_NEXT_FLAG; - len = copy_data_to_desc(virtio, buf_desc, buf + offset, data_len - offset); offset += len; + + if (offset < data_len) { + buf_desc->flags = VIRTIO_NEXT_FLAG; + } + buf_desc->length = len; // TODO: do we need this? } q->used->ring[q->used->index % q->queue_size].id = q->avail->ring[q->cur_avail_idx % q->queue_size]; - q->used->ring[q->used->index % q->queue_size].length = data_len; // What do we set this to???? + q->used->ring[q->used->index % q->queue_size].length = data_len + hdr_len; // This should be the total length of data sent to guest (header+pkt_data) q->used->index++; + + int last_idx = q->cur_avail_idx; q->cur_avail_idx++; + if (q->cur_avail_idx < last_idx) + q->idx_overflow = false; + } else { + virtio->pkt_drop++; + +#ifdef VIRTIO_NIC_PROFILE + PrintError("Virtio NIC: %p, one pkt dropped receieved: %ld, dropped: %ld, sent: %ld curidx: %d, avaiIdx: %d\n", virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent, q->cur_avail_idx, q->avail->index); +#endif } +#ifdef VIRTIO_NIC_PROFILE + if ((virtio->pkt_recv % 10000) == 0){ + PrintError("Virtio NIC: %p, receieved: %ld, dropped: %ld, sent: %ld curidx: %d, avaiIdx: %d\n", virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent, q->cur_avail_idx, q->avail->index); + } +#endif + if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { PrintDebug("Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line); v3_pci_raise_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev); @@ -348,15 +381,21 @@ static int handle_ctrl(struct virtio_net_state * dev) { //get packet from guest static int handle_pkt_tx(struct virtio_net_state * virtio_state) { - //struct virtio_net_state *virtio = (struct virtio_net_state *)dev->private_data; struct virtio_queue * q = &(virtio_state->tx_vq); + struct virtio_net_hdr * hdr = NULL; - PrintDebug("VIRTIO NIC pkt_tx: cur_index=%d (mod=%d), avail_index=%d\n", - q->cur_avail_idx, q->cur_avail_idx % q->queue_size, q->avail->index); + virtio_state->pkt_sent ++; - struct virtio_net_hdr * hdr = NULL; + if (q->avail->index < q->last_avail_idx) + q->idx_overflow = true; + q->last_avail_idx = q->avail->index; + +#ifdef VIRTIO_NIC_PROFILE + if(virtio_state->pkt_sent % 10000 == 0) + PrintError("Virtio NIC: %p, pkt_sent: %ld curidx: %d, avaiIdx: %d\n", virtio_state, virtio_state->pkt_sent, q->cur_avail_idx, q->avail->index); +#endif - while (q->cur_avail_idx < q->avail->index) { + while (q->cur_avail_idx < q->avail->index ||(q->idx_overflow && q->cur_avail_idx < (q->avail->index + 65536))) { struct vring_desc * hdr_desc = NULL; addr_t hdr_addr = 0; uint16_t desc_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; @@ -364,31 +403,17 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) uint32_t req_len = 0; int i = 0; - PrintDebug("Descriptor Count=%d, index=%d\n", desc_cnt, q->cur_avail_idx % q->queue_size); - hdr_desc = &(q->desc[desc_idx]); - - PrintDebug("Header Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", hdr_desc, - (void *)(hdr_desc->addr_gpa), hdr_desc->length, hdr_desc->flags, hdr_desc->next); - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { PrintError("Could not translate block header address\n"); return -1; } - //memcpy(&hdr, (void *)hdr_addr, sizeof(struct virtio_net_hdr)); hdr = (struct virtio_net_hdr*)hdr_addr; - - PrintDebug("NIC Op Hdr (ptr=%p) header len =%x\n", (void *)hdr_addr, (int)hdr->hdr_len); - desc_idx = hdr_desc->next; for (i = 0; i < desc_cnt - 1; i++) { struct vring_desc * buf_desc = &(q->desc[desc_idx]); - - PrintDebug("Buffer Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", buf_desc, - (void *)(buf_desc->addr_gpa), buf_desc->length, buf_desc->flags, buf_desc->next); - if (pkt_write(virtio_state, buf_desc) == -1) { PrintError("Error handling nic operation\n"); return -1; @@ -402,11 +427,14 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) q->used->ring[q->used->index % q->queue_size].length = req_len; // What do we set this to???? q->used->index++; - q->cur_avail_idx++; + + int last_idx = q->cur_avail_idx; + q->cur_avail_idx ++; + if (q->cur_avail_idx < last_idx) + q->idx_overflow = false; } if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - PrintDebug("Raising IRQ %d\n", virtio_state->pci_dev->config_header.intr_line); v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, 0, virtio_state->pci_dev); virtio_state->virtio_cfg.pci_isr = 0x1; } @@ -520,10 +548,10 @@ static int virtio_io_write(uint16_t port, void * src, uint_t length, void * priv { uint16_t queue_idx = *(uint16_t *)src; - PrintDebug("Handling Kick\n"); + //PrintDebug("Handling Kick\n"); if (queue_idx == 0){ - PrintError("receive queue notification\n"); + PrintDebug("receive queue notification 0, packet get by Guest\n"); } else if (queue_idx == 1){ if (handle_pkt_tx(virtio) == -1) { PrintError("Could not handle NIC Notification\n"); @@ -745,6 +773,7 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_stat net_state->ctrl_vq.queue_size = CTRL_QUEUE_SIZE; net_state->virtio_dev = virtio; + net_state->pkt_sent = net_state->pkt_recv = net_state->pkt_drop = 0; virtio_reset(net_state); @@ -771,6 +800,78 @@ static int connect_fn(struct guest_info * info, return 0; } +#if 1 +//temporary interface between Virtio-NIC and Vnet +//Treat vnet as backend, and virtio nic as frontend + +//used when virtio_nic get a packet from guest and send it to the backend +// send packet to all of the virtio nic devices other than the sender +static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){ + + PrintDebug("Virito NIC: In vnet_send: guest net state %p\n", private_data); + +#ifdef CONFIG_DEBUG_VIRTIO_NET + print_packet(buf, len); +#endif + + v3_vnet_send_rawpkt(buf, len, private_data); + return 0; +} + +//used to send packet to guest by a virtio nic +static int vnet_receive(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *src_dev){ + + return 0; +} + +static int virtio_input(uchar_t * buf, uint_t len, void * private_data){ + PrintDebug("Virito NIC: In virtio_input: guest net state %p\n", private_data); + +#ifdef CONFIG_DEBUG_VIRTIO_NET + print_packet(buf, len); +#endif + + return __virtio_dev_send(buf, len, private_data); +} + + +//register a virtio device to the vnet as backend +void register_virtio_to_vnet(struct vm_device *dev, + char *dev_name, + uchar_t mac[6]){ + struct virtio_net_state * net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state)); + memset(net_state, 0, sizeof(struct virtio_net_state)); + + struct virtio_dev_state *virtio_state = (struct virtio_dev_state *)dev->private_data; + + net_state->net_ops = (struct v3_dev_net_ops *)V3_Malloc(sizeof(struct v3_dev_net_ops)); + + net_state->net_ops->send = &vnet_send; + net_state->net_ops->receive = &vnet_receive; + + register_dev(virtio_state, net_state); + + PrintDebug("Virtio NIC After register Device %s: queue size: %d, %d\n", dev->name, + net_state->rx_vq.queue_size, net_state->tx_vq.queue_size); + + PrintDebug("VNET: connect virtio nic state %p to vnet\n", net_state); + + //add a device link to link table + int idx = vnet_register_device(dev, dev_name, mac, &virtio_input, net_state); + + uchar_t srcmac[6] = {0x00,0x02,0x55,0x67,0x42,0x39}; + uchar_t dstmac[6] = {0xff,0xff,0xff,0xff,0xff,0xff}; + uchar_t zeromac[6] = {0,0,0,0,0,0}; + + vnet_add_route_entry(zeromac, dstmac, MAC_ANY, MAC_NONE, idx, LINK_INTERFACE, -1, LINK_INTERFACE); + if (idx == 0) + vnet_add_route_entry(zeromac, srcmac, MAC_ANY, MAC_NONE, idx, LINK_INTERFACE, -1, LINK_INTERFACE); + if (idx == 1) + vnet_add_route_entry(srcmac, zeromac, MAC_NONE, MAC_ANY, idx, LINK_INTERFACE, -1, LINK_INTERFACE); + +} + +#endif static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus")); @@ -804,8 +905,8 @@ static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { //for temporary testing, add a backend - #if 1 - +#if 0 + struct virtio_net_state * net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state)); memset(net_state, 0, sizeof(struct virtio_net_state)); @@ -822,9 +923,16 @@ static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { temp_net_states[net_idx ++] = net_state; PrintDebug("Net_states: 0: %p, 1: %p, 2: %p\n", temp_net_states[0], temp_net_states[1], temp_net_states[2]); - - #endif +#endif + +#if 1 //test interface between vnet & virtio-nic + + uchar_t mac[6] = {0,0,0,0,0,0}; + register_virtio_to_vnet(dev, name,mac); + +#endif + return 0; }