net: add '-net tap,sndbuf=nbytes'
2.6.30 adds a new TUNSETSNDBUF ioctl() which allows a send buffer limit
for the tap device to be specified. When this limit is reached, a tap
write() will return EAGAIN and poll() will indicate the fd isn't
writable.
This allows people to tune their setups so as to avoid e.g. UDP packet
loss when the sending application in the guest out-runs the NIC in the
host.
There is no obviously sensible default setting - a suitable value
depends mostly on the capabilities of the physical NIC through which the
packets are being sent.
Also, note that when using a bridge with netfilter enabled, we currently
never get EAGAIN because netfilter causes the packet to be immediately
orphaned. Set /proc/sys/net/bridge/bridge nf-call-iptables to zero to
disable this behaviour.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/net.c b/net.c
index 21710b7..1586c68 100644
--- a/net.c
+++ b/net.c
@@ -1162,6 +1162,18 @@
} while (size > 0);
}
+static void tap_set_sndbuf(TAPState *s, int sndbuf, Monitor *mon)
+{
+#ifdef TUNSETSNDBUF
+ if (ioctl(s->fd, TUNSETSNDBUF, &sndbuf) == -1) {
+ config_error(mon, "TUNSETSNDBUF ioctl failed: %s\n",
+ strerror(errno));
+ }
+#else
+ config_error(mon, "No '-net tap,sndbuf=<nbytes>' support available\n");
+#endif
+}
+
static void tap_cleanup(VLANClientState *vc)
{
TAPState *s = vc->opaque;
@@ -2141,9 +2153,6 @@
int net_client_init(Monitor *mon, const char *device, const char *p)
{
- static const char * const fd_params[] = {
- "vlan", "name", "fd", NULL
- };
char buf[1024];
int vlan_id, ret;
VLANState *vlan;
@@ -2298,6 +2307,9 @@
int fd;
vlan->nb_host_devs++;
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
+ static const char * const fd_params[] = {
+ "vlan", "name", "fd", "sndbuf", NULL
+ };
if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) {
config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p);
ret = -1;
@@ -2308,7 +2320,7 @@
s = net_tap_fd_init(vlan, device, name, fd);
} else {
static const char * const tap_params[] = {
- "vlan", "name", "ifname", "script", "downscript", NULL
+ "vlan", "name", "ifname", "script", "downscript", "sndbuf", NULL
};
if (check_params(chkbuf, sizeof(chkbuf), tap_params, p) < 0) {
config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p);
@@ -2327,6 +2339,9 @@
s = net_tap_init(vlan, device, name, ifname, setup_script, down_script);
}
if (s != NULL) {
+ if (get_param_value(buf, sizeof(buf), "sndbuf", p)) {
+ tap_set_sndbuf(s, atoi(buf), mon);
+ }
ret = 0;
} else {
ret = -1;
@@ -2336,6 +2351,9 @@
if (!strcmp(device, "socket")) {
char chkbuf[64];
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
+ static const char * const fd_params[] = {
+ "vlan", "name", "fd", NULL
+ };
int fd;
if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) {
config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p);
