Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Updated devices to remove vm_device dependencies.
[palacios.git] / palacios / src / devices / vnet_nic.c
index ffe99df..fb91984 100644 (file)
@@ -7,8 +7,8 @@
  * and the University of New Mexico.  You can find out more at 
  * http://www.v3vee.org
  *
- * Copyright (c) 2008, Lei Xia <lxia@northwestern.edu>
- * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu>
+ * Copyright (c) 2010, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
  *
  * Author: Lei Xia <lxia@northwestern.edu>
@@ -25,7 +25,7 @@
 #include <devices/lnx_virtio_pci.h>
 #include <palacios/vm_guest_mem.h>
 #include <devices/pci.h>
-
+#include <palacios/vmm_sprintf.h>
 
 #ifndef CONFIG_DEBUG_VNET_NIC
 #undef PrintDebug
 
 struct vnet_nic_state {
     char mac[6];
-    struct guest_info * core;
+    struct v3_vm_info * vm;
     struct v3_dev_net_ops net_ops;
+    int vnet_dev_id;
 };
 
-//used when virtio_nic get a packet from guest and send it to the backend
-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);
-    struct v3_vnet_pkt * pkt = NULL; 
+/* called by frontend device, 
+  * tell the VNET can start sending pkt to it */
+static void start_rx(void * private_data){
+    //struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    // fill in packet
-    pkt = (struct v3_vnet_pkt *)V3_Malloc(sizeof(struct v3_vnet_pkt));
+    //v3_vnet_enable_device(vnetnic->vnet_dev_id);
+}
 
-    if(pkt == NULL){
-       PrintError("Malloc() fails");
-       return -1;
-    }
+/* called by frontend device, 
+  * tell the VNET stop sending pkt to it */
+static void stop_rx(void * private_data){
+    //struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    pkt->size = len;
-    memcpy(pkt->data, buf, pkt->size);
+    //v3_vnet_disable_device(vnetnic->vnet_dev_id);
+}
 
-    //TODO: 
+/* called by frontend, send pkt to VNET */
+static int vnet_nic_send(uint8_t * buf, uint32_t len, 
+                        void * private_data) {
+    struct vnet_nic_state * vnetnic = (struct vnet_nic_state *)private_data;
+
+    struct v3_vnet_pkt pkt;
+    pkt.size = len;
+    pkt.src_type = LINK_INTERFACE;
+    pkt.src_id = vnetnic->vnet_dev_id;
+    memcpy(pkt.header, buf, ETHERNET_HEADER_LEN);
+    pkt.data = buf;
+
+#ifdef CONFIG_DEBUG_VNET_NIC
+    {
+       PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n", 
+                       len,  vnetnic->vnet_dev_id);
+       v3_hexdump(buf, len, NULL, 0);
+    }
+#endif
 
-    v3_vnet_send_pkt(pkt);
-    return 0;
+    return v3_vnet_send_pkt(&pkt, NULL);;
 }
 
 
