From: Asias He <asias.hejun@gmail.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>, Ingo Molnar <mingo@elte.hu>,
Sasha Levin <levinsasha928@gmail.com>,
Prasad Joshi <prasadjoshi124@gmail.com>,
kvm@vger.kernel.org, Asias He <asias.hejun@gmail.com>
Subject: [PATCH v2 01/31] kvm tools: Introduce ethernet frame buffer system for uip
Date: Thu, 30 Jun 2011 16:40:49 +0800 [thread overview]
Message-ID: <1309423279-3093-2-git-send-email-asias.hejun@gmail.com> (raw)
In-Reply-To: <1309423279-3093-1-git-send-email-asias.hejun@gmail.com>
- uip_buf_get_free()
Get a free buffer from buffer pool, sleep if there is no free buffer.
- uip_buf_get_used()
Get a used buffer from buffer pool, sleep if there is no used buffer.
- uip_buf_set_free()
Set a buffer as free, so it can be reused by the buffer producer.
- uip_buf_set_used()
Set a buffer as used, uip rx code will inject the ethernet frame in
this buffer into guest.
- uip_buf_clone()
Get a free buffer, and clone data into it.
Signed-off-by: Asias He <asias.hejun@gmail.com>
---
tools/kvm/Makefile | 1 +
tools/kvm/include/kvm/uip.h | 69 ++++++++++++++++++++++++++
tools/kvm/uip/buf.c | 114 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 184 insertions(+), 0 deletions(-)
create mode 100644 tools/kvm/include/kvm/uip.h
create mode 100644 tools/kvm/uip/buf.c
diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index d368c22..91539de 100644
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -45,6 +45,7 @@ OBJS += disk/qcow.o
OBJS += disk/raw.o
OBJS += ioeventfd.o
OBJS += irq.o
+OBJS += uip/buf.o
OBJS += kvm-cmd.o
OBJS += kvm-debug.o
OBJS += kvm-help.o
diff --git a/tools/kvm/include/kvm/uip.h b/tools/kvm/include/kvm/uip.h
new file mode 100644
index 0000000..32a5da3
--- /dev/null
+++ b/tools/kvm/include/kvm/uip.h
@@ -0,0 +1,69 @@
+#ifndef KVM__UIP_H
+#define KVM__UIP_H
+
+#include "linux/types.h"
+#include "kvm/mutex.h"
+
+#include <netinet/in.h>
+#include <sys/uio.h>
+
+#define UIP_BUF_STATUS_FREE 0
+#define UIP_BUF_STATUS_INUSE 1
+#define UIP_BUF_STATUS_USED 2
+
+struct uip_eth_addr {
+ u8 addr[6];
+};
+
+struct uip_eth {
+ struct uip_eth_addr dst;
+ struct uip_eth_addr src;
+ u16 type;
+} __attribute__((packed));
+
+struct uip_info {
+ struct list_head udp_socket_head;
+ struct list_head tcp_socket_head;
+ pthread_mutex_t udp_socket_lock;
+ pthread_mutex_t tcp_socket_lock;
+ struct uip_eth_addr guest_mac;
+ struct uip_eth_addr host_mac;
+ pthread_cond_t buf_free_cond;
+ pthread_cond_t buf_used_cond;
+ struct list_head buf_head;
+ pthread_mutex_t buf_lock;
+ pthread_t udp_thread;
+ int udp_epollfd;
+ int buf_free_nr;
+ int buf_used_nr;
+ u32 host_ip;
+ u32 buf_nr;
+};
+
+struct uip_buf {
+ struct list_head list;
+ struct uip_info *info;
+ u32 payload;
+ int vnet_len;
+ int eth_len;
+ int status;
+ char *vnet;
+ char *eth;
+ int id;
+};
+
+struct uip_tx_arg {
+ struct virtio_net_hdr *vnet;
+ struct uip_info *info;
+ struct uip_eth *eth;
+ int vnet_len;
+ int eth_len;
+};
+
+struct uip_buf *uip_buf_set_used(struct uip_info *info, struct uip_buf *buf);
+struct uip_buf *uip_buf_set_free(struct uip_info *info, struct uip_buf *buf);
+struct uip_buf *uip_buf_get_used(struct uip_info *info);
+struct uip_buf *uip_buf_get_free(struct uip_info *info);
+struct uip_buf *uip_buf_clone(struct uip_tx_arg *arg);
+
+#endif /* KVM__UIP_H */
diff --git a/tools/kvm/uip/buf.c b/tools/kvm/uip/buf.c
new file mode 100644
index 0000000..5e564a9
--- /dev/null
+++ b/tools/kvm/uip/buf.c
@@ -0,0 +1,114 @@
+#include "kvm/uip.h"
+
+#include <linux/kernel.h>
+#include <linux/list.h>
+
+struct uip_buf *uip_buf_get_used(struct uip_info *info)
+{
+ struct uip_buf *buf;
+ bool found = false;
+
+ mutex_lock(&info->buf_lock);
+
+ while (!(info->buf_used_nr > 0))
+ pthread_cond_wait(&info->buf_used_cond, &info->buf_lock);
+
+ list_for_each_entry(buf, &info->buf_head, list) {
+ if (buf->status == UIP_BUF_STATUS_USED) {
+ /*
+ * Set status to INUSE immediately to prevent
+ * someone from using this buf until we free it
+ */
+ buf->status = UIP_BUF_STATUS_INUSE;
+ info->buf_used_nr--;
+ found = true;
+ break;
+ }
+ }
+
+ mutex_unlock(&info->buf_lock);
+
+ return found ? buf : NULL;
+}
+
+struct uip_buf *uip_buf_get_free(struct uip_info *info)
+{
+ struct uip_buf *buf;
+ bool found = false;
+
+ mutex_lock(&info->buf_lock);
+
+ while (!(info->buf_free_nr > 0))
+ pthread_cond_wait(&info->buf_free_cond, &info->buf_lock);
+
+ list_for_each_entry(buf, &info->buf_head, list) {
+ if (buf->status == UIP_BUF_STATUS_FREE) {
+ /*
+ * Set status to INUSE immediately to prevent
+ * someone from using this buf until we free it
+ */
+ buf->status = UIP_BUF_STATUS_INUSE;
+ info->buf_free_nr--;
+ found = true;
+ break;
+ }
+ }
+
+ mutex_unlock(&info->buf_lock);
+
+ return found ? buf : NULL;
+}
+
+struct uip_buf *uip_buf_set_used(struct uip_info *info, struct uip_buf *buf)
+{
+ mutex_lock(&info->buf_lock);
+
+ buf->status = UIP_BUF_STATUS_USED;
+ info->buf_used_nr++;
+ pthread_cond_signal(&info->buf_used_cond);
+
+ mutex_unlock(&info->buf_lock);
+
+ return buf;
+}
+
+struct uip_buf *uip_buf_set_free(struct uip_info *info, struct uip_buf *buf)
+{
+ mutex_lock(&info->buf_lock);
+
+ buf->status = UIP_BUF_STATUS_FREE;
+ info->buf_free_nr++;
+ pthread_cond_signal(&info->buf_free_cond);
+
+ mutex_unlock(&info->buf_lock);
+
+ return buf;
+}
+
+struct uip_buf *uip_buf_clone(struct uip_tx_arg *arg)
+{
+ struct uip_buf *buf;
+ struct uip_eth *eth2;
+ struct uip_info *info;
+
+ info = arg->info;
+
+ /*
+ * Get buffer from device to guest
+ */
+ buf = uip_buf_get_free(info);
+
+ /*
+ * Clone buffer
+ */
+ memcpy(buf->vnet, arg->vnet, arg->vnet_len);
+ memcpy(buf->eth, arg->eth, arg->eth_len);
+ buf->vnet_len = arg->vnet_len;
+ buf->eth_len = arg->eth_len;
+
+ eth2 = (struct uip_eth *)buf->eth;
+ eth2->src = info->host_mac;
+ eth2->dst = arg->eth->src;
+
+ return buf;
+}
--
1.7.5.4
next prev parent reply other threads:[~2011-06-30 8:43 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 8:40 [PATCH v2 00/31] Implement user mode network for kvm tools Asias He
2011-06-30 8:40 ` Asias He [this message]
2011-06-30 8:40 ` [PATCH v2 02/31] kvm tools: Add ARP support for uip Asias He
2011-06-30 8:40 ` [PATCH v2 03/31] kvm tools: Add IPV4 " Asias He
2011-06-30 8:40 ` [PATCH v2 04/31] kvm tools: Implement IP checksum " Asias He
2011-06-30 8:40 ` [PATCH v2 05/31] kvm tools: Add ICMP support " Asias He
2011-06-30 8:40 ` [PATCH v2 06/31] kvm tools: Introduce struct uip_udp to present UDP package Asias He
2011-06-30 8:40 ` [PATCH v2 07/31] kvm tools: Introduce struct uip_pseudo_hdr to present UDP pseudo header Asias He
2011-06-30 8:40 ` [PATCH v2 08/31] kvm tools: Introduce struct uip_udp_socket Asias He
2011-06-30 8:40 ` [PATCH v2 09/31] kvm tools: Add two helpers to return UDP {header, total} length Asias He
2011-06-30 8:40 ` [PATCH v2 10/31] kvm tools: Add helper to return ethernet header length Asias He
2011-06-30 8:40 ` [PATCH v2 11/31] kvm tools: Implement uip_csum_udp() to calculate UDP checksum Asias He
2011-06-30 8:41 ` [PATCH v2 12/31] kvm tools: Add UDP support for uip Asias He
2011-07-01 11:46 ` Ingo Molnar
2011-07-01 15:24 ` Asias He
2011-06-30 8:41 ` [PATCH v2 13/31] kvm tools: Introduce struct uip_tcp to present TCP package Asias He
2011-06-30 8:41 ` [PATCH v2 14/31] kvm tools: Introduce struct uip_tcp_socket Asias He
2011-06-30 8:41 ` [PATCH v2 15/31] kvm tools: Add helpers to return TCP {header, total, payload} length Asias He
2011-06-30 8:41 ` [PATCH v2 16/31] kvm tools: Add helper to return start address of TCP payload Asias He
2011-06-30 8:41 ` [PATCH v2 17/31] kvm tools: Add helpers to test whether SYN or FIN bit is set Asias He
2011-06-30 8:41 ` [PATCH v2 18/31] kvm tools: Add helper to allocate and get TCP initial sequence number Asias He
2011-06-30 8:41 ` [PATCH v2 19/31] kvm tools: Implement uip_csum_tcp() to calculate TCP checksum Asias He
2011-06-30 8:41 ` [PATCH v2 20/31] kvm tools: Add TCP support for uip Asias He
2011-06-30 8:41 ` [PATCH v2 21/31] kvm tools: Introduce uip_init() " Asias He
2011-06-30 8:41 ` [PATCH v2 22/31] kvm tools: Introduce uip_tx() " Asias He
2011-06-30 8:41 ` [PATCH v2 23/31] kvm tools: Introduce uip_rx() " Asias He
2011-06-30 8:41 ` [PATCH v2 24/31] kvm tools: Add MACRO for user and tap mode for virtio net Asias He
2011-06-30 8:41 ` [PATCH v2 25/31] kvm tools: Reanme net_device to net_dev Asias He
2011-06-30 8:41 ` [PATCH v2 26/31] kvm tools: Introduce -net {user, tap, none} options for virtio net Asias He
2011-06-30 8:41 ` [PATCH v2 27/31] kvm tools: Change default guest MAC address to 00:15:15:15:15:15 Asias He
2011-06-30 8:41 ` [PATCH v2 28/31] kvm tools: Make virtio net work with user mode network Asias He
2011-06-30 8:41 ` [PATCH v2 29/31] kvm tools: Make default network mode to user mode Asias He
2011-06-30 8:41 ` [PATCH v2 30/31] kvm tools: Make default host ip address to 192.168.33.1 Asias He
2011-06-30 8:41 ` [PATCH v2 31/31] kvm tools: Introduce struct net_dev_operations Asias He
2011-06-30 8:56 ` [PATCH v2 00/31] Implement user mode network for kvm tools Stefan Hajnoczi
2011-06-30 15:32 ` Anthony Liguori
2011-07-01 0:18 ` Asias He
2011-07-01 11:53 ` Ingo Molnar
2011-07-01 13:46 ` Alexander Graf
2011-07-02 9:45 ` Pekka Enberg
2011-07-02 10:30 ` Ingo Molnar
2011-07-02 11:19 ` Alexander Graf
2011-07-02 11:27 ` Pekka Enberg
2011-07-02 12:31 ` Alexander Graf
2011-07-03 19:42 ` Ingo Molnar
2011-07-03 22:15 ` Alexander Graf
2011-07-04 9:11 ` Ingo Molnar
2011-07-04 9:30 ` Alexander Graf
2011-07-04 9:43 ` Ingo Molnar
2011-07-02 9:42 ` Pekka Enberg
2011-06-30 23:38 ` Asias He
2011-07-01 16:50 ` Stefan Hajnoczi
2011-07-01 20:36 ` Pekka Enberg
2011-07-02 3:49 ` Asias He
2011-07-02 9:02 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309423279-3093-2-git-send-email-asias.hejun@gmail.com \
--to=asias.hejun@gmail.com \
--cc=gorcunov@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=levinsasha928@gmail.com \
--cc=mingo@elte.hu \
--cc=penberg@kernel.org \
--cc=prasadjoshi124@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox