Srv6 l2 dx2

.github/workflows/check.yml

@@ -73,7 +73,7 @@ jobs:
             libibverbs-dev libasan8 libcmocka-dev libedit-dev libarchive-dev \
             libevent-dev libsmartcols-dev libmnl-dev libnuma-dev python3-pyelftools \
             socat tcpdump traceroute graphviz iproute2 iputils-ping ndisc6 jq \
-            dnsmasq \
+            dnsmasq scapy \
             "linux-modules-extra-$(uname -r)"
           if echo $MESON_EXTRA_OPTS | grep -q frr=enabled ; then
             sudo apt-get install -qy --no-install-recommends \

README.md

@@ -281,13 +281,13 @@ In order to run the `smoke-tests`, `lint`, `check-patches` and `update-graph`
 targets, you'll need additional packages:
 
 ```sh
-dnf install gawk gdb clang-tools-extra jq codespell curl traceroute graphviz ndisc6
+dnf install gawk gdb clang-tools-extra jq codespell curl traceroute graphviz ndisc6 scapy
 ```
 
 or
 
 ```sh
-apt install gawk gdb clang-format jq codespell curl traceroute graphviz ndisc6
+apt install gawk gdb clang-format jq codespell curl traceroute graphviz ndisc6 scapy
 ```
 
 ### Build

frr/rt_grout.c

@@ -266,6 +266,9 @@ static int grout_gr_nexthop_to_frr_nexthop(
 		case SR_BEHAVIOR_END_DT46:
 			action = ZEBRA_SEG6_LOCAL_ACTION_END_DT46;
 			break;
+		case SR_BEHAVIOR_END_DX2:
+			action = ZEBRA_SEG6_LOCAL_ACTION_END_DX2;
+			break;
 		}
 
 		ctx.table = ifindex_grout_to_frr(sr6->out_vrf_id);
@@ -726,6 +729,11 @@ grout_add_nexthop(uint32_t nh_id, gr_nh_origin_t origin, const struct nexthop *n
 				nh->nh_srv6->seg6local_ctx.table
 			);
 			break;