-// We need to make this dynamically allocated
-//static struct v3_dev_net_ops net_ops = {
-//    .send = vnet_send, 
-//};
-
-static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){
+/* send pkt to frontend device */
+static int virtio_input(struct v3_vm_info * info, 
+                       struct v3_vnet_pkt * pkt, 
+                       void * private_data){
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
        
-    PrintDebug("Vnet-nic: In input: vnet_nic state %p\n", vnetnic);    
+    return vnetnic->net_ops.recv(pkt->data, 
+                                                       pkt->size, 
+                                                       vnetnic->net_ops.frontend_data);
+}
 
-    return vnetnic->net_ops.recv(pkt->data, pkt->size, vnetnic->net_ops.frontend_data);
+/* tell frontend device to poll data from guest */
+static void virtio_poll(struct v3_vm_info * info, 
+                       void * private_data){
+    struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
+
+    vnetnic->net_ops.poll(info, vnetnic->net_ops.frontend_data);
 }
 
-#if 0
-static int sendto_buf(struct vnet_nic_dev_state *vnetnic_dev, uchar_t * buf, uint_t size) {
-    struct eth_pkt *pkt;
 
-    pkt = (struct eth_pkt *)V3_Malloc(sizeof(struct eth_pkt));
-    if(pkt == NULL){
-        PrintError("Vnet NIC: Memory allocate fails\n");
-        return -1;
-    }
-  
-    pkt->size = size;
-    memcpy(pkt->data, buf, size);
-    v3_enqueue(vnetnic_dev->inpkt_q, (addr_t)pkt);
-       
-    PrintDebug("Vnet NIC: sendto_buf: packet: (size:%d)\n", (int)pkt->size);
+/* tell the frontend to start sending pkt to VNET*/
+static void start_tx(void * private_data){
+    struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    return pkt->size;
+    vnetnic->net_ops.start_tx(vnetnic->net_ops.frontend_data);
 }
 
-/*
-  *called in svm/vmx handler
-  *iteative handled the unsent packet in incoming packet queues for
-  *all virtio nic devices in this guest
-  */
-int v3_virtionic_pktprocess(struct guest_info * info)
-{
-    struct eth_pkt *pkt = NULL;
-    struct virtio_net_state *net_state;
-    int i;
-
-    //PrintDebug("Virtio NIC: processing guest %p\n", info);
-    for (i = 0; i < net_idx; i++) {
-        while (1) {
-            net_state = temp_net_states[i];
-            if(net_state->dev->vm != info)
-                break;
-
-            pkt = (struct eth_pkt *)v3_dequeue(net_state->inpkt_q);
-            if(pkt == NULL) 
-                break;
-                       
-            if (send_pkt_to_guest(net_state, pkt->data, pkt->size, 1, NULL)) {
-                PrintDebug("Virtio NIC: %p In pkt_handle: send one packet! pt length %d\n", 
-                               net_state, (int)pkt->size);  
-            } else {
-                PrintDebug("Virtio NIC: %p In pkt_handle: Fail to send one packet, pt length %d, discard it!\n", 
-                               net_state, (int)pkt->size); 
-            }
-       
-            V3_Free(pkt);
-        }
-    }
-    
-    return 0;
+/* tell the frontend device to stop sending pkt to VNET*/
+static void stop_tx(void * private_data){
+    struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
+
+    vnetnic->net_ops.stop_tx(vnetnic->net_ops.frontend_data);
 }
 
 
-/*
-  *called in svm/vmx handler
-  *iteative handled the unsent packet in incoming packet queues for
-  *all virtio nic devices in this guest
-  */
-int v3_vnetnic_pktprocess(struct guest_info * info)
-{
+static int vnet_nic_free(struct vm_device * dev) {
     return 0;
 }
 
-#endif
+static struct v3_device_ops dev_ops = {
+    .free = vnet_nic_free,
+
+};
+
+static struct v3_vnet_dev_ops vnet_dev_ops = {
+    .input = virtio_input,
+    .poll = virtio_poll,
+    .start_tx = start_tx,
+    .stop_tx = stop_tx,
+};
+
 
-//register a virtio device to the vnet as backend
-int register_to_vnet(struct v3_vm_info * vm,
-                    struct vnet_nic_state *vnet_nic,
-                    char *dev_name,
-                    uchar_t mac[6]) { 
+static int register_to_vnet(struct v3_vm_info * vm,
+                           struct vnet_nic_state * vnet_nic,
+                           char * dev_name, uchar_t mac[6]) { 
    
     PrintDebug("Vnet-nic: register Vnet-nic device %s, state %p to VNET\n", dev_name, vnet_nic);
        
-    v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic);
-
-    return 0;
+    return v3_vnet_add_dev(vm, mac, &vnet_dev_ops, (void *)vnet_nic);
 }
 
-static int vnet_nic_free(struct vm_device * dev) {
-    return 0;
-}
 
-static struct v3_device_ops dev_ops = {
-    .free = vnet_nic_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
-};
+static int str2mac(char * macstr, char mac[6]){
+    char hex[2], *s = macstr;
+    int i = 0;
+
+    while(s){
+       memcpy(hex, s, 2);
+       mac[i++] = (char)atox(hex);
+       if (i == 6) return 0;
+       s=strchr(s, ':');
+       if(s) s++;
+    }
+
+    return -1;
+}
 
 static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vnet_nic_state * vnetnic = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
+    char * macstr = NULL;
+    char mac[6];
+    int vnet_dev_id;
 
     v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
+    macstr = v3_cfg_val(frontend_cfg, "mac");
+
+    if (macstr == NULL) {
+       PrintDebug("Vnet-nic: No Mac specified\n");
+    } else {
+       str2mac(macstr, mac);
+    }
 
     vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state));
     memset(vnetnic, 0, sizeof(struct vnet_nic_state));
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnetnic);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, vnetnic);
 
     if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", name);
