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

tap: Add USO support to tap device.

Browse Source 
Passing additional parameters (USOv4 and USOv6 offloads) when
setting TAP offloads

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Andrew Melnychenko 2023-08-01 01:31:45 +03:00 committed by Jason Wang
parent 005ad32358
commit 2ab0ec3121
15 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/net/e1000e_core.c
View File

@ -2852,7 +2852,7 @@ e1000e_update_rx_offloads(E1000ECore *core)
if (core->has_vnet) { if (core->has_vnet) {
qemu_set_offload(qemu_get_queue(core->owner_nic)->peer, qemu_set_offload(qemu_get_queue(core->owner_nic)->peer,
cso_state, 0, 0, 0, 0); cso_state, 0, 0, 0, 0, 0, 0);
} }
} }

2
hw/net/igb_core.c
View File

@ -2753,7 +2753,7 @@ igb_update_rx_offloads(IGBCore *core)
if (core->has_vnet) { if (core->has_vnet) {
qemu_set_offload(qemu_get_queue(core->owner_nic)->peer, qemu_set_offload(qemu_get_queue(core->owner_nic)->peer,
cso_state, 0, 0, 0, 0); cso_state, 0, 0, 0, 0, 0, 0);
} }
} }

4
hw/net/virtio-net.c
View File

@ -859,7 +859,9 @@ static void virtio_net_apply_guest_offloads(VirtIONet *n)
!!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO4)), !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO4)),
!!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO6)), !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO6)),
!!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_ECN)), !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_ECN)),
!!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_UFO))); !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_UFO)),
!!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO4)),
!!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO6)));
} }
static uint64_t virtio_net_guest_offloads_by_features(uint32_t features) static uint64_t virtio_net_guest_offloads_by_features(uint32_t features)

2
hw/net/vmxnet3.c
View File

@ -1341,6 +1341,8 @@ static void vmxnet3_update_features(VMXNET3State *s)
s->lro_supported, s->lro_supported,
s->lro_supported, s->lro_supported,
0, 0,
0,
0,
0); 0);
} }
} }

4
include/net/net.h
View File

@ -58,7 +58,7 @@ typedef bool (HasVnetHdr)(NetClientState *);
typedef bool (HasVnetHdrLen)(NetClientState *, int); typedef bool (HasVnetHdrLen)(NetClientState *, int);
typedef bool (GetUsingVnetHdr)(NetClientState *); typedef bool (GetUsingVnetHdr)(NetClientState *);
typedef void (UsingVnetHdr)(NetClientState *, bool); typedef void (UsingVnetHdr)(NetClientState *, bool);
typedef void (SetOffload)(NetClientState *, int, int, int, int, int); typedef void (SetOffload)(NetClientState *, int, int, int, int, int, int, int);
typedef int (GetVnetHdrLen)(NetClientState *); typedef int (GetVnetHdrLen)(NetClientState *);
typedef void (SetVnetHdrLen)(NetClientState *, int); typedef void (SetVnetHdrLen)(NetClientState *, int);
typedef int (SetVnetLE)(NetClientState *, bool); typedef int (SetVnetLE)(NetClientState *, bool);
@ -192,7 +192,7 @@ bool qemu_has_vnet_hdr_len(NetClientState *nc, int len);
bool qemu_get_using_vnet_hdr(NetClientState *nc); bool qemu_get_using_vnet_hdr(NetClientState *nc);
void qemu_using_vnet_hdr(NetClientState *nc, bool enable); void qemu_using_vnet_hdr(NetClientState *nc, bool enable);
void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6, void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
int ecn, int ufo); int ecn, int ufo, int uso4, int uso6);
int qemu_get_vnet_hdr_len(NetClientState *nc); int qemu_get_vnet_hdr_len(NetClientState *nc);
void qemu_set_vnet_hdr_len(NetClientState *nc, int len); void qemu_set_vnet_hdr_len(NetClientState *nc, int len);
int qemu_set_vnet_le(NetClientState *nc, bool is_le); int qemu_set_vnet_le(NetClientState *nc, bool is_le);

4
net/net.c
View File

@ -532,13 +532,13 @@ void qemu_using_vnet_hdr(NetClientState *nc, bool enable)
} }
void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6, void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
int ecn, int ufo) int ecn, int ufo, int uso4, int uso6)
{ {
if (!nc || !nc->info->set_offload) { if (!nc || !nc->info->set_offload) {
return; return;
} }
nc->info->set_offload(nc, csum, tso4, tso6, ecn, ufo); nc->info->set_offload(nc, csum, tso4, tso6, ecn, ufo, uso4, uso6);
} }
int qemu_get_vnet_hdr_len(NetClientState *nc) int qemu_get_vnet_hdr_len(NetClientState *nc)

2
net/netmap.c
View File

@ -371,7 +371,7 @@ static void netmap_set_vnet_hdr_len(NetClientState *nc, int len)
} }
static void netmap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, static void netmap_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
int ecn, int ufo) int ecn, int ufo, int uso4, int uso6)
{ {
NetmapState *s = DO_UPCAST(NetmapState, nc, nc); NetmapState *s = DO_UPCAST(NetmapState, nc, nc);

2
net/tap-bsd.c
View File

@ -232,7 +232,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
} }
void tap_fd_set_offload(int fd, int csum, int tso4, void tap_fd_set_offload(int fd, int csum, int tso4,
int tso6, int ecn, int ufo) int tso6, int ecn, int ufo, int uso4, int uso6)
{ {
} }

