From: David Gibson <david(a)gibson.dropbear.id.au>
tcp_vu_send_flag() and tcp_vu_prepare() both needs to do some different
things for IPv4 vs. IPv6. However the two paths have a number of lines of
duplicated code. We can share those at the expense of an additional
conditional (which we might be able to simplify again later).
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
Signed-off-by: Laurent Vivier <lvivier(a)redhat.com>
---
tcp_vu.c | 91 ++++++++++++++++++++++++--------------------------------
1 file changed, 39 insertions(+), 52 deletions(-)
diff --git a/tcp_vu.c b/tcp_vu.c
index cc6d4f0f262e..260dda7887e1 100644
--- a/tcp_vu.c
+++ b/tcp_vu.c
@@ -32,6 +32,7 @@
#include "tcp_internal.h"
#include "checksum.h"
#include "vu_common.h"
+#include <time.h>
static struct iovec iov_vu[VIRTQUEUE_MAX_SIZE + 1];
static struct vu_virtq_element elem[VIRTQUEUE_MAX_SIZE];
@@ -96,8 +97,12 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn,
int flags)
const struct flowside *tapside = TAPFLOW(conn);
size_t l2len, l4len, optlen, hdrlen;
struct vu_virtq_element flags_elem[2];
+ struct tcp_flags_t *tcp_flags;
+ struct ipv6hdr *ip6h = NULL;
struct iovec flags_iov[2];
+ struct iphdr *iph = NULL;
struct ethhdr *eh;
+ uint32_t seq;
int elem_cnt;
int nb_ack;
int ret;
@@ -119,60 +124,44 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn,
int flags)
memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source));
if (CONN_V4(conn)) {
- struct tcp_flags_t *tcp_flags;
- struct iphdr *iph;
- uint32_t seq;
-
eh->h_proto = htons(ETH_P_IP);
iph = vu_ip(flags_elem[0].in_sg[0].iov_base);
*iph = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_TCP);
tcp_flags = vu_payloadv4(flags_elem[0].in_sg[0].iov_base);
- memset(&tcp_flags->th, 0, sizeof(tcp_flags->th));
- tcp_flags->th.doff = offsetof(struct tcp_flags_t, opts) / 4;
- tcp_flags->th.ack = 1;
-
- seq = conn->seq_to_tap;
- ret = tcp_prepare_flags(c, conn, flags, &tcp_flags->th,
- &tcp_flags->opts, &optlen);
- if (ret <= 0) {
- vu_queue_rewind(vq, 1);
- return ret;
- }
-
- l4len = tcp_fill_headers4(conn, NULL, iph,
- (struct tcp_payload_t *)tcp_flags,
- optlen, NULL, seq, true);
- l2len = sizeof(*iph);
} else {
- struct tcp_flags_t *tcp_flags;
- struct ipv6hdr *ip6h;
- uint32_t seq;
-
eh->h_proto = htons(ETH_P_IPV6);
ip6h = vu_ip(flags_elem[0].in_sg[0].iov_base);
*ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_TCP);
-
tcp_flags = vu_payloadv6(flags_elem[0].in_sg[0].iov_base);
- memset(&tcp_flags->th, 0, sizeof(tcp_flags->th));
- tcp_flags->th.doff = offsetof(struct tcp_flags_t, opts) / 4;
- tcp_flags->th.ack = 1;
-
- seq = conn->seq_to_tap;
- ret = tcp_prepare_flags(c, conn, flags, &tcp_flags->th,
- &tcp_flags->opts, &optlen);
- if (ret <= 0) {
- vu_queue_rewind(vq, 1);
- return ret;
- }
+ }
+
+ memset(&tcp_flags->th, 0, sizeof(tcp_flags->th));
+ tcp_flags->th.doff = offsetof(struct tcp_flags_t, opts) / 4;
+ tcp_flags->th.ack = 1;
+
+ seq = conn->seq_to_tap;
+ ret = tcp_prepare_flags(c, conn, flags, &tcp_flags->th,
+ &tcp_flags->opts, &optlen);
+ if (ret <= 0) {
+ vu_queue_rewind(vq, 1);
+ return ret;
+ }
+ if (CONN_V4(conn)) {
+ l4len = tcp_fill_headers4(conn, NULL, iph,
+ (struct tcp_payload_t *)tcp_flags, optlen,
+ NULL, seq, true);
+ l2len = sizeof(*iph);
+ } else {
l4len = tcp_fill_headers6(conn, NULL, ip6h,
(struct tcp_payload_t *)tcp_flags,
optlen, seq, true);
l2len = sizeof(*ip6h);
}
+
l2len += l4len + sizeof(struct ethhdr);
flags_elem[0].in_sg[0].iov_len = l2len +
@@ -296,7 +285,10 @@ static void tcp_vu_prepare(const struct ctx *c,
size_t dlen, const uint16_t **check)
{
const struct flowside *toside = TAPFLOW(conn);
+ struct tcp_payload_t *payload;
char *base = first->iov_base;
+ struct ipv6hdr *ip6h = NULL;
+ struct iphdr *iph = NULL;
struct ethhdr *eh;
/* we guess the first iovec provided by the guest can embed
@@ -309,10 +301,8 @@ static void tcp_vu_prepare(const struct ctx *c,
memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source));
/* initialize header */
- if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) {
- struct tcp_payload_t *payload;
- struct iphdr *iph;
+ if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) {
ASSERT(first[0].iov_len >= sizeof(struct virtio_net_hdr_mrg_rxbuf) +
sizeof(struct ethhdr) + sizeof(struct iphdr) +
sizeof(struct tcphdr));
@@ -322,17 +312,7 @@ static void tcp_vu_prepare(const struct ctx *c,
iph = vu_ip(base);
*iph = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_TCP);
payload = vu_payloadv4(base);
- memset(&payload->th, 0, sizeof(payload->th));
- payload->th.doff = offsetof(struct tcp_payload_t, data) / 4;
- payload->th.ack = 1;
-
- tcp_fill_headers4(conn, NULL, iph, payload, dlen,
- *check, conn->seq_to_tap, true);
- *check = &iph->check;
} else {
- struct tcp_payload_t *payload;
- struct ipv6hdr *ip6h;
-
ASSERT(first[0].iov_len >= sizeof(struct virtio_net_hdr_mrg_rxbuf) +
sizeof(struct ethhdr) + sizeof(struct ipv6hdr) +
sizeof(struct tcphdr));
@@ -343,10 +323,17 @@ static void tcp_vu_prepare(const struct ctx *c,
*ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_TCP);
payload = vu_payloadv6(base);
- memset(&payload->th, 0, sizeof(payload->th));
- payload->th.doff = offsetof(struct tcp_payload_t, data) / 4;
- payload->th.ack = 1;
+ }
+ memset(&payload->th, 0, sizeof(payload->th));
+ payload->th.doff = offsetof(struct tcp_payload_t, data) / 4;
+ payload->th.ack = 1;
+
+ if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) {
+ tcp_fill_headers4(conn, NULL, iph, payload, dlen,
+ *check, conn->seq_to_tap, true);
+ *check = &iph->check;
+ } else {
tcp_fill_headers6(conn, NULL, ip6h, payload, dlen,
conn->seq_to_tap, true);
}
--
2.47.0