net: add local address bind support to vxlan and geneve
Subsystems (2)
v2 cover net: add local address bind support to vxlan and geneve
This series adds local address bind support to both vxlan and geneve sockets.
v1 -> v2:
- Change runtime checking of CONFIG_IPV6 to compile time in geneve
- Change {geneve,vxlan}_find_sock to check listening address
- Fix incorrect usage of IFLA_VXLAN_LOCAL6 in geneve
- Use NLA_POLICY_EXACT_LEN instead of changing strict_start_type in geneve
Richard Gobert (2):
net: vxlan: enable local address bind for vxlan sockets
net: geneve: enable local address bind for geneve sockets
drivers/net/geneve.c | 78 ++++++++++++++++++++++++++---- drivers/net/vxlan/vxlan_core.c | 52 ++++++++++++++------ include/net/geneve.h | 6 +++ include/uapi/linux/if_link.h | 2 + tools/include/uapi/linux/if_link.h | 2 + 5 files changed, 116 insertions(+), 24 deletions(-)
Signature · 1 line
2.36.1
PATCH v2 1/2 net: vxlan: enable local address bind for vxlan sockets
This patch adds support for binding to a local address in vxlan sockets. It achieves this by using vxlan_addr union to represent a local address to bind to, and copying it to udp_port_cfg in vxlan_create_sock.
Also change vxlan_find_sock to search the socket based on the listening address.
--- drivers/net/vxlan/vxlan_core.c | 53 ++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 15 deletions(-)
drivers/net/vxlan/vxlan_core.c +38 -15
@@ -72,22 +72,34 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) }/* Find VXLAN socket based on network namespace, address family, UDP port, -* enabled unshareable flags and socket device binding (see l3mdev with -* non-default VRF). +* bounded address, enabled unshareable flags and socket device binding +* (see l3mdev with non-default VRF). */ static struct vxlan_sock *vxlan_find_sock (struct net *net,sa_family_t family, -__be16 port,u32 flags,int ifindex) +__be16 port,u32 flags,int ifindex,union vxlan_addr *saddr) {struct vxlan_sock *vs; flags &=VXLAN_F_RCV_FLAGS ;hlist_for_each_entry_rcu (vs,vs_head (net, port), hlist) { -if (inet_sk (vs->sock->sk)->inet_sport == port && +struct sock *sk = vs->sock->sk; +struct inet_sock *inet =inet_sk (sk); + +if (inet->inet_sport == port &&vxlan_get_sk_family (vs) == family && vs->flags == flags && - vs->sock->sk->sk_bound_dev_if == ifindex) -return vs; + vs->sock->sk->sk_bound_dev_if == ifindex) { +if (family ==AF_INET && inet->inet_rcv_saddr == saddr->sin.sin_addr.s_addr) { +return vs; + } +#if IS_ENABLED (CONFIG_IPV6 ) + else if (ipv6_addr_cmp(&sk->sk_v6_rcv_saddr, &saddr->sin6.sin6_addr) == 0) + return vs; + } +#endif + } + }return NULL ; }
@@ -135,11 +147,11 @@ static struct vxlan_dev *vxlan_vs_find_vni(struct vxlan_sock *vs,/* Look up VNI in a per net namespace table */ static struct vxlan_dev *vxlan_find_vni (struct net *net,int ifindex,__be32 vni,sa_family_t family, -__be16 port,u32 flags) +__be16 port,u32 flags,union vxlan_addr *saddr) {struct vxlan_sock *vs; - vs =vxlan_find_sock (net, family, port, flags, ifindex); + vs =vxlan_find_sock (net, family, port, flags, ifindex, saddr);if (!vs)return NULL ;
@@ -2315,7 +2327,7 @@ static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,dst_release (dst); dst_vxlan =vxlan_find_vni (vxlan->net, dst_ifindex, vni, addr_family, dst_port, - vxlan->cfg.flags); + vxlan->cfg.flags, &vxlan->cfg.saddr);if (!dst_vxlan) {DEV_STATS_INC (dev, tx_errors); vxlan_vnifilter_count(vxlan, vni, NULL,
@@ -3503,8 +3515,9 @@ static const struct ethtool_ops vxlan_ethtool_ops = { .get_link_ksettings = vxlan_get_link_ksettings, }; -static struct socket *vxlan_create_sock (struct net *net,bool ipv6, -__be16 port,u32 flags,int ifindex) +static struct socket *vxlan_create_sock (struct net *net,bool ipv6,__be16 port, +u32 flags,int ifindex, +union vxlan_addr *addr) {struct socket *sock;struct udp_port_cfg udp_conf;
@@ -3517,8 +3530,17 @@ static struct socket *vxlan_create_sock(struct net *net, bool ipv6, udp_conf.use_udp6_rx_checksums = !(flags &VXLAN_F_UDP_ZERO_CSUM6_RX ); udp_conf.ipv6_v6only =1 ; +#if IS_ENABLED (CONFIG_IPV6 ) +memcpy (&udp_conf.local_ip6.s6_addr32, + &addr->sin6.sin6_addr.s6_addr32, +sizeof (addr->sin6.sin6_addr.s6_addr32)); +#endif }else { udp_conf.family =AF_INET ; + udp_conf.local_ip.s_addr = addr->sin.sin_addr.s_addr; +memcpy (&udp_conf.local_ip.s_addr, + &addr->sin.sin_addr.s_addr, +sizeof (addr->sin.sin_addr.s_addr)); } udp_conf.local_udp_port = port;
@@ -3536,7 +3558,8 @@ static struct socket *vxlan_create_sock(struct net *net, bool ipv6,/* Create new listen socket if needed */ static struct vxlan_sock *vxlan_socket_create (struct net *net,bool ipv6,__be16 port,u32 flags, -int ifindex) +int ifindex, +union vxlan_addr *addr) {struct vxlan_net *vn =net_generic (net, vxlan_net_id);struct vxlan_sock *vs;
@@ -3551,7 +3574,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,for (h =0 ; h <VNI_HASH_SIZE ; ++h)INIT_HLIST_HEAD (&vs->vni_list[h]); - sock =vxlan_create_sock (net, ipv6, port, flags, ifindex); + sock =vxlan_create_sock (net, ipv6, port, flags, ifindex, addr);if (IS_ERR (sock)) {kfree (vs);return ERR_CAST (sock);
@@ -3605,7 +3628,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)spin_lock (&vn->sock_lock); vs =vxlan_find_sock (vxlan->net, ipv6 ?AF_INET6 :AF_INET , vxlan->cfg.dst_port, vxlan->cfg.flags, - l3mdev_index); + l3mdev_index, &vxlan->cfg.saddr);if (vs && !refcount_inc_not_zero (&vs->refcnt)) {spin_unlock (&vn->sock_lock);return -EBUSY ;
@@ -3615,7 +3638,7 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)if (!vs) vs =vxlan_socket_create (vxlan->net, ipv6, vxlan->cfg.dst_port, vxlan->cfg.flags, - l3mdev_index); + l3mdev_index, &vxlan->cfg.saddr);if (IS_ERR (vs))return PTR_ERR (vs);#if IS_ENABLED (CONFIG_IPV6 )
Signature · 1 line
2.36.1
Simon Horman
reviewerRe: [PATCH net-next v2 1/2] net: vxlan: enable local address bind for vxlan sockets
Quoted 17 lines · Richard Gobert
This patch adds support for binding to a local address in vxlan sockets. It achieves this by using
vxlan_addrunion to represent a local address to bind to, and copying it toudp_port_cfginvxlan_create_sock.Also change
vxlan_find_sockto search the socket based on the listening address.Signed-off-by Richard Gobert <[email protected]>--- drivers/net/vxlan/vxlan_core.c | 53 ++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 15 deletions(-)drivers/net/vxlan/vxlan_core.c +0
-0@@ -72,22 +72,34 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) }
drivers/net/vxlan/vxlan_core.c static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) · line 79
Quoted 10 lines
drivers/net/vxlan/vxlan_core.c +3
-3/* Find VXLAN socket based on network namespace, address family, UDP port, -* enabled unshareable flags and socket device binding (see l3mdev with -* non-default VRF). +* bounded address, enabled unshareable flags and socket device binding +* (see l3mdev with non-default VRF). */ static struct vxlan_sock *vxlan_find_sock (struct net *net,sa_family_t family, -__be16 port,u32 flags,int ifindex) +__be16 port,u32 flags,int ifindex,union vxlan_addr *saddr)
nit: Where it can trivially be achieved, please limit lines to 80 columns
wide as is still preferred in Networking code.
Flagged by ./scripts/checkpatch.pl --max-line-length=80
Quoted 11 lines
drivers/net/vxlan/vxlan_core.c +4
-1{struct vxlan_sock *vs; flags &=VXLAN_F_RCV_FLAGS ;hlist_for_each_entry_rcu (vs,vs_head (net, port), hlist) { - if (inet_sk(vs->sock->sk)->inet_sport == port && +struct sock *sk = vs->sock->sk; +struct inet_sock *inet =inet_sk (sk); + + if (inet->inet_sport == port &&
drivers/net/vxlan/vxlan_core.c static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) · line 97
Quoted 10 lines
drivers/net/vxlan/vxlan_core.c +6
-2vxlan_get_sk_family(vs) == family && vs->flags == flags && - vs->sock->sk->sk_bound_dev_if == ifindex) - return vs; + vs->sock->sk->sk_bound_dev_if == ifindex) { +if (family ==AF_INET && inet->inet_rcv_saddr == saddr->sin.sin_addr.s_addr) { +return vs; + } +#if IS_ENABLED (CONFIG_IPV6 ) + else if (ipv6_addr_cmp(&sk->sk_v6_rcv_saddr, &saddr->sin6.sin6_addr) == 0)
1. There is a '{' missing form the line above, so this doesn't compile (if IPV6 is configured).
2. Probably the '{}' can be dropped from this if / else if conditional.
Quoted 8 lines
drivers/net/vxlan/vxlan_core.c +5
-0+ return vs; + } +#endif + } + }return NULL ; }
Signature · 1 line
pw-bot: changes-requested
PATCH v2 2/2 net: geneve: enable local address bind for geneve sockets
In reply to Richard GobertThis patch adds support for binding to a local address in geneve sockets. It achieves this by adding a new netlink local argument and geneve_addr union to represent local address to bind to, and copying it to udp_port_cfg in geneve_create_sock.
Also change geneve_find_sock to search the socket based on listening address.
--- drivers/net/geneve.c | 78 ++++++++++++++++++++++++++---- drivers/net/vxlan/vxlan_core.c | 5 +- include/net/geneve.h | 6 +++ include/uapi/linux/if_link.h | 2 + tools/include/uapi/linux/if_link.h | 2 + 5 files changed, 81 insertions(+), 12 deletions(-)
drivers/net/geneve.c +69 -9
@@ -57,6 +57,7 @@ struct geneve_config {bool ttl_inherit;enum ifla_geneve_df df;bool inner_proto_inherit; +union geneve_addr saddr; };/* Pseudo network device */
@@ -461,7 +462,8 @@ static int geneve_udp_encap_err_lookup(struct sock *sk, struct sk_buff *skb) }static struct socket *geneve_create_sock (struct net *net,bool ipv6, -__be16 port,bool ipv6_rx_csum) +__be16 port,bool ipv6_rx_csum, +union geneve_addr *local_addr) {struct socket *sock;struct udp_port_cfg udp_conf;
@@ -473,9 +475,17 @@ static struct socket *geneve_create_sock(struct net *net, bool ipv6, udp_conf.family =AF_INET6 ; udp_conf.ipv6_v6only =1 ; udp_conf.use_udp6_rx_checksums = ipv6_rx_csum; +#if IS_ENABLED (CONFIG_IPV6 ) +memcpy (&udp_conf.local_ip6, + &local_addr->sin6.sin6_addr, +sizeof (local_addr->sin6.sin6_addr)); +#endif }else { udp_conf.family =AF_INET ; udp_conf.local_ip.s_addr =htonl (INADDR_ANY ); +memcpy (&udp_conf.local_ip, + &local_addr->sin.sin_addr, +sizeof (local_addr->sin.sin_addr)); } udp_conf.local_udp_port = port;
@@ -582,7 +592,8 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb,/* Create new listen socket if needed */ static struct geneve_sock *geneve_socket_create (struct net *net,__be16 port, -bool ipv6,bool ipv6_rx_csum) +bool ipv6,bool ipv6_rx_csum, +union geneve_addr *local_addr) {struct geneve_net *gn =net_generic (net, geneve_net_id);struct geneve_sock *gs;
@@ -594,7 +605,7 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,if (!gs)return ERR_PTR (-ENOMEM ); - sock =geneve_create_sock (net, ipv6, port, ipv6_rx_csum); + sock =geneve_create_sock (net, ipv6, port, ipv6_rx_csum, local_addr);if (IS_ERR (sock)) {kfree (gs);return ERR_CAST (sock);
@@ -653,16 +664,25 @@ static void geneve_sock_release(struct geneve_dev *geneve)static struct geneve_sock *geneve_find_sock (struct geneve_net *gn,sa_family_t family, -__be16 dst_port) +__be16 dst_port, +union geneve_addr *saddr) {struct geneve_sock *gs;list_for_each_entry (gs, &gn->sock_list, list) { -if (inet_sk (gs->sock->sk)->inet_sport == dst_port && -geneve_get_sk_family (gs) == family) { -return gs; +struct sock *sk = gs->sock->sk; +struct inet_sock *inet =inet_sk (sk); + +if (inet->inet_sport == dst_port &&geneve_get_sk_family (gs) == family) { +if (family ==AF_INET && inet->inet_rcv_saddr == saddr->sin.sin_addr.s_addr) +return gs; +#if IS_ENABLED (CONFIG_IPV6 ) + else if (ipv6_addr_cmp(&sk->sk_v6_rcv_saddr, &saddr->sin6.sin6_addr) == 0) +return gs; +#endif } } +return NULL ; }
@@ -675,14 +695,16 @@ static int geneve_sock_add(struct geneve_dev *geneve, bool ipv6)__u8 vni[3 ];__u32 hash; - gs =geneve_find_sock (gn, ipv6 ?AF_INET6 :AF_INET , geneve->cfg.info.key.tp_dst); + gs =geneve_find_sock (gn, ipv6 ?AF_INET6 :AF_INET , geneve->cfg.info.key.tp_dst, + &geneve->cfg.saddr);if (gs) { gs->refcnt++; goto out; } gs =geneve_socket_create (net, geneve->cfg.info.key.tp_dst, ipv6, - geneve->cfg.use_udp6_rx_checksums); + geneve->cfg.use_udp6_rx_checksums, + &geneve->cfg.saddr);if (IS_ERR (gs))return PTR_ERR (gs);
@@ -1234,6 +1256,8 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = { [IFLA_GENEVE_TTL_INHERIT] = { .type = NLA_U8 }, [IFLA_GENEVE_DF] = { .type = NLA_U8 }, [IFLA_GENEVE_INNER_PROTO_INHERIT] = { .type = NLA_FLAG }, + [IFLA_GENEVE_LOCAL] = NLA_POLICY_EXACT_LEN(sizeof_field(struct iphdr, saddr)), + [IFLA_GENEVE_LOCAL6] = NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)), }; static int geneve_validate(struct nlattr *tb[], struct nlattr *data[],
@@ -1561,6 +1585,31 @@ static int geneve_nl2info(struct nlattr *tb[], struct nlattr *data[], cfg->inner_proto_inherit = true; } +if (data[IFLA_GENEVE_LOCAL ]) { +if (changelink && cfg->saddr.sa.sa_family !=AF_INET ) { +NL_SET_ERR_MSG_ATTR (extack, tb[IFLA_GENEVE_LOCAL ],"New local address family does not match old" ); +return -EOPNOTSUPP ; + } + + cfg->saddr.sin.sin_addr.s_addr =nla_get_in_addr (data[IFLA_GENEVE_LOCAL ]); + cfg->saddr.sa.sa_family =AF_INET ; + } + +if (data[IFLA_GENEVE_LOCAL6 ]) { +#if IS_ENABLED (CONFIG_IPV6 ) +if (changelink && cfg->saddr.sa.sa_family !=AF_INET6 ) { +NL_SET_ERR_MSG_ATTR (extack, tb[IFLA_GENEVE_LOCAL6 ],"New local address family does not match old" ); +return -EOPNOTSUPP ; + } + + cfg->saddr.sin6.sin6_addr =nla_get_in6_addr (data[IFLA_GENEVE_LOCAL6 ]); + cfg->saddr.sa.sa_family =AF_INET6 ; +#else +NL_SET_ERR_MSG_ATTR (extack, tb[IFLA_GENEVE_LOCAL6 ],"IPv6 support not enabled in the kernel" ); +return -EPFNOSUPPORT ; +#endif + } +return 0 ; change_notsup: NL_SET_ERR_MSG_ATTR(extack, data[attrtype],
@@ -1741,6 +1790,7 @@ static size_t geneve_get_size(const struct net_device *dev)nla_total_size (sizeof (__u8)) +/* IFLA_GENEVE_UDP_ZERO_CSUM6_RX */ nla_total_size (sizeof (__u8)) +/* IFLA_GENEVE_TTL_INHERIT */ nla_total_size (0 ) +/* IFLA_GENEVE_INNER_PROTO_INHERIT */ +nla_total_size (sizeof (struct in6_addr )) +/* IFLA_GENEVE_LOCAL{6} */ 0 ; }
@@ -1762,6 +1812,11 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev)if (nla_put_in_addr (skb,IFLA_GENEVE_REMOTE , info->key.u.ipv4.dst)) goto nla_put_failure; + +if (nla_put_in_addr (skb,IFLA_GENEVE_LOCAL , + info->key.u.ipv4.src)) + goto nla_put_failure; +if (nla_put_u8 (skb,IFLA_GENEVE_UDP_CSUM ,test_bit (IP_TUNNEL_CSUM_BIT , info->key.tun_flags)))
@@ -1772,6 +1827,11 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev)if (nla_put_in6_addr (skb,IFLA_GENEVE_REMOTE6 , &info->key.u.ipv6.dst)) goto nla_put_failure; + +if (nla_put_in6_addr (skb,IFLA_GENEVE_LOCAL6 , + &info->key.u.ipv6.src)) + goto nla_put_failure; +if (nla_put_u8 (skb,IFLA_GENEVE_UDP_ZERO_CSUM6_TX , !test_bit (IP_TUNNEL_CSUM_BIT , info->key.tun_flags)))
drivers/net/vxlan/vxlan_core.c +2 -3
@@ -90,13 +90,12 @@ static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family, vxlan_get_sk_family(vs) == family && vs->flags == flags && vs->sock->sk->sk_bound_dev_if == ifindex) { -if (family ==AF_INET && inet->inet_rcv_saddr == saddr->sin.sin_addr.s_addr) { +if (family ==AF_INET && inet->inet_rcv_saddr == saddr->sin.sin_addr.s_addr)return vs; - } +#if IS_ENABLED (CONFIG_IPV6 ) else if (ipv6_addr_cmp(&sk->sk_v6_rcv_saddr, &saddr->sin6.sin6_addr) == 0)return vs; - }#endif }
include/net/geneve.h +6 -0
@@ -68,6 +68,12 @@ static inline bool netif_is_geneve(const struct net_device *dev) !strcmp (dev->rtnl_link_ops->kind,"geneve" ); } +union geneve_addr { +struct sockaddr_in sin; +struct sockaddr_in6 sin6; +struct sockaddr sa; +}; +#ifdef CONFIG_INET struct net_device *geneve_dev_create_fb (struct net *net,const char *name,u8 name_assign_type,u16 dst_port);
include/uapi/linux/if_link.h +2 -0
@@ -1419,6 +1419,8 @@ enum {IFLA_GENEVE_TTL_INHERIT ,IFLA_GENEVE_DF ,IFLA_GENEVE_INNER_PROTO_INHERIT , +IFLA_GENEVE_LOCAL , +IFLA_GENEVE_LOCAL6 , __IFLA_GENEVE_MAX };#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
tools/include/uapi/linux/if_link.h +2 -0
@@ -888,6 +888,8 @@ enum {IFLA_GENEVE_TTL_INHERIT ,IFLA_GENEVE_DF ,IFLA_GENEVE_INNER_PROTO_INHERIT , +IFLA_GENEVE_LOCAL , +IFLA_GENEVE_LOCAL6 , __IFLA_GENEVE_MAX };#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
Signature · 1 line
2.36.1