15
net/tap-linux.c
View File

@ -237,7 +237,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
} }
void tap_fd_set_offload(int fd, int csum, int tso4, void tap_fd_set_offload(int fd, int csum, int tso4,
int tso6, int ecn, int ufo) int tso6, int ecn, int ufo, int uso4, int uso6)
{ {
unsigned int offload = 0; unsigned int offload = 0;
@ -256,13 +256,22 @@ void tap_fd_set_offload(int fd, int csum, int tso4,
offload |= TUN_F_TSO_ECN; offload |= TUN_F_TSO_ECN;
if (ufo) if (ufo)
offload |= TUN_F_UFO; offload |= TUN_F_UFO;
if (uso4) {
offload |= TUN_F_USO4;
}
if (uso6) {
offload |= TUN_F_USO6;
}
} }
if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) { if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
offload &= ~TUN_F_UFO; offload &= ~(TUN_F_USO4 | TUN_F_USO6);
if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) { if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
fprintf(stderr, "TUNSETOFFLOAD ioctl() failed: %s\n", offload &= ~TUN_F_UFO;
if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
fprintf(stderr, "TUNSETOFFLOAD ioctl() failed: %s\n",
strerror(errno)); strerror(errno));
}
} }
} }
} }

2
net/tap-linux.h
View File

@ -50,5 +50,7 @@
#define TUN_F_TSO6 0x04 /* I can handle TSO for IPv6 packets */ #define TUN_F_TSO6 0x04 /* I can handle TSO for IPv6 packets */
#define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */ #define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */
#define TUN_F_UFO 0x10 /* I can handle UFO packets */ #define TUN_F_UFO 0x10 /* I can handle UFO packets */
#define TUN_F_USO4 0x20 /* I can handle USO for IPv4 packets */
#define TUN_F_USO6 0x40 /* I can handle USO for IPv6 packets */
#endif /* QEMU_TAP_LINUX_H */ #endif /* QEMU_TAP_LINUX_H */

2
net/tap-solaris.c
View File

@ -236,7 +236,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
} }
void tap_fd_set_offload(int fd, int csum, int tso4, void tap_fd_set_offload(int fd, int csum, int tso4,
int tso6, int ecn, int ufo) int tso6, int ecn, int ufo, int uso4, int uso6)
{ {
} }

2
net/tap-stub.c
View File

@ -67,7 +67,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
} }
void tap_fd_set_offload(int fd, int csum, int tso4, void tap_fd_set_offload(int fd, int csum, int tso4,
int tso6, int ecn, int ufo) int tso6, int ecn, int ufo, int uso4, int uso6)
{ {
} }

2
net/tap-win32.c
View File

@ -741,7 +741,7 @@ static void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr)
} }
static void tap_set_offload(NetClientState *nc, int csum, int tso4, static void tap_set_offload(NetClientState *nc, int csum, int tso4,
int tso6, int ecn, int ufo) int tso6, int ecn, int ufo, int uso4, int uso6)
{ {
} }

6
net/tap.c
View File

@ -307,14 +307,14 @@ static int tap_set_vnet_be(NetClientState *nc, bool is_be)
} }
static void tap_set_offload(NetClientState *nc, int csum, int tso4, static void tap_set_offload(NetClientState *nc, int csum, int tso4,
int tso6, int ecn, int ufo) int tso6, int ecn, int ufo, int uso4, int uso6)
{ {
TAPState *s = DO_UPCAST(TAPState, nc, nc); TAPState *s = DO_UPCAST(TAPState, nc, nc);
if (s->fd < 0) { if (s->fd < 0) {
return; return;
} }
tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo); tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo, uso4, uso6);
} }
static void tap_exit_notify(Notifier *notifier, void *data) static void tap_exit_notify(Notifier *notifier, void *data)
@ -414,7 +414,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
s->using_vnet_hdr = false; s->using_vnet_hdr = false;
s->has_ufo = tap_probe_has_ufo(s->fd); s->has_ufo = tap_probe_has_ufo(s->fd);
s->enabled = true; s->enabled = true;
tap_set_offload(&s->nc, 0, 0, 0, 0, 0); tap_set_offload(&s->nc, 0, 0, 0, 0, 0, 0, 0);
/* /*
* Make sure host header length is set correctly in tap: * Make sure host header length is set correctly in tap:
* it might have been modified by another instance of qemu. * it might have been modified by another instance of qemu.

3
net/tap_int.h
View File

@ -37,7 +37,8 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
int tap_probe_vnet_hdr(int fd, Error **errp); int tap_probe_vnet_hdr(int fd, Error **errp);
int tap_probe_vnet_hdr_len(int fd, int len); int tap_probe_vnet_hdr_len(int fd, int len);
int tap_probe_has_ufo(int fd); int tap_probe_has_ufo(int fd);
void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo); void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo,
int uso4, int uso6);
void tap_fd_set_vnet_hdr_len(int fd, int len); void tap_fd_set_vnet_hdr_len(int fd, int len);
int tap_fd_set_vnet_le(int fd, int vnet_is_le); int tap_fd_set_vnet_le(int fd, int vnet_is_le);
int tap_fd_set_vnet_be(int fd, int vnet_is_be); int tap_fd_set_vnet_be(int fd, int vnet_is_be);