+       PrintError("Could not attach device %s\n", dev_id);
        return -1;
     }
 
-    vnetnic->net_ops.send = vnet_send;
+    vnetnic->net_ops.send = vnet_nic_send;
+    vnetnic->net_ops.start_rx = start_rx;
+    vnetnic->net_ops.stop_rx = stop_rx;
+    memcpy(vnetnic->mac, mac, 6);
+    vnetnic->vm = vm;
+       
     if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), 
                           &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) {
        PrintError("Could not connect %s to frontend %s\n", 
-                  name, v3_cfg_val(frontend_cfg, "tag"));
+                  dev_id, v3_cfg_val(frontend_cfg, "tag"));
        return -1;
     }
 
-    if (register_to_vnet(vm, vnetnic, name, vnetnic->mac) == -1) {
-       return -1;
+    PrintDebug("Vnet-nic: Connect %s to frontend %s\n", 
+             dev_id, v3_cfg_val(frontend_cfg, "tag"));
+
+    if ((vnet_dev_id = register_to_vnet(vm, vnetnic, dev_id, vnetnic->mac)) == -1) {
+       PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", dev_id, macstr);
+    }
+    vnetnic->vnet_dev_id = vnet_dev_id;
+
+    PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", 
+               dev_id, macstr, *((ulong_t *)vnetnic->mac));
+
+
+//for temporary hack for vnet bridge test
+#if 0
+    {
+       uchar_t zeromac[6] = {0,0,0,0,0,0};
+               
+       if(!strcmp(dev_id, "vnet_nic")){
+           struct v3_vnet_route route;
+               
+           route.dst_id = vnet_dev_id;
+           route.dst_type = LINK_INTERFACE;
+           route.src_id = 0;
+           route.src_type = LINK_EDGE;
+           memcpy(route.dst_mac, zeromac, 6);
+           route.dst_mac_qual = MAC_ANY;
+           memcpy(route.src_mac, zeromac, 6);
+           route.src_mac_qual = MAC_ANY;  
+           v3_vnet_add_route(route);
+
+
+           route.dst_id = 0;
+           route.dst_type = LINK_EDGE;
+           route.src_id = vnet_dev_id;
+           route.src_type = LINK_INTERFACE;
+           memcpy(route.dst_mac, zeromac, 6);
+           route.dst_mac_qual = MAC_ANY;
+           memcpy(route.src_mac, zeromac, 6);
+           route.src_mac_qual = MAC_ANY;
+
+           v3_vnet_add_route(route);
+       }
     }
+#endif
 
-    PrintDebug("Vnet-nic device %s initialized\n", name);
+//for temporary hack for Linux bridge (w/o encapuslation) test
+#if 1
+    {
+       static int vnet_nic_guestid = -1;
+       static int vnet_nic_dom0 = -1;
+       uchar_t zeromac[6] = {0,0,0,0,0,0};
+               
+       if(!strcmp(dev_id, "vnet_nic")){ //domu
+           vnet_nic_guestid = vnet_dev_id;
+       }
+       if (!strcmp(dev_id, "vnet_nic_dom0")){
+           vnet_nic_dom0 = vnet_dev_id;
+       }
+
+       if(vnet_nic_guestid != -1 && vnet_nic_dom0 !=-1){
+           struct v3_vnet_route route;
+               
+           route.src_id = vnet_nic_guestid;
+           route.src_type = LINK_INTERFACE;
+           route.dst_id = vnet_nic_dom0;
+           route.dst_type = LINK_INTERFACE;
+           memcpy(route.dst_mac, zeromac, 6);
+           route.dst_mac_qual = MAC_ANY;
+           memcpy(route.src_mac, zeromac, 6);
+           route.src_mac_qual = MAC_ANY;  
+           v3_vnet_add_route(route);
+
+
+           route.src_id = vnet_nic_dom0;
+           route.src_type = LINK_INTERFACE;
+           route.dst_id = vnet_nic_guestid;
+           route.dst_type = LINK_INTERFACE;
+           memcpy(route.dst_mac, zeromac, 6);
+           route.dst_mac_qual = MAC_ANY;
+           memcpy(route.src_mac, zeromac, 6);
+           route.src_mac_qual = MAC_ANY;
+
+           v3_vnet_add_route(route);
+       }
+    }
+#endif
 
     return 0;
 }