+		case ZEBRA_SEG6_LOCAL_ACTION_END_DX2:
+			sr6_local->behavior = SR_BEHAVIOR_END_DX2;
+			// FIXME
+			sr6_local->out_vrf_id = ifindex_frr_to_grout(GR_VRF_ID_ALL);
+			break;
 		default:
 			gr_log_err(
 				"not supported srv6 local behaviour action=%u",

modules/infra/api/gr_infra.h

@@ -51,6 +51,7 @@ typedef enum : uint16_t {
 typedef enum : uint8_t {
 	GR_IFACE_MODE_L3 = 0,
 	GR_IFACE_MODE_L1_XC,
+	GR_IFACE_MODE_SRV6_XC,
 	GR_IFACE_MODE_COUNT
 } gr_iface_mode_t;
 
@@ -74,6 +75,7 @@ struct __gr_iface_base {
 		uint16_t vrf_id; // L3 addressing and routing domain
 		uint16_t domain_id; // L2 xconnect peer interface id
 	};
+	uint32_t mode_data; // Abstract mode data
 	uint32_t speed; // Link speed in Megabit/sec.
 };
 
@@ -452,6 +454,8 @@ static inline const char *gr_iface_mode_name(gr_iface_mode_t mode) {
 		return "l3";
 	case GR_IFACE_MODE_L1_XC:
 		return "l1-xc";
+	case GR_IFACE_MODE_SRV6_XC:
+		return "srv6-evpn";
 	case GR_IFACE_MODE_COUNT:
 		break;
 	}

modules/infra/cli/gr_cli_iface.h

@@ -17,10 +17,21 @@ struct cli_iface_type {
 	void (*list_info)(struct gr_api_client *c, const struct gr_iface *, char *, size_t);
 };
 
+struct cli_iface_mode {
+	STAILQ_ENTRY(cli_iface_mode) next;
+	gr_iface_mode_t mode_id;
+	const char *str;
+	int (*init)(struct ec_node *);
+	void (*show)(struct gr_api_client *, const struct gr_iface *);
+	void (*list_info)(struct gr_api_client *, const struct gr_iface *, char *, size_t);
+};
+
 void register_iface_type(struct cli_iface_type *);
+void register_iface_mode(struct cli_iface_mode *);
 
 const struct cli_iface_type *type_from_name(const char *name);
 const struct cli_iface_type *type_from_id(gr_iface_type_t type_id);
+const struct cli_iface_mode *mode_from_id(gr_iface_mode_t mode_id);
 struct gr_iface *iface_from_name(struct gr_api_client *c, const char *name);
 struct gr_iface *iface_from_id(struct gr_api_client *c, uint16_t ifid);
 
@@ -51,7 +62,7 @@ int complete_iface_names(
 #define INTERFACE_SET_CTX(root)                                                                    \
 	CLI_CONTEXT(root, INTERFACE_ARG, CTX_ARG("set", "Modify an existing interface."))
 
-#define IFACE_ATTRS_CMD "(up|down),(promisc PROMISC),(mtu MTU),(vrf VRF)"
+#define IFACE_ATTRS_CMD "(up|down),(promisc PROMISC),(mtu MTU),(vrf VRF),(mode IFACE_MODE)"
 
 #define IFACE_ATTRS_ARGS                                                                           \
 	with_help("Set the interface UP.", ec_node_str("up", "up")),                               \
@@ -67,6 +78,10 @@ int complete_iface_names(
 		with_help(                                                                         \
 			"L3 addressing/routing domain ID.",                                        \
 			ec_node_uint("VRF", 0, UINT16_MAX - 1, 10)                                 \
+		),                                                                                 \
+		with_help(                                                                         \
+			"interface mode.",                                                         \
+			EC_NODE_OR("IFACE_MODE", with_help("L3 routing.", ec_node_str("", "l3")))  \
 		)
 
 uint64_t parse_iface_args(
@@ -76,3 +91,12 @@ uint64_t parse_iface_args(
 	size_t info_size,
 	bool update
 );
+
+#define CALLBACK_ATTR_IFACE_MODE "callback_iface_mode"
+typedef cmd_status_t (*cmd_iface_set_cb_t)(
+	struct gr_api_client *,
+	struct gr_iface *,
+	const struct ec_pnode *,
+	uint64_t *
+);
+struct ec_node *with_iface_set_callback(cmd_iface_set_cb_t cb, struct ec_node *node);

modules/infra/cli/iface.c

@@ -18,11 +18,40 @@
 #include <unistd.h>
 
 static STAILQ_HEAD(, cli_iface_type) types = STAILQ_HEAD_INITIALIZER(types);
+static STAILQ_HEAD(, cli_iface_mode) modes = STAILQ_HEAD_INITIALIZER(modes);
 
 void register_iface_type(struct cli_iface_type *type) {
 	STAILQ_INSERT_TAIL(&types, type, next);
 }
 
+void register_iface_mode(struct cli_iface_mode *mode) {
+	STAILQ_INSERT_TAIL(&modes, mode, next);
+}
+
+struct ec_node *with_iface_set_callback(cmd_iface_set_cb_t cb, struct ec_node *node) {
+	if (node == NULL)
+		return NULL;
+	struct ec_dict *attrs = ec_node_attrs(node);
+	if (attrs == NULL || ec_dict_set(attrs, CALLBACK_ATTR_IFACE_MODE, cb, NULL) < 0) {
+		ec_node_free(node);
+		node = NULL;
+	}
+	return node;
+}
+
+static cmd_iface_set_cb_t find_cmd_iface_mode_callback(const struct ec_pnode *parsed) {
+	const struct ec_pnode *p;
+
+	for (p = parsed; p != NULL; p = EC_PNODE_ITER_NEXT(parsed, p, true)) {
+		const struct ec_node *node = ec_pnode_get_node(p);
+		cmd_iface_set_cb_t cb = ec_dict_get(ec_node_attrs(node), CALLBACK_ATTR_IFACE_MODE);
+		if (cb != NULL)
+			return cb;
+	}
+
+	return errno_set_null(EOPNOTSUPP);
+}
+
 const struct cli_iface_type *type_from_name(const char *name) {
 	const struct cli_iface_type *type;
 
@@ -57,6 +86,7 @@ int complete_iface_types(
 	}
 	return 0;
 }
+
 const struct cli_iface_type *type_from_id(gr_iface_type_t type_id) {
 	const struct cli_iface_type *type;
 
@@ -68,6 +98,17 @@ const struct cli_iface_type *type_from_id(gr_iface_type_t type_id) {
 	return NULL;
 }
 
+const struct cli_iface_mode *mode_from_id(gr_iface_mode_t mode_id) {
+	const struct cli_iface_mode *mode;
+
+	STAILQ_FOREACH (mode, &modes, next) {
+		if (mode->mode_id == mode_id)
+			return mode;
+	}
+	errno = ENODEV;
+	return NULL;
+}
+
 int complete_iface_names(
 	struct gr_api_client *c,
 	const struct ec_node *node,
@@ -147,6 +188,7 @@ uint64_t parse_iface_args(
 	size_t info_size,
 	bool update
 ) {
+	const struct ec_pnode *node;
 	const char *name, *promisc;
 	uint64_t set_attrs = 0;
 
@@ -191,6 +233,19 @@ uint64_t parse_iface_args(
 	if (arg_u16(p, "VRF", &iface->vrf_id) == 0)
 		set_attrs |= GR_IFACE_SET_VRF;
 
+	if ((node = ec_pnode_find(p, "IFACE_MODE")) != NULL) {
+		if (ec_pnode_find(node, "l3")) {
+			set_attrs |= GR_IFACE_SET_MODE;
+			set_attrs |= GR_IFACE_SET_VRF;
+			iface->mode = GR_IFACE_MODE_L3;
+			iface->vrf_id = 0;
+		} else {
+			cmd_iface_set_cb_t cb = find_cmd_iface_mode_callback(node);
+			if (cb)
+				cb(c, iface, node, &set_attrs);
+		}
+	}
+
 	return set_attrs;
 err:
 	return 0;
@@ -232,10 +287,12 @@ static cmd_status_t iface_list(struct gr_api_client *c, const struct ec_pnode *p
 	scols_table_new_column(table, "DOMAIN", 0, 0);
 	scols_table_new_column(table, "TYPE", 0, 0);
 	scols_table_new_column(table, "INFO", 0, 0);
+	scols_table_new_column(table, "", 0, 0);
 	scols_table_set_column_separator(table, "  ");
 
 	gr_api_client_stream_foreach (iface, ret, c, GR_INFRA_IFACE_LIST, sizeof(req), &req) {
 		const struct cli_iface_type *type = type_from_id(iface->type);
+		const struct cli_iface_mode *mode = mode_from_id(iface->mode);
 		struct libscols_line *line = scols_table_new_line(table, NULL);
 		char buf[128];
 
@@ -253,17 +310,8 @@ static cmd_status_t iface_list(struct gr_api_client *c, const struct ec_pnode *p
 		scols_line_set_data(line, 2, buf);
 
 		// mode
-		switch (iface->mode) {
-		case GR_IFACE_MODE_L1_XC:
-			scols_line_set_data(line, 3, "XC");
-			break;
-		case GR_IFACE_MODE_L3:
-			scols_line_set_data(line, 3, "L3");
-			break;
-		default:
-			scols_line_sprintf(line, 3, "%u", iface->mode);
-			break;
-		}
+		assert(mode != NULL);
+		scols_line_sprintf(line, 3, "%s", mode->str);
 
 		// vrf
 		scols_line_sprintf(line, 4, "%u", iface->vrf_id);
@@ -276,6 +324,11 @@ static cmd_status_t iface_list(struct gr_api_client *c, const struct ec_pnode *p
 		buf[0] = 0;
 		type->list_info(c, iface, buf, sizeof(buf));
 		scols_line_set_data(line, 6, buf);
+		if (mode->list_info) {
+			buf[0] = 0;
+			mode->list_info(c, iface, buf, sizeof(buf));
+			scols_line_set_data(line, 7, buf);
+		}
 	}
 
 	scols_print_table(table);
@@ -436,6 +489,7 @@ static cmd_status_t iface_rates(struct gr_api_client *c, const struct ec_pnode *
 
 static cmd_status_t iface_show(struct gr_api_client *c, const struct ec_pnode *p) {
 	const struct cli_iface_type *type;
+	const struct cli_iface_mode *mode;
 	char buf[128];
 
 	if (arg_str(p, "stats") != NULL) {
@@ -473,12 +527,19 @@ static cmd_status_t iface_show(struct gr_api_client *c, const struct ec_pnode *p
 	assert(type != NULL);
 	type->show(c, iface);
 
+	mode = mode_from_id(iface->mode);
+	assert(mode);
+	if (mode->show)
+		mode->show(c, iface);
+
 	free(iface);
 
 	return CMD_SUCCESS;
 }
 
 static int ctx_init(struct ec_node *root) {
+	struct ec_node *iface_mode = NULL;
+	struct cli_iface_mode *mode;
 	int ret;
 
 	if (INTERFACE_ADD_CTX(root) == NULL)
@@ -487,6 +548,17 @@ static int ctx_init(struct ec_node *root) {
 	if (INTERFACE_SET_CTX(root) == NULL)
 		return -1;
 
+	// IFACE_MODE is present many times in the ecoli cli tree:
+	// It can be configured with "interface add" and "interface set".
+	// Also, each interface type (port, vlan, ... ) will need to be attached
+	// all interface modes.
+	while ((iface_mode = ec_node_find_next(root, iface_mode, "IFACE_MODE"))) {
+		STAILQ_FOREACH (mode, &modes, next) {
+			if ((ret = mode->init(iface_mode)) < 0)
+				return ret;
+		}
+	}
+
 	ret = CLI_COMMAND(
 		INTERFACE_CTX(root),
 		"del NAME",
@@ -584,7 +656,19 @@ static struct cli_event_printer printer = {
 	},
 };
 
+static int l3_mode_init(struct ec_node *) {
+	// This default l3 mode is handled statically
+	return 0;
+}
+
+static struct cli_iface_mode iface_mode_l3 = {
+	.mode_id = GR_IFACE_MODE_L3,
+	.str = "L3",
+	.init = l3_mode_init,
+};
+
 static void __attribute__((constructor, used)) init(void) {
 	cli_context_register(&ctx);
 	cli_event_printer_register(&printer);
+	register_iface_mode(&iface_mode_l3);
 }