nettrace: use OPTION_IPV4ORIPV6 for nettrace

Now, we can filter ipv4 or ipv6 address with the --addr argument.
Such as --addr ::1

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

nodetrace/mark.c

@@ -31,11 +31,10 @@ static void print_bpf_output(void *ctx, int cpu, void *data, __u32 size)
 
 static int parse_opts(int argc, char *argv[], bpf_args_t *args)
 {
-	int proto_l;
-	u16 proto;
+	COMMON_PROG_ARGS_BEGIN()
 
 	option_item_t opts[] = {
-		COMMON_PROG_ARGS(&args->pkt),
+		COMMON_PROG_ARGS_DEFINE(&args->pkt),
 		{ .type = OPTION_BLANK },
 		{
 			.sname = 'i', .dest = &nic, .type = OPTION_STRING,
@@ -54,11 +53,11 @@ static int parse_opts(int argc, char *argv[], bpf_args_t *args)
 			.desc = "show help information",
 		},
 	};
-#undef E
-#undef R
 
 	if (parse_args(argc, argv, &prog_config, opts, ARRAY_SIZE(opts)))
 		goto err;
+	
+	COMMON_PROG_ARGS_END(&args->pkt)
 	return 0;
 err:
 	return -1;

shared/bpf/skb_shared.h

@@ -57,30 +57,29 @@ typedef struct __attribute__((__packed__)) {
 #define TCP_FLAGS_RST	(1 << 2)
 #define TCP_FLAGS_SYN	(1 << 1)
 
+#define APPLY_DEFINE_FIELD(dummy, a, b, ...)	DEFINE_FIELD_##b
+#define DEFINE_FIELD_STD(type, name)		\
+	type name;				\
+	bool enable_##name;
+#define DEFINE_FIELD_ARRAY(type, name, size)	\
+	type name[size];			\
+	bool enable_##name;
+#define DEFINE_FIELD(type, name, args...)	\
+	APPLY_DEFINE_FIELD(dummy, ##args, ARRAY, STD)(type, name, ##args)
+
 /* used for packet filter condition */
 typedef struct {
-	u32	saddr;
-	bool	enable_saddr;
-	u32	daddr;
-	bool	enable_daddr;
-	u32	addr;
-	bool	enable_addr;
-	u8	saddr_v6[16];
-	bool	enable_saddr_v6;
-	u8	daddr_v6[16];
-	bool	enable_daddr_v6;
-	u8	addr_v6[16];
-	bool	enable_addr_v6;
-	u16	sport;
-	bool	enable_sport;
-	u16	dport;
-	bool	enable_dport;
-	u16	port;
-	bool	enable_port;
-	u16	l3_proto;
-	bool	enable_l3_proto;
-	u8	l4_proto;
-	bool	enable_l4_proto;
+	DEFINE_FIELD(u32, saddr)
+	DEFINE_FIELD(u32, daddr)
+	DEFINE_FIELD(u32, addr)
+	DEFINE_FIELD(u8, saddr_v6, 16)
+	DEFINE_FIELD(u8, daddr_v6, 16)
+	DEFINE_FIELD(u8, addr_v6, 16)
+	DEFINE_FIELD(u16, sport)
+	DEFINE_FIELD(u16, dport)
+	DEFINE_FIELD(u16, port)
+	DEFINE_FIELD(u16, l3_proto)
+	DEFINE_FIELD(u8, l4_proto)
 } pkt_args_t;
 
 #define CONFIG_MAP_SIZE	1024

shared/common_args.h

@@ -1,48 +1,33 @@
 
-#define COMMON_PROG_ARGS(args)					\
+#define COMMON_PROG_ARGS_BEGIN()				\
+	u8 addr_buf[16], saddr_buf[16], daddr_buf[16];		\
+	u16 addr_pf = 0, saddr_pf = 0, daddr_pf = 0;		\
+	int proto_l = 0;					\
+	u16 proto;
+
+#define COMMON_PROG_ARGS_DEFINE(args)				\
 	{							\
 		.lname = "saddr",				\
 		.sname = 's',					\
-		.dest = &(args)->saddr,				\
-		.type = OPTION_IPV4,				\
-		.set = &(args)->enable_saddr,			\
-		.desc = "filter source ip address",		\
-	},							\
-	{							\
-		.lname = "saddr6",				\
-		.dest = &(args)->saddr_v6,			\
-		.type = OPTION_IPV6,				\
-		.set = &(args)->enable_saddr_v6,		\
-		.desc = "filter source ip v6 address",		\
+		.dest = saddr_buf,				\
+		.type = OPTION_IPV4ORIPV6,			\
+		.set = &saddr_pf,				\
+		.desc = "filter source ip/ipv6 address",	\
 	},							\
 	{							\
 		.lname = "daddr",				\
 		.sname = 'd',					\
-		.dest = &(args)->daddr,				\
-		.type = OPTION_IPV4,				\
-		.set = &(args)->enable_daddr,			\
-		.desc = "filter dest ip address",		\
-	},							\
-	{							\
-		.lname = "daddr6",				\
-		.dest = &(args)->daddr_v6,			\
-		.type = OPTION_IPV6,				\
-		.set = &(args)->enable_daddr_v6,		\
-		.desc = "filter dest ip v6 address",		\
+		.dest = daddr_buf,				\
+		.type = OPTION_IPV4ORIPV6,			\
+		.set = &daddr_pf,				\
+		.desc = "filter dest ip/ipv6 address",		\
 	},							\
 	{							\
 		.lname = "addr",				\
-		.dest = &(args)->addr,				\
-		.type = OPTION_IPV4,				\
-		.set = &(args)->enable_addr,			\
-		.desc = "filter source or dest ip address",	\
-	},							\
-	{							\
-		.lname = "addr6",				\
-		.dest = &(args)->addr_v6,			\
-		.type = OPTION_IPV6,				\
-		.set = &(args)->enable_addr_v6,			\
-		.desc = "filter source or dest ip v6 address",	\
+		.dest = addr_buf,				\
+		.type = OPTION_IPV4ORIPV6,			\
+		.set = &addr_pf,				\
+		.desc = "filter source or dest ip/ipv6 address",	\
 	},							\
 	{							\
 		.lname = "sport",				\
@@ -76,3 +61,36 @@
 		.set = &proto_l,				\
 		.desc = "filter L3/L4 protocol, such as 'tcp', 'arp'",	\
 	}
+
+/* convert the args to the eBPF pkt_arg struct */
+#define FILL_ADDR_PROTO(name, subfix, args, pf) if (name##_pf == pf) {	\
+	memcpy(&(args)->name##subfix, name##_buf,			\
+	       sizeof((args)->name##subfix));				\
+	(args)->enable_##name##subfix = true;				\
+	if ((args)->enable_l3_proto && (args)->l3_proto != pf) { 	\
+		pr_err("ip" #subfix " protocol is excepted!\n");	\
+		goto err;						\
+	}								\
+	(args)->enable_l3_proto = true;					\
+	(args)->l3_proto = pf;						\
+}
+#define FILL_ADDR(name, args)					\
+	FILL_ADDR_PROTO(name, _v6, args, ETH_P_IPV6)		\
+	FILL_ADDR_PROTO(name, , args, ETH_P_IP)
+
+#define COMMON_PROG_ARGS_END(args)		\
+	switch (proto_l) {			\
+	case 3:					\
+		(args)->enable_l3_proto = true;	\
+		(args)->l3_proto = proto;	\
+		break;				\
+	case 4:					\
+		(args)->enable_l4_proto = true;	\
+		(args)->l4_proto = proto;	\
+		break;				\
+	default:				\
+		break;				\
+	}					\
+	FILL_ADDR(saddr, args)			\
+	FILL_ADDR(daddr, args)			\
+	FILL_ADDR(addr, args)

src/nettrace.c

@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: MulanPSL-2.0
 
+#include <arpa/inet.h>
+
 #include <arg_parse.h>
 #include <common_args.h>
 
@@ -18,11 +20,10 @@ static void do_parse_args(int argc, char *argv[])
 	trace_args_t *trace_args = &trace_ctx.args;
 	bpf_args_t *bpf_args = &trace_ctx.bpf_args;
 	pkt_args_t *pkt_args = &bpf_args->pkt;
-	int proto_l = 0;
-	u16 proto;
+	COMMON_PROG_ARGS_BEGIN()
 
 	option_item_t opts[] = {
-		COMMON_PROG_ARGS(pkt_args),
+		COMMON_PROG_ARGS_DEFINE(pkt_args),
 		{
 			.lname = "pid", .type = OPTION_U32,
 			.dest = &bpf_args->pid, .set = &bpf_args->enable_pid,
@@ -134,18 +135,7 @@ static void do_parse_args(int argc, char *argv[])
 		exit(0);
 	}
 
-	switch (proto_l) {
-	case 3:
-		pkt_args->enable_l3_proto = true;
-		pkt_args->l3_proto = proto;
-		break;
-	case 4:
-		pkt_args->enable_l4_proto = true;
-		pkt_args->l4_proto = proto;
-		break;
-	default:
-		break;
-	}
+	COMMON_PROG_ARGS_END(pkt_args)
 
 	return;
 err: