Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 70fb0828 编写于 作者: R Roopa Prabhu 提交者： David S. Miller
浏览文件
操作

vxlan: add extack support for create and changelink 

This patch adds extack coverage in vxlan link
create and changelink paths. Introduces a new helper
vxlan_nl2flags to consolidate flag attribute validation.

thanks to Johannes Berg for some tips to construct the
generic vxlan flag extack strings.
Signed-off-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: NPetr Machata <petrm@mellanox.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 703bdcbc
隐藏空白更改
内联 并排
Showing with 172 addition and 67 deletion
drivers/net/vxlan.c
浏览文件 @ 70fb0828
...@@ -3583,11 +3583,40 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev, ...@@ -3583,11 +3583,40 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,
return err; return err;
} }
/* Set/clear flags based on attribute */
static int vxlan_nl2flag(struct vxlan_config *conf, struct nlattr *tb[],
int attrtype, unsigned long mask, bool changelink,
bool changelink_supported,
struct netlink_ext_ack *extack)
{
unsigned long flags;
if (!tb[attrtype])
return 0;
if (changelink && !changelink_supported) {
vxlan_flag_attr_error(attrtype, extack);
return -EOPNOTSUPP;
}
if (vxlan_policy[attrtype].type == NLA_FLAG)
flags = conf->flags | mask;
else if (nla_get_u8(tb[attrtype]))
flags = conf->flags | mask;
else
flags = conf->flags & ~mask;
conf->flags = flags;
return 0;
}
static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
struct net_device *dev, struct vxlan_config *conf, struct net_device *dev, struct vxlan_config *conf,
bool changelink) bool changelink, struct netlink_ext_ack *extack)
{ {
struct vxlan_dev *vxlan = netdev_priv(dev); struct vxlan_dev *vxlan = netdev_priv(dev);
int err = 0;
memset(conf, 0, sizeof(*conf)); memset(conf, 0, sizeof(*conf));
...@@ -3598,40 +3627,54 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], ...@@ -3598,40 +3627,54 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
if (data[IFLA_VXLAN_ID]) { if (data[IFLA_VXLAN_ID]) {
__be32 vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID])); __be32 vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID]));
if (changelink && (vni != conf->vni)) if (changelink && (vni != conf->vni)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_ID], "Cannot change VNI");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID])); conf->vni = cpu_to_be32(nla_get_u32(data[IFLA_VXLAN_ID]));
} }
if (data[IFLA_VXLAN_GROUP]) { if (data[IFLA_VXLAN_GROUP]) {
if (changelink && (conf->remote_ip.sa.sa_family != AF_INET)) if (changelink && (conf->remote_ip.sa.sa_family != AF_INET)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_GROUP], "New group address family does not match old group");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->remote_ip.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_GROUP]); conf->remote_ip.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_GROUP]);
conf->remote_ip.sa.sa_family = AF_INET; conf->remote_ip.sa.sa_family = AF_INET;
} else if (data[IFLA_VXLAN_GROUP6]) { } else if (data[IFLA_VXLAN_GROUP6]) {
if (!IS_ENABLED(CONFIG_IPV6)) if (!IS_ENABLED(CONFIG_IPV6)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_GROUP6], "IPv6 support not enabled in the kernel");
return -EPFNOSUPPORT; return -EPFNOSUPPORT;
}
if (changelink && (conf->remote_ip.sa.sa_family != AF_INET6)) if (changelink && (conf->remote_ip.sa.sa_family != AF_INET6)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_GROUP6], "New group address family does not match old group");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->remote_ip.sin6.sin6_addr = nla_get_in6_addr(data[IFLA_VXLAN_GROUP6]); conf->remote_ip.sin6.sin6_addr = nla_get_in6_addr(data[IFLA_VXLAN_GROUP6]);
conf->remote_ip.sa.sa_family = AF_INET6; conf->remote_ip.sa.sa_family = AF_INET6;
} }
if (data[IFLA_VXLAN_LOCAL]) { if (data[IFLA_VXLAN_LOCAL]) {
if (changelink && (conf->saddr.sa.sa_family != AF_INET)) if (changelink && (conf->saddr.sa.sa_family != AF_INET)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_LOCAL], "New local address family does not match old");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]); conf->saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]);
conf->saddr.sa.sa_family = AF_INET; conf->saddr.sa.sa_family = AF_INET;
} else if (data[IFLA_VXLAN_LOCAL6]) { } else if (data[IFLA_VXLAN_LOCAL6]) {
if (!IS_ENABLED(CONFIG_IPV6)) if (!IS_ENABLED(CONFIG_IPV6)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_LOCAL6], "IPv6 support not enabled in the kernel");
return -EPFNOSUPPORT; return -EPFNOSUPPORT;
}
if (changelink && (conf->saddr.sa.sa_family != AF_INET6)) if (changelink && (conf->saddr.sa.sa_family != AF_INET6)) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_LOCAL6], "New local address family does not match old");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
/* TODO: respect scope id */ /* TODO: respect scope id */
conf->saddr.sin6.sin6_addr = nla_get_in6_addr(data[IFLA_VXLAN_LOCAL6]); conf->saddr.sin6.sin6_addr = nla_get_in6_addr(data[IFLA_VXLAN_LOCAL6]);
...@@ -3648,9 +3691,12 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], ...@@ -3648,9 +3691,12 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
conf->ttl = nla_get_u8(data[IFLA_VXLAN_TTL]); conf->ttl = nla_get_u8(data[IFLA_VXLAN_TTL]);
if (data[IFLA_VXLAN_TTL_INHERIT]) { if (data[IFLA_VXLAN_TTL_INHERIT]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_TTL_INHERIT,
return -EOPNOTSUPP; VXLAN_F_TTL_INHERIT, changelink, false,
conf->flags |= VXLAN_F_TTL_INHERIT; extack);
if (err)
return err;
} }
if (data[IFLA_VXLAN_LABEL]) if (data[IFLA_VXLAN_LABEL])
...@@ -3658,10 +3704,11 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], ...@@ -3658,10 +3704,11 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
IPV6_FLOWLABEL_MASK; IPV6_FLOWLABEL_MASK;
if (data[IFLA_VXLAN_LEARNING]) { if (data[IFLA_VXLAN_LEARNING]) {
if (nla_get_u8(data[IFLA_VXLAN_LEARNING])) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_LEARNING,
conf->flags |= VXLAN_F_LEARN; VXLAN_F_LEARN, changelink, true,
else extack);
conf->flags &= ~VXLAN_F_LEARN; if (err)
return err;
} else if (!changelink) { } else if (!changelink) {
/* default to learn on a new device */ /* default to learn on a new device */
conf->flags |= VXLAN_F_LEARN; conf->flags |= VXLAN_F_LEARN;
...@@ -3671,44 +3718,52 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], ...@@ -3671,44 +3718,52 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
conf->age_interval = nla_get_u32(data[IFLA_VXLAN_AGEING]); conf->age_interval = nla_get_u32(data[IFLA_VXLAN_AGEING]);
if (data[IFLA_VXLAN_PROXY]) { if (data[IFLA_VXLAN_PROXY]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_PROXY,
return -EOPNOTSUPP; VXLAN_F_PROXY, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_PROXY])) extack);
conf->flags |= VXLAN_F_PROXY; if (err)
return err;
} }
if (data[IFLA_VXLAN_RSC]) { if (data[IFLA_VXLAN_RSC]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_RSC,
return -EOPNOTSUPP; VXLAN_F_RSC, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_RSC])) extack);
conf->flags |= VXLAN_F_RSC; if (err)
return err;
} }
if (data[IFLA_VXLAN_L2MISS]) { if (data[IFLA_VXLAN_L2MISS]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_L2MISS,
return -EOPNOTSUPP; VXLAN_F_L2MISS, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_L2MISS])) extack);
conf->flags |= VXLAN_F_L2MISS; if (err)
return err;
} }
if (data[IFLA_VXLAN_L3MISS]) { if (data[IFLA_VXLAN_L3MISS]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_L3MISS,
return -EOPNOTSUPP; VXLAN_F_L3MISS, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_L3MISS])) extack);
conf->flags |= VXLAN_F_L3MISS; if (err)
return err;
} }
if (data[IFLA_VXLAN_LIMIT]) { if (data[IFLA_VXLAN_LIMIT]) {
if (changelink) if (changelink) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_LIMIT],
"Cannot change limit");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->addrmax = nla_get_u32(data[IFLA_VXLAN_LIMIT]); conf->addrmax = nla_get_u32(data[IFLA_VXLAN_LIMIT]);
} }
if (data[IFLA_VXLAN_COLLECT_METADATA]) { if (data[IFLA_VXLAN_COLLECT_METADATA]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_COLLECT_METADATA,
return -EOPNOTSUPP; VXLAN_F_COLLECT_METADATA, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_COLLECT_METADATA])) extack);
conf->flags |= VXLAN_F_COLLECT_METADATA; if (err)
return err;
} }
if (data[IFLA_VXLAN_PORT_RANGE]) { if (data[IFLA_VXLAN_PORT_RANGE]) {
...@@ -3718,72 +3773,92 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[], ...@@ -3718,72 +3773,92 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
conf->port_min = ntohs(p->low); conf->port_min = ntohs(p->low);
conf->port_max = ntohs(p->high); conf->port_max = ntohs(p->high);
} else { } else {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_PORT_RANGE],
"Cannot change port range");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
} }
if (data[IFLA_VXLAN_PORT]) { if (data[IFLA_VXLAN_PORT]) {
if (changelink) if (changelink) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_PORT],
"Cannot change port");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->dst_port = nla_get_be16(data[IFLA_VXLAN_PORT]); conf->dst_port = nla_get_be16(data[IFLA_VXLAN_PORT]);
} }
if (data[IFLA_VXLAN_UDP_CSUM]) { if (data[IFLA_VXLAN_UDP_CSUM]) {
if (changelink) if (changelink) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_UDP_CSUM],
"Cannot change UDP_CSUM flag");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
if (!nla_get_u8(data[IFLA_VXLAN_UDP_CSUM])) if (!nla_get_u8(data[IFLA_VXLAN_UDP_CSUM]))
conf->flags |= VXLAN_F_UDP_ZERO_CSUM_TX; conf->flags |= VXLAN_F_UDP_ZERO_CSUM_TX;
} }
if (data[IFLA_VXLAN_UDP_ZERO_CSUM6_TX]) { if (data[IFLA_VXLAN_UDP_ZERO_CSUM6_TX]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
return -EOPNOTSUPP; VXLAN_F_UDP_ZERO_CSUM6_TX, changelink,
if (nla_get_u8(data[IFLA_VXLAN_UDP_ZERO_CSUM6_TX])) false, extack);
conf->flags |= VXLAN_F_UDP_ZERO_CSUM6_TX; if (err)
return err;
} }
if (data[IFLA_VXLAN_UDP_ZERO_CSUM6_RX]) { if (data[IFLA_VXLAN_UDP_ZERO_CSUM6_RX]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
return -EOPNOTSUPP; VXLAN_F_UDP_ZERO_CSUM6_RX, changelink,
if (nla_get_u8(data[IFLA_VXLAN_UDP_ZERO_CSUM6_RX])) false, extack);
conf->flags |= VXLAN_F_UDP_ZERO_CSUM6_RX; if (err)
return err;
} }
if (data[IFLA_VXLAN_REMCSUM_TX]) { if (data[IFLA_VXLAN_REMCSUM_TX]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_REMCSUM_TX,
return -EOPNOTSUPP; VXLAN_F_REMCSUM_TX, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_REMCSUM_TX])) extack);
conf->flags |= VXLAN_F_REMCSUM_TX; if (err)
return err;
} }
if (data[IFLA_VXLAN_REMCSUM_RX]) { if (data[IFLA_VXLAN_REMCSUM_RX]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_REMCSUM_RX,
return -EOPNOTSUPP; VXLAN_F_REMCSUM_RX, changelink, false,
if (nla_get_u8(data[IFLA_VXLAN_REMCSUM_RX])) extack);
conf->flags |= VXLAN_F_REMCSUM_RX; if (err)
return err;
} }
if (data[IFLA_VXLAN_GBP]) { if (data[IFLA_VXLAN_GBP]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_GBP,
return -EOPNOTSUPP; VXLAN_F_GBP, changelink, false, extack);
conf->flags |= VXLAN_F_GBP; if (err)
return err;
} }
if (data[IFLA_VXLAN_GPE]) { if (data[IFLA_VXLAN_GPE]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_GPE,
return -EOPNOTSUPP; VXLAN_F_GPE, changelink, false,
conf->flags |= VXLAN_F_GPE; extack);
if (err)
return err;
} }
if (data[IFLA_VXLAN_REMCSUM_NOPARTIAL]) { if (data[IFLA_VXLAN_REMCSUM_NOPARTIAL]) {
if (changelink) err = vxlan_nl2flag(conf, data, IFLA_VXLAN_REMCSUM_NOPARTIAL,
return -EOPNOTSUPP; VXLAN_F_REMCSUM_NOPARTIAL, changelink,
conf->flags |= VXLAN_F_REMCSUM_NOPARTIAL; false, extack);
if (err)
return err;
} }
if (tb[IFLA_MTU]) { if (tb[IFLA_MTU]) {
if (changelink) if (changelink) {
NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_MTU],
"Cannot change mtu");
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
conf->mtu = nla_get_u32(tb[IFLA_MTU]); conf->mtu = nla_get_u32(tb[IFLA_MTU]);
} }
...@@ -3800,7 +3875,7 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, ...@@ -3800,7 +3875,7 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,
struct vxlan_config conf; struct vxlan_config conf;
int err; int err;
err = vxlan_nl2conf(tb, data, dev, &conf, false); err = vxlan_nl2conf(tb, data, dev, &conf, false, extack);
if (err) if (err)
return err; return err;
...@@ -3817,8 +3892,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], ...@@ -3817,8 +3892,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
struct vxlan_config conf; struct vxlan_config conf;
int err; int err;
err = vxlan_nl2conf(tb, data, err = vxlan_nl2conf(tb, data, dev, &conf, true, extack);
dev, &conf, true);
if (err) if (err)
return err; return err;
......
include/net/vxlan.h
浏览文件 @ 70fb0828
...@@ -453,4 +453,35 @@ vxlan_fdb_clear_offload(const struct net_device *dev, __be32 vni) ...@@ -453,4 +453,35 @@ vxlan_fdb_clear_offload(const struct net_device *dev, __be32 vni)
} }
#endif #endif
static inline void vxlan_flag_attr_error(int attrtype,
struct netlink_ext_ack *extack)
{
#define VXLAN_FLAG(flg) \
case IFLA_VXLAN_##flg: \
NL_SET_ERR_MSG_MOD(extack, \
"cannot change " #flg " flag"); \
break
switch (attrtype) {
VXLAN_FLAG(TTL_INHERIT);
VXLAN_FLAG(LEARNING);
VXLAN_FLAG(PROXY);
VXLAN_FLAG(RSC);
VXLAN_FLAG(L2MISS);
VXLAN_FLAG(L3MISS);
VXLAN_FLAG(COLLECT_METADATA);
VXLAN_FLAG(UDP_ZERO_CSUM6_TX);
VXLAN_FLAG(UDP_ZERO_CSUM6_RX);
VXLAN_FLAG(REMCSUM_TX);
VXLAN_FLAG(REMCSUM_RX);
VXLAN_FLAG(GBP);
VXLAN_FLAG(GPE);
VXLAN_FLAG(REMCSUM_NOPARTIAL);
default:
NL_SET_ERR_MSG_MOD(extack, \
"cannot change flag");
break;
}
#undef VXLAN_FLAG
}
#endif #endif
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或