X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=812325000da045e51c56e2814307ccdf55e805ce;hp=7be4d24de732c86044186569e89472a890684c39;hb=32bc8adcd836baff68e4d0f53b9a382f358cccf8;hpb=92d927f850d4b668b44f3e5f41e266d934d03726 diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 7be4d24de..812325000 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -20,10 +20,11 @@ ***/ #include -#include +#include #include "sd-id128.h" +#include "missing.h" #include "link-config.h" #include "ethtool-util.h" @@ -87,24 +88,6 @@ int link_config_ctx_new(link_config_ctx **ret) { return 0; } -static int link_config_ctx_connect(link_config_ctx *ctx) { - int r; - - if (ctx->ethtool_fd == -1) { - r = ethtool_connect(&ctx->ethtool_fd); - if (r < 0) - return r; - } - - if (!ctx->rtnl) { - r = sd_rtnl_open(&ctx->rtnl, 0); - if (r < 0) - return r; - } - - return 0; -} - static void link_configs_free(link_config_ctx *ctx) { link_config *link, *link_next; @@ -113,11 +96,13 @@ static void link_configs_free(link_config_ctx *ctx) { LIST_FOREACH_SAFE(links, link, link_next, ctx->links) { free(link->filename); + free(link->name); free(link->match_path); free(link->match_driver); free(link->match_type); free(link->description); free(link->alias); + free(link->name_policy); free(link); } @@ -140,17 +125,12 @@ void link_config_ctx_free(link_config_ctx *ctx) { static int load_link(link_config_ctx *ctx, const char *filename) { _cleanup_free_ link_config *link = NULL; - _cleanup_fclose_ FILE *file; + _cleanup_fclose_ FILE *file = NULL; int r; assert(ctx); assert(filename); - if (null_or_empty_path(filename)) { - log_debug("skipping empty file: %s", filename); - return 0; - } - file = fopen(filename, "re"); if (!file) { if (errno == ENOENT) @@ -159,6 +139,11 @@ static int load_link(link_config_ctx *ctx, const char *filename) { return -errno; } + if (null_or_empty_fd(fileno(file))) { + log_debug("Skipping empty file: %s", filename); + return 0; + } + link = new0(link_config, 1); if (!link) return log_oom(); @@ -167,12 +152,13 @@ static int load_link(link_config_ctx *ctx, const char *filename) { link->wol = _WOL_INVALID; link->duplex = _DUP_INVALID; - r = config_parse(NULL, filename, file, "Match\0Link\0Ethernet\0", config_item_perf_lookup, - (void*) link_config_gperf_lookup, false, false, link); - if (r < 0) { - log_warning("Could not parse config file %s: %s", filename, strerror(-r)); + r = config_parse(NULL, filename, file, + "Match\0Link\0Ethernet\0", + config_item_perf_lookup, link_config_gperf_lookup, + false, false, true, link); + if (r < 0) return r; - } else + else log_debug("Parsed configuration file %s", filename); link->filename = strdup(filename); @@ -184,19 +170,19 @@ static int load_link(link_config_ctx *ctx, const char *filename) { } static bool enable_name_policy(void) { - _cleanup_free_ char *line; - char *w, *state; + _cleanup_free_ char *line = NULL; + const char *word, *state; int r; size_t l; r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) + if (r < 0) { + log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m"); return true; + } - FOREACH_WORD_QUOTED(w, l, line, state) - if (strneq(w, "net.ifnames=0", l)) + FOREACH_WORD_QUOTED(word, l, line, state) + if (strneq(word, "net.ifnames=0", l)) return false; return true; @@ -204,23 +190,22 @@ static bool enable_name_policy(void) { int link_config_load(link_config_ctx *ctx) { int r; - char **files, **f; + _cleanup_strv_free_ char **files; + char **f; link_configs_free(ctx); if (!enable_name_policy()) { ctx->enable_name_policy = false; - log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring."); + log_info("Network interface NamePolicy= disabled on kernel command line, ignoring."); } /* update timestamp */ paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, true); r = conf_files_list_strv(&files, ".link", NULL, link_dirs); - if (r < 0) { - log_error("failed to enumerate link files: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "failed to enumerate link files: %m"); STRV_FOREACH_BACKWARDS(f, files) { r = load_link(ctx, *f); @@ -235,25 +220,56 @@ bool link_config_should_reload(link_config_ctx *ctx) { return paths_check_timestamp(link_dirs, &ctx->link_dirs_ts_usec, false); } -int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_config **ret) { +int link_config_get(link_config_ctx *ctx, struct udev_device *device, + link_config **ret) { link_config *link; LIST_FOREACH(links, link, ctx->links) { + const char* attr_value; + + attr_value = udev_device_get_sysattr_value(device, "address"); if (net_match_config(link->match_mac, link->match_path, link->match_driver, - link->match_type, NULL, link->match_host, + link->match_type, link->match_name, link->match_host, link->match_virt, link->match_kernel, link->match_arch, - ether_aton(udev_device_get_sysattr_value(device, "address")), + attr_value ? ether_aton(attr_value) : NULL, udev_device_get_property_value(device, "ID_PATH"), udev_device_get_driver(udev_device_get_parent(device)), udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), - NULL)) { - log_debug("Config file %s applies to device %s", - link->filename, - udev_device_get_sysname(device)); - *ret = link; - return 0; + udev_device_get_sysname(device))) { + if (link->match_name) { + unsigned char name_assign_type = NET_NAME_UNKNOWN; + + attr_value = udev_device_get_sysattr_value(device, "name_assign_type"); + if (attr_value) + (void)safe_atou8(attr_value, &name_assign_type); + + if (name_assign_type == NET_NAME_ENUM) { + log_warning("Config file %s applies to device based on potentially unstable interface name '%s'", + link->filename, udev_device_get_sysname(device)); + *ret = link; + + return 0; + } else if (name_assign_type == NET_NAME_RENAMED) { + log_warning("Config file %s matches device based on renamed interface name '%s', ignoring", + link->filename, udev_device_get_sysname(device)); + } else { + log_debug("Config file %s applies to device %s", + link->filename, udev_device_get_sysname(device)); + + *ret = link; + + return 0; + } + } else { + log_debug("Config file %s applies to device %s", + link->filename, udev_device_get_sysname(device)); + + *ret = link; + + return 0; + } } } @@ -267,18 +283,51 @@ static bool mac_is_random(struct udev_device *device) { unsigned type; int r; + /* if we can't get the assign type, assume it is not random */ s = udev_device_get_sysattr_value(device, "addr_assign_type"); if (!s) - return false; /* if we don't know, assume it is not random */ + return false; + r = safe_atou(s, &type); if (r < 0) return false; - /* check for NET_ADDR_RANDOM */ - return type == 1; + return type == NET_ADDR_RANDOM; +} + +static bool should_rename(struct udev_device *device, bool respect_predictable) { + const char *s; + unsigned type; + int r; + + /* if we can't get the assgin type, assume we should rename */ + s = udev_device_get_sysattr_value(device, "name_assign_type"); + if (!s) + return true; + + r = safe_atou(s, &type); + if (r < 0) + return true; + + switch (type) { + case NET_NAME_USER: + case NET_NAME_RENAMED: + /* these were already named by userspace, do not touch again */ + return false; + case NET_NAME_PREDICTABLE: + /* the kernel claims to have given a predictable name */ + if (respect_predictable) + return false; + /* fall through */ + case NET_NAME_ENUM: + default: + /* the name is known to be bad, or of an unknown type */ + return true; + } } -static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) { +static int get_mac(struct udev_device *device, bool want_random, + struct ether_addr *mac) { int r; if (want_random) @@ -295,17 +344,19 @@ static int get_mac(struct udev_device *device, bool want_random, struct ether_ad } /* see eth_random_addr in the kernel */ - mac->ether_addr_octet[0] &= 0xfe; /* clear multicast bit */ - mac->ether_addr_octet[0] |= 0x02; /* set local assignment bit (IEEE802) */ + mac->ether_addr_octet[0] &= 0xfe; /* clear multicast bit */ + mac->ether_addr_octet[0] |= 0x02; /* set local assignment bit (IEEE802) */ return 0; } -int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device, const char **name) { +int link_config_apply(link_config_ctx *ctx, link_config *config, + struct udev_device *device, const char **name) { const char *old_name; const char *new_name = NULL; struct ether_addr generated_mac; struct ether_addr *mac = NULL; + bool respect_predictable = false; int r, ifindex; assert(ctx); @@ -313,24 +364,21 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev assert(device); assert(name); - r = link_config_ctx_connect(ctx); - if (r < 0) - return r; - old_name = udev_device_get_sysname(device); if (!old_name) return -EINVAL; - r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed / 1024, config->duplex); + r = ethtool_set_speed(&ctx->ethtool_fd, old_name, config->speed / 1024, + config->duplex); if (r < 0) - log_warning("Could not set speed or duplex of %s to %u Mbps (%s): %s", - old_name, config->speed / 1024, duplex_to_string(config->duplex), - strerror(-r)); + log_warning_errno(r, "Could not set speed or duplex of %s to %u Mbps (%s): %m", + old_name, config->speed / 1024, + duplex_to_string(config->duplex)); - r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol); + r = ethtool_set_wol(&ctx->ethtool_fd, old_name, config->wol); if (r < 0) - log_warning("Could not set WakeOnLan of %s to %s: %s", - old_name, wol_to_string(config->wol), strerror(-r)); + log_warning_errno(r, "Could not set WakeOnLan of %s to %s: %m", + old_name, wol_to_string(config->wol)); ifindex = udev_device_get_ifindex(device); if (ifindex <= 0) { @@ -341,8 +389,12 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev if (ctx->enable_name_policy && config->name_policy) { NamePolicy *policy; - for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) { + for (policy = config->name_policy; + !new_name && *policy != _NAMEPOLICY_INVALID; policy++) { switch (*policy) { + case NAMEPOLICY_KERNEL: + respect_predictable = true; + break; case NAMEPOLICY_DATABASE: new_name = udev_device_get_property_value(device, "ID_NET_NAME_FROM_DATABASE"); break; @@ -364,18 +416,20 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev } } - if (new_name) - *name = new_name; /* a name was set by a policy */ - else if (config->name) - *name = config->name; /* a name was set manually in the config */ - else - *name = NULL; + if (should_rename(device, respect_predictable)) { + /* if not set by policy, fall back manually set name */ + if (!new_name) + new_name = config->name; + } else + new_name = NULL; switch (config->mac_policy) { case MACPOLICY_PERSISTENT: if (mac_is_random(device)) { r = get_mac(device, false, &generated_mac); - if (r < 0) + if (r == -ENOENT) + break; + else if (r < 0) return r; mac = &generated_mac; } @@ -383,7 +437,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev case MACPOLICY_RANDOM: if (!mac_is_random(device)) { r = get_mac(device, true, &generated_mac); - if (r < 0) + if (r == -ENOENT) + break; + else if (r < 0) return r; mac = &generated_mac; } @@ -392,11 +448,12 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev mac = config->mac; } - r = rtnl_set_link_properties(ctx->rtnl, ifindex, config->alias, mac, config->mtu); - if (r < 0) { - log_warning("Could not set Alias, MACAddress or MTU on %s: %s", old_name, strerror(-r)); - return r; - } + r = rtnl_set_link_properties(&ctx->rtnl, ifindex, config->alias, mac, + config->mtu); + if (r < 0) + return log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name); + + *name = new_name; return 0; } @@ -406,15 +463,11 @@ int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret char *driver; int r; - r = link_config_ctx_connect(ctx); - if (r < 0) - return r; - name = udev_device_get_sysname(device); if (!name) return -EINVAL; - r = ethtool_get_driver(ctx->ethtool_fd, name, &driver); + r = ethtool_get_driver(&ctx->ethtool_fd, name, &driver); if (r < 0) return r; @@ -428,9 +481,11 @@ static const char* const mac_policy_table[_MACPOLICY_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy); -DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy"); +DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, + "Failed to parse MAC address policy"); static const char* const name_policy_table[_NAMEPOLICY_MAX] = { + [NAMEPOLICY_KERNEL] = "kernel", [NAMEPOLICY_DATABASE] = "database", [NAMEPOLICY_ONBOARD] = "onboard", [NAMEPOLICY_SLOT] = "slot", @@ -439,4 +494,6 @@ static const char* const name_policy_table[_NAMEPOLICY_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(name_policy, NamePolicy); -DEFINE_CONFIG_PARSE_ENUMV(config_parse_name_policy, name_policy, NamePolicy, _NAMEPOLICY_INVALID, "Failed to parse interface name policy"); +DEFINE_CONFIG_PARSE_ENUMV(config_parse_name_policy, name_policy, NamePolicy, + _NAMEPOLICY_INVALID, + "Failed to parse interface name policy");