#include <devices/lnx_virtio_pci.h>
#include <palacios/vm_guest_mem.h>
#include <devices/pci.h>
+#include <palacios/vmm_sprintf.h>
-struct vnet_nic_state {
- char mac[6];
+#ifndef CONFIG_DEBUG_VNET_NIC
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+struct vnet_nic_state {
+ char mac[6];
+ 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
-// send packet to all of the virtio nic devices other than the sender
-static int 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);
+#if 0
+//Malloc/Free version of send
+static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
+ struct v3_vnet_pkt * pkt = NULL;
+ struct guest_info *core = (struct guest_info *)private_data;
+
+#ifdef WCONFIG_DEBUG_VNET_NIC
+ {
+ PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
+ v3_hexdump(buf, len, NULL, 0);
+ }
+#endif
+
+#ifdef CONFIG_VNET_PROFILE
+ uint64_t start, end;
+ rdtscll(start);
+#endif
- v3_vnet_send_rawpkt(buf, len, private_data);
- return 0;
-}
+ pkt = (struct v3_vnet_pkt *)V3_Malloc(sizeof(struct v3_vnet_pkt));
-static int receive(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *src_dev){
+ if(pkt == NULL){
+ PrintError("Malloc() fails");
+ return -1;
+ }
+
+#ifdef CONFIG_VNET_PROFILE
+ {
+ rdtscll(end);
+ core->vnet_times.time_mallocfree = end - start;
+ }
+#endif
+
+
+ pkt->size = len;
+ pkt->src_type = LINK_INTERFACE;
+ pkt->src_id = 0;
+ memcpy(pkt->data, buf, pkt->size);
+
+#ifdef CONFIG_VNET_PROFILE
+ {
+ rdtscll(start);
+ core->vnet_times.memcpy_time = start - end;
+ core->vnet_times.time_copy_from_guest = start - core->vnet_times.virtio_handle_start - core->vnet_times.time_mallocfree;
+ }
+#endif
+
+ v3_vnet_send_pkt(pkt, (void *)core);
+
+#ifdef CONFIG_VNET_PROFILE
+ rdtscll(start);
+#endif
+
+ V3_Free(pkt);
+
+#ifdef CONFIG_VNET_PROFILE
+ {
+ rdtscll(end);
+ core->vnet_times.time_mallocfree += end - start;
+ }
+#endif
return 0;
}
+#endif
-static struct v3_dev_net_ops net_ops = {
- .send = send,
- .receive = receive,
-};
+#if 1
+//alternative way, no malloc/free
+static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
+ struct v3_vnet_pkt pkt;
+ struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
+ struct guest_info *core = &(vnetnic->vm->cores[0]);
+#ifdef CONFIG_VNET_PROFILE
+ uint64_t start, end;
+ rdtscll(start);
+#endif
-#if 0
-static int input(struct v3_vm_info *info, uchar_t * buf, uint_t len, void * private_data){
- PrintDebug("Virito NIC: In virtio_input: guest net state %p\n", private_data);
+ pkt.size = len;
+ pkt.src_type = LINK_INTERFACE;
+ pkt.src_id = vnetnic->vnet_dev_id;
+ memcpy(pkt.data, buf, pkt.size);
- return __virtio_dev_send(buf, len, private_data);
-}
+#ifdef CONFIG_DEBUG_VNET_NIC
+ {
+ PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d, src_type: %d\n",
+ len, pkt.src_id, pkt.src_type);
+ v3_hexdump(buf, len, NULL, 0);
+ }
+#endif
-//register a virtio device to the vnet as backend
-void register_to_vnet(struct vm_device *dev,
- char *dev_name,
- uchar_t mac[6]){
- struct virtio_net_state * net_state;
- struct virtio_dev_state *virtio_state = (struct virtio_dev_state *)dev->private_data;
- uchar_t tapmac[6] = {0x00,0x02,0x55,0x67,0x42,0x39}; //for Intel-VT test HW
- //uchar_t tapmac[6] = {0x6e,0xa8,0x75,0xf4,0x82,0x95};
- uchar_t dstmac[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
- uchar_t zeromac[6] = {0,0,0,0,0,0};
+#ifdef CONFIG_VNET_PROFILE
+ rdtscll(end);
+ core->vnet_times.time_copy_from_guest = end - core->vnet_times.virtio_handle_start;
+ core->vnet_times.memcpy_time = end - start;
+#endif
+ v3_vnet_send_pkt(&pkt, (void *)core);
- net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state));
- memset(net_state, 0, sizeof(struct virtio_net_state));
- 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;
- net_state->dev = dev;
+ return 0;
+}
+#endif
- register_dev(virtio_state, net_state);
+#if 0
+//alternative way, no malloc/free, no copy
+//need to change pkt format
+static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
+ struct v3_vnet_pkt pkt;
+ struct guest_info *core = (struct guest_info *)private_data;
- PrintDebug("Virtio NIC register Device %s: queue size: %d, %d\n", dev->name,
- net_state->rx_vq.queue_size, net_state->tx_vq.queue_size);
- PrintDebug("Virtio NIC: connect virtio device %s, state %p, to vnet\n", dev->name, net_state);
-
- int idx = vnet_register_device(dev, dev_name, mac, &virtio_input, net_state);
- //vnet_add_route_entry(zeromac, dstmac, MAC_ANY, MAC_NONE, idx, LINK_INTERFACE, -1, LINK_INTERFACE);
- if (!strcmp(dev_name, "net_virtiodom0")){
- vnet_add_route_entry(zeromac, tapmac, MAC_ANY, MAC_NONE, idx, LINK_INTERFACE, -1, LINK_INTERFACE);
- vnet_add_route_entry(zeromac, dstmac, MAC_ANY, MAC_NONE, idx, LINK_INTERFACE, -1, LINK_INTERFACE);
- }
- if (!strcmp(dev_name, "net_virtio"))
- vnet_add_route_entry(tapmac, zeromac, MAC_NONE, MAC_ANY, idx, LINK_INTERFACE, -1, LINK_INTERFACE);
-
-
- v3_vnet_add_node(dev_name, mac, input, priv_data);
- struct v3_vnet_route route;
- //add default route
- memset(&route, 0, sizeof(struct v3_vnet_route));
- memcpy(&route.dest_mac, mac, 6);
- route.src_mac_qual = MAC_ANY;
- route.dest_mac_qual = MAC_NONE;
- route.link_idx = idx;
- route.link_type = LINK_EDGE;
- route.src_link_idx = -1;
- route.src_type = LINK_ANY;
- v3_vnet_add_route(&route);
-
- char mac
- memset(&route, 0, sizeof(struct v3_vnet_route));
- memcpy(&route.dest_mac, mac, 6);
- route.src_mac_qual = MAC_ANY;
- route.dest_mac_qual = MAC_NONE;
- route.link_idx = idx;
- route.link_type = LINK_EDGE;
- route.src_link_idx = -1;
- route.src_type = LINK_ANY;
- v3_vnet_add_route(&route);
-}
+#ifdef CONFIG_DEBUG_VNET_NIC
+ {
+ PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
+ v3_hexdump(buf, len, NULL, 0);
+ }
+#endif
+ pkt.size = len;
+ pkt.data = buf;
+
+#ifdef CONFIG_VNET_PROFILE
+ uint64_t start, end;
+ rdtscll(start);
+#endif
+
+ v3_vnet_send_pkt(&pkt, (void *)core);
+
+#ifdef CONFIG_VNET_PROFILE
+ {
+ rdtscll(end);
+ core->vnet_times.vnet_handle_time = end - start;
+ }
+#endif
-/*
- *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)
-{
-
return 0;
}
#endif
+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);
+}
+
+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);
+
+ return v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic);
+}
+
static int vnet_nic_free(struct vm_device * dev) {
return 0;
}
.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 * 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));
-
- PrintDebug("Registering vnet_nic device at\n");
-
struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnetnic);
if (v3_attach_device(vm, dev) == -1) {
return -1;
}
+ vnetnic->net_ops.send = vnet_send;
+ memcpy(vnetnic->mac, mac, 6);
+ vnetnic->vm = vm;
+
if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"),
- &net_ops, frontend_cfg, vnetnic) == -1) {
+ &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) {
PrintError("Could not connect %s to frontend %s\n",
name, v3_cfg_val(frontend_cfg, "tag"));
return -1;
}
-
+
+ PrintDebug("Vnet-nic: Connect %s to frontend %s\n",
+ name, v3_cfg_val(frontend_cfg, "tag"));
+
+ if ((vnet_dev_id = register_to_vnet(vm, vnetnic, name, vnetnic->mac)) == -1) {
+ PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", name, macstr);
+ }
+ vnetnic->vnet_dev_id = vnet_dev_id;
+
+ PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", name, macstr, *((ulong_t *)vnetnic->mac));
+
+
+//for temporary hack for vnet bridge test
+#if 1
+ {
+ uchar_t zeromac[6] = {0,0,0,0,0,0};
+
+ if(!strcmp(name, "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
+#if 0 //temporay hacking for vnet virtio bridge
+ {
+ uchar_t tapmac[6] = {0x00,0x02,0x55,0x67,0x42,0x39}; //for Intel-VT test HW
+ //uchar_t tapmac[6] = {0x6e,0xa8,0x75,0xf4,0x82,0x95};
+ uchar_t dstmac[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
+ uchar_t zeromac[6] = {0,0,0,0,0,0};
+
+ struct v3_vnet_route route;
+ route.dst_id = vnet_dev_id;
+ route.dst_type = LINK_INTERFACE;
+ route.src_id = -1;
+ route.src_type = LINK_ANY;
+
+ if(!strcmp(name, "vnet_nicdom0")){
+ memcpy(route.dst_mac, tapmac, 6);
+ route.dst_mac_qual = MAC_NONE;
+ memcpy(route.src_mac, zeromac, 6);
+ route.src_mac_qual = MAC_ANY;
+
+ v3_vnet_add_route(route);
+
+ memcpy(route.dst_mac, dstmac, 6);
+ route.dst_mac_qual = MAC_NONE;
+ memcpy(route.src_mac, tapmac, 6);
+ route.src_mac_qual = MAC_NOT;
+
+ v3_vnet_add_route(route);
+ }
+
+ if (!strcmp(name, "vnet_nic0")){
+ memcpy(route.dst_mac, zeromac, 6);
+ route.dst_mac_qual = MAC_ANY;
+ memcpy(route.src_mac, tapmac, 6);
+ route.src_mac_qual = MAC_NONE;
+
+ v3_vnet_add_route(route);
+ }
+ }
+#endif
return 0;
}
