joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

remove clatd_microbenchmark.c

Browse source 
In the era of ebpf offload the speed of writing packets via
tun and reading via udp socket aren't all that important.

Test: builds
Bug: 144730808
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie2b49c8b109052b9212d3b21fd16784a464e2a1b
This commit is contained in:
Maciej Żenczykowski 2019-11-26 22:44:08 -08:00
commit badfbedcad
4 changed files with 0 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Android.bp
View file

@ -96,16 +96,3 @@ cc_test {
test_suites: ["device-tests"],
require_root: true,
}
// Microbenchmark.
cc_test {
name: "clatd_microbenchmark",
defaults: ["clatd_defaults"],
srcs: [
"clatd_microbenchmark.c",
"tun.c",
],
shared_libs: [
"libnetutils",
],
}

211
clatd_microbenchmark.c
View file

@ -1,211 +0,0 @@
/*
* Copyright 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* clatd_microbenchmark.c - micro-benchmark for clatd tun send path
*
* Run with:
*
* adb push {$ANDROID_PRODUCT_OUT,}/data/nativetest/clatd_microbenchmark/clatd_microbenchmark
* adb shell /data/nativetest/clatd_microbenchmark/clatd_microbenchmark
*
*/
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/if.h>
#include <linux/if_tun.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/ip6.h>
#include <netinet/udp.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <time.h>
#include <unistd.h>
#include "netutils/checksum.h"
#include "tun.h"
#define DEVICENAME "clat4"
#define PORT 51339
#define PAYLOADSIZE (1280 - sizeof(struct iphdr) - sizeof(struct udphdr))
#define NUMPACKETS 1000000
#define SEC_TO_NANOSEC (1000 * 1000 * 1000)
void init_sockaddr_in(struct sockaddr_in *sin, const char *addr) {
sin->sin_family = AF_INET;
sin->sin_port = 0;
sin->sin_addr.s_addr = inet_addr(addr);
}
void die(const char *str) {
perror(str);
exit(1);
}
int setup_tun() {
int fd = tun_open();
if (fd == -1) die("tun_open");
char dev[IFNAMSIZ] = DEVICENAME;
int ret = tun_alloc(dev, fd, sizeof(dev));
if (ret == -1) die("tun_alloc");
struct ifreq ifr = {
.ifr_name = DEVICENAME,
};
int s = socket(AF_INET, SOCK_DGRAM, 0);
init_sockaddr_in((struct sockaddr_in *)&ifr.ifr_addr, "192.0.0.4");
if (ioctl(s, SIOCSIFADDR, &ifr) < 0) die("SIOCSIFADDR");
init_sockaddr_in((struct sockaddr_in *)&ifr.ifr_addr, "255.255.255.248");
if (ioctl(s, SIOCSIFNETMASK, &ifr) < 0) die("SIOCSIFNETMASK");
if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) die("SIOCGIFFLAGS");
ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) die("SIOCSIFFLAGS");
return fd;
}
int send_packet(int fd, uint8_t payload[], int len, uint32_t payload_checksum) {
struct tun_pi tun = { 0, htons(ETH_P_IP) };
struct udphdr udp = {
.source = htons(1234),
.dest = htons(PORT),
.len = htons(len + sizeof(udp)),
.check = 0,
};
struct iphdr ip = {
.version = 4,
.ihl = 5,
.tot_len = htons(len + sizeof(ip) + sizeof(udp)),
.frag_off = htons(IP_DF),
.ttl = 55,
.protocol = IPPROTO_UDP,
.saddr = htonl(0xc0000006), // 192.0.0.6
.daddr = htonl(0xc0000004), // 192.0.0.4
};
clat_packet out = {
{ &tun, sizeof(tun) }, // tun header
{ &ip, sizeof(ip) }, // IP header
{ NULL, 0 }, // Fragment header
{ &udp, sizeof(udp) }, // Transport header
{ NULL, 0 }, // ICMP error IP header
{ NULL, 0 }, // ICMP error fragment header
{ NULL, 0 }, // ICMP error transport header
{ payload, len }, // Payload
};
ip.check = ip_checksum(&ip, sizeof(ip));
uint32_t sum;
sum = ipv4_pseudo_header_checksum(&ip, ntohs(udp.len));
sum = ip_checksum_add(sum, &udp, sizeof(udp));
sum += payload_checksum;
udp.check = ip_checksum_finish(sum);
return send_tun(fd, out, sizeof(out) / sizeof(out[0]));
}
double timedelta(const struct timespec tv1, const struct timespec tv2) {
struct timespec end = tv2;
if (end.tv_nsec < tv1.tv_nsec) {
end.tv_sec -= 1;
end.tv_nsec += SEC_TO_NANOSEC;
}
double seconds = (end.tv_sec - tv1.tv_sec);
seconds += (((double)(end.tv_nsec - tv1.tv_nsec)) / SEC_TO_NANOSEC);
return seconds;
}
void benchmark(const char *name, int fd, int s, int num, int do_read, uint8_t payload[], int len,
uint32_t payload_sum) {
int i;
char buf[4096];
struct timespec tv1, tv2;
int write_err = 0, read_err = 0;
clock_gettime(CLOCK_MONOTONIC, &tv1);
for (i = 0; i < num; i++) {
if (send_packet(fd, payload, len, payload_sum) == -1) write_err++;
if (do_read && recvfrom(s, buf, sizeof(buf), 0, NULL, NULL) == -1) {
read_err++;
if (errno == ETIMEDOUT) {
printf("Timed out after %d packets!\n", i);
break;
}
}
}
clock_gettime(CLOCK_MONOTONIC, &tv2);
double seconds = timedelta(tv1, tv2);
int pps = (int)(i / seconds);
double mbps = (i * PAYLOADSIZE / 1000000 * 8 / seconds);
printf("%s: %d packets in %.2fs (%d pps, %.2f Mbps), ", name, i, seconds, pps, mbps);
printf("read err %d (%.2f%%), write err %d (%.2f%%)\n", read_err, (float)read_err / i * 100,
write_err, (float)write_err / i * 100);
}
int open_socket() {
int sock = socket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
int on = 1;
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) die("SO_REUSEADDR");
struct timeval tv = { 1, 0 };
if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) == -1) die("SO_RCVTIMEO");
struct sockaddr_in addr = {
.sin_family = AF_INET,
.sin_port = ntohs(PORT),
.sin_addr = { INADDR_ANY },
};
if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) die("bind");
return sock;
}
int main() {
int fd = setup_tun();
int sock = open_socket();
int i;
uint8_t payload[PAYLOADSIZE];
for (i = 0; i < (int)sizeof(payload); i++) {
payload[i] = (uint8_t)i;
}
uint32_t payload_sum = ip_checksum_add(0, payload, sizeof(payload));
// Check things are working.
char buf[4096];
if (send_packet(fd, payload, sizeof(payload), payload_sum) == -1) die("send_packet");
if (recvfrom(sock, buf, sizeof(buf), 0, NULL, NULL) == -1) die("recvfrom");
benchmark("Blocking", fd, sock, NUMPACKETS, 1, payload, sizeof(payload), payload_sum);
close(fd);
fd = setup_tun();
benchmark("No read", fd, sock, NUMPACKETS, 0, payload, sizeof(payload), payload_sum);
close(fd);
fd = setup_tun();
benchmark("Nonblocking", fd, sock, NUMPACKETS, 1, payload, sizeof(payload), payload_sum);
close(fd);
return 0;
}

