| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1407349024-2489-5-git-send-email-zoltan.kiss@citrix.com>
Date: Wed, 6 Aug 2014 19:17:04 +0100
From: Zoltan Kiss <zoltan.kiss@...rix.com>
To: Steffen Klassert <steffen.klassert@...unet.com>,
Mathias Krause <minipli@...glemail.com>,
Daniel Borkmann <dborkman@...hat.com>
CC: Zoltan Kiss <zoltan.kiss@...rix.com>,
"David S. Miller" <davem@...emloft.net>,
Thomas Graf <tgraf@...g.ch>, Joe Perches <joe@...ches.com>,
<netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<xen-devel@...ts.xenproject.org>
Subject: [PATCH net-next 4/4 v5] pktgen: Allow sending IPv4 TCP packets
This is a prototype patch to enable sending IPv4 TCP packets with pktgen. The
original motivation is to test TCP GSO with xen-netback/netfront, but I'm not
sure about how the checksum should be set up, and also someone should verify the
GSO settings I'm using.
Signed-off-by: Zoltan Kiss <zoltan.kiss@...rix.com>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: Thomas Graf <tgraf@...g.ch>
Cc: Joe Perches <joe@...ches.com>
Cc: netdev@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
Cc: xen-devel@...ts.xenproject.org
---
v3:
- mention explicitly that this for IPv4
- memset the TCP header and set up doff
- rework of checksum handling and GSO setting in fill_packet_ipv4
- bail out in pktgen_xmit if the device won't be able to handle GSO
v4:
- set the transport headers in dedicated functions
- instead of fake sockets just duplicate the relevant parts of
__tcp_v4_send_check
v5:
- ratelimit error message in xmit
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 0d0aaac..e84699d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -162,6 +162,7 @@
#include <net/checksum.h>
#include <net/ipv6.h>
#include <net/udp.h>
+#include <net/tcp.h>
#include <net/ip6_checksum.h>
#include <net/addrconf.h>
#ifdef CONFIG_XFRM
@@ -203,6 +204,7 @@
#define F_NODE (1<<15) /* Node memory alloc*/
#define F_UDPCSUM (1<<16) /* Include UDP checksum */
#define F_PATTERN (1<<17) /* Fill the payload with a pattern */
+#define F_TCP (1<<18) /* Send TCP packet instead of UDP */
/* Thread control flag bits */
#define T_STOP (1<<0) /* Stop run */
@@ -664,6 +666,9 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
if (pkt_dev->flags & F_PATTERN)
seq_puts(seq, "PATTERN ");
+ if (pkt_dev->flags & F_TCP)
+ seq_puts(seq, "TCP ");
+
if (pkt_dev->flags & F_MPLS_RND)
seq_puts(seq, "MPLS_RND ");
@@ -1342,6 +1347,12 @@ static ssize_t pktgen_if_write(struct file *file,
else if (strcmp(f, "!PATTERN") == 0)
pkt_dev->flags &= ~F_PATTERN;
+ else if (strcmp(f, "TCP") == 0)
+ pkt_dev->flags |= F_TCP;
+
+ else if (strcmp(f, "!TCP") == 0)
+ pkt_dev->flags &= ~F_TCP;
+
else {
sprintf(pg_result,
"Flag -:%s:- unknown\nAvailable flags, (prepend ! to un-set flag):\n%s",
@@ -2950,12 +2961,39 @@ static struct sk_buff *pktgen_alloc_skb(struct net_device *dev,
return skb;
}
+static int fill_packet_tcp(struct pktgen_dev *pkt_dev, struct sk_buff *skb)
+{
+ struct tcphdr *tcph =
+ (struct tcphdr *)skb_put(skb, sizeof(struct tcphdr));
+
+ memset(tcph, 0, sizeof(*tcph));
+ tcph->source = htons(pkt_dev->cur_udp_src);
+ tcph->dest = htons(pkt_dev->cur_udp_dst);
+ tcph->doff = sizeof(struct tcphdr) >> 2;
+ return pkt_dev->cur_pkt_size - ETH_HLEN - 20 - sizeof(struct tcphdr) -
+ pkt_dev->pkt_overhead;
+}
+
+static int fill_packet_udp(struct pktgen_dev *pkt_dev, struct sk_buff *skb)
+{
+ struct udphdr *udph =
+ (struct udphdr *)skb_put(skb, sizeof(struct udphdr));
+ int datalen = pkt_dev->cur_pkt_size - ETH_HLEN - 20 -
+ sizeof(struct udphdr) - pkt_dev->pkt_overhead;
+
+ udph = (struct udphdr *)skb_put(skb, sizeof(struct udphdr));
+ udph->source = htons(pkt_dev->cur_udp_src);
+ udph->dest = htons(pkt_dev->cur_udp_dst);
+ udph->len = htons(datalen + sizeof(struct udphdr));
+ udph->check = 0;
+ return datalen;
+}
+
static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
struct pktgen_dev *pkt_dev)
{
struct sk_buff *skb = NULL;
__u8 *eth;
- struct udphdr *udph;
int datalen, iplen;
struct iphdr *iph;
__be16 protocol = htons(ETH_P_IP);
@@ -3017,29 +3055,27 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
iph = (struct iphdr *) skb_put(skb, sizeof(struct iphdr));
skb_set_transport_header(skb, skb->len);
- udph = (struct udphdr *) skb_put(skb, sizeof(struct udphdr));
+
+ if (pkt_dev->flags & F_TCP)
+ datalen = fill_packet_tcp(pkt_dev, skb);
+ else
+ datalen = fill_packet_udp(pkt_dev, skb);
+
skb_set_queue_mapping(skb, queue_map);
skb->priority = pkt_dev->skb_priority;
memcpy(eth, pkt_dev->hh, 12);
*(__be16 *) & eth[12] = protocol;
- /* Eth + IPh + UDPh + mpls */
- datalen = pkt_dev->cur_pkt_size - 14 - 20 - 8 -
- pkt_dev->pkt_overhead;
if (datalen < 0 || datalen < sizeof(struct pktgen_hdr))
datalen = sizeof(struct pktgen_hdr);
- udph->source = htons(pkt_dev->cur_udp_src);
- udph->dest = htons(pkt_dev->cur_udp_dst);
- udph->len = htons(datalen + 8); /* DATA + udphdr */
- udph->check = 0;
iph->ihl = 5;
iph->version = 4;
iph->ttl = 32;
iph->tos = pkt_dev->tos;
- iph->protocol = IPPROTO_UDP; /* UDP */
+ iph->protocol = pkt_dev->flags & F_TCP ? IPPROTO_TCP : IPPROTO_UDP;
iph->saddr = pkt_dev->cur_saddr;
iph->daddr = pkt_dev->cur_daddr;
iph->id = htons(pkt_dev->ip_id);
@@ -3055,10 +3091,17 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
if (!(pkt_dev->flags & F_UDPCSUM)) {
skb->ip_summed = CHECKSUM_NONE;
} else if (odev->features & NETIF_F_V4_CSUM) {
- skb->ip_summed = CHECKSUM_PARTIAL;
- skb->csum = 0;
- udp4_hwcsum(skb, udph->source, udph->dest);
+ skb_checksum_setup(skb, true);
+ } else if (pkt_dev->flags & F_TCP) {
+ struct tcphdr *tcph = tcp_hdr(skb);
+
+ skb->ip_summed = CHECKSUM_NONE;
+ tcph->check = tcp_v4_check(skb->len, iph->saddr, iph->daddr,
+ csum_partial(tcph, tcph->doff << 2,
+ skb->csum));
} else {
+ struct udphdr * const udph =
+ (struct udphdr *)skb_transport_header(skb);
__wsum csum = udp_csum(skb);
/* add protocol-dependent pseudo-header */
@@ -3072,6 +3115,20 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
pktgen_finalize_skb(pkt_dev, skb, datalen);
+ if (odev->mtu < skb->len) {
+ int hdrlen = skb_transport_header(skb) - skb_mac_header(skb);
+
+ if (pkt_dev->flags & F_TCP) {
+ skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+ hdrlen += tcp_hdrlen(skb);
+ } else {
+ skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+ hdrlen += sizeof(struct udphdr);
+ }
+ skb_shinfo(skb)->gso_size = odev->mtu - hdrlen;
+ skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len - hdrlen, skb_shinfo(skb)->gso_size);
+ }
+
#ifdef CONFIG_XFRM
if (!process_ipsec(pkt_dev, skb, protocol))
return NULL;
@@ -3559,6 +3616,14 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
pkt_dev->last_pkt_size = pkt_dev->skb->len;
pkt_dev->allocated_skbs++;
pkt_dev->clone_count = 0; /* reset counter */
+
+ if (netif_needs_gso(pkt_dev->skb, netif_skb_features(pkt_dev->skb))) {
+ net_err_ratelimited("Device don't have necessary GSO features! netif_skb_features: %llX summed %u\n",
+ netif_skb_features(pkt_dev->skb),
+ pkt_dev->skb->ip_summed);
+ pkt_dev->sofar++;
+ goto out;
+ }
}
if (pkt_dev->delay && pkt_dev->last_ok)
@@ -3608,7 +3673,7 @@ unlock:
HARD_TX_UNLOCK(odev, txq);
local_bh_enable();
-
+out:
/* If pkt_dev->count is zero, then run forever */
if ((pkt_dev->count != 0) && (pkt_dev->sofar >= pkt_dev->count)) {
pktgen_wait_for_skb(pkt_dev);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists