update Intel copyright years to 2014

[dpdk.git] / lib / librte_eal / linuxapp / kni / kni_dev.h

diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h
index fda9432..2e94f46 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/kni_dev.h
+++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
@@ -1,7 +1,7 @@
 /*-
  * GPL LICENSE SUMMARY
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  * 
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,12 @@
 #include <linux/spinlock.h>
 #include <linux/list.h>
 
-#define KNI_KTHREAD_RESCHEDULE_INTERVAL 10 /* us */
+#ifdef RTE_KNI_VHOST
+#include <net/sock.h>
+#endif
+
+#include <exec-env/rte_kni_common.h>
+#define KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */
 
 /**
  * A structure describing the private information for a kni device.
@@ -44,7 +49,10 @@ struct kni_dev {
 
        struct net_device_stats stats;
        int status;
-       int port_id;
+       uint16_t group_id;           /* Group ID of a group of KNI devices */
+       unsigned core_id;            /* Core ID to bind */
+       char name[RTE_KNI_NAMESIZE]; /* Network device name */
+       struct task_struct *pthread;
 
        /* wait queue for req/resp */
        wait_queue_head_t wq;
@@ -87,8 +95,16 @@ struct kni_dev {
 
        /* synchro for request processing */
        unsigned long synchro;
-};
 
+#ifdef RTE_KNI_VHOST
+       struct kni_vhost_queue* vhost_queue;
+       volatile enum {
+               BE_STOP = 0x1,
+               BE_START = 0x2,
+               BE_FINISH = 0x4,
+       }vq_status;
+#endif
+};
 
 #define KNI_ERR(args...) printk(KERN_DEBUG "KNI: Error: " args)
 #define KNI_PRINT(args...) printk(KERN_DEBUG "KNI: " args)
@@ -98,4 +114,37 @@ struct kni_dev {
        #define KNI_DBG(args...)
 #endif
 
+#ifdef RTE_KNI_VHOST
+unsigned int 
+kni_poll(struct file *file, struct socket *sock, poll_table * wait);
+int kni_chk_vhost_rx(struct kni_dev *kni);
+int kni_vhost_init(struct kni_dev *kni);
+int kni_vhost_backend_release(struct kni_dev *kni);
+
+struct kni_vhost_queue {
+       struct sock sk;
+       struct socket *sock;
+       int vnet_hdr_sz;
+       struct kni_dev *kni;
+       int sockfd;
+       unsigned int flags;
+       struct sk_buff* cache;
+       struct rte_kni_fifo* fifo;
+};
+
+#endif
+
+#ifdef RTE_KNI_VHOST_DEBUG_RX
+       #define KNI_DBG_RX(args...) printk(KERN_DEBUG "KNI RX: " args)
+#else
+       #define KNI_DBG_RX(args...)
+#endif
+
+#ifdef RTE_KNI_VHOST_DEBUG_TX
+       #define KNI_DBG_TX(args...) printk(KERN_DEBUG "KNI TX: " args)
+#else
+       #define KNI_DBG_TX(args...)
+#endif
+
 #endif
+