From 1a9bc3d8f6131ace0328b7c2bdd408a136cfbdfb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Mar 2019 02:47:33 +0900 Subject: [PATCH 1/5] network: do not continue when appending data to netlink message fails --- src/network/netdev/tunnel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 55d6f7a32c..244954ef69 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -141,7 +141,7 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink r = sd_netlink_message_append_in_addr(m, IFLA_GRE_REMOTE, &t->remote.in); if (r < 0) - log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_REMOTE attribute: %m"); + return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_REMOTE attribute: %m"); r = sd_netlink_message_append_u8(m, IFLA_GRE_TTL, t->ttl); if (r < 0) @@ -149,7 +149,7 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink r = sd_netlink_message_append_u8(m, IFLA_GRE_TOS, t->tos); if (r < 0) - log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_TOS attribute: %m"); + return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_TOS attribute: %m"); r = sd_netlink_message_append_u8(m, IFLA_GRE_PMTUDISC, t->pmtudisc); if (r < 0) @@ -224,7 +224,7 @@ static int netdev_erspan_fill_message_create(NetDev *netdev, Link *link, sd_netl r = sd_netlink_message_append_in_addr(m, IFLA_GRE_REMOTE, &t->remote.in); if (r < 0) - log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_REMOTE attribute: %m"); + return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_REMOTE attribute: %m"); return r; } From 9282f75bf4c1e7ca4b4e3fd8386e21f4632bc385 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Mar 2019 03:34:03 +0900 Subject: [PATCH 2/5] network: make erspan netdev can be specified in Network.Tunnel= --- src/network/netdev/netdev.c | 3 +++ src/network/netdev/tunnel.c | 2 +- src/network/networkd-network.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 5cdd09d775..f6d3ef8153 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -779,6 +779,9 @@ int netdev_load_one(Manager *manager, const char *filename) { case NETDEV_KIND_IP6TNL: independent = IP6TNL(netdev)->independent; break; + case NETDEV_KIND_ERSPAN: + independent = ERSPAN(netdev)->independent; + break; default: break; } diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 244954ef69..ad7c83e855 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -857,6 +857,6 @@ const NetDevVTable erspan_vtable = { .init = erspan_init, .sections = "Match\0NetDev\0Tunnel\0", .fill_message_create = netdev_erspan_fill_message_create, - .create_type = NETDEV_CREATE_INDEPENDENT, + .create_type = NETDEV_CREATE_STACKED, .config_verify = netdev_tunnel_verify, }; diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index c6c3480cd1..836776ae84 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -104,7 +104,8 @@ static int network_resolve_netdev_one(Network *network, const char *name, NetDev NETDEV_KIND_IP6GRETAP, NETDEV_KIND_VTI, NETDEV_KIND_VTI6, - NETDEV_KIND_IP6TNL))) + NETDEV_KIND_IP6TNL, + NETDEV_KIND_ERSPAN))) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "%s: NetDev %s is not a %s, ignoring assignment", network->filename, name, kind_string); From a8b9a65c504a811696e73cddc803dabfb2c370c7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Mar 2019 03:43:19 +0900 Subject: [PATCH 3/5] network: make GRE and GRETAP support Key=, InputKey=, OutputKey=, and SerializeTunneledPackets= This also merge netdev_gre_fill_message_create() and netdev_erspan_fill_message_create(). --- src/network/netdev/netdev-gperf.gperf | 2 +- src/network/netdev/tunnel.c | 102 +++++++++++--------------- src/network/netdev/tunnel.h | 2 +- 3 files changed, 46 insertions(+), 60 deletions(-) diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 96632da0b6..1677e937b6 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -73,7 +73,7 @@ Tunnel.FOUSourcePort, config_parse_ip_port, 0, Tunnel.Encapsulation, config_parse_fou_encap_type, 0, offsetof(Tunnel, fou_encap_type) Tunnel.IPv6RapidDeploymentPrefix, config_parse_6rd_prefix, 0, 0 Tunnel.ERSPANIndex, config_parse_uint32, 0, offsetof(Tunnel, erspan_index) -Tunnel.SerializeTunneledPackets, config_parse_tristate, 0, offsetof(Tunnel, erspan_sequence) +Tunnel.SerializeTunneledPackets, config_parse_tristate, 0, offsetof(Tunnel, gre_erspan_sequence) Tunnel.ISATAP, config_parse_tristate, 0, offsetof(Tunnel, isatap) FooOverUDP.Protocol, config_parse_uint8, 0, offsetof(FouTunnel, fou_protocol) FooOverUDP.Encapsulation, config_parse_fou_encap_type, 0, offsetof(FouTunnel, fou_encap_type) diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index ad7c83e855..8599020d22 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -114,20 +114,33 @@ static int netdev_ipip_sit_fill_message_create(NetDev *netdev, Link *link, sd_ne return r; } -static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { +static int netdev_gre_erspan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { + uint32_t ikey = 0; + uint32_t okey = 0; + uint16_t iflags = 0; + uint16_t oflags = 0; Tunnel *t; int r; assert(netdev); + assert(m); - if (netdev->kind == NETDEV_KIND_GRE) + switch (netdev->kind) { + case NETDEV_KIND_GRE: t = GRE(netdev); - else + break; + case NETDEV_KIND_ERSPAN: + t = ERSPAN(netdev); + break; + case NETDEV_KIND_GRETAP: t = GRETAP(netdev); + break; + default: + assert_not_reached("invalid netdev kind"); + } assert(t); assert(t->family == AF_INET); - assert(m); if (link) { r = sd_netlink_message_append_u32(m, IFLA_GRE_LINK, link->ifindex); @@ -135,6 +148,12 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_LINK attribute: %m"); } + if (netdev->kind == NETDEV_KIND_ERSPAN) { + r = sd_netlink_message_append_u32(m, IFLA_GRE_ERSPAN_INDEX, t->erspan_index); + if (r < 0) + return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_ERSPAN_INDEX attribute: %m"); + } + r = sd_netlink_message_append_in_addr(m, IFLA_GRE_LOCAL, &t->local.in); if (r < 0) return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_LOCAL attribute: %m"); @@ -155,29 +174,6 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink if (r < 0) return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_PMTUDISC attribute: %m"); - return r; -} - -static int netdev_erspan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { - uint32_t ikey = 0; - uint32_t okey = 0; - uint16_t iflags = 0; - uint16_t oflags = 0; - Tunnel *t; - int r; - - assert(netdev); - - t = ERSPAN(netdev); - - assert(t); - assert(t->family == AF_INET); - assert(m); - - r = sd_netlink_message_append_u32(m, IFLA_GRE_ERSPAN_INDEX, t->erspan_index); - if (r < 0) - return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_ERSPAN_INDEX attribute: %m"); - if (t->key != 0) { ikey = okey = htobe32(t->key); iflags |= GRE_KEY; @@ -194,10 +190,10 @@ static int netdev_erspan_fill_message_create(NetDev *netdev, Link *link, sd_netl oflags |= GRE_KEY; } - if (t->erspan_sequence > 0) { + if (t->gre_erspan_sequence > 0) { iflags |= GRE_SEQ; oflags |= GRE_SEQ; - } else if (t->erspan_sequence == 0) { + } else if (t->gre_erspan_sequence == 0) { iflags &= ~GRE_SEQ; oflags &= ~GRE_SEQ; } @@ -218,14 +214,6 @@ static int netdev_erspan_fill_message_create(NetDev *netdev, Link *link, sd_netl if (r < 0) return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_OFLAGS, attribute: %m"); - r = sd_netlink_message_append_in_addr(m, IFLA_GRE_LOCAL, &t->local.in); - if (r < 0) - return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_LOCAL attribute: %m"); - - r = sd_netlink_message_append_in_addr(m, IFLA_GRE_REMOTE, &t->remote.in); - if (r < 0) - return log_netdev_error_errno(netdev, r, "Could not append IFLA_GRE_REMOTE attribute: %m"); - return r; } @@ -716,19 +704,29 @@ static void vti_init(NetDev *n) { t->pmtudisc = true; } -static void gre_init(NetDev *n) { +static void gre_erspan_init(NetDev *n) { Tunnel *t; assert(n); - if (n->kind == NETDEV_KIND_GRE) + switch (n->kind) { + case NETDEV_KIND_GRE: t = GRE(n); - else + break; + case NETDEV_KIND_ERSPAN: + t = ERSPAN(n); + break; + case NETDEV_KIND_GRETAP: t = GRETAP(n); + break; + default: + assert_not_reached("invalid netdev kind"); + } assert(t); t->pmtudisc = true; + t->gre_erspan_sequence = -1; } static void ip6gre_init(NetDev *n) { @@ -746,18 +744,6 @@ static void ip6gre_init(NetDev *n) { t->ttl = DEFAULT_TNL_HOP_LIMIT; } -static void erspan_init(NetDev *n) { - Tunnel *t; - - assert(n); - - t = ERSPAN(n); - - assert(t); - - t->erspan_sequence = -1; -} - static void ip6tnl_init(NetDev *n) { Tunnel *t = IP6TNL(n); @@ -809,18 +795,18 @@ const NetDevVTable vti6_vtable = { const NetDevVTable gre_vtable = { .object_size = sizeof(Tunnel), - .init = gre_init, + .init = gre_erspan_init, .sections = "Match\0NetDev\0Tunnel\0", - .fill_message_create = netdev_gre_fill_message_create, + .fill_message_create = netdev_gre_erspan_fill_message_create, .create_type = NETDEV_CREATE_STACKED, .config_verify = netdev_tunnel_verify, }; const NetDevVTable gretap_vtable = { .object_size = sizeof(Tunnel), - .init = gre_init, + .init = gre_erspan_init, .sections = "Match\0NetDev\0Tunnel\0", - .fill_message_create = netdev_gre_fill_message_create, + .fill_message_create = netdev_gre_erspan_fill_message_create, .create_type = NETDEV_CREATE_STACKED, .config_verify = netdev_tunnel_verify, }; @@ -854,9 +840,9 @@ const NetDevVTable ip6tnl_vtable = { const NetDevVTable erspan_vtable = { .object_size = sizeof(Tunnel), - .init = erspan_init, + .init = gre_erspan_init, .sections = "Match\0NetDev\0Tunnel\0", - .fill_message_create = netdev_erspan_fill_message_create, + .fill_message_create = netdev_gre_erspan_fill_message_create, .create_type = NETDEV_CREATE_STACKED, .config_verify = netdev_tunnel_verify, }; diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h index 8f511dd1f6..3637e4f377 100644 --- a/src/network/netdev/tunnel.h +++ b/src/network/netdev/tunnel.h @@ -29,7 +29,7 @@ typedef struct Tunnel { int family; int ipv6_flowlabel; int allow_localremote; - int erspan_sequence; + int gre_erspan_sequence; int isatap; unsigned ttl; From c65c01c41ac1263dbee2acd40e671536d0900a54 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Mar 2019 03:49:11 +0900 Subject: [PATCH 4/5] man: update Tunnel.Key= and friends --- man/systemd.netdev.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index fd8031a5fd..8ccc7c1a5a 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -957,22 +957,24 @@ It is used as mark-configured SAD/SPD entry as part of the lookup key (both in data and control path) in ip xfrm (framework used to implement IPsec protocol). See - ip-xfrm — transform configuration for details. It is only used for VTI/VTI6 - tunnels. + ip-xfrm — transform configuration for details. It is only used for VTI/VTI6, + GRE, GRETAP, and ERSPAN tunnels. InputKey= The InputKey= parameter specifies the key to use for input. - The format is same as Key=. It is only used for VTI/VTI6 tunnels. + The format is same as Key=. It is only used for VTI/VTI6, GRE, GRETAP, + and ERSPAN tunnels. OutputKey= The OutputKey= parameter specifies the key to use for output. - The format is same as Key=. It is only used for VTI/VTI6 tunnels. + The format is same as Key=. It is only used for VTI/VTI6, GRE, GRETAP, + and ERSPAN tunnels. @@ -1048,8 +1050,8 @@ SerializeTunneledPackets= - Takes a boolean. If set to yes, then packets are serialized. Only applies for ERSPAN tunnel. - When unset, the kernel's default will be used. + Takes a boolean. If set to yes, then packets are serialized. Only applies for GRE, + GRETAP, and ERSPAN tunnels. When unset, the kernel's default will be used. From 6730a1f343ef0cbba766037490731e573f09ccc3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Mar 2019 03:50:11 +0900 Subject: [PATCH 5/5] test-network: test stacked erspan tunnels --- test/test-network/conf/25-erspan-tunnel-local-any.netdev | 1 - test/test-network/conf/25-erspan-tunnel.netdev | 1 - test/test-network/conf/erspan.network | 6 ++++++ test/test-network/systemd-networkd-tests.py | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 test/test-network/conf/erspan.network diff --git a/test/test-network/conf/25-erspan-tunnel-local-any.netdev b/test/test-network/conf/25-erspan-tunnel-local-any.netdev index cd7df3ada1..e9eb1c1cfc 100644 --- a/test/test-network/conf/25-erspan-tunnel-local-any.netdev +++ b/test/test-network/conf/25-erspan-tunnel-local-any.netdev @@ -3,7 +3,6 @@ Name=erspan98 Kind=erspan [Tunnel] -Independent=true ERSPANIndex=124 Local = any Remote = 172.16.1.100 diff --git a/test/test-network/conf/25-erspan-tunnel.netdev b/test/test-network/conf/25-erspan-tunnel.netdev index 60da0e9dad..86935e998c 100644 --- a/test/test-network/conf/25-erspan-tunnel.netdev +++ b/test/test-network/conf/25-erspan-tunnel.netdev @@ -3,7 +3,6 @@ Name=erspan99 Kind=erspan [Tunnel] -Independent=true ERSPANIndex=123 Local = 172.16.1.200 Remote = 172.16.1.100 diff --git a/test/test-network/conf/erspan.network b/test/test-network/conf/erspan.network new file mode 100644 index 0000000000..49364c506c --- /dev/null +++ b/test/test-network/conf/erspan.network @@ -0,0 +1,6 @@ +[Match] +Name=dummy98 + +[Network] +Tunnel=erspan99 +Tunnel=erspan98 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 1621d400b1..f0851efb15 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -289,6 +289,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-wireguard-private-key.txt', '25-wireguard.netdev', '6rd.network', + 'erspan.network', 'gre.network', 'gretap.network', 'gretun.network', @@ -728,9 +729,11 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfERSPANModuleIsNotAvailable() def test_erspan_tunnel(self): - self.copy_unit_to_networkd_unit_path('25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev') + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'erspan.network', + '25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev') self.start_networkd() + self.assertTrue(self.link_exits('dummy98')) self.assertTrue(self.link_exits('erspan99')) self.assertTrue(self.link_exits('erspan98'))