Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / linux_module / palacios-packet.c

diff --git a/linux_module/palacios-packet.c b/linux_module/palacios-packet.c
index 2df4879..83404de 100644 (file)
--- a/linux_module/palacios-packet.c
+++ b/linux_module/palacios-packet.c
@@ -15,22 +15,24 @@
 #include <linux/errno.h>
 #include <asm/msr.h>
  
-#include <palacios/vmm_packet.h>
+#include <interfaces/vmm_packet.h>
 #include <palacios/vmm_host_events.h>
-#include <palacios/vmm_vnet.h>
+#include <vnet/vnet.h>
+
+#define __V3VEE__
+#include <palacios/vmm_hashtable.h>
 #include <palacios/vmm_ethernet.h>
+#undef __V3VEE__
 
 #include "palacios.h"
 #include "palacios-packet.h"
-#include "palacios-hashtable.h"
-
 
 struct palacios_packet_state {
-       struct socket * raw_sock;
-       uint8_t inited;
+    struct socket * raw_sock;
+    uint8_t inited;
        
-       struct hashtable * mac_vm_cache;
-       struct task_struct * server_thread;
+    struct hashtable * mac_vm_cache;
+    struct task_struct * server_thread;
 };
 
 static struct palacios_packet_state packet_state;
@@ -38,7 +40,7 @@ static struct palacios_packet_state packet_state;
 static inline uint_t hash_fn(addr_t hdr_ptr) {    
     uint8_t * hdr_buf = (uint8_t *)hdr_ptr;
 
-    return palacios_hash_buffer(hdr_buf, ETH_ALEN);
+    return v3_hash_buffer(hdr_buf, ETH_ALEN);
 }
 
 static inline int hash_eq(addr_t key1, addr_t key2) {  
@@ -53,7 +55,7 @@ static int palacios_packet_add_recver(const char * mac,
     key = (char *)kmalloc(ETH_ALEN, GFP_KERNEL);                                       
     memcpy(key, mac, ETH_ALEN);    
 
-    if (palacios_htable_insert(packet_state.mac_vm_cache, (addr_t)key, (addr_t)vm) == 0) {
+    if (v3_htable_insert(packet_state.mac_vm_cache, (addr_t)key, (addr_t)vm) == 0) {
        printk("Palacios Packet: Failed to insert new mac entry to the hash table\n");
        return -1;
     }
@@ -138,14 +140,11 @@ palacios_packet_send(const char * pkt, unsigned int len, void * private_data) {
     size = sock_sendmsg(packet_state.raw_sock, &msg, len);
     set_fs(oldfs);
 
-#if 1
-    {
-       printk("Palacios Packet: send pkt to NIC (size: %d)\n", 
-                       len);
+    if(vnet_debug >= 4){
+       printk("Palacios Packet: send pkt to NIC (size: %d)\n", len);
        print_hex_dump(NULL, "pkt_header: ", 0, 20, 20, pkt, 20, 0);
        printk("palacios_packet_send return: %d\n", size);
     }
-#endif
 
     return size;
 }
@@ -219,13 +218,10 @@ static int packet_server(void * arg) {
            break;
        }
 
-#if 1
-    {
-       printk("Palacios Packet: receive pkt from NIC (size: %d)\n", 
-                       size);
-       print_hex_dump(NULL, "pkt_header: ", 0, 10, 10, pkt, 20, 0);
-    }
-#endif
+       if(vnet_debug >= 4){
+           printk("Palacios Packet: receive pkt from NIC (size: %d)\n",size);
+           print_hex_dump(NULL, "pkt_header: ", 0, 10, 10, pkt, 20, 0);
+       }
 
        /* if VNET is enabled, send to VNET */
        // ...
@@ -235,7 +231,7 @@ static int packet_server(void * arg) {
        // ...
 
 
-       vm = (struct v3_vm_info *)palacios_htable_search(packet_state.mac_vm_cache, (addr_t)pkt);
+       vm = (struct v3_vm_info *)v3_htable_search(packet_state.mac_vm_cache, (addr_t)pkt);
        if(vm != NULL){
            printk("Find destinated VM 0x%p\n", vm);
            send_raw_packet_to_palacios(pkt, size, vm);
@@ -258,7 +254,7 @@ int palacios_init_packet(const char * eth_dev) {
        
        V3_Init_Packet(&palacios_packet_hooks);
 
-       packet_state.mac_vm_cache = palacios_create_htable(0, &hash_fn, &hash_eq);
+       packet_state.mac_vm_cache = v3_create_htable(0, &hash_fn, &hash_eq);
 
        packet_state.server_thread = kthread_run(packet_server, NULL, "raw-packet-server");
     }
@@ -270,7 +266,7 @@ void palacios_deinit_packet(const char * eth_dev) {
 
     kthread_stop(packet_state.server_thread);
     packet_state.raw_sock->ops->release(packet_state.raw_sock);
-    palacios_free_htable(packet_state.mac_vm_cache, 0, 1);
+    v3_free_htable(packet_state.mac_vm_cache, 0, 1);
     packet_state.inited = 0;
 }