system_set_dev_sysfs("brport/isolated", dev->ifname, val);
}
-static void system_bridge_set_multicast_router(struct device *dev, const char *val, bool bridge)
+static void system_bridge_set_multicast_router(struct device *dev, const char *val)
{
- system_set_dev_sysfs(bridge ? "bridge/multicast_router" :
- "brport/multicast_router",
- dev->ifname, val);
-}
-
-static void system_bridge_set_robustness(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_startup_query_count",
- dev->ifname, val);
- system_set_dev_sysfs("bridge/multicast_last_member_count",
- dev->ifname, val);
-}
-
-static void system_bridge_set_query_interval(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_query_interval",
- dev->ifname, val);
-}
-
-static void system_bridge_set_query_response_interval(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_query_response_interval",
- dev->ifname, val);
-}
-
-static void system_bridge_set_last_member_interval(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_last_member_interval",
- dev->ifname, val);
-}
-
-static void system_bridge_set_membership_interval(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_membership_interval",
- dev->ifname, val);
-}
-
-static void system_bridge_set_other_querier_timeout(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_querier_interval",
- dev->ifname, val);
-}
-
-static void system_bridge_set_startup_query_interval(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/multicast_startup_query_interval",
- dev->ifname, val);
+ system_set_dev_sysfs("brport/multicast_router", dev->ifname, val);
}
void system_bridge_set_stp_state(struct device *dev, bool val)
system_set_dev_sysfs("bridge/stp_state", dev->ifname, valstr);
}
-static void system_bridge_set_forward_delay(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/forward_delay", dev->ifname, val);
-}
-
-static void system_bridge_set_priority(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/priority", dev->ifname, val);
-}
-
-static void system_bridge_set_ageing_time(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/ageing_time", dev->ifname, val);
-}
-
-static void system_bridge_set_hello_time(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/hello_time", dev->ifname, val);
-}
-
-static void system_bridge_set_max_age(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/max_age", dev->ifname, val);
-}
-
static void system_bridge_set_learning(struct device *dev, const char *val)
{
system_set_dev_sysfs("brport/learning", dev->ifname, val);
system_set_dev_sysfs("brport/unicast_flood", dev->ifname, val);
}
-static void system_bridge_set_vlan_filtering(struct device *dev, const char *val)
-{
- system_set_dev_sysfs("bridge/vlan_filtering", dev->ifname, val);
-}
-
static int system_get_disable_ipv6(struct device *dev, char *buf, const size_t buf_sz)
{
return system_get_dev_sysctl("ipv6/conf", "disable_ipv6",
return nl_wait_for_ack(sock_rtnl);
}
+static struct nl_msg *__system_ifinfo_msg(int af, int index, const char *ifname, uint16_t type, uint16_t flags)
+{
+ struct nl_msg *msg;
+ struct ifinfomsg iim = {
+ .ifi_family = af,
+ .ifi_index = index,
+ };
+
+ msg = nlmsg_alloc_simple(type, flags | NLM_F_REQUEST);
+ if (!msg)
+ return NULL;
+
+ nlmsg_append(msg, &iim, sizeof(iim), 0);
+ if (ifname)
+ nla_put_string(msg, IFLA_IFNAME, ifname);
+
+ return msg;
+}
+
+static struct nl_msg *system_ifinfo_msg(const char *ifname, uint16_t type, uint16_t flags)
+{
+ return __system_ifinfo_msg(AF_UNSPEC, 0, ifname, type, flags);
+}
+
+static int system_link_del(const char *ifname)
+{
+ struct nl_msg *msg;
+
+ msg = system_ifinfo_msg(ifname, RTM_DELLINK, 0);
+ if (!msg)
+ return -1;
+
+ return system_rtnl_call(msg);
+}
+
int system_bridge_delbr(struct device *bridge)
{
- return ioctl(sock_ioctl, SIOCBRDELBR, bridge->ifname);
+ return system_link_del(bridge->ifname);
}
static int system_bridge_if(const char *bridge, struct device *dev, int cmd, void *data)
if (dev->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
snprintf(buf, sizeof(buf), "%u", dev->settings.multicast_router);
- system_bridge_set_multicast_router(dev, buf, false);
+ system_bridge_set_multicast_router(dev, buf);
}
if (dev->settings.flags & DEV_OPT_MULTICAST_FAST_LEAVE &&
int system_bridge_vlan(const char *iface, uint16_t vid, bool add, unsigned int vflags)
{
- struct ifinfomsg ifi = { .ifi_family = PF_BRIDGE, };
struct bridge_vlan_info vinfo = { .vid = vid, };
unsigned short flags = 0;
struct nlattr *afspec;
struct nl_msg *nlm;
+ int index;
int ret = 0;
- ifi.ifi_index = if_nametoindex(iface);
- if (!ifi.ifi_index)
+ index = if_nametoindex(iface);
+ if (!index)
return -1;
- nlm = nlmsg_alloc_simple(add ? RTM_SETLINK : RTM_DELLINK, NLM_F_REQUEST);
+ nlm = __system_ifinfo_msg(PF_BRIDGE, index, NULL, add ? RTM_SETLINK : RTM_DELLINK, 0);
if (!nlm)
return -1;
- nlmsg_append(nlm, &ifi, sizeof(ifi), 0);
-
if (vflags & BRVLAN_F_SELF)
flags |= BRIDGE_FLAGS_SELF;
return (unsigned long) val * 100;
}
-static void system_bridge_conf_multicast_deps(struct device *bridge,
- struct bridge_config *cfg,
- char *buf,
- int buf_len)
+int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
{
- int val;
-
- if (cfg->flags & BRIDGE_OPT_ROBUSTNESS ||
- cfg->flags & BRIDGE_OPT_QUERY_INTERVAL ||
- cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) {
- val = cfg->robustness * cfg->query_interval +
- cfg->query_response_interval;
-
- snprintf(buf, buf_len, "%i", val);
- system_bridge_set_membership_interval(bridge, buf);
-
- val = cfg->robustness * cfg->query_interval +
- cfg->query_response_interval / 2;
-
- snprintf(buf, buf_len, "%i", val);
- system_bridge_set_other_querier_timeout(bridge, buf);
- }
+ struct nlattr *linkinfo, *data;
+ struct nl_msg *msg;
+ uint64_t val;
+ int rv;
- if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) {
- val = cfg->query_interval / 4;
+ msg = system_ifinfo_msg(bridge->ifname, RTM_NEWLINK, NLM_F_CREATE | NLM_F_EXCL);
+ if (!msg)
+ return -1;
- snprintf(buf, buf_len, "%i", val);
- system_bridge_set_startup_query_interval(bridge, buf);
- }
-}
+ if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
+ goto nla_put_failure;
-static void system_bridge_conf_multicast(struct device *bridge,
- struct bridge_config *cfg,
- char *buf,
- int buf_len)
-{
- system_set_dev_sysfs("bridge/multicast_snooping",
- bridge->ifname, cfg->igmp_snoop ? "1" : "0");
+ nla_put_string(msg, IFLA_INFO_KIND, "bridge");
- system_set_dev_sysfs("bridge/multicast_querier",
- bridge->ifname, cfg->multicast_querier ? "1" : "0");
+ if (!(data = nla_nest_start(msg, IFLA_INFO_DATA)))
+ goto nla_put_failure;
- snprintf(buf, buf_len, "%i", cfg->hash_max);
- system_set_dev_sysfs("/bridge/hash_max",
- bridge->ifname, buf);
+ nla_put_u32(msg, IFLA_BR_STP_STATE, cfg->stp);
+ nla_put_u32(msg, IFLA_BR_FORWARD_DELAY, sec_to_jiffies(cfg->forward_delay));
+ nla_put_u8(msg, IFLA_BR_MCAST_SNOOPING, !!cfg->igmp_snoop);
+ nla_put_u8(msg, IFLA_BR_MCAST_QUERIER, !!cfg->multicast_querier);
+ nla_put_u32(msg, IFLA_BR_MCAST_HASH_MAX, cfg->hash_max);
- if (bridge->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
- snprintf(buf, buf_len, "%u", bridge->settings.multicast_router);
- system_bridge_set_multicast_router(bridge, buf, true);
- }
+ if (bridge->settings.flags & DEV_OPT_MULTICAST_ROUTER)
+ nla_put_u8(msg, IFLA_BR_MCAST_ROUTER, !!bridge->settings.multicast_router);
if (cfg->flags & BRIDGE_OPT_ROBUSTNESS) {
- snprintf(buf, buf_len, "%i", cfg->robustness);
- system_bridge_set_robustness(bridge, buf);
+ nla_put_u32(msg, IFLA_BR_MCAST_STARTUP_QUERY_CNT, cfg->robustness);
+ nla_put_u32(msg, IFLA_BR_MCAST_LAST_MEMBER_CNT, cfg->robustness);
}
- if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) {
- snprintf(buf, buf_len, "%i", cfg->query_interval);
- system_bridge_set_query_interval(bridge, buf);
- }
+ if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL)
+ nla_put_u64(msg, IFLA_BR_MCAST_QUERY_INTVL, cfg->query_interval);
- if (cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) {
- snprintf(buf, buf_len, "%i", cfg->query_response_interval);
- system_bridge_set_query_response_interval(bridge, buf);
- }
+ if (cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL)
+ nla_put_u64(msg, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, cfg->query_response_interval);
- if (cfg->flags & BRIDGE_OPT_LAST_MEMBER_INTERVAL) {
- snprintf(buf, buf_len, "%i", cfg->last_member_interval);
- system_bridge_set_last_member_interval(bridge, buf);
- }
+ if (cfg->flags & BRIDGE_OPT_LAST_MEMBER_INTERVAL)
+ nla_put_u64(msg, IFLA_BR_MCAST_LAST_MEMBER_INTVL, cfg->last_member_interval);
- system_bridge_conf_multicast_deps(bridge, cfg, buf, buf_len);
-}
+ if (cfg->flags & BRIDGE_OPT_ROBUSTNESS ||
+ cfg->flags & BRIDGE_OPT_QUERY_INTERVAL ||
+ cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) {
+ val = cfg->robustness * cfg->query_interval +
+ cfg->query_response_interval;
-int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
-{
- char buf[64];
+ nla_put_u64(msg, IFLA_BR_MCAST_MEMBERSHIP_INTVL, val);
- if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
- return -1;
+ val -= cfg->query_response_interval / 2;
- system_bridge_set_stp_state(bridge, cfg->stp);
+ nla_put_u64(msg, IFLA_BR_MCAST_QUERIER_INTVL, val);
+ }
- snprintf(buf, sizeof(buf), "%lu", sec_to_jiffies(cfg->forward_delay));
- system_bridge_set_forward_delay(bridge, buf);
+ if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) {
+ val = cfg->query_interval / 4;
- system_bridge_conf_multicast(bridge, cfg, buf, sizeof(buf));
- system_bridge_set_vlan_filtering(bridge, cfg->vlan_filtering ? "1" : "0");
+ nla_put_u64(msg, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, val);
+ }
- snprintf(buf, sizeof(buf), "%d", cfg->priority);
- system_bridge_set_priority(bridge, buf);
+ nla_put_u8(msg, IFLA_BR_VLAN_FILTERING, !!cfg->vlan_filtering);
+ nla_put_u16(msg, IFLA_BR_PRIORITY, cfg->priority);
+ nla_put_u32(msg, IFLA_BR_HELLO_TIME, sec_to_jiffies(cfg->hello_time));
+ nla_put_u32(msg, IFLA_BR_MAX_AGE, sec_to_jiffies(cfg->max_age));
- snprintf(buf, sizeof(buf), "%lu", sec_to_jiffies(cfg->hello_time));
- system_bridge_set_hello_time(bridge, buf);
+ if (cfg->flags & BRIDGE_OPT_AGEING_TIME)
+ nla_put_u32(msg, IFLA_BR_AGEING_TIME, sec_to_jiffies(cfg->ageing_time));
- snprintf(buf, sizeof(buf), "%lu", sec_to_jiffies(cfg->max_age));
- system_bridge_set_max_age(bridge, buf);
+ nla_nest_end(msg, data);
+ nla_nest_end(msg, linkinfo);
- if (cfg->flags & BRIDGE_OPT_AGEING_TIME) {
- snprintf(buf, sizeof(buf), "%lu", sec_to_jiffies(cfg->ageing_time));
- system_bridge_set_ageing_time(bridge, buf);
- }
+ rv = system_rtnl_call(msg);
+ if (rv)
+ D(SYSTEM, "Error adding bridge '%s': %d\n", bridge->ifname, rv);
- return 0;
+ return rv;
+
+nla_put_failure:
+ nlmsg_free(msg);
+ return -ENOMEM;
}
int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvlan_config *cfg)
{
struct nl_msg *msg;
struct nlattr *linkinfo, *data;
- struct ifinfomsg iim = { .ifi_family = AF_UNSPEC, };
int i, rv;
static const struct {
const char *name;
{ "passthru", MACVLAN_MODE_PASSTHRU },
};
- msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL);
-
+ msg = system_ifinfo_msg(macvlan->ifname, RTM_NEWLINK, NLM_F_CREATE | NLM_F_EXCL);
if (!msg)
return -1;
- nlmsg_append(msg, &iim, sizeof(iim), 0);
-
if (cfg->flags & MACVLAN_OPT_MACADDR)
nla_put(msg, IFLA_ADDRESS, sizeof(cfg->macaddr), cfg->macaddr);
- nla_put_string(msg, IFLA_IFNAME, macvlan->ifname);
nla_put_u32(msg, IFLA_LINK, dev->ifindex);
if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
int system_link_netns_move(struct device *dev, int netns_fd, const char *target_ifname)
{
struct nl_msg *msg;
- struct ifinfomsg iim = {
- .ifi_family = AF_UNSPEC,
- };
+ int index;
if (!dev)
return -1;
- iim.ifi_index = system_if_resolve(dev);
- msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST);
-
+ index = system_if_resolve(dev);
+ msg = __system_ifinfo_msg(AF_UNSPEC, index, target_ifname, RTM_NEWLINK, 0);
if (!msg)
return -1;
- nlmsg_append(msg, &iim, sizeof(iim), 0);
- if (target_ifname)
- nla_put_string(msg, IFLA_IFNAME, target_ifname);
-
nla_put_u32(msg, IFLA_NET_NS_FD, netns_fd);
return system_rtnl_call(msg);
}
-static int system_link_del(const char *ifname)
-{
- struct nl_msg *msg;
- struct ifinfomsg iim = {
- .ifi_family = AF_UNSPEC,
- .ifi_index = 0,
- };
-
- msg = nlmsg_alloc_simple(RTM_DELLINK, NLM_F_REQUEST);
-
- if (!msg)
- return -1;
-
- nlmsg_append(msg, &iim, sizeof(iim), 0);
- nla_put_string(msg, IFLA_IFNAME, ifname);
- return system_rtnl_call(msg);
-}
-
int system_macvlan_del(struct device *macvlan)
{
return system_link_del(macvlan->ifname);
}
}
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+
+static int32_t
+ethtool_feature_count(const char *ifname)
+{
+ struct {
+ struct ethtool_sset_info hdr;
+ uint32_t buf;
+ } req = {
+ .hdr = {
+ .cmd = ETHTOOL_GSSET_INFO,
+ .sset_mask = 1 << ETH_SS_FEATURES
+ }
+ };
+
+ struct ifreq ifr = {
+ .ifr_data = (void *)&req
+ };
+
+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+
+ if (ioctl(sock_ioctl, SIOCETHTOOL, &ifr) != 0)
+ return -1;
+
+ if (!req.hdr.sset_mask)
+ return 0;
+
+ return req.buf;
+}
+
+static int32_t
+ethtool_feature_index(const char *ifname, const char *keyname)
+{
+ struct ethtool_gstrings *feature_names;
+ struct ifreq ifr = { 0 };
+ int32_t n_features, i;
+
+ n_features = ethtool_feature_count(ifname);
+
+ if (n_features <= 0)
+ return -1;
+
+ feature_names = calloc(1, sizeof(*feature_names) + n_features * ETH_GSTRING_LEN);
+
+ if (!feature_names)
+ return -1;
+
+ feature_names->cmd = ETHTOOL_GSTRINGS;
+ feature_names->string_set = ETH_SS_FEATURES;
+ feature_names->len = n_features;
+
+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+ ifr.ifr_data = (void *)feature_names;
+
+ if (ioctl(sock_ioctl, SIOCETHTOOL, &ifr) != 0) {
+ free(feature_names);
+
+ return -1;
+ }
+
+ for (i = 0; i < feature_names->len; i++)
+ if (!strcmp((char *)&feature_names->data[i * ETH_GSTRING_LEN], keyname))
+ break;
+
+ if (i >= feature_names->len)
+ i = -1;
+
+ free(feature_names);
+
+ return i;
+}
+
+static bool
+ethtool_feature_value(const char *ifname, const char *keyname)
+{
+ struct ethtool_get_features_block *feature_block;
+ struct ethtool_gfeatures *feature_values;
+ struct ifreq ifr = { 0 };
+ int32_t feature_idx;
+ bool active;
+
+ feature_idx = ethtool_feature_index(ifname, keyname);
+
+ if (feature_idx < 0)
+ return false;
+
+ feature_values = calloc(1,
+ sizeof(*feature_values) +
+ sizeof(feature_values->features[0]) * DIV_ROUND_UP(feature_idx, 32));
+
+ if (!feature_values)
+ return false;
+
+ feature_values->cmd = ETHTOOL_GFEATURES;
+ feature_values->size = DIV_ROUND_UP(feature_idx, 32);
+
+ strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
+ ifr.ifr_data = (void *)feature_values;
+
+ if (ioctl(sock_ioctl, SIOCETHTOOL, &ifr) != 0) {
+ free(feature_values);
+
+ return false;
+ }
+
+ feature_block = &feature_values->features[feature_idx / 32];
+ active = feature_block->active & (1U << feature_idx % 32);
+
+ free(feature_values);
+
+ return active;
+}
+
int
system_if_dump_info(struct device *dev, struct blob_buf *b)
{
blobmsg_add_u8(b, "autoneg", !!ecmd.autoneg);
}
+ blobmsg_add_u8(b, "hw-tc-offload",
+ ethtool_feature_value(dev->ifname, "hw-tc-offload"));
+
system_add_devtype(b, dev->ifname);
return 0;
projects / project / netifd.git / blobdiff