66
tun.c
View file

@ -1,66 +0,0 @@
/*
* Copyright 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* tun.c - tun device functions
*/
#include <arpa/inet.h>
#include <fcntl.h>
#include <linux/if.h>
#include <linux/if_tun.h>
#include <string.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include "common.h"
/* function: tun_open
* tries to open the tunnel device in non-blocking mode
*/
int tun_open() {
int fd;
fd = open("/dev/tun", O_RDWR | O_NONBLOCK | O_CLOEXEC);
if (fd < 0) {
fd = open("/dev/net/tun", O_RDWR | O_NONBLOCK | O_CLOEXEC);
}
return fd;
}
/* function: tun_alloc
* creates a tun interface and names it
* dev - the name for the new tun device
* fd - an open fd to the tun device node
* len - the length of the buffer pointed to by dev
*/
int tun_alloc(char *dev, int fd, size_t len) {
struct ifreq ifr;
int err;
memset(&ifr, 0, sizeof(ifr));
ifr.ifr_flags = IFF_TUN;
if (*dev) {
strncpy(ifr.ifr_name, dev, IFNAMSIZ);
ifr.ifr_name[IFNAMSIZ - 1] = '\0';
}
if ((err = ioctl(fd, TUNSETIFF, (void *)&ifr)) < 0) {
close(fd);
return err;
}
strlcpy(dev, ifr.ifr_name, len);
return 0;
}

4
tun.h
View file

@ -32,10 +32,6 @@ struct tun_data {
struct packet_ring ring;
};
// tun_open and tun_alloc are defined in tun.c and only used by clatd_microbenchmark.c
int tun_open();
int tun_alloc(char *dev, int fd, size_t len);
/* function: send_tun
* sends a clat_packet to a tun interface
* fd - the tun filedescriptor