Skip to content

T
tsn-measures
Commit 126217da authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

Add AF_XDP sockets 

Describe XDP option in help
Add option to link with local libbpf folder
Update wrapper server script
Fix min max functions conflicts
Compile xdp-kern.o
Add IFLAGS to CFLAGS in makefile for XDP
Add bpf_helpers and xdp_kern files
Close XDP socket before exiting program
Add tracecmd option for XDP
Print stats for XDP too
Add an active polling mode
parent 682b8420
Show whitespace changes
Inline Side-by-side
Showing with 1804 additions and 951 deletions
packet-exchange/build/Makefile
View file @ 126217da
...@@ -27,15 +27,35 @@ CFLAGS += -MD -MP ...@@ -27,15 +27,35 @@ CFLAGS += -MD -MP
CFLAGS += -I $(SRCDIR) CFLAGS += -I $(SRCDIR)
CFLAGS += -std=gnu99 CFLAGS += -std=gnu99
LDFLAGS = -pthread LLIBS = -pthread
ifneq ($(WITH_XDP),)
CFLAGS += -D WITH_XDP
LDFLAGS += -L/usr/lib -lbpf
else ifneq ($(WITH_GIT_XDP),)
IFLAGS += -I ${HOME}/libbpf/include
CFLAGS += -D WITH_XDP $(IFLAGS)
LDIRS += -L${HOME}/libbpf/src
LLIBS += -lelf -lz -l:libbpf.a
endif
vpath %.c $(SRCDIR) vpath %.c $(SRCDIR)
xdp_kern.o: xdp_kern.c
clang $(IFLAGS) -isystem /usr/include/arm-linux-gnueabihf -S -target bpf -D __BPF_TRACING__ -Wall -O2 -emit-llvm -c -g -o xdp_kern.ll $^
llc -march=bpf -filetype=obj -o $@ xdp_kern.ll
ifneq ($(WITH_GIT_XDP),)
$(SERVER_PROG): $(SERVER_OBJS) xdp_kern.o
$(CC) $(LDFLAGS) $(LDIRS) $(SERVER_OBJS) $(LLIBS) -o $@
else
$(SERVER_PROG): $(SERVER_OBJS) $(SERVER_PROG): $(SERVER_OBJS)
$(CC) $(LDFLAGS) $^ -o $@ $(CC) $(LDFLAGS) $(LDIRS) $^ $(LLIBS) -o $@
endif
$(CLIENT_PROG): $(CLIENT_OBJS) $(CLIENT_PROG): $(CLIENT_OBJS)
$(CC) $(LDFLAGS) $^ -o $@ $(CC) $(LDFLAGS) $(LDIRS) $^ $(LLIBS) -o $@
-include $(subst .c,.d,$(SERVER_SRCS)) -include $(subst .c,.d,$(SERVER_SRCS))
-include $(subst .c,.d,$(CLIENT_SRCS)) -include $(subst .c,.d,$(CLIENT_SRCS))
......
packet-exchange/src/bpf_helpers.h 0 → 100644
View file @ 126217da
/* SPDX-License-Identifier: GPL-2.0 */
/* Copied from $(LINUX)/tools/testing/selftests/bpf/bpf_helpers.h */
/* Added to fix compilation on old Ubuntu systems - please preserve when
updating file! */
#ifndef __always_inline
# define __always_inline inline __attribute__((always_inline))
#endif
#ifndef __BPF_HELPERS_H
#define __BPF_HELPERS_H
/* helper macro to place programs, maps, license in
* different sections in elf_bpf file. Section names
* are interpreted by elf_bpf loader
*/
#define SEC(NAME) __attribute__((section(NAME), used))
/* helper functions called from eBPF programs written in C */
static void *(*bpf_map_lookup_elem)(void *map, void *key) =
(void *) BPF_FUNC_map_lookup_elem;
static int (*bpf_map_update_elem)(void *map, void *key, void *value,
unsigned long long flags) =
(void *) BPF_FUNC_map_update_elem;
static int (*bpf_map_delete_elem)(void *map, void *key) =
(void *) BPF_FUNC_map_delete_elem;
static int (*bpf_map_push_elem)(void *map, void *value,
unsigned long long flags) =
(void *) BPF_FUNC_map_push_elem;
static int (*bpf_map_pop_elem)(void *map, void *value) =
(void *) BPF_FUNC_map_pop_elem;
static int (*bpf_map_peek_elem)(void *map, void *value) =
(void *) BPF_FUNC_map_peek_elem;
static int (*bpf_probe_read)(void *dst, int size, void *unsafe_ptr) =
(void *) BPF_FUNC_probe_read;
static unsigned long long (*bpf_ktime_get_ns)(void) =
(void *) BPF_FUNC_ktime_get_ns;
static int (*bpf_trace_printk)(const char *fmt, int fmt_size, ...) =
(void *) BPF_FUNC_trace_printk;
static void (*bpf_tail_call)(void *ctx, void *map, int index) =
(void *) BPF_FUNC_tail_call;
static unsigned long long (*bpf_get_smp_processor_id)(void) =
(void *) BPF_FUNC_get_smp_processor_id;
static unsigned long long (*bpf_get_current_pid_tgid)(void) =
(void *) BPF_FUNC_get_current_pid_tgid;
static unsigned long long (*bpf_get_current_uid_gid)(void) =
(void *) BPF_FUNC_get_current_uid_gid;
static int (*bpf_get_current_comm)(void *buf, int buf_size) =
(void *) BPF_FUNC_get_current_comm;
static unsigned long long (*bpf_perf_event_read)(void *map,
unsigned long long flags) =
(void *) BPF_FUNC_perf_event_read;
static int (*bpf_clone_redirect)(void *ctx, int ifindex, int flags) =
(void *) BPF_FUNC_clone_redirect;
static int (*bpf_redirect)(int ifindex, int flags) =
(void *) BPF_FUNC_redirect;
static int (*bpf_redirect_map)(void *map, int key, int flags) =
(void *) BPF_FUNC_redirect_map;
static int (*bpf_perf_event_output)(void *ctx, void *map,
unsigned long long flags, void *data,
int size) =
(void *) BPF_FUNC_perf_event_output;
static int (*bpf_get_stackid)(void *ctx, void *map, int flags) =
(void *) BPF_FUNC_get_stackid;
static int (*bpf_probe_write_user)(void *dst, void *src, int size) =
(void *) BPF_FUNC_probe_write_user;
static int (*bpf_current_task_under_cgroup)(void *map, int index) =
(void *) BPF_FUNC_current_task_under_cgroup;
static int (*bpf_skb_get_tunnel_key)(void *ctx, void *key, int size, int flags) =
(void *) BPF_FUNC_skb_get_tunnel_key;
static int (*bpf_skb_set_tunnel_key)(void *ctx, void *key, int size, int flags) =
(void *) BPF_FUNC_skb_set_tunnel_key;
static int (*bpf_skb_get_tunnel_opt)(void *ctx, void *md, int size) =
(void *) BPF_FUNC_skb_get_tunnel_opt;
static int (*bpf_skb_set_tunnel_opt)(void *ctx, void *md, int size) =
(void *) BPF_FUNC_skb_set_tunnel_opt;
static unsigned long long (*bpf_get_prandom_u32)(void) =
(void *) BPF_FUNC_get_prandom_u32;
static int (*bpf_xdp_adjust_head)(void *ctx, int offset) =
(void *) BPF_FUNC_xdp_adjust_head;
static int (*bpf_xdp_adjust_meta)(void *ctx, int offset) =
(void *) BPF_FUNC_xdp_adjust_meta;
static int (*bpf_get_socket_cookie)(void *ctx) =
(void *) BPF_FUNC_get_socket_cookie;
static int (*bpf_setsockopt)(void *ctx, int level, int optname, void *optval,
int optlen) =
(void *) BPF_FUNC_setsockopt;
static int (*bpf_getsockopt)(void *ctx, int level, int optname, void *optval,
int optlen) =
(void *) BPF_FUNC_getsockopt;
static int (*bpf_sock_ops_cb_flags_set)(void *ctx, int flags) =
(void *) BPF_FUNC_sock_ops_cb_flags_set;
static int (*bpf_sk_redirect_map)(void *ctx, void *map, int key, int flags) =
(void *) BPF_FUNC_sk_redirect_map;
static int (*bpf_sk_redirect_hash)(void *ctx, void *map, void *key, int flags) =
(void *) BPF_FUNC_sk_redirect_hash;
static int (*bpf_sock_map_update)(void *map, void *key, void *value,
unsigned long long flags) =
(void *) BPF_FUNC_sock_map_update;
static int (*bpf_sock_hash_update)(void *map, void *key, void *value,
unsigned long long flags) =
(void *) BPF_FUNC_sock_hash_update;
static int (*bpf_perf_event_read_value)(void *map, unsigned long long flags,
void *buf, unsigned int buf_size) =
(void *) BPF_FUNC_perf_event_read_value;
static int (*bpf_perf_prog_read_value)(void *ctx, void *buf,
unsigned int buf_size) =
(void *) BPF_FUNC_perf_prog_read_value;
static int (*bpf_override_return)(void *ctx, unsigned long rc) =
(void *) BPF_FUNC_override_return;
static int (*bpf_msg_redirect_map)(void *ctx, void *map, int key, int flags) =
(void *) BPF_FUNC_msg_redirect_map;
static int (*bpf_msg_redirect_hash)(void *ctx,
void *map, void *key, int flags) =
(void *) BPF_FUNC_msg_redirect_hash;
static int (*bpf_msg_apply_bytes)(void *ctx, int len) =
(void *) BPF_FUNC_msg_apply_bytes;
static int (*bpf_msg_cork_bytes)(void *ctx, int len) =
(void *) BPF_FUNC_msg_cork_bytes;
static int (*bpf_msg_pull_data)(void *ctx, int start, int end, int flags) =
(void *) BPF_FUNC_msg_pull_data;
static int (*bpf_msg_push_data)(void *ctx, int start, int end, int flags) =
(void *) BPF_FUNC_msg_push_data;
static int (*bpf_msg_pop_data)(void *ctx, int start, int cut, int flags) =
(void *) BPF_FUNC_msg_pop_data;
static int (*bpf_bind)(void *ctx, void *addr, int addr_len) =
(void *) BPF_FUNC_bind;
static int (*bpf_xdp_adjust_tail)(void *ctx, int offset) =
(void *) BPF_FUNC_xdp_adjust_tail;
static int (*bpf_skb_get_xfrm_state)(void *ctx, int index, void *state,
int size, int flags) =
(void *) BPF_FUNC_skb_get_xfrm_state;
static int (*bpf_sk_select_reuseport)(void *ctx, void *map, void *key, __u32 flags) =
(void *) BPF_FUNC_sk_select_reuseport;
static int (*bpf_get_stack)(void *ctx, void *buf, int size, int flags) =
(void *) BPF_FUNC_get_stack;
static int (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params,
int plen, __u32 flags) =
(void *) BPF_FUNC_fib_lookup;
static int (*bpf_lwt_push_encap)(void *ctx, unsigned int type, void *hdr,
unsigned int len) =
(void *) BPF_FUNC_lwt_push_encap;
static int (*bpf_lwt_seg6_store_bytes)(void *ctx, unsigned int offset,
void *from, unsigned int len) =
(void *) BPF_FUNC_lwt_seg6_store_bytes;
static int (*bpf_lwt_seg6_action)(void *ctx, unsigned int action, void *param,
unsigned int param_len) =
(void *) BPF_FUNC_lwt_seg6_action;
static int (*bpf_lwt_seg6_adjust_srh)(void *ctx, unsigned int offset,
unsigned int len) =
(void *) BPF_FUNC_lwt_seg6_adjust_srh;
static int (*bpf_rc_repeat)(void *ctx) =
(void *) BPF_FUNC_rc_repeat;
static int (*bpf_rc_keydown)(void *ctx, unsigned int protocol,
unsigned long long scancode, unsigned int toggle) =
(void *) BPF_FUNC_rc_keydown;
static unsigned long long (*bpf_get_current_cgroup_id)(void) =
(void *) BPF_FUNC_get_current_cgroup_id;
static void *(*bpf_get_local_storage)(void *map, unsigned long long flags) =
(void *) BPF_FUNC_get_local_storage;
static unsigned long long (*bpf_skb_cgroup_id)(void *ctx) =
(void *) BPF_FUNC_skb_cgroup_id;
static unsigned long long (*bpf_skb_ancestor_cgroup_id)(void *ctx, int level) =
(void *) BPF_FUNC_skb_ancestor_cgroup_id;
static struct bpf_sock *(*bpf_sk_lookup_tcp)(void *ctx,
struct bpf_sock_tuple *tuple,
int size, unsigned long long netns_id,
unsigned long long flags) =
(void *) BPF_FUNC_sk_lookup_tcp;
static struct bpf_sock *(*bpf_sk_lookup_udp)(void *ctx,
struct bpf_sock_tuple *tuple,
int size, unsigned long long netns_id,
unsigned long long flags) =
(void *) BPF_FUNC_sk_lookup_udp;
static int (*bpf_sk_release)(struct bpf_sock *sk) =
(void *) BPF_FUNC_sk_release;
static int (*bpf_skb_vlan_push)(void *ctx, __be16 vlan_proto, __u16 vlan_tci) =
(void *) BPF_FUNC_skb_vlan_push;
static int (*bpf_skb_vlan_pop)(void *ctx) =
(void *) BPF_FUNC_skb_vlan_pop;
static int (*bpf_rc_pointer_rel)(void *ctx, int rel_x, int rel_y) =
(void *) BPF_FUNC_rc_pointer_rel;
static void (*bpf_spin_lock)(struct bpf_spin_lock *lock) =
(void *) BPF_FUNC_spin_lock;
static void (*bpf_spin_unlock)(struct bpf_spin_lock *lock) =
(void *) BPF_FUNC_spin_unlock;
static struct bpf_sock *(*bpf_sk_fullsock)(struct bpf_sock *sk) =
(void *) BPF_FUNC_sk_fullsock;
static struct bpf_tcp_sock *(*bpf_tcp_sock)(struct bpf_sock *sk) =
(void *) BPF_FUNC_tcp_sock;
static struct bpf_sock *(*bpf_get_listener_sock)(struct bpf_sock *sk) =
(void *) BPF_FUNC_get_listener_sock;
static int (*bpf_skb_ecn_set_ce)(void *ctx) =
(void *) BPF_FUNC_skb_ecn_set_ce;
/* llvm builtin functions that eBPF C program may use to
* emit BPF_LD_ABS and BPF_LD_IND instructions
*/
struct sk_buff;
unsigned long long load_byte(void *skb,
unsigned long long off) asm("llvm.bpf.load.byte");
unsigned long long load_half(void *skb,
unsigned long long off) asm("llvm.bpf.load.half");
unsigned long long load_word(void *skb,
unsigned long long off) asm("llvm.bpf.load.word");
/* a helper structure used by eBPF C program
* to describe map attributes to elf_bpf loader
*/
struct bpf_map_def {
unsigned int type;
unsigned int key_size;
unsigned int value_size;
unsigned int max_entries;
unsigned int map_flags;
unsigned int inner_map_idx;
unsigned int numa_node;
};
#define BPF_ANNOTATE_KV_PAIR(name, type_key, type_val) \
struct ____btf_map_##name { \
type_key key; \
type_val value; \
}; \
struct ____btf_map_##name \
__attribute__ ((section(".maps." #name), used)) \
____btf_map_##name = { }
static int (*bpf_skb_load_bytes)(void *ctx, int off, void *to, int len) =
(void *) BPF_FUNC_skb_load_bytes;
static int (*bpf_skb_load_bytes_relative)(void *ctx, int off, void *to, int len, __u32 start_header) =
(void *) BPF_FUNC_skb_load_bytes_relative;
static int (*bpf_skb_store_bytes)(void *ctx, int off, void *from, int len, int flags) =
(void *) BPF_FUNC_skb_store_bytes;
static int (*bpf_l3_csum_replace)(void *ctx, int off, int from, int to, int flags) =
(void *) BPF_FUNC_l3_csum_replace;
static int (*bpf_l4_csum_replace)(void *ctx, int off, int from, int to, int flags) =
(void *) BPF_FUNC_l4_csum_replace;
static int (*bpf_csum_diff)(void *from, int from_size, void *to, int to_size, int seed) =
(void *) BPF_FUNC_csum_diff;
static int (*bpf_skb_under_cgroup)(void *ctx, void *map, int index) =
(void *) BPF_FUNC_skb_under_cgroup;
static int (*bpf_skb_change_head)(void *, int len, int flags) =
(void *) BPF_FUNC_skb_change_head;
static int (*bpf_skb_pull_data)(void *, int len) =
(void *) BPF_FUNC_skb_pull_data;
static unsigned int (*bpf_get_cgroup_classid)(void *ctx) =
(void *) BPF_FUNC_get_cgroup_classid;
static unsigned int (*bpf_get_route_realm)(void *ctx) =
(void *) BPF_FUNC_get_route_realm;
static int (*bpf_skb_change_proto)(void *ctx, __be16 proto, __u64 flags) =
(void *) BPF_FUNC_skb_change_proto;
static int (*bpf_skb_change_type)(void *ctx, __u32 type) =
(void *) BPF_FUNC_skb_change_type;
static unsigned int (*bpf_get_hash_recalc)(void *ctx) =
(void *) BPF_FUNC_get_hash_recalc;
static unsigned long long (*bpf_get_current_task)(void *ctx) =
(void *) BPF_FUNC_get_current_task;
static int (*bpf_skb_change_tail)(void *ctx, __u32 len, __u64 flags) =
(void *) BPF_FUNC_skb_change_tail;
static long long (*bpf_csum_update)(void *ctx, __u32 csum) =
(void *) BPF_FUNC_csum_update;
static void (*bpf_set_hash_invalid)(void *ctx) =
(void *) BPF_FUNC_set_hash_invalid;
static int (*bpf_get_numa_node_id)(void) =
(void *) BPF_FUNC_get_numa_node_id;
static int (*bpf_probe_read_str)(void *ctx, __u32 size,
const void *unsafe_ptr) =
(void *) BPF_FUNC_probe_read_str;
static unsigned int (*bpf_get_socket_uid)(void *ctx) =
(void *) BPF_FUNC_get_socket_uid;
static unsigned int (*bpf_set_hash)(void *ctx, __u32 hash) =
(void *) BPF_FUNC_set_hash;
static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode,
unsigned long long flags) =
(void *) BPF_FUNC_skb_adjust_room;
/* Scan the ARCH passed in from ARCH env variable (see Makefile) */
#if defined(__TARGET_ARCH_x86)
#define bpf_target_x86
#define bpf_target_defined
#elif defined(__TARGET_ARCH_s930x)
#define bpf_target_s930x
#define bpf_target_defined
#elif defined(__TARGET_ARCH_arm64)
#define bpf_target_arm64
#define bpf_target_defined
#elif defined(__TARGET_ARCH_mips)
#define bpf_target_mips
#define bpf_target_defined
#elif defined(__TARGET_ARCH_powerpc)
#define bpf_target_powerpc
#define bpf_target_defined
#elif defined(__TARGET_ARCH_sparc)
#define bpf_target_sparc
#define bpf_target_defined
#else
#undef bpf_target_defined
#endif
/* Fall back to what the compiler says */
#ifndef bpf_target_defined
#if defined(__x86_64__)
#define bpf_target_x86
#elif defined(__s390x__)
#define bpf_target_s930x
#elif defined(__aarch64__)
#define bpf_target_arm64
#elif defined(__mips__)
#define bpf_target_mips
#elif defined(__powerpc__)
#define bpf_target_powerpc
#elif defined(__sparc__)
#define bpf_target_sparc
#endif
#endif
#if defined(bpf_target_x86)
#define PT_REGS_PARM1(x) ((x)->di)
#define PT_REGS_PARM2(x) ((x)->si)
#define PT_REGS_PARM3(x) ((x)->dx)
#define PT_REGS_PARM4(x) ((x)->cx)
#define PT_REGS_PARM5(x) ((x)->r8)
#define PT_REGS_RET(x) ((x)->sp)
#define PT_REGS_FP(x) ((x)->bp)
#define PT_REGS_RC(x) ((x)->ax)
#define PT_REGS_SP(x) ((x)->sp)
#define PT_REGS_IP(x) ((x)->ip)
#elif defined(bpf_target_s390x)
#define PT_REGS_PARM1(x) ((x)->gprs[2])
#define PT_REGS_PARM2(x) ((x)->gprs[3])
#define PT_REGS_PARM3(x) ((x)->gprs[4])
#define PT_REGS_PARM4(x) ((x)->gprs[5])
#define PT_REGS_PARM5(x) ((x)->gprs[6])
#define PT_REGS_RET(x) ((x)->gprs[14])
#define PT_REGS_FP(x) ((x)->gprs[11]) /* Works only with CONFIG_FRAME_POINTER */
#define PT_REGS_RC(x) ((x)->gprs[2])
#define PT_REGS_SP(x) ((x)->gprs[15])
#define PT_REGS_IP(x) ((x)->psw.addr)
#elif defined(bpf_target_arm64)
#define PT_REGS_PARM1(x) ((x)->regs[0])
#define PT_REGS_PARM2(x) ((x)->regs[1])
#define PT_REGS_PARM3(x) ((x)->regs[2])
#define PT_REGS_PARM4(x) ((x)->regs[3])
#define PT_REGS_PARM5(x) ((x)->regs[4])
#define PT_REGS_RET(x) ((x)->regs[30])
#define PT_REGS_FP(x) ((x)->regs[29]) /* Works only with CONFIG_FRAME_POINTER */
#define PT_REGS_RC(x) ((x)->regs[0])
#define PT_REGS_SP(x) ((x)->sp)
#define PT_REGS_IP(x) ((x)->pc)
#elif defined(bpf_target_mips)
#define PT_REGS_PARM1(x) ((x)->regs[4])
#define PT_REGS_PARM2(x) ((x)->regs[5])
#define PT_REGS_PARM3(x) ((x)->regs[6])
#define PT_REGS_PARM4(x) ((x)->regs[7])
#define PT_REGS_PARM5(x) ((x)->regs[8])
#define PT_REGS_RET(x) ((x)->regs[31])
#define PT_REGS_FP(x) ((x)->regs[30]) /* Works only with CONFIG_FRAME_POINTER */
#define PT_REGS_RC(x) ((x)->regs[1])
#define PT_REGS_SP(x) ((x)->regs[29])
#define PT_REGS_IP(x) ((x)->cp0_epc)
#elif defined(bpf_target_powerpc)
#define PT_REGS_PARM1(x) ((x)->gpr[3])
#define PT_REGS_PARM2(x) ((x)->gpr[4])
#define PT_REGS_PARM3(x) ((x)->gpr[5])
#define PT_REGS_PARM4(x) ((x)->gpr[6])
#define PT_REGS_PARM5(x) ((x)->gpr[7])
#define PT_REGS_RC(x) ((x)->gpr[3])
#define PT_REGS_SP(x) ((x)->sp)
#define PT_REGS_IP(x) ((x)->nip)
#elif defined(bpf_target_sparc)
#define PT_REGS_PARM1(x) ((x)->u_regs[UREG_I0])
#define PT_REGS_PARM2(x) ((x)->u_regs[UREG_I1])
#define PT_REGS_PARM3(x) ((x)->u_regs[UREG_I2])
#define PT_REGS_PARM4(x) ((x)->u_regs[UREG_I3])
#define PT_REGS_PARM5(x) ((x)->u_regs[UREG_I4])
#define PT_REGS_RET(x) ((x)->u_regs[UREG_I7])
#define PT_REGS_RC(x) ((x)->u_regs[UREG_I0])
#define PT_REGS_SP(x) ((x)->u_regs[UREG_FP])
/* Should this also be a bpf_target check for the sparc case? */
#if defined(__arch64__)
#define PT_REGS_IP(x) ((x)->tpc)
#else
#define PT_REGS_IP(x) ((x)->pc)
#endif
#endif
#ifdef bpf_target_powerpc
#define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = (ctx)->link; })
#define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP
#elif bpf_target_sparc
#define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ (ip) = PT_REGS_RET(ctx); })
#define BPF_KRETPROBE_READ_RET_IP BPF_KPROBE_READ_RET_IP
#else
#define BPF_KPROBE_READ_RET_IP(ip, ctx) ({ \
bpf_probe_read(&(ip), sizeof(ip), (void *)PT_REGS_RET(ctx)); })
#define BPF_KRETPROBE_READ_RET_IP(ip, ctx) ({ \
bpf_probe_read(&(ip), sizeof(ip), \
(void *)(PT_REGS_FP(ctx) + sizeof(ip))); })
#endif
#endif
packet-exchange/src/client.c
View file @ 126217da
...@@ -90,24 +90,30 @@ static char send_data[MAX_BUFFER_SIZE]; ...@@ -90,24 +90,30 @@ static char send_data[MAX_BUFFER_SIZE];
static void help(char *argv[]) { static void help(char *argv[]) {
printf( printf(
"Usage: %s -f IF [-abthgv] [-e ETF_OFFSET] [-d BUF_LEN] [-i USEC] [-l N]" "Usage: %s -f IF [-abthgv] [-e ETF_OFFSET] [-d BUF_LEN] [-i USEC] "
"[-l N]"
"[-p PRIO] [-q PACKET_PRIO] [-r USEC] [-T LATENCY_THRESHOLD -G]\n\n" "[-p PRIO] [-q PACKET_PRIO] [-r USEC] [-T LATENCY_THRESHOLD -G]\n\n"
" -a Run the real time thread on CPU1\n" " -a Run the real time thread on CPU1\n"
" -b Measure RTT\n" " -b Measure RTT\n"
" -d BUF_LEN Set the length of tx buffer\n" " -d BUF_LEN Set the length of tx buffer\n"
" -e ETF_OFFSET Set a txtime with an offset of ETF_OFFSET " " -e ETF_OFFSET Set a txtime with an offset of "
"ETF_OFFSET "
"us (to be used in an ETF qdisc)\n" "us (to be used in an ETF qdisc)\n"
" -f IF Set the network interface to be used\n" " -f IF Set the network interface to be "
"used\n"
" -g Print histograms to sdtout on exit\n" " -g Print histograms to sdtout on exit\n"
" -h Show help\n" " -h Show help\n"
" -i USEC Wake up the real time thread every USEC " " -i USEC Wake up the real time thread every "
"USEC "
"microseconds (Default: 10ms)\n" "microseconds (Default: 10ms)\n"
" -l N Wake up the real time thread N times " " -l N Wake up the real time thread N times "
"(Default: 0)\n" "(Default: 0)\n"
" -p PRIO Run the real time thread at priority " " -p PRIO Run the real time thread at priority "
"PRIO\n" "PRIO\n"
" -q PACKET_PRIO Send packets with PACKET_PRIO priority\n" " -q PACKET_PRIO Send packets with PACKET_PRIO "
" -r USEC Refresh the non real time main thread " "priority\n"
" -r USEC Refresh the non real time main "
"thread "
"every USEC microseconds (Default: 50ms)\n" "every USEC microseconds (Default: 50ms)\n"
" -t Enable timestamps\n" " -t Enable timestamps\n"
" -v Verbose\n" " -v Verbose\n"
...@@ -131,7 +137,8 @@ static void *packet_sending_thread(void *p) { ...@@ -131,7 +137,8 @@ static void *packet_sending_thread(void *p) {
CPU_ZERO(&mask); CPU_ZERO(&mask);
CPU_SET(1, &mask); CPU_SET(1, &mask);
if (sched_setaffinity(0, sizeof(mask), &mask)) if (sched_setaffinity(0, sizeof(mask), &mask))
error(EXIT_FAILURE, errno, "Could not set CPU affinity to CPU #1\n"); error(EXIT_FAILURE, errno,
"Could not set CPU affinity to CPU #1\n");
} }
if (enable_etf) { if (enable_etf) {
...@@ -164,10 +171,13 @@ static void *packet_sending_thread(void *p) { ...@@ -164,10 +171,13 @@ static void *packet_sending_thread(void *p) {
if (nb_cycles) { if (nb_cycles) {
int interval_us = calcdiff_ns(current, previous) / 1000; int interval_us = calcdiff_ns(current, previous) / 1000;
egress_stats.min_interval = min(interval_us, egress_stats.min_interval); egress_stats.min_interval =
egress_stats.max_interval = max(interval_us, egress_stats.max_interval); _min_(interval_us, egress_stats.min_interval);
egress_stats.max_interval =
_max_(interval_us, egress_stats.max_interval);
egress_stats.avg_interval = egress_stats.avg_interval =
(egress_stats.avg_interval * nb_cycles + interval_us) / (egress_stats.avg_interval * nb_cycles +
interval_us) /
(nb_cycles + 1); (nb_cycles + 1);
} }
...@@ -207,7 +217,8 @@ int main(int argc, char *argv[]) { ...@@ -207,7 +217,8 @@ int main(int argc, char *argv[]) {
egress_params.packet_priority = 3; egress_params.packet_priority = 3;
egress_params.tx_buffer_len = 1024; egress_params.tx_buffer_len = 1024;
/* Lock all current and future pages from preventing of being paged to swap */ /* Lock all current and future pages from preventing of being paged to
* swap */
if (mlockall(MCL_CURRENT | MCL_FUTURE)) { if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
perror("mlockall failed"); perror("mlockall failed");
/* exit(-1) or do error handling */ /* exit(-1) or do error handling */
...@@ -231,16 +242,16 @@ int main(int argc, char *argv[]) { ...@@ -231,16 +242,16 @@ int main(int argc, char *argv[]) {
} }
// Catch breaks with sighand to print the histograms // Catch breaks with sighand to print the histograms
init_signals(sighand, enable_histograms); init_signals(sighand);
// Initialize the UDP packet sending socket // Initialize the UDP packet sending socket
init_udp_send(&egress_params, &egress_stats, enable_histograms, main_params.enable_tracing, init_udp_send(&egress_params, &egress_stats, enable_histograms,
kernel_latency_hist); main_params.enable_tracing, kernel_latency_hist);
// Initialize the UDP packet receiving socket if RTT is measured // Initialize the UDP packet receiving socket if RTT is measured
if (tsn_task == RTT_TASK) if (tsn_task == RTT_TASK)
init_udp_recv(&ingress_params, &ingress_stats, enable_histograms, init_udp_recv(&ingress_params, &ingress_stats,
kernel_latency_hist); enable_histograms, kernel_latency_hist);
/* Initialize pthread attributes (default values) */ /* Initialize pthread attributes (default values) */
if (pthread_attr_init(&attr)) { if (pthread_attr_init(&attr)) {
...@@ -270,7 +281,8 @@ int main(int argc, char *argv[]) { ...@@ -270,7 +281,8 @@ int main(int argc, char *argv[]) {
// Create the real time thread // Create the real time thread
if (pthread_create(&thread, &attr, packet_sending_thread, NULL)) if (pthread_create(&thread, &attr, packet_sending_thread, NULL))
error(EXIT_FAILURE, errno, "Couldn't create packet sending thread"); error(EXIT_FAILURE, errno,
"Couldn't create packet sending thread");
// Verbose loop // Verbose loop
for (;;) { for (;;) {
...@@ -278,21 +290,27 @@ int main(int argc, char *argv[]) { ...@@ -278,21 +290,27 @@ int main(int argc, char *argv[]) {
if (main_params.verbose) { if (main_params.verbose) {
if (tsn_task == RTT_TASK) { if (tsn_task == RTT_TASK) {
printf("%9" PRIu64 ": RTT: %4d %4d %4d\n", nb_cycles, rtt_stats.min_rtt, printf("%9" PRIu64 ": RTT: %4d %4d %4d\n",
nb_cycles, rtt_stats.min_rtt,
rtt_stats.avg_rtt, rtt_stats.max_rtt); rtt_stats.avg_rtt, rtt_stats.max_rtt);
printf("\033[%dA", 1); printf("\033[%dA", 1);
} else { } else {
printf("%9" PRIu64 ": [%4d, %4d], I (10us): %3d %3d %3d", nb_cycles, printf("%9" PRIu64
": [%4d, %4d], I (10us): %3d %3d %3d",
nb_cycles,
(int)egress_stats.invalid_parameter, (int)egress_stats.invalid_parameter,
(int)egress_stats.missed_deadline, (int)egress_stats.missed_deadline,
egress_stats.min_interval / 10, egress_stats.avg_interval / 10, egress_stats.min_interval / 10,
egress_stats.avg_interval / 10,
egress_stats.max_interval / 10); egress_stats.max_interval / 10);
if (enable_timestamps) { if (enable_timestamps) {
printf(", K: %4d %4d %4d [%4d]\n", egress_stats.min_kernel_latency, printf(", K: %4d %4d %4d [%4d]\n",
egress_stats.min_kernel_latency,
egress_stats.avg_kernel_latency, egress_stats.avg_kernel_latency,
egress_stats.max_kernel_latency, egress_stats.max_kernel_latency,
(int)egress_stats.high_kernel_latency); (int)egress_stats
.high_kernel_latency);
} else { } else {
printf("\n"); printf("\n");
} }
...@@ -322,19 +340,21 @@ static void do_tsn_task(char *data, uint64_t next_txtime) { ...@@ -322,19 +340,21 @@ static void do_tsn_task(char *data, uint64_t next_txtime) {
} else if (tsn_task == RTT_TASK) { } else if (tsn_task == RTT_TASK) {
clock_gettime(CLOCK_MONOTONIC, &t1); clock_gettime(CLOCK_MONOTONIC, &t1);
send_udp_packet(data, next_txtime); send_udp_packet(data, next_txtime);
recv_udp_packet(0, 0, NULL); recv_udp_packet();
clock_gettime(CLOCK_MONOTONIC, &t2); clock_gettime(CLOCK_MONOTONIC, &t2);
rtt_us = calcdiff_ns(t2, t1) / 1000; rtt_us = calcdiff_ns(t2, t1) / 1000;
rtt_stats.min_rtt = min(rtt_us, rtt_stats.min_rtt); rtt_stats.min_rtt = _min_(rtt_us, rtt_stats.min_rtt);
rtt_stats.max_rtt = max(rtt_us, rtt_stats.max_rtt); rtt_stats.max_rtt = _max_(rtt_us, rtt_stats.max_rtt);
rtt_stats.avg_rtt = rtt_stats.avg_rtt =
(((uint64_t)rtt_stats.avg_rtt) * (nb_cycles - 1) + rtt_us) / nb_cycles; (((uint64_t)rtt_stats.avg_rtt) * (nb_cycles - 1) + rtt_us) /
nb_cycles;
if (rtt_us > MAX_RTT) if (rtt_us > MAX_RTT)
fprintf(stderr, "RTT value higher than MAX_RTT : %d ( > %d)\n", rtt_us, fprintf(stderr,
MAX_RTT); "RTT value higher than MAX_RTT : %d ( > %d)\n",
rtt_us, MAX_RTT);
else else
rtt_hist[rtt_us]++; rtt_hist[rtt_us]++;
} }
...@@ -364,7 +384,8 @@ static void print_histograms() { ...@@ -364,7 +384,8 @@ static void print_histograms() {
"\"metadata\": {\"i\": \"%dus\", \"duration\": \"%dh%d\", " "\"metadata\": {\"i\": \"%dus\", \"duration\": \"%dh%d\", "
"\"etf_offset\": \"%dus\"}," "\"etf_offset\": \"%dus\"},"
"\"props\": [[", "\"props\": [[",
(tsn_task == SEND_PACKET_TASK) ? "packet_send_timestamps" : "packet_rtt", (tsn_task == SEND_PACKET_TASK) ? "packet_send_timestamps"
: "packet_rtt",
(tsn_task == SEND_PACKET_TASK) ? "kernel_space" : "rtt", interval, (tsn_task == SEND_PACKET_TASK) ? "kernel_space" : "rtt", interval,
duration_hour, duration_minutes, thread_params.etf_offset); duration_hour, duration_minutes, thread_params.etf_offset);
...@@ -377,13 +398,14 @@ static void print_histograms() { ...@@ -377,13 +398,14 @@ static void print_histograms() {
} }
for (int j = 0; j < max_hist_val; j++) for (int j = 0; j < max_hist_val; j++)
printf("%" PRIi64 "%s", histogram[j], (j + 1 < max_hist_val ? ", " : "")); printf("%" PRIi64 "%s", histogram[j],
(j + 1 < max_hist_val ? ", " : ""));
printf("]]}]}\n"); printf("]]}]}\n");
} }
static void sighand(int sig_num) { static void sighand(int sig_num) {
(void)sig_num; (void)sig_num;
print_histograms(); if (enable_histograms) print_histograms();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
...@@ -406,7 +428,9 @@ static void process_options(int argc, char *argv[]) { ...@@ -406,7 +428,9 @@ static void process_options(int argc, char *argv[]) {
case 'd': case 'd':
egress_params.tx_buffer_len = atoi(optarg); egress_params.tx_buffer_len = atoi(optarg);
if (egress_params.tx_buffer_len < 1) { if (egress_params.tx_buffer_len < 1) {
fprintf(stderr, "BUF_LEN should be greater than 1\n"); fprintf(stderr,
"BUF_LEN should be greater "
"than 1\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
break; break;
......
packet-exchange/src/common.c
View file @ 126217da
#define _GNU_SOURCE #define _GNU_SOURCE
#include "common.h"
#include <inttypes.h> #include <inttypes.h>
#include <signal.h> #include <signal.h>
#include <stdint.h> #include <stdint.h>
...@@ -7,8 +9,6 @@ ...@@ -7,8 +9,6 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "common.h"
void (*previous_handlers[NSIG])(int); void (*previous_handlers[NSIG])(int);
static void (*sighand)(int); static void (*sighand)(int);
...@@ -32,30 +32,27 @@ uint64_t calcdiff_ns(struct timespec t1, struct timespec t2) { ...@@ -32,30 +32,27 @@ uint64_t calcdiff_ns(struct timespec t1, struct timespec t2) {
return diff; return diff;
} }
int max(int a, int b) { return a > b ? a : b; } int _max_(int a, int b) { return a > b ? a : b; }
int min(int a, int b) { return a < b ? a : b; } int _min_(int a, int b) { return a < b ? a : b; }
int histogram_min(uint64_t * histogram, int max_value) { int histogram_min(uint64_t *histogram, int max_value) {
int ret = max_value; int ret = max_value;
for (int i = max_value; i >= 0; i--) for (int i = max_value; i >= 0; i--) ret = histogram[i] ? i : ret;
ret = histogram[i] ? i : ret;
return ret; return ret;
} }
int histogram_max(uint64_t * histogram, int max_value) { int histogram_max(uint64_t *histogram, int max_value) {
int ret = 0; int ret = 0;
for (int i = 0; i <= max_value; i++) for (int i = 0; i <= max_value; i++) ret = histogram[i] ? i : ret;
ret = histogram[i] ? i : ret;
return ret; return ret;
} }
static void sighand_wrapper(int sig) { static void sighand_wrapper(int sig) {
// If we get un unexpected signal, report it, if not print the histogram // If we get un unexpected signal, report it, if not print the histogram
if (sig == SIGINT || sig == SIGTERM) if (sig == SIGINT || sig == SIGTERM)
(*sighand)(sig); // Will print the histogram (*sighand)(sig); // Will print the histogram
else else
printf("Uknown signal interrupt: %s (%d)\n", strsignal(sig), sig); printf("Uknown signal interrupt: %s (%d)\n", strsignal(sig),
sig);
// Execute the default handler // Execute the default handler
if (previous_handlers[sig] == SIG_DFL) { if (previous_handlers[sig] == SIG_DFL) {
...@@ -68,12 +65,9 @@ static void sighand_wrapper(int sig) { ...@@ -68,12 +65,9 @@ static void sighand_wrapper(int sig) {
} }
} }
void init_signals(void (*_sighand)(int), int enable_histograms) { void init_signals(void (*_sighand)(int)) {
sighand = _sighand; sighand = _sighand;
if (enable_histograms) for (int i = 0; i < NSIG; i++) signal(i, sighand_wrapper);
for (int i = 0; i < NSIG; i++)
signal(i, sighand_wrapper);
} }
packet-exchange/src/common.h
View file @ 126217da
...@@ -8,6 +8,17 @@ ...@@ -8,6 +8,17 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef WITH_XDP
#include <bpf/bpf.h>
#include <bpf/libbpf.h>
#include <bpf/xsk.h>
#include <linux/if_ether.h>
#include <linux/if_link.h>
#include <linux/if_xdp.h>
#include <linux/ip.h>
#include <linux/udp.h>
#endif
#define NSEC_PER_SEC UINT64_C(1000000000) #define NSEC_PER_SEC UINT64_C(1000000000)
#define SERVER_PORT "50000" #define SERVER_PORT "50000"
#define SERVER_PORT_INT 50000 #define SERVER_PORT_INT 50000
...@@ -19,18 +30,25 @@ ...@@ -19,18 +30,25 @@
#define MAX_BUFFER_SIZE 1024 #define MAX_BUFFER_SIZE 1024
#define TIMESTAMP_BUFFER_SIZE 4096 #define TIMESTAMP_BUFFER_SIZE 4096
#define err(...) \
do { \
fprintf(stderr, __VA_ARGS__); \
exit(EXIT_FAILURE); \
} while (0)
#define err_errno(...) error(EXIT_FAILURE, errno, __VA_ARGS__);
uint64_t ts_to_uint(struct timespec t); uint64_t ts_to_uint(struct timespec t);
void add_ns(struct timespec *t, uint64_t ns); void add_ns(struct timespec *t, uint64_t ns);
uint64_t calcdiff_ns(struct timespec t1, struct timespec t2); uint64_t calcdiff_ns(struct timespec t1, struct timespec t2);
void init_signals(void (*_sighand)(int), int enable_histograms); void init_signals(void (*_sighand)(int));
int min(int a, int b); int _min_(int a, int b);
int max(int a, int b); int _max_(int a, int b);
int histogram_min(uint64_t * histogram, int max_value); int histogram_min(uint64_t *histogram, int max_value);
int histogram_max(uint64_t * histogram, int max_value); int histogram_max(uint64_t *histogram, int max_value);
extern void (*previous_handlers[NSIG])(int); extern void (*previous_handlers[NSIG])(int);
......
packet-exchange/src/recv_packet.c
View file @ 126217da
#define _GNU_SOURCE #define _GNU_SOURCE
#include "recv_packet.h"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <error.h> #include <error.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <ifaddrs.h> #include <ifaddrs.h>
#include <inttypes.h> #include <inttypes.h>
#include <limits.h>
#include <linux/errqueue.h> #include <linux/errqueue.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/net_tstamp.h> #include <linux/net_tstamp.h>
...@@ -12,6 +16,7 @@ ...@@ -12,6 +16,7 @@
#include <net/if.h> #include <net/if.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <poll.h>
#include <pthread.h> #include <pthread.h>
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
...@@ -20,13 +25,25 @@ ...@@ -20,13 +25,25 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include "common.h" #include "common.h"
#include "recv_packet.h"
#ifdef WITH_XDP
#include <bpf/bpf.h>
#include <bpf/libbpf.h>
#include <bpf/xsk.h>
#include <linux/if_ether.h>
#include <linux/if_link.h>
#include <linux/if_xdp.h>
#include <linux/ip.h>
#include <linux/udp.h>
#endif
static char rx_buffer[MAX_BUFFER_SIZE]; static char rx_buffer[MAX_BUFFER_SIZE];
static int sock_fd; static int sock_fd;
...@@ -42,7 +59,7 @@ static int use_histogram; ...@@ -42,7 +59,7 @@ static int use_histogram;
uint64_t post_kernel_timestamp; uint64_t post_kernel_timestamp;
// Sets the interface // Sets the interface
static int set_if() { static int set_if(void) {
struct ifreq ifreq; struct ifreq ifreq;
memset(&ifreq, 0, sizeof(ifreq)); memset(&ifreq, 0, sizeof(ifreq));
...@@ -54,10 +71,8 @@ static int set_if() { ...@@ -54,10 +71,8 @@ static int set_if() {
return ifreq.ifr_ifindex; return ifreq.ifr_ifindex;
} }
void init_udp_recv(ingress_param_t *_params, void init_udp_recv(ingress_param_t *_params, ingress_stat_t *_stats,
ingress_stat_t *_stats, int _use_histogram, uint64_t *_kernel_latency_hist) {
int _use_histogram,
uint64_t *_kernel_latency_hist) {
int getaddrinfo_err; int getaddrinfo_err;
int set_if_err; int set_if_err;
struct addrinfo hints, *servinfo, *servinfo_it; struct addrinfo hints, *servinfo, *servinfo_it;
...@@ -74,7 +89,8 @@ void init_udp_recv(ingress_param_t *_params, ...@@ -74,7 +89,8 @@ void init_udp_recv(ingress_param_t *_params,
getaddrinfo_err = getaddrinfo(NULL, SERVER_PORT, &hints, &servinfo); getaddrinfo_err = getaddrinfo(NULL, SERVER_PORT, &hints, &servinfo);
if (getaddrinfo_err != 0) { if (getaddrinfo_err != 0) {
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(getaddrinfo_err)); fprintf(stderr, "getaddrinfo: %s\n",
gai_strerror(getaddrinfo_err));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
...@@ -83,7 +99,8 @@ void init_udp_recv(ingress_param_t *_params, ...@@ -83,7 +99,8 @@ void init_udp_recv(ingress_param_t *_params,
sock_fd = socket(servinfo->ai_family, servinfo->ai_socktype, sock_fd = socket(servinfo->ai_family, servinfo->ai_socktype,
servinfo->ai_protocol); servinfo->ai_protocol);
if (bind(sock_fd, servinfo_it->ai_addr, servinfo_it->ai_addrlen) == -1) { if (bind(sock_fd, servinfo_it->ai_addr,
servinfo_it->ai_addrlen) == -1) {
close(sock_fd); close(sock_fd);
continue; continue;
} }
...@@ -95,26 +112,28 @@ void init_udp_recv(ingress_param_t *_params, ...@@ -95,26 +112,28 @@ void init_udp_recv(ingress_param_t *_params,
if (sock_fd == -1) if (sock_fd == -1)
error(EXIT_FAILURE, errno, "Couldn't create receive socket"); error(EXIT_FAILURE, errno, "Couldn't create receive socket");
set_if_err = set_if(params->network_if); set_if_err = set_if();
if (set_if_err < 0) if (set_if_err < 0)
error(EXIT_FAILURE, errno, "Couldn't set interface\n"); error(EXIT_FAILURE, errno, "Couldn't set interface\n");
if (setsockopt(sock_fd, SOL_SOCKET, SO_BINDTODEVICE, params->network_if, if (setsockopt(sock_fd, SOL_SOCKET, SO_BINDTODEVICE, params->network_if,
strlen(params->network_if))) strlen(params->network_if)))
error(EXIT_FAILURE, errno, "setsockopt SO_BINDTODEVICE failed\n"); error(EXIT_FAILURE, errno,
"setsockopt SO_BINDTODEVICE failed\n");
if (params->use_timestamps) { if (params->use_timestamps) {
if (setsockopt(sock_fd, SOL_SOCKET, SO_TIMESTAMPING, &so_timestamping_flags, if (setsockopt(sock_fd, SOL_SOCKET, SO_TIMESTAMPING,
&so_timestamping_flags,
sizeof(so_timestamping_flags))) sizeof(so_timestamping_flags)))
error(EXIT_FAILURE, errno, "setsockopt SO_TIMESTAMPING failed\n"); error(EXIT_FAILURE, errno,
"setsockopt SO_TIMESTAMPING failed\n");
} }
} }
/* /*
* Receives udp packets * Receive UDP packet
*/ */
void recv_udp_packet() { void recv_udp_packet() {
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
struct msghdr msg; // Message hardware, sent to the socket struct msghdr msg; // Message hardware, sent to the socket
struct iovec iov; // The iovec structures stores the RX buffer struct iovec iov; // The iovec structures stores the RX buffer
...@@ -141,32 +160,42 @@ void recv_udp_packet() { ...@@ -141,32 +160,42 @@ void recv_udp_packet() {
recvmsgerr = recvmsg(sock_fd, &msg, 0); recvmsgerr = recvmsg(sock_fd, &msg, 0);
if (recvmsgerr < 0) if (recvmsgerr < 0)
error(EXIT_FAILURE, errno, "recvmsg failed, ret value: %d\n", recvmsgerr); error(EXIT_FAILURE, errno, "recvmsg failed, ret value: %d\n",
recvmsgerr);
if (params->use_timestamps) { if (params->use_timestamps) {
clock_gettime(CLOCK_REALTIME, &ts); clock_gettime(CLOCK_REALTIME, &ts);
post_kernel_timestamp = ts_to_uint(ts); post_kernel_timestamp = ts_to_uint(ts);
} }
if (params->use_timestamps) { if (params->use_timestamps) {
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg;
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMPING) { cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_SOCKET &&
struct timespec *stamp = (struct timespec *)CMSG_DATA(cmsg); cmsg->cmsg_type == SO_TIMESTAMPING) {
struct timespec *stamp =
uint64_t kernel_latency = post_kernel_timestamp - ts_to_uint(*stamp); (struct timespec *)CMSG_DATA(cmsg);
uint64_t kernel_latency =
post_kernel_timestamp - ts_to_uint(*stamp);
kernel_latency /= 1000u; kernel_latency /= 1000u;
stats->min_kernel_latency = min(kernel_latency, stats->min_kernel_latency); stats->min_kernel_latency = _min_(
stats->max_kernel_latency = max(kernel_latency, stats->max_kernel_latency); kernel_latency, stats->min_kernel_latency);
stats->avg_kernel_latency = (stats->max_kernel_latency * (stats->packets_received) + kernel_latency) / (stats->packets_received + 1); stats->max_kernel_latency = _max_(
kernel_latency, stats->max_kernel_latency);
stats->avg_kernel_latency =
(stats->max_kernel_latency *
(stats->packets_received) +
kernel_latency) /
(stats->packets_received + 1);
if (use_histogram) { if (use_histogram) {
if (kernel_latency > MAX_KERNEL_LATENCY) if (kernel_latency > MAX_KERNEL_LATENCY)
stats->high_kernel_latency++; stats->high_kernel_latency++;
else else
kernel_latency_hist[kernel_latency]++; kernel_latency_hist
[kernel_latency]++;
} }
} }
} }
...@@ -175,19 +204,180 @@ void recv_udp_packet() { ...@@ -175,19 +204,180 @@ void recv_udp_packet() {
strcpy(stats->data, rx_buffer); strcpy(stats->data, rx_buffer);
} }
#ifdef WITH_XDP
static int xdp_flags = XDP_FLAGS_DRV_MODE;
static struct pollfd fds[1] = {0};
static unsigned int ifindex;
static struct xdpsock xdp_socket;
static void open_xdp_socket(char *network_if) {
struct xsk_socket_config xsk_cfg;
uint32_t idx;
int ret, i;
/* Create XDP socket */
xsk_cfg.rx_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;
xsk_cfg.tx_size = XSK_RING_PROD__DEFAULT_NUM_DESCS;
xsk_cfg.libbpf_flags = 0;
xsk_cfg.xdp_flags = xdp_flags;
xsk_cfg.bind_flags = 0;
ret = xsk_socket__create(&xdp_socket.xsk, network_if, 0,
xdp_socket.umem.umem, &xdp_socket.rx,
&xdp_socket.tx, &xsk_cfg);
if (ret) err("xsk_socket__create() failed");
/* Add some buffers */
ret = xsk_ring_prod__reserve(&xdp_socket.umem.fq,
XSK_RING_PROD__DEFAULT_NUM_DESCS, &idx);
if (ret != XSK_RING_PROD__DEFAULT_NUM_DESCS)
err("xsk_ring_prod__reserve() failed");
for (i = 0; i < XSK_RING_PROD__DEFAULT_NUM_DESCS; i++)
*xsk_ring_prod__fill_addr(&xdp_socket.umem.fq, idx++) =
i * FRAME_SIZE;
xsk_ring_prod__submit(&xdp_socket.umem.fq,
XSK_RING_PROD__DEFAULT_NUM_DESCS);
}
/*
* Init XDP socket
*/
void init_xdp_recv(ingress_param_t * _params) {
int ret, prog_fd, xsks_map = 0;
struct bpf_prog_load_attr prog_load_attr = {
.prog_type = BPF_PROG_TYPE_XDP,
.file = "/home/oli/rt-measures/packet-exchange/build/xdp_kern.o",
};
struct xsk_umem_config cfg = {
.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
.frame_size = FRAME_SIZE,
.frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM,
.flags = 0,
};
struct bpf_object *obj;
struct bpf_map *map;
void *buffer = NULL;
params = _params;
ret = bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd);
if (ret || prog_fd < 0) err("bpf_prog_load_xattr() failed");
map = bpf_object__find_map_by_name(obj, "xsks_map");
xsks_map = bpf_map__fd(map);
if (xsks_map < 0) err("No xsks_map found!");
ifindex = if_nametoindex(params->network_if);
if (!ifindex) err_errno("if_nametoindex() failed");
/* Use XDP _only_ in conjuction with driver assisted mode */
ret = bpf_set_link_xdp_fd(ifindex, prog_fd, xdp_flags);
if (ret) err("bpf_set_link_xdp_fd() failed");
/* Allocate user space memory for xdp frames */
ret = posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE),
NUM_FRAMES * FRAME_SIZE);
if (ret) err_errno("posix_memalign() failed");
ret = xsk_umem__create(&xdp_socket.umem.umem, buffer,
NUM_FRAMES * FRAME_SIZE, &xdp_socket.umem.fq,
&xdp_socket.umem.cq, &cfg);
if (ret) err("xsk_umem__create() failed");
xdp_socket.umem.buffer = buffer;
/* Open and bind socket */
open_xdp_socket(params->network_if);
}
void setup_poll_fd(void) {
fds[0].fd = xsk_socket__fd(xdp_socket.xsk);
fds[0].events = POLLIN;
}
static int received;
static uint32_t idx_rx = 0, idx;
/*
* Receive XDP socket
*/
int recv_xdp_packet(void) {
int ret;
if (params->xdp_polling_mode == 0) {
ret = poll(fds, 1, -1);
if (ret == 0) {
return -1;
} else if (ret < 0)
error(EXIT_FAILURE, errno, "poll failed");
received = xsk_ring_cons__peek(&xdp_socket.rx, 1, &idx_rx);
} else {
do {
received =
xsk_ring_cons__peek(&xdp_socket.rx, 1, &idx_rx);
} while (!received);
}
if (!received) return 1;
if (received != 1)
error(EXIT_FAILURE, errno,
"Received more packets than expected");
return 0;
}
void recv_xdp_cleanup(void) {
uint64_t addr;
int ret;
/* Cleanup */
xsk_ring_cons__release(&xdp_socket.rx, received);
/* Add that particular buffer back to the fill queue */
if (xsk_prod_nb_free(&xdp_socket.umem.fq, received)) {
ret =
xsk_ring_prod__reserve(&xdp_socket.umem.fq, received, &idx);
if (ret != received) err("xsk_ring_prod__reserve() failed");
*xsk_ring_prod__fill_addr(&xdp_socket.umem.fq, idx) =
xsk_umem__extract_addr(addr);
xsk_ring_prod__submit(&xdp_socket.umem.fq, received);
}
}
void close_xdp_socket(void) {
xsk_socket__delete(xdp_socket.xsk);
xsk_umem__delete(xdp_socket.umem.umem);
bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
}
#else
void init_xdp_recv(ingress_param_t * _params) { (void) _params; }
void setup_poll_fd(void) {}
void close_xdp_socket(void) {}
int recv_xdp_packet(void) { return 0; }
void recv_xdp_cleanup(void) {}
#endif
#ifdef DEBUG #ifdef DEBUG
/* /*
* Code from scheduled_tx_tools * Code from scheduled_tx_tools
*/ */
static int process_socket_error_queue() { static int process_socket_error_queue(void) {
uint8_t msg_control[CMSG_SPACE(sizeof(struct sock_extended_err))]; uint8_t msg_control[CMSG_SPACE(sizeof(struct sock_extended_err))];
unsigned char err_buffer[256]; unsigned char err_buffer[256];
struct sock_extended_err *serr; struct sock_extended_err *serr;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
__u64 tstamp = 0; __u64 tstamp = 0;
struct iovec iov = {.iov_base = err_buffer, .iov_len = sizeof(err_buffer)}; struct iovec iov = {.iov_base = err_buffer,
.iov_len = sizeof(err_buffer)};
struct msghdr msg = {.msg_iov = &iov, struct msghdr msg = {.msg_iov = &iov,
.msg_iovlen = 1, .msg_iovlen = 1,
.msg_control = msg_control, .msg_control = msg_control,
...@@ -206,13 +396,17 @@ static int process_socket_error_queue() { ...@@ -206,13 +396,17 @@ static int process_socket_error_queue() {
switch (serr->ee_code) { switch (serr->ee_code) {
case SO_EE_CODE_TXTIME_INVALID_PARAM: case SO_EE_CODE_TXTIME_INVALID_PARAM:
fprintf(stderr, fprintf(
"packet with tstamp %llu dropped due to invalid params\n", stderr,
"packet with tstamp %llu dropped "
"due to invalid params\n",
tstamp); tstamp);
return 0; return 0;
case SO_EE_CODE_TXTIME_MISSED: case SO_EE_CODE_TXTIME_MISSED:
fprintf(stderr, fprintf(
"packet with tstamp %llu dropped due to missed deadline\n", stderr,
"packet with tstamp %llu dropped "
"due to missed deadline\n",
tstamp); tstamp);
return 0; return 0;
default: default:
......
packet-exchange/src/recv_packet.h
View file @ 126217da
...@@ -7,13 +7,14 @@ typedef struct ingress_param { ...@@ -7,13 +7,14 @@ typedef struct ingress_param {
char network_if[16]; char network_if[16];
int use_timestamps; int use_timestamps;
int xdp_polling_mode;
int interval;
size_t tx_buffer_len; size_t tx_buffer_len;
} ingress_param_t; } ingress_param_t;
typedef struct ingress_stat { typedef struct ingress_stat {
int min_kernel_latency; int min_kernel_latency;
int avg_kernel_latency; int avg_kernel_latency;
int max_kernel_latency; int max_kernel_latency;
...@@ -30,11 +31,34 @@ typedef struct ingress_stat { ...@@ -30,11 +31,34 @@ typedef struct ingress_stat {
char data[MAX_BUFFER_SIZE]; char data[MAX_BUFFER_SIZE];
} ingress_stat_t; } ingress_stat_t;
void init_udp_recv(ingress_param_t *_params, void init_udp_recv(ingress_param_t *_params, ingress_stat_t *stats,
ingress_stat_t *stats, int use_histogram, uint64_t *_kernel_latency_hist);
int use_histogram,
uint64_t *_kernel_latency_hist); void recv_udp_packet(void);
#ifdef WITH_XDP
#define NUM_FRAMES 4096
#define FRAME_SIZE XSK_UMEM__DEFAULT_FRAME_SIZE
struct xsk_umem_info {
struct xsk_ring_prod fq;
struct xsk_ring_cons cq;
struct xsk_umem *umem;
void *buffer;
};
struct xdpsock {
struct xsk_ring_cons rx;
struct xsk_ring_prod tx;
struct xsk_umem_info umem;
struct xsk_socket *xsk;
int fd;
};
#endif
void recv_udp_packet(); void init_xdp_recv(ingress_param_t * _params);
int recv_xdp_packet(void);
void recv_xdp_cleanup(void);
void setup_poll_fd(void);
void close_xdp_socket(void);
#endif #endif
packet-exchange/src/send_packet.c
View file @ 126217da
...@@ -222,9 +222,9 @@ static void process_error_queue() { ...@@ -222,9 +222,9 @@ static void process_error_queue() {
ts_buf_read_index = (ts_buf_read_index + 1) % TIMESTAMP_BUFFER_SIZE; ts_buf_read_index = (ts_buf_read_index + 1) % TIMESTAMP_BUFFER_SIZE;
stats->min_kernel_latency = stats->min_kernel_latency =
min(kernel_latency, stats->min_kernel_latency); _min_(kernel_latency, stats->min_kernel_latency);
stats->max_kernel_latency = stats->max_kernel_latency =
max(kernel_latency, stats->max_kernel_latency); _max_(kernel_latency, stats->max_kernel_latency);
stats->avg_kernel_latency = stats->avg_kernel_latency =
(stats->max_kernel_latency * packets_sent + kernel_latency) / (stats->max_kernel_latency * packets_sent + kernel_latency) /
(packets_sent + 1); (packets_sent + 1);
......
packet-exchange/src/server.c
View file @ 126217da
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
// Structs // Structs
enum TSNTask { RECV_PACKET_TASK, RTT_TASK }; enum TSNTask { RECV_PACKET_TASK, RTT_TASK, XDP_TASK };
typedef struct thread_param { typedef struct thread_param {
int interval; int interval;
...@@ -46,6 +46,7 @@ typedef struct main_params { ...@@ -46,6 +46,7 @@ typedef struct main_params {
int refresh_rate; int refresh_rate;
int verbose; int verbose;
int enable_tracing; int enable_tracing;
int enable_xdp_tracing;
int enable_graph; int enable_graph;
} main_param_t; } main_param_t;
...@@ -78,25 +79,35 @@ static struct timespec measures_end; ...@@ -78,25 +79,35 @@ static struct timespec measures_end;
static void help(char *argv[]) { static void help(char *argv[]) {
printf( printf(
"Usage: %s [-aghtv] [-b CLIENT_IP] [-d BUF_LEN] [-f IF] [-i USEC] [-p " "Usage: %s [-aghtv] [-b CLIENT_IP] [-d BUF_LEN] [-f IF] [-i USEC] "
"[-p "
"PRIO] [-T LATENCY_THRESHOLD -G]" "PRIO] [-T LATENCY_THRESHOLD -G]"
" [-r USEC]\n\n" " [-r USEC]\n\n"
" -a Run the real time thread on CPU1\n" " -a Run the real time thread on CPU1\n"
" -b CLIENT_IP Server side RTT\n" " -b CLIENT_IP Server side RTT\n"
" -d BUF_LEN Set the length of tx buffer\n" " -d BUF_LEN Set the length of tx buffer\n"
" -f IF Set the network interface to be used\n" " -f IF Set the network interface to be "
"used\n"
" -g Print histograms to sdtout on exit\n" " -g Print histograms to sdtout on exit\n"
" -h Show help\n" " -h Show help\n"
" -i USEC Wake up the real time thread every USEC " " -i USEC Wake up the real time thread every "
"USEC "
"microseconds (Default: 10ms)\n" "microseconds (Default: 10ms)\n"
" -p PRIO Run the real time thread at priority PRIO\n" " -p PRIO Run the real time thread at priority "
" -r USEC Refresh the non real time main thread " "PRIO\n"
" -r USEC Refresh the non real time main "
"thread "
"every USEC microseconds\n" "every USEC microseconds\n"
" -t Enable timestamps\n" " -t Enable timestamps\n"
" -v Verbose\n" " -v Verbose\n"
" -T LATENCY_THRESHOLD Enable tracing until LATENCY_THRESHOLD is " " -x POLL_MODE Use AF_XDP sockets\n"
" POLL_MODE: 0 for polling, 1 for combination of both\n"
" -X Trace during XDP packet reception\n"
" -T LATENCY_THRESHOLD Enable tracing until "
"LATENCY_THRESHOLD is "
"reached\n" "reached\n"
" -G Enable function_graph tracer, used with " " -G Enable function_graph tracer, used "
"with "
"-T\n" "-T\n"
"\n", "\n",
argv[0]); argv[0]);
...@@ -116,64 +127,88 @@ static void *packet_receiving_thread(void *p) { ...@@ -116,64 +127,88 @@ static void *packet_receiving_thread(void *p) {
CPU_ZERO(&mask); CPU_ZERO(&mask);
CPU_SET(1, &mask); CPU_SET(1, &mask);
if (sched_setaffinity(0, sizeof(mask), &mask)) if (sched_setaffinity(0, sizeof(mask), &mask))
error(EXIT_FAILURE, errno, "Could not set CPU affinity to CPU #1\n"); error(EXIT_FAILURE, errno,
"Could not set CPU affinity to CPU #1\n");
} }
clock_gettime(CLOCK_MONOTONIC, &measures_start); clock_gettime(CLOCK_MONOTONIC, &measures_start);
if(tsn_task == XDP_TASK)
setup_poll_fd();
// Packet receiving loop // Packet receiving loop
for (ingress_stats.packets_received = 0;; ingress_stats.packets_received++) { for (ingress_stats.packets_received = 0;;
ingress_stats.packets_received++) {
if (tsn_task == RTT_TASK) { if (tsn_task == RTT_TASK) {
recv_udp_packet(); recv_udp_packet();
send_udp_packet("", 0); send_udp_packet("", 0);
} else if (tsn_task == RECV_PACKET_TASK) { } else if (tsn_task == RECV_PACKET_TASK ||
tsn_task == XDP_TASK) {
int current_packet_id; int current_packet_id;
if (tsn_task == RECV_PACKET_TASK)
recv_udp_packet(); recv_udp_packet();
else
recv_xdp_packet();
clock_gettime(CLOCK_MONOTONIC, &current); clock_gettime(CLOCK_MONOTONIC, &current);
current_packet_id = atoi(ingress_stats.data); recv_xdp_cleanup();
if (ingress_stats.packets_received) { if (ingress_stats.packets_received) {
int interval_us = calcdiff_ns(current, previous) / 1000; int interval_us =
calcdiff_ns(current, previous) / 1000;
ingress_stats.min_interval = ingress_stats.min_interval = _min_(
min(interval_us, ingress_stats.min_interval); interval_us, ingress_stats.min_interval);
ingress_stats.max_interval = ingress_stats.max_interval = _max_(
max(interval_us, ingress_stats.max_interval); interval_us, ingress_stats.max_interval);
ingress_stats.avg_interval = ingress_stats.avg_interval =
(ingress_stats.avg_interval * ingress_stats.packets_received + (ingress_stats.avg_interval *
ingress_stats.packets_received +
interval_us) / interval_us) /
(ingress_stats.packets_received + 1); (ingress_stats.packets_received + 1);
if (tsn_task == RECV_PACKET_TASK) {
// Check if packets were lost // Check if packets were lost
current_packet_id = atoi(ingress_stats.data);
ingress_stats.lost_packets += ingress_stats.lost_packets +=
(current_packet_id - prev_packet_id - 1) % 1000; (current_packet_id -
prev_packet_id - 1) %
1000;
prev_packet_id = current_packet_id;
}
if (enable_histograms) { if (enable_histograms) {
int dist_to_interval = interval_us - (thread_params.interval / 1000); int dist_to_interval =
interval_us -
(thread_params.interval / 1000);
dist_to_interval += MAX_JITTER / 2; dist_to_interval += MAX_JITTER / 2;
if (dist_to_interval > ((int)MAX_JITTER) || dist_to_interval < 0) if (dist_to_interval >
((int)MAX_JITTER) ||
dist_to_interval < 0)
ingress_stats.high_jitter++; ingress_stats.high_jitter++;
else else
jitter_hist[dist_to_interval]++; jitter_hist[dist_to_interval]++;
} }
} }
// If the latency hits the tracing threshold, stop tracing // If the latency hits the tracing threshold, stop
// tracing
if (main_params.enable_tracing && if (main_params.enable_tracing &&
(ingress_stats.max_interval > ((int)thread_params.latency_threshold))) { (ingress_stats.max_interval >
sprintf(tracemark_message, "Jitter threshold hit: %dus\n", ingress_stats.max_interval); ((int)thread_params.latency_threshold))) {
sprintf(tracemark_message,
"Jitter threshold hit: %dus\n",
ingress_stats.max_interval);
tracemark(tracemark_message); tracemark(tracemark_message);
tracing(0); tracing(0);
break; break;
} }
previous = current; previous = current;
prev_packet_id = current_packet_id;
} }
} }
...@@ -216,6 +251,7 @@ int main(int argc, char *argv[]) { ...@@ -216,6 +251,7 @@ int main(int argc, char *argv[]) {
process_options(argc, argv); process_options(argc, argv);
ingress_params.use_timestamps = enable_timestamps; ingress_params.use_timestamps = enable_timestamps;
ingress_params.interval = thread_params.interval;
if (enable_histograms) { if (enable_histograms) {
// Init histograms // Init histograms
...@@ -223,17 +259,22 @@ int main(int argc, char *argv[]) { ...@@ -223,17 +259,22 @@ int main(int argc, char *argv[]) {
memset(jitter_hist, 0, sizeof(jitter_hist)); memset(jitter_hist, 0, sizeof(jitter_hist));
} }
if (main_params.enable_tracing) { if (main_params.enable_tracing || main_params.enable_xdp_tracing) {
// Enable ftrace // Enable ftrace
open_fds(); open_fds();
} }
// Catch breaks with sighand to print the histograms // Catch breaks with sighand to print the histograms or exit XDP
init_signals(sighand, enable_histograms); init_signals(sighand);
if (tsn_task == XDP_TASK) {
// Initialize the XDP packet receiving socket
init_xdp_recv(&ingress_params);
} else {
// Initialize the UDP packet receiving socket // Initialize the UDP packet receiving socket
init_udp_recv(&ingress_params, &ingress_stats, enable_histograms, init_udp_recv(&ingress_params, &ingress_stats,
kernel_latency_hist); enable_histograms, kernel_latency_hist);
}
// Initialize the UDP packet sending socket if RTT is measured // Initialize the UDP packet sending socket if RTT is measured
if (tsn_task == RTT_TASK) if (tsn_task == RTT_TASK)
...@@ -267,27 +308,36 @@ int main(int argc, char *argv[]) { ...@@ -267,27 +308,36 @@ int main(int argc, char *argv[]) {
// Create the real time thread // Create the real time thread
if (pthread_create(&thread, &attr, packet_receiving_thread, NULL)) if (pthread_create(&thread, &attr, packet_receiving_thread, NULL))
error(EXIT_FAILURE, errno, "Couldn't create packet receiving thread"); error(EXIT_FAILURE, errno,
"Couldn't create packet receiving thread");
// Verbose loop // Verbose loop
for (;;) { for (;;) {
usleep(main_params.refresh_rate); usleep(main_params.refresh_rate);
if (main_params.verbose && ingress_stats.packets_received > 1) { if (main_params.verbose && ingress_stats.packets_received > 1) {
if (tsn_task == RECV_PACKET_TASK) { if (tsn_task == RECV_PACKET_TASK ||
int jitter = ingress_stats.max_interval - ingress_stats.min_interval; tsn_task == XDP_TASK) {
int jitter = ingress_stats.max_interval -
ingress_stats.min_interval;
printf("%9" PRIu64 ": J: %5d, I (10us): %3d %3d %3d [%3d,%3d]", printf(
"%9" PRIu64
": J: %5d, I (10us): %3d %3d %3d [%3d,%3d]",
ingress_stats.packets_received, jitter, ingress_stats.packets_received, jitter,
ingress_stats.min_interval / 10, ingress_stats.avg_interval / 10, ingress_stats.min_interval / 10,
ingress_stats.max_interval / 10, (int)ingress_stats.high_jitter, ingress_stats.avg_interval / 10,
ingress_stats.max_interval / 10,
(int)ingress_stats.high_jitter,
(int)ingress_stats.lost_packets); (int)ingress_stats.lost_packets);
if (enable_timestamps) { if (enable_timestamps) {
printf(", K: %4d %4d %4d [%3d]\n", ingress_stats.min_kernel_latency, printf(", K: %4d %4d %4d [%3d]\n",
ingress_stats.min_kernel_latency,
ingress_stats.avg_kernel_latency, ingress_stats.avg_kernel_latency,
ingress_stats.max_kernel_latency, ingress_stats.max_kernel_latency,
(int)ingress_stats.high_kernel_latency); (int)ingress_stats
.high_kernel_latency);
} else { } else {
printf("\n"); printf("\n");
} }
...@@ -297,9 +347,11 @@ int main(int argc, char *argv[]) { ...@@ -297,9 +347,11 @@ int main(int argc, char *argv[]) {
} }
if (main_params.enable_tracing && if (main_params.enable_tracing &&
(ingress_stats.max_interval >= ((int)thread_params.latency_threshold))) (ingress_stats.max_interval >=
((int)thread_params.latency_threshold)))
break; break;
} }
close_xdp_socket();
} }
// Print histograms in .json format // Print histograms in .json format
...@@ -327,9 +379,11 @@ static void print_histograms() { ...@@ -327,9 +379,11 @@ static void print_histograms() {
"\"lost_packets\": \"%d\"}," "\"lost_packets\": \"%d\"},"
"\"props\": [[", "\"props\": [[",
interval, duration_hour, duration_minutes, interval, duration_hour, duration_minutes,
ingress_stats.lost_packets + ((int)ingress_stats.high_jitter)); ingress_stats.lost_packets +
((int)ingress_stats.high_jitter));
max_latency = histogram_max(kernel_latency_hist, MAX_KERNEL_LATENCY - 1); max_latency =
histogram_max(kernel_latency_hist, MAX_KERNEL_LATENCY - 1);
for (int j = 0; j < max_latency; j++) for (int j = 0; j < max_latency; j++)
printf("%" PRIi64 "%s", kernel_latency_hist[j], printf("%" PRIi64 "%s", kernel_latency_hist[j],
...@@ -351,21 +405,30 @@ static void print_histograms() { ...@@ -351,21 +405,30 @@ static void print_histograms() {
"\"metadata\": {\"i\": \"%dus\", \"duration\": \"%dh%d\"," "\"metadata\": {\"i\": \"%dus\", \"duration\": \"%dh%d\","
"\"lost_packets\": \"%d\"}," "\"lost_packets\": \"%d\"},"
"\"props\": [[", "\"props\": [[",
MAX_JITTER / 2 - min_jitter, interval, duration_hour, duration_minutes, MAX_JITTER / 2 - min_jitter, interval, duration_hour,
duration_minutes,
ingress_stats.lost_packets + ((int)ingress_stats.high_jitter)); ingress_stats.lost_packets + ((int)ingress_stats.high_jitter));
for (int j = min_jitter; j < max_jitter; j++) for (int j = min_jitter; j < max_jitter; j++)
printf("%" PRIi64 "%s", jitter_hist[j], (j + 1 < max_jitter ? ", " : "")); printf("%" PRIi64 "%s", jitter_hist[j],
(j + 1 < max_jitter ? ", " : ""));
printf("]]}]}\n"); printf("]]}]}\n");
} }
static void sighand(int sig_num) { static void sighand(int sig_num) {
(void)sig_num; (void)sig_num;
if (enable_histograms) {
print_histograms(); print_histograms();
}
if (tsn_task == XDP_TASK) {
close_xdp_socket();
}
if (ingress_stats.lost_packets) if (ingress_stats.lost_packets)
fprintf(stderr, "%d packets were lost\n", ingress_stats.lost_packets); fprintf(stderr, "%d packets were lost\n",
ingress_stats.lost_packets);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
...@@ -375,7 +438,7 @@ static void process_options(int argc, char *argv[]) { ...@@ -375,7 +438,7 @@ static void process_options(int argc, char *argv[]) {
int network_if_specified = 0; int network_if_specified = 0;
for (;;) { for (;;) {
int c = getopt(argc, argv, "ab:d:f:ghi:p:r:tvT:G"); int c = getopt(argc, argv, "ab:d:f:ghi:p:r:tvx:XT:G");
if (c == -1) break; if (c == -1) break;
...@@ -390,7 +453,9 @@ static void process_options(int argc, char *argv[]) { ...@@ -390,7 +453,9 @@ static void process_options(int argc, char *argv[]) {
case 'd': case 'd':
ingress_params.tx_buffer_len = atoi(optarg); ingress_params.tx_buffer_len = atoi(optarg);
if (ingress_params.tx_buffer_len < 1) { if (ingress_params.tx_buffer_len < 1) {
fprintf(stderr, "BUF_LEN should be greater than 1\n"); fprintf(stderr,
"BUF_LEN should be greater "
"than 1\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
break; break;
...@@ -420,6 +485,13 @@ static void process_options(int argc, char *argv[]) { ...@@ -420,6 +485,13 @@ static void process_options(int argc, char *argv[]) {
case 'v': case 'v':
main_params.verbose = 1; main_params.verbose = 1;
break; break;
case 'x':
tsn_task = XDP_TASK;
ingress_params.xdp_polling_mode = atoi(optarg);
break;
case 'X':
main_params.enable_xdp_tracing = 1;
break;
case 'T': case 'T':
main_params.enable_tracing = 1; main_params.enable_tracing = 1;
thread_params.latency_threshold = atoi(optarg); thread_params.latency_threshold = atoi(optarg);
......
packet-exchange/src/tracer.c
View file @ 126217da
...@@ -75,7 +75,7 @@ static void setkernvar(const char *name, char *value) { ...@@ -75,7 +75,7 @@ static void setkernvar(const char *name, char *value) {
fprintf(stderr, "could not set %s to %s\n", name, value); fprintf(stderr, "could not set %s to %s\n", name, value);
} }
void open_fds() { void open_fds(void) {
fileprefix = debugfileprefix; fileprefix = debugfileprefix;
......
packet-exchange/src/tracer.h
View file @ 126217da
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define TRACER_H #define TRACER_H
void setup_tracer(int enable_graph); void setup_tracer(int enable_graph);
void open_fds(); void open_fds(void);
void tracing(int on); void tracing(int on);
void tracemark(char * s); void tracemark(char * s);
......
packet-exchange/src/xdp_kern.c 0 → 100644
View file @ 126217da
#define KBUILD_MODNAME "blub"
#include <linux/bpf.h>
#include <linux/if_ether.h>
#include <linux/if_link.h>
#include <linux/if_xdp.h>
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/udp.h>
#include "bpf_helpers.h"
#define bpf_printk(fmt, ...) \
({ \
char ____fmt[] = fmt; \
bpf_trace_printk(____fmt, sizeof(____fmt), ##__VA_ARGS__); \
})
struct bpf_map_def SEC("maps") xsks_map = {
.type = BPF_MAP_TYPE_XSKMAP,
.key_size = sizeof(int),
.value_size = sizeof(int),
.max_entries = 64,
};
static inline int parse_ipv4(void *data, unsigned long long nh_off,
void *data_end) {
struct iphdr *iph = data + nh_off;
if ((void *)(iph + 1) > data_end) return 0;
return iph->protocol;
}
SEC("xdp_sock")
int xdp_sock_prog(struct xdp_md *ctx) {
void *data_end = (void *)(long)ctx->data_end;
void *data = (void *)(long)ctx->data;
struct ethhdr *eth = data;
int idx = ctx->rx_queue_index;
unsigned int ipproto = 0;
unsigned long long nh_off;
/* Check if it's a UDP frame: If UDP -> Redirect to active xsk for user
* space. If not -> pass to stack.
*/
nh_off = sizeof(*eth);
if (data + nh_off > data_end) return XDP_PASS;
if (eth->h_proto == __builtin_bswap16(ETH_P_IP))
ipproto = parse_ipv4(data, nh_off, data_end);
if (ipproto != IPPROTO_UDP) return XDP_PASS;
/* If socket bound to rx_queue then redirect to user space */
if (bpf_map_lookup_elem(&xsks_map, &idx))
return bpf_redirect_map(&xsks_map, idx, 0);
/* Else pass to Linux' network stack */
return XDP_PASS;
}
char _license[] SEC("license") = "GPL";
scripts/run-server
View file @ 126217da
...@@ -3,16 +3,28 @@ ...@@ -3,16 +3,28 @@
script_dir=$(dirname $(realpath $0)) script_dir=$(dirname $(realpath $0))
usage() { usage() {
echo "Usage: $0 [[-bt] [-g INTERVAL]] | (-d NB_PACKETS [-i INTERVAL]) [-T LATENCY_THRESHOLD -G]" 1>&2; echo "Usage: $0 | " 1>&2;
exit 1;
}
usage() {
cat << ENDUSAGE
Usage: $0 SERVER | TCPDUMP [TRACE_OPTS]
SERVER: [-bt] [(-x | -X) POLL] [-g INTERVAL]
TCPDUMP: -d NB_PACKETS [-i INTERVAL]
TRACE_OPTS: (-T LATENCY_THRESHOLD -G) | -E
ENDUSAGE
1>&2;
exit 1; exit 1;
} }
# Default options # Default options
server_options="-a -p 99 -f eth0" server_options="-a -p 99 -f eth0"
make_opts=""
ip="10.100.21." ip="10.100.21."
tcpdump_interval=1000000 tcpdump_interval=1000000
while getopts "b:htd:i:g:T:G" opt; do while getopts "b:htx:X:d:i:g:T:GE" opt; do
case "${opt}" in case "${opt}" in
b ) b )
use_rtt=1 use_rtt=1
...@@ -37,12 +49,23 @@ while getopts "b:htd:i:g:T:G" opt; do ...@@ -37,12 +49,23 @@ while getopts "b:htd:i:g:T:G" opt; do
t ) t )
server_options+=" -t" server_options+=" -t"
;; ;;
x )
server_options+=" -x ${OPTARG}"
make_opts=" -e WITH_XDP=1"
;;
X )
server_options+=" -x ${OPTARG}"
make_opts=" -e WITH_GIT_XDP=1"
;;
T ) T )
server_options+=" -T ${OPTARG}" server_options+=" -T ${OPTARG}"
;; ;;
G ) G )
server_options+=" -G" server_options+=" -G"
;; ;;
E )
enable_xdp_events=1
;;
* ) * )
usage usage
;; ;;
...@@ -78,10 +101,14 @@ if [ -n "${use_tcpdump}" ]; then ...@@ -78,10 +101,14 @@ if [ -n "${use_tcpdump}" ]; then
$script_dir/txtime-stats.py -f server_stats_tmp.out -i $tcpdump_interval; $script_dir/txtime-stats.py -f server_stats_tmp.out -i $tcpdump_interval;
else else
echo "make server"; echo "make $make_opts server";
cd $script_dir/../packet-exchange/build;make server;cd $script_dir cd $script_dir/../packet-exchange/build;make $make_opts server;cd $script_dir
if [ -z "${use_histogram}" ]; then if [ -n "${enable_xdp_events}" ]; then
tracecmd_events="-e irq -e sched -e xdp"
echo "trace-cmd record $tracecmd_events $script_dir/../packet-exchange/build/server $server_options";
trace-cmd record $tracecmd_events $script_dir/../packet-exchange/build/server $server_options;
elif [ -z "${use_histogram}" ]; then
echo "server $server_options"; echo "server $server_options";
$script_dir/../packet-exchange/build/server $server_options; $script_dir/../packet-exchange/build/server $server_options;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7