OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tap: generalize code for different vnet header len

Browse Source 
Make host vnet header length a structure field in
preparation for using this support in linux kernel.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2010-07-13 17:55:31 +03:00
parent a05e8a6e90
commit ef4252b149
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/tap-linux.h
View File

@ -52,4 +52,10 @@ struct virtio_net_hdr
uint16_t csum_offset; uint16_t csum_offset;
}; };
struct virtio_net_hdr_mrg_rxbuf
{
struct virtio_net_hdr hdr;
uint16_t num_buffers; /* Number of merged rx buffers */
};
#endif /* QEMU_TAP_H */ #endif /* QEMU_TAP_H */

28
net/tap.c
View File

@ -57,10 +57,10 @@ typedef struct TAPState {
uint8_t buf[TAP_BUFSIZE]; uint8_t buf[TAP_BUFSIZE];
unsigned int read_poll : 1; unsigned int read_poll : 1;
unsigned int write_poll : 1; unsigned int write_poll : 1;
unsigned int has_vnet_hdr : 1;
unsigned int using_vnet_hdr : 1; unsigned int using_vnet_hdr : 1;
unsigned int has_ufo: 1; unsigned int has_ufo: 1;
VHostNetState *vhost_net; VHostNetState *vhost_net;
unsigned host_vnet_hdr_len;
} TAPState; } TAPState;
static int launch_script(const char *setup_script, const char *ifname, int fd); static int launch_script(const char *setup_script, const char *ifname, int fd);
@ -121,11 +121,11 @@ static ssize_t tap_receive_iov(VLANClientState *nc, const struct iovec *iov,
TAPState *s = DO_UPCAST(TAPState, nc, nc); TAPState *s = DO_UPCAST(TAPState, nc, nc);
const struct iovec *iovp = iov; const struct iovec *iovp = iov;
struct iovec iov_copy[iovcnt + 1]; struct iovec iov_copy[iovcnt + 1];
struct virtio_net_hdr hdr = { 0, }; struct virtio_net_hdr_mrg_rxbuf hdr = { };
if (s->has_vnet_hdr && !s->using_vnet_hdr) { if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
iov_copy[0].iov_base = &hdr; iov_copy[0].iov_base = &hdr;
iov_copy[0].iov_len = sizeof(hdr); iov_copy[0].iov_len = s->host_vnet_hdr_len;
memcpy(&iov_copy[1], iov, iovcnt * sizeof(*iov)); memcpy(&iov_copy[1], iov, iovcnt * sizeof(*iov));
iovp = iov_copy; iovp = iov_copy;
iovcnt++; iovcnt++;
@ -139,11 +139,11 @@ static ssize_t tap_receive_raw(VLANClientState *nc, const uint8_t *buf, size_t s
TAPState *s = DO_UPCAST(TAPState, nc, nc); TAPState *s = DO_UPCAST(TAPState, nc, nc);
struct iovec iov[2]; struct iovec iov[2];
int iovcnt = 0; int iovcnt = 0;
struct virtio_net_hdr hdr = { 0, }; struct virtio_net_hdr_mrg_rxbuf hdr = { };
if (s->has_vnet_hdr) { if (s->host_vnet_hdr_len) {
iov[iovcnt].iov_base = &hdr; iov[iovcnt].iov_base = &hdr;
iov[iovcnt].iov_len = sizeof(hdr); iov[iovcnt].iov_len = s->host_vnet_hdr_len;
iovcnt++; iovcnt++;
} }
@ -159,7 +159,7 @@ static ssize_t tap_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
TAPState *s = DO_UPCAST(TAPState, nc, nc); TAPState *s = DO_UPCAST(TAPState, nc, nc);
struct iovec iov[1]; struct iovec iov[1];
if (s->has_vnet_hdr && !s->using_vnet_hdr) { if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
return tap_receive_raw(nc, buf, size); return tap_receive_raw(nc, buf, size);
} }
@ -202,9 +202,9 @@ static void tap_send(void *opaque)
break; break;
} }
if (s->has_vnet_hdr && !s->using_vnet_hdr) { if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
buf += sizeof(struct virtio_net_hdr); buf += s->host_vnet_hdr_len;
size -= sizeof(struct virtio_net_hdr); size -= s->host_vnet_hdr_len;
} }
size = qemu_send_packet_async(&s->nc, buf, size, tap_send_completed); size = qemu_send_packet_async(&s->nc, buf, size, tap_send_completed);
@ -229,7 +229,7 @@ int tap_has_vnet_hdr(VLANClientState *nc)
assert(nc->info->type == NET_CLIENT_TYPE_TAP); assert(nc->info->type == NET_CLIENT_TYPE_TAP);
return s->has_vnet_hdr; return !!s->host_vnet_hdr_len;
} }
void tap_using_vnet_hdr(VLANClientState *nc, int using_vnet_hdr) void tap_using_vnet_hdr(VLANClientState *nc, int using_vnet_hdr)
@ -239,7 +239,7 @@ void tap_using_vnet_hdr(VLANClientState *nc, int using_vnet_hdr)
using_vnet_hdr = using_vnet_hdr != 0; using_vnet_hdr = using_vnet_hdr != 0;
assert(nc->info->type == NET_CLIENT_TYPE_TAP); assert(nc->info->type == NET_CLIENT_TYPE_TAP);
assert(s->has_vnet_hdr == using_vnet_hdr); assert(!!s->host_vnet_hdr_len == using_vnet_hdr);
s->using_vnet_hdr = using_vnet_hdr; s->using_vnet_hdr = using_vnet_hdr;
} }
@ -310,7 +310,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
s = DO_UPCAST(TAPState, nc, nc); s = DO_UPCAST(TAPState, nc, nc);
s->fd = fd; s->fd = fd;
s->has_vnet_hdr = vnet_hdr != 0; s->host_vnet_hdr_len = vnet_hdr ? sizeof(struct virtio_net_hdr) : 0;
s->using_vnet_hdr = 0; s->using_vnet_hdr = 0;
s->has_ufo = tap_probe_has_ufo(s->fd); s->has_ufo = tap_probe_has_ufo(s->fd);
tap_set_offload(&s->nc, 0, 0, 0, 0, 0); tap_set_offload(&s->nc, 0, 0, 0, 0, 0);