X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=529ce02d641960eed4f2e4c87b07e63b0c118d0a;hb=4af50228c3683df4d542ee79d5747ed51840ef0c;hp=899909f4bbbc67693d56343e67c5ad979c04bca4;hpb=d1ec82424844857c506e3022ff27aee90343f5ac;p=palacios-OLD.git diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c index 899909f..529ce02 100644 --- a/palacios/src/devices/lnx_virtio_nic.c +++ b/palacios/src/devices/lnx_virtio_nic.c @@ -29,6 +29,7 @@ #include #include #include +#include #ifndef CONFIG_DEBUG_VIRTIO_NET @@ -39,6 +40,7 @@ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10)) + struct virtio_net_hdr { uint8_t flags; @@ -62,13 +64,20 @@ struct virtio_net_hdr_mrg_rxbuf { #define TX_QUEUE_SIZE 64 #define RX_QUEUE_SIZE 1024 #define CTRL_QUEUE_SIZE 64 -#define ETH_ALEN 6 #define VIRTIO_NET_F_MRG_RXBUF 15 /* Host can merge receive buffers. */ #define VIRTIO_NET_F_MAC 5 /* Host has given MAC address. */ #define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */ #define VIRTIO_NET_F_HOST_TSO4 11 /* Host can handle TSOv4 in. */ +/* this is not how virtio supposed to be, + * we may need a separately implemented virtio_pci + * In order to make guest to get virtio MAC from host + * I added it here -- Lei + */ + #define VIRTIO_NET_CONFIG 20 + + struct virtio_net_config { uint8_t mac[ETH_ALEN]; /* VIRTIO_NET_F_MAC */ @@ -79,6 +88,8 @@ struct virtio_dev_state { struct vm_device * pci_bus; struct list_head dev_list; struct v3_vm_info *vm; + + uint8_t mac[ETH_ALEN]; }; struct virtio_net_state { @@ -96,7 +107,7 @@ struct virtio_net_state { int buffed_rx; int tx_disabled; /* stop TX pkts from guest */ - uint64_t pkt_sent, pkt_recv, pkt_drop; + struct nic_statistics statistics; struct v3_dev_net_ops * net_ops; v3_lock_t rx_lock, tx_lock; @@ -143,14 +154,13 @@ static int virtio_init_state(struct virtio_net_state * virtio) virtio->virtio_cfg.pci_isr = 0; - virtio->virtio_cfg.host_features = 0; // (1 << VIRTIO_NET_F_MAC); + virtio->virtio_cfg.host_features = 0 | (1 << VIRTIO_NET_F_MAC); if ((v3_lock_init(&(virtio->rx_lock)) == -1) || (v3_lock_init(&(virtio->tx_lock)) == -1)){ PrintError("Virtio NIC: Failure to init locks for net_state\n"); } - virtio->pkt_sent = virtio->pkt_recv = virtio->pkt_drop = 0; virtio->buffed_rx = 0; return 0; @@ -169,7 +179,16 @@ pkt_tx(struct guest_info * core, return -ERR_VIRTIO_OTHER; } - return virtio->net_ops->send(buf, len, virtio->backend_data); + if(virtio->net_ops->send(buf, len, virtio->backend_data) >= 0){ + virtio->statistics.tx_pkts ++; + virtio->statistics.tx_bytes += len; + + return 0; + } + + virtio->statistics.tx_dropped ++; + + return -1; } @@ -235,7 +254,7 @@ static int handle_rx_kick(struct guest_info *core, if(virtio->net_ops->start_rx != NULL){ virtio->net_ops->start_rx(virtio->backend_data); } - //disable_cb(&virtio->rx_vq); + //disable_cb(&virtio->rx_vq); v3_unlock_irqrestore(virtio->rx_lock, flags); @@ -297,8 +316,6 @@ static int handle_pkt_tx(struct guest_info *core, req_len += buf_desc->length; desc_idx = buf_desc->next; } - virtio_state->pkt_sent ++; - recved ++; 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 = req_len; // What do we set this to???? @@ -315,6 +332,8 @@ static int handle_pkt_tx(struct guest_info *core, if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, 0, virtio_state->pci_dev); virtio_state->virtio_cfg.pci_isr = 0x1; + + virtio_state->statistics.interrupts ++; } return 0; @@ -468,7 +487,7 @@ static int virtio_io_read(struct guest_info *core, int port_idx = port % virtio->io_range_size; uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector; - PrintDebug("Virtio NIC %p: Read for port %d (index =%d), length=%d\n", private_data, + PrintDebug("Virtio NIC %p: Read for port 0x%x (index =%d), length=%d\n", private_data, port, port_idx, length); switch (port_idx) { @@ -534,6 +553,10 @@ static int virtio_io_read(struct guest_info *core, v3_pci_lower_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev); break; + case VIRTIO_NET_CONFIG ... VIRTIO_NET_CONFIG + ETH_ALEN: + *(uint8_t *)dst = virtio->net_cfg.mac[port_idx-VIRTIO_NET_CONFIG]; + break; + default: PrintError("Virtio NIC: Read of Unhandled Virtio Read:%d\n", port_idx); return -1; @@ -563,7 +586,6 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { flags = v3_lock_irqsave(virtio->rx_lock); - virtio->pkt_recv ++; if (!raw) data_len -= hdr_len; @@ -624,8 +646,12 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { } virtio->buffed_rx = 0; } + + virtio->statistics.rx_pkts ++; + virtio->statistics.rx_bytes += size; } else { - virtio->pkt_drop++; + virtio->statistics.rx_dropped ++; + /* RX queue is full, tell backend to stop RX on this device */ virtio->net_ops->stop_rx(virtio->backend_data); enable_cb(&virtio->rx_vq); @@ -638,6 +664,8 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { 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); virtio->virtio_cfg.pci_isr = 0x1; + + virtio->statistics.interrupts ++; } ret_val = offset; @@ -649,9 +677,18 @@ exit: return ret_val; } -static int virtio_free(struct virtio_net_state * virtio) { - - // unregister from PCI +static int virtio_free(struct virtio_dev_state * virtio) { + struct virtio_net_state * backend = NULL; + struct virtio_net_state * tmp = NULL; + + + list_for_each_entry_safe(backend, tmp, &(virtio->dev_list), dev_link) { + + // unregister from PCI + + list_del(&(backend->dev_link)); + V3_Free(backend); + } V3_Free(virtio); return 0; @@ -763,13 +800,13 @@ static int register_dev(struct virtio_dev_state * virtio, net_state->pci_dev = pci_dev; net_state->virtio_dev = virtio; - uchar_t mac[6] = {0x11,0x11,0x11,0x11,0x11,0x11}; - memcpy(net_state->net_cfg.mac, mac, 6); - - memcpy(pci_dev->config_data, net_state->net_cfg.mac, ETH_ALEN); - + memcpy(net_state->net_cfg.mac, virtio->mac, 6); + virtio_init_state(net_state); + /* Add backend to list of devices */ + list_add(&(net_state->dev_link), &(virtio->dev_list)); + return 0; } @@ -794,6 +831,7 @@ static int connect_fn(struct v3_vm_info * info, ops->start_tx = virtio_start_tx; ops->stop_tx = virtio_stop_tx; ops->frontend_data = net_state; + memcpy(ops->fnt_mac, virtio->mac, ETH_ALEN); return 0; } @@ -802,8 +840,7 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus")); struct virtio_dev_state * virtio_state = NULL; char * dev_id = v3_cfg_val(cfg, "ID"); - - PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", dev_id); + char * macstr = v3_cfg_val(cfg, "mac"); if (pci_bus == NULL) { PrintError("Virtio NIC: VirtIO devices require a PCI Bus"); @@ -817,6 +854,13 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { virtio_state->pci_bus = pci_bus; virtio_state->vm = vm; + if (macstr != NULL && !str2mac(macstr, virtio_state->mac)) { + PrintDebug("Virtio NIC: Mac specified %s\n", macstr); + }else { + PrintDebug("Virtio NIC: MAC not specified\n"); + random_ethaddr(virtio_state->mac); + } + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state); if (dev == NULL) {