Compare commits
No commits in common. "819528326571f3d5e7fccaf5bc72be6ca00ae78a" and "6743a1caf4037f03dc51a1277855018e4ab61957" have entirely different histories.
8195283265
...
6743a1caf4
|
|
@ -1042,8 +1042,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
|
|||
|
||||
<listitem><para>Controls the NUMA node list which will be applied alongside with selected NUMA policy.
|
||||
Takes a list of NUMA nodes and has the same syntax as a list of CPUs for <varname>CPUAffinity=</varname>
|
||||
option or special "all" value which will include all available NUMA nodes in the mask. Note that the list
|
||||
of NUMA nodes is not required for <option>default</option> and <option>local</option>
|
||||
option. Note that the list of NUMA nodes is not required for <option>default</option> and <option>local</option>
|
||||
policies and for <option>preferred</option> policy we expect a single NUMA node.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
|
|
|
|||
|
|
@ -755,13 +755,13 @@ static int in_addr_data_compare_func(const struct in_addr_data *x, const struct
|
|||
|
||||
DEFINE_HASH_OPS(in_addr_data_hash_ops, struct in_addr_data, in_addr_data_hash_func, in_addr_data_compare_func);
|
||||
|
||||
void in6_addr_hash_func(const struct in6_addr *addr, struct siphash *state) {
|
||||
static void in6_addr_hash_func(const struct in6_addr *addr, struct siphash *state) {
|
||||
assert(addr);
|
||||
|
||||
siphash24_compress(addr, sizeof(*addr), state);
|
||||
}
|
||||
|
||||
int in6_addr_compare_func(const struct in6_addr *a, const struct in6_addr *b) {
|
||||
static int in6_addr_compare_func(const struct in6_addr *a, const struct in6_addr *b) {
|
||||
return memcmp(a, b, sizeof(*a));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -80,8 +80,5 @@ static inline size_t FAMILY_ADDRESS_SIZE(int family) {
|
|||
* See also oss-fuzz#11344. */
|
||||
#define IN_ADDR_NULL ((union in_addr_union) { .in6 = {} })
|
||||
|
||||
void in6_addr_hash_func(const struct in6_addr *addr, struct siphash *state);
|
||||
int in6_addr_compare_func(const struct in6_addr *a, const struct in6_addr *b);
|
||||
|
||||
extern const struct hash_ops in_addr_data_hash_ops;
|
||||
extern const struct hash_ops in6_addr_hash_ops;
|
||||
|
|
|
|||
|
|
@ -1370,19 +1370,11 @@ int config_parse_numa_mask(const char *unit,
|
|||
assert(rvalue);
|
||||
assert(data);
|
||||
|
||||
if (streq(rvalue, "all")) {
|
||||
r = numa_mask_add_all(&p->nodes);
|
||||
if (r < 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to create NUMA mask representing \"all\" NUMA nodes, ignoring: %m");
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
r = parse_cpu_set_extend(rvalue, &p->nodes, true, unit, filename, line, lvalue);
|
||||
if (r < 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse NUMA node mask, ignoring: %s", rvalue);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
#include "netlink-util.h"
|
||||
#include "networkd-address.h"
|
||||
#include "networkd-manager.h"
|
||||
#include "networkd-ndisc.h"
|
||||
#include "parse-util.h"
|
||||
#include "set.h"
|
||||
#include "socket-util.h"
|
||||
|
|
@ -124,9 +123,6 @@ void address_free(Address *address) {
|
|||
}
|
||||
|
||||
if (address->link && !address->acd) {
|
||||
NDiscAddress *n;
|
||||
Iterator i;
|
||||
|
||||
set_remove(address->link->addresses, address);
|
||||
set_remove(address->link->addresses_foreign, address);
|
||||
set_remove(address->link->static_addresses, address);
|
||||
|
|
@ -138,9 +134,8 @@ void address_free(Address *address) {
|
|||
set_remove(address->link->dhcp6_addresses_old, address);
|
||||
set_remove(address->link->dhcp6_pd_addresses, address);
|
||||
set_remove(address->link->dhcp6_pd_addresses_old, address);
|
||||
SET_FOREACH(n, address->link->ndisc_addresses, i)
|
||||
if (n->address == address)
|
||||
free(set_remove(address->link->ndisc_addresses, n));
|
||||
set_remove(address->link->ndisc_addresses, address);
|
||||
set_remove(address->link->ndisc_addresses_old, address);
|
||||
|
||||
if (in_addr_equal(AF_INET6, &address->in_addr, (const union in_addr_union *) &address->link->ipv6ll_address))
|
||||
memzero(&address->link->ipv6ll_address, sizeof(struct in6_addr));
|
||||
|
|
@ -167,7 +162,7 @@ static uint32_t address_prefix(const Address *a) {
|
|||
return be32toh(a->in_addr.in.s_addr) >> (32 - a->prefixlen);
|
||||
}
|
||||
|
||||
void address_hash_func(const Address *a, struct siphash *state) {
|
||||
static void address_hash_func(const Address *a, struct siphash *state) {
|
||||
assert(a);
|
||||
|
||||
siphash24_compress(&a->family, sizeof(a->family), state);
|
||||
|
|
@ -192,7 +187,7 @@ void address_hash_func(const Address *a, struct siphash *state) {
|
|||
}
|
||||
}
|
||||
|
||||
int address_compare_func(const Address *a1, const Address *a2) {
|
||||
static int address_compare_func(const Address *a1, const Address *a2) {
|
||||
int r;
|
||||
|
||||
r = CMP(a1->family, a2->family);
|
||||
|
|
|
|||
|
|
@ -75,8 +75,6 @@ int generate_ipv6_eui_64_address(Link *link, struct in6_addr *ret);
|
|||
|
||||
DEFINE_NETWORK_SECTION_FUNCTIONS(Address, address_free);
|
||||
|
||||
void address_hash_func(const Address *a, struct siphash *state);
|
||||
int address_compare_func(const Address *a1, const Address *a2);
|
||||
extern const struct hash_ops address_hash_ops;
|
||||
|
||||
CONFIG_PARSER_PROTOTYPE(config_parse_address);
|
||||
|
|
|
|||
|
|
@ -720,6 +720,7 @@ static Link *link_free(Link *link) {
|
|||
link->dhcp6_pd_routes = set_free(link->dhcp6_pd_routes);
|
||||
link->dhcp6_pd_routes_old = set_free(link->dhcp6_pd_routes_old);
|
||||
link->ndisc_routes = set_free(link->ndisc_routes);
|
||||
link->ndisc_routes_old = set_free(link->ndisc_routes_old);
|
||||
|
||||
link->nexthops = set_free(link->nexthops);
|
||||
link->nexthops_foreign = set_free(link->nexthops_foreign);
|
||||
|
|
@ -735,6 +736,7 @@ static Link *link_free(Link *link) {
|
|||
link->dhcp6_pd_addresses = set_free(link->dhcp6_pd_addresses);
|
||||
link->dhcp6_pd_addresses_old = set_free(link->dhcp6_pd_addresses_old);
|
||||
link->ndisc_addresses = set_free(link->ndisc_addresses);
|
||||
link->ndisc_addresses_old = set_free(link->ndisc_addresses_old);
|
||||
|
||||
while ((address = link->pool_addresses)) {
|
||||
LIST_REMOVE(addresses, link->pool_addresses, address);
|
||||
|
|
@ -1161,8 +1163,6 @@ void link_check_ready(Link *link) {
|
|||
}
|
||||
|
||||
if (link_has_carrier(link) || !link->network->configure_without_carrier) {
|
||||
bool has_ndisc_address = false;
|
||||
NDiscAddress *n;
|
||||
|
||||
if (link_ipv4ll_enabled(link, ADDRESS_FAMILY_IPV4) && !link->ipv4ll_address_configured) {
|
||||
log_link_debug(link, "%s(): IPv4LL is not configured.", __func__);
|
||||
|
|
@ -1175,14 +1175,8 @@ void link_check_ready(Link *link) {
|
|||
return;
|
||||
}
|
||||
|
||||
SET_FOREACH(n, link->ndisc_addresses, i)
|
||||
if (!n->marked) {
|
||||
has_ndisc_address = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) &&
|
||||
!link->dhcp_address && set_isempty(link->dhcp6_addresses) && !has_ndisc_address &&
|
||||
!link->dhcp_address && set_isempty(link->dhcp6_addresses) && set_isempty(link->ndisc_addresses) &&
|
||||
!(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address_configured)) {
|
||||
log_link_debug(link, "%s(): DHCP4 or DHCP6 is enabled but no dynamic address is assigned yet.", __func__);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -132,8 +132,8 @@ typedef struct Link {
|
|||
sd_ndisc *ndisc;
|
||||
Set *ndisc_rdnss;
|
||||
Set *ndisc_dnssl;
|
||||
Set *ndisc_addresses;
|
||||
Set *ndisc_routes;
|
||||
Set *ndisc_addresses, *ndisc_addresses_old;
|
||||
Set *ndisc_routes, *ndisc_routes_old;
|
||||
unsigned ndisc_addresses_messages;
|
||||
unsigned ndisc_routes_messages;
|
||||
bool ndisc_addresses_configured:1;
|
||||
|
|
|
|||
|
|
@ -35,218 +35,79 @@
|
|||
|
||||
#define NDISC_APP_ID SD_ID128_MAKE(13,ac,81,a7,d5,3f,49,78,92,79,5d,0c,29,3a,bc,7e)
|
||||
|
||||
static int ndisc_remove_old_one(Link *link, const struct in6_addr *router, bool force);
|
||||
static int ndisc_remove_old(Link *link, bool force);
|
||||
|
||||
static int ndisc_address_callback(Address *address) {
|
||||
struct in6_addr router = {};
|
||||
NDiscAddress *n;
|
||||
Address *a;
|
||||
Iterator i;
|
||||
|
||||
assert(address);
|
||||
assert(address->link);
|
||||
|
||||
SET_FOREACH(n, address->link->ndisc_addresses, i)
|
||||
if (n->address == address) {
|
||||
router = n->router;
|
||||
break;
|
||||
}
|
||||
|
||||
if (IN6_IS_ADDR_UNSPECIFIED(&router)) {
|
||||
_cleanup_free_ char *buf = NULL;
|
||||
|
||||
(void) in_addr_to_string(address->family, &address->in_addr, &buf);
|
||||
log_link_debug(address->link, "%s is called for %s/%u, but it is already removed, ignoring.",
|
||||
__func__, strna(buf), address->prefixlen);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Make this called only once */
|
||||
SET_FOREACH(n, address->link->ndisc_addresses, i)
|
||||
if (IN6_ARE_ADDR_EQUAL(&n->router, &router))
|
||||
n->address->callback = NULL;
|
||||
SET_FOREACH(a, address->link->ndisc_addresses, i)
|
||||
a->callback = NULL;
|
||||
|
||||
return ndisc_remove_old_one(address->link, &router, true);
|
||||
return ndisc_remove_old(address->link, true);
|
||||
}
|
||||
|
||||
static int ndisc_remove_old_one(Link *link, const struct in6_addr *router, bool force) {
|
||||
NDiscAddress *na;
|
||||
NDiscRoute *nr;
|
||||
static int ndisc_remove_old(Link *link, bool force) {
|
||||
Address *address;
|
||||
Route *route;
|
||||
NDiscDNSSL *dnssl;
|
||||
NDiscRDNSS *rdnss;
|
||||
Iterator i;
|
||||
int k, r = 0;
|
||||
|
||||
assert(link);
|
||||
assert(router);
|
||||
|
||||
if (!force) {
|
||||
bool set_callback = false;
|
||||
bool set_callback = !set_isempty(link->ndisc_addresses);
|
||||
|
||||
if (!link->ndisc_addresses_configured || !link->ndisc_routes_configured)
|
||||
return 0;
|
||||
|
||||
SET_FOREACH(na, link->ndisc_addresses, i)
|
||||
if (!na->marked && IN6_ARE_ADDR_EQUAL(&na->router, router)) {
|
||||
set_callback = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if (set_callback)
|
||||
SET_FOREACH(na, link->ndisc_addresses, i)
|
||||
if (!na->marked && address_is_ready(na->address)) {
|
||||
SET_FOREACH(address, link->ndisc_addresses, i)
|
||||
if (address_is_ready(address)) {
|
||||
set_callback = false;
|
||||
break;
|
||||
}
|
||||
|
||||
if (set_callback) {
|
||||
SET_FOREACH(na, link->ndisc_addresses, i)
|
||||
if (!na->marked && IN6_ARE_ADDR_EQUAL(&na->router, router))
|
||||
na->address->callback = ndisc_address_callback;
|
||||
|
||||
if (DEBUG_LOGGING) {
|
||||
_cleanup_free_ char *buf = NULL;
|
||||
|
||||
(void) in_addr_to_string(AF_INET6, (union in_addr_union *) router, &buf);
|
||||
log_link_debug(link, "No SLAAC address obtained from %s is ready. "
|
||||
"The old NDisc information will be removed later.",
|
||||
strna(buf));
|
||||
}
|
||||
SET_FOREACH(address, link->ndisc_addresses, i)
|
||||
address->callback = ndisc_address_callback;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (DEBUG_LOGGING) {
|
||||
_cleanup_free_ char *buf = NULL;
|
||||
|
||||
(void) in_addr_to_string(AF_INET6, (union in_addr_union *) router, &buf);
|
||||
log_link_debug(link, "Removing old NDisc information obtained from %s.", strna(buf));
|
||||
}
|
||||
if (!set_isempty(link->ndisc_addresses_old) || !set_isempty(link->ndisc_routes_old))
|
||||
log_link_debug(link, "Removing old NDisc addresses and routes.");
|
||||
|
||||
link_dirty(link);
|
||||
|
||||
SET_FOREACH(na, link->ndisc_addresses, i)
|
||||
if (na->marked && IN6_ARE_ADDR_EQUAL(&na->router, router)) {
|
||||
k = address_remove(na->address, link, NULL);
|
||||
SET_FOREACH(address, link->ndisc_addresses_old, i) {
|
||||
k = address_remove(address, link, NULL);
|
||||
if (k < 0)
|
||||
r = k;
|
||||
}
|
||||
|
||||
SET_FOREACH(nr, link->ndisc_routes, i)
|
||||
if (nr->marked && IN6_ARE_ADDR_EQUAL(&nr->router, router)) {
|
||||
k = route_remove(nr->route, link, NULL);
|
||||
SET_FOREACH(route, link->ndisc_routes_old, i) {
|
||||
k = route_remove(route, link, NULL);
|
||||
if (k < 0)
|
||||
r = k;
|
||||
}
|
||||
|
||||
SET_FOREACH(rdnss, link->ndisc_rdnss, i)
|
||||
if (rdnss->marked && IN6_ARE_ADDR_EQUAL(&rdnss->router, router))
|
||||
if (rdnss->marked)
|
||||
free(set_remove(link->ndisc_rdnss, rdnss));
|
||||
|
||||
SET_FOREACH(dnssl, link->ndisc_dnssl, i)
|
||||
if (dnssl->marked && IN6_ARE_ADDR_EQUAL(&dnssl->router, router))
|
||||
if (dnssl->marked)
|
||||
free(set_remove(link->ndisc_dnssl, dnssl));
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static int ndisc_remove_old(Link *link) {
|
||||
_cleanup_set_free_free_ Set *routers = NULL;
|
||||
_cleanup_free_ struct in6_addr *router = NULL;
|
||||
struct in6_addr *a;
|
||||
NDiscAddress *na;
|
||||
NDiscRoute *nr;
|
||||
NDiscDNSSL *dnssl;
|
||||
NDiscRDNSS *rdnss;
|
||||
Iterator i;
|
||||
int k, r;
|
||||
|
||||
assert(link);
|
||||
|
||||
routers = set_new(&in6_addr_hash_ops);
|
||||
if (!routers)
|
||||
return -ENOMEM;
|
||||
|
||||
SET_FOREACH(na, link->ndisc_addresses, i)
|
||||
if (!set_contains(routers, &na->router)) {
|
||||
router = newdup(struct in6_addr, &na->router, 1);
|
||||
if (!router)
|
||||
return -ENOMEM;
|
||||
|
||||
r = set_put(routers, router);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
assert(r > 0);
|
||||
TAKE_PTR(router);
|
||||
}
|
||||
|
||||
SET_FOREACH(nr, link->ndisc_routes, i)
|
||||
if (!set_contains(routers, &nr->router)) {
|
||||
router = newdup(struct in6_addr, &nr->router, 1);
|
||||
if (!router)
|
||||
return -ENOMEM;
|
||||
|
||||
r = set_put(routers, router);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
assert(r > 0);
|
||||
TAKE_PTR(router);
|
||||
}
|
||||
|
||||
SET_FOREACH(rdnss, link->ndisc_rdnss, i)
|
||||
if (!set_contains(routers, &rdnss->router)) {
|
||||
router = newdup(struct in6_addr, &rdnss->router, 1);
|
||||
if (!router)
|
||||
return -ENOMEM;
|
||||
|
||||
r = set_put(routers, router);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
assert(r > 0);
|
||||
TAKE_PTR(router);
|
||||
}
|
||||
|
||||
SET_FOREACH(dnssl, link->ndisc_dnssl, i)
|
||||
if (!set_contains(routers, &dnssl->router)) {
|
||||
router = newdup(struct in6_addr, &dnssl->router, 1);
|
||||
if (!router)
|
||||
return -ENOMEM;
|
||||
|
||||
r = set_put(routers, router);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
assert(r > 0);
|
||||
TAKE_PTR(router);
|
||||
}
|
||||
|
||||
r = 0;
|
||||
SET_FOREACH(a, routers, i) {
|
||||
k = ndisc_remove_old_one(link, a, false);
|
||||
if (k < 0)
|
||||
r = k;
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static void ndisc_route_hash_func(const NDiscRoute *x, struct siphash *state) {
|
||||
route_hash_func(x->route, state);
|
||||
}
|
||||
|
||||
static int ndisc_route_compare_func(const NDiscRoute *a, const NDiscRoute *b) {
|
||||
return route_compare_func(a->route, b->route);
|
||||
}
|
||||
|
||||
DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(
|
||||
ndisc_route_hash_ops,
|
||||
NDiscRoute,
|
||||
ndisc_route_hash_func,
|
||||
ndisc_route_compare_func,
|
||||
free);
|
||||
|
||||
static int ndisc_route_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
|
||||
int r;
|
||||
|
||||
|
|
@ -269,7 +130,7 @@ static int ndisc_route_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *li
|
|||
log_link_debug(link, "NDisc routes set.");
|
||||
link->ndisc_routes_configured = true;
|
||||
|
||||
r = ndisc_remove_old(link);
|
||||
r = ndisc_remove_old(link, false);
|
||||
if (r < 0) {
|
||||
link_enter_failed(link);
|
||||
return 1;
|
||||
|
|
@ -281,67 +142,6 @@ static int ndisc_route_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *li
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int ndisc_route_configure(Route *route, Link *link, sd_ndisc_router *rt) {
|
||||
_cleanup_free_ NDiscRoute *nr = NULL;
|
||||
NDiscRoute *nr_exist;
|
||||
struct in6_addr router;
|
||||
Route *ret;
|
||||
int r;
|
||||
|
||||
assert(route);
|
||||
assert(link);
|
||||
assert(rt);
|
||||
|
||||
r = route_configure(route, link, ndisc_route_handler, &ret);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to set NDisc route: %m");
|
||||
|
||||
link->ndisc_routes_messages++;
|
||||
|
||||
r = sd_ndisc_router_get_address(rt, &router);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get router address from RA: %m");
|
||||
|
||||
nr = new(NDiscRoute, 1);
|
||||
if (!nr)
|
||||
return log_oom();
|
||||
|
||||
*nr = (NDiscRoute) {
|
||||
.router = router,
|
||||
.route = ret,
|
||||
};
|
||||
|
||||
nr_exist = set_get(link->ndisc_routes, nr);
|
||||
if (nr_exist) {
|
||||
nr_exist->marked = false;
|
||||
nr_exist->router = router;
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = set_ensure_put(&link->ndisc_routes, &ndisc_route_hash_ops, nr);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to store NDisc SLAAC route: %m");
|
||||
assert(r > 0);
|
||||
TAKE_PTR(nr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ndisc_address_hash_func(const NDiscAddress *x, struct siphash *state) {
|
||||
address_hash_func(x->address, state);
|
||||
}
|
||||
|
||||
static int ndisc_address_compare_func(const NDiscAddress *a, const NDiscAddress *b) {
|
||||
return address_compare_func(a->address, b->address);
|
||||
}
|
||||
|
||||
DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(
|
||||
ndisc_address_hash_ops,
|
||||
NDiscAddress,
|
||||
ndisc_address_hash_func,
|
||||
ndisc_address_compare_func,
|
||||
free);
|
||||
|
||||
static int ndisc_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
|
||||
int r;
|
||||
|
||||
|
|
@ -365,7 +165,7 @@ static int ndisc_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *
|
|||
log_link_debug(link, "NDisc SLAAC addresses set.");
|
||||
link->ndisc_addresses_configured = true;
|
||||
|
||||
r = ndisc_remove_old(link);
|
||||
r = ndisc_remove_old(link, false);
|
||||
if (r < 0) {
|
||||
link_enter_failed(link);
|
||||
return 1;
|
||||
|
|
@ -381,16 +181,34 @@ static int ndisc_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int ndisc_address_configure(Address *address, Link *link, sd_ndisc_router *rt) {
|
||||
_cleanup_free_ NDiscAddress *na = NULL;
|
||||
NDiscAddress *na_exist;
|
||||
struct in6_addr router;
|
||||
static int ndisc_route_configure(Route *route, Link *link) {
|
||||
Route *ret;
|
||||
int r;
|
||||
|
||||
assert(route);
|
||||
assert(link);
|
||||
|
||||
r = route_configure(route, link, ndisc_route_handler, &ret);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to set NDisc route: %m");
|
||||
|
||||
link->ndisc_routes_messages++;
|
||||
|
||||
r = set_ensure_put(&link->ndisc_routes, &route_hash_ops, ret);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to store NDisc route: %m");
|
||||
|
||||
(void) set_remove(link->ndisc_routes_old, ret);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ndisc_address_configure(Address *address, Link *link) {
|
||||
Address *ret;
|
||||
int r;
|
||||
|
||||
assert(address);
|
||||
assert(link);
|
||||
assert(rt);
|
||||
|
||||
r = address_configure(address, link, ndisc_address_handler, true, &ret);
|
||||
if (r < 0)
|
||||
|
|
@ -398,31 +216,11 @@ static int ndisc_address_configure(Address *address, Link *link, sd_ndisc_router
|
|||
|
||||
link->ndisc_addresses_messages++;
|
||||
|
||||
r = sd_ndisc_router_get_address(rt, &router);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get router address from RA: %m");
|
||||
|
||||
na = new(NDiscAddress, 1);
|
||||
if (!na)
|
||||
return log_oom();
|
||||
|
||||
*na = (NDiscAddress) {
|
||||
.router = router,
|
||||
.address = ret,
|
||||
};
|
||||
|
||||
na_exist = set_get(link->ndisc_addresses, na);
|
||||
if (na_exist) {
|
||||
na_exist->marked = false;
|
||||
na_exist->router = router;
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = set_ensure_put(&link->ndisc_addresses, &ndisc_address_hash_ops, na);
|
||||
r = set_ensure_put(&link->ndisc_addresses, &address_hash_ops, ret);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to store NDisc SLAAC address: %m");
|
||||
assert(r > 0);
|
||||
TAKE_PTR(na);
|
||||
|
||||
(void) set_remove(link->ndisc_addresses_old, ret);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -488,7 +286,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
|
|||
route->lifetime = time_now + lifetime * USEC_PER_SEC;
|
||||
route->mtu = mtu;
|
||||
|
||||
r = ndisc_route_configure(route, link, rt);
|
||||
r = ndisc_route_configure(route, link);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not set default route: %m");
|
||||
|
||||
|
|
@ -502,7 +300,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
|
|||
|
||||
route_gw->gw = gateway;
|
||||
|
||||
r = ndisc_route_configure(route_gw, link, rt);
|
||||
r = ndisc_route_configure(route_gw, link);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not set gateway: %m");
|
||||
}
|
||||
|
|
@ -716,7 +514,7 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
|
|||
|
||||
address->in_addr.in6 = *a;
|
||||
|
||||
r = ndisc_address_configure(address, link, rt);
|
||||
r = ndisc_address_configure(address, link);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not set SLAAC address: %m");
|
||||
}
|
||||
|
|
@ -762,7 +560,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
|
|||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get prefix address: %m");
|
||||
|
||||
r = ndisc_route_configure(route, link, rt);
|
||||
r = ndisc_route_configure(route, link);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not set prefix route: %m");;
|
||||
|
||||
|
|
@ -819,7 +617,7 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) {
|
|||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get route address: %m");
|
||||
|
||||
r = ndisc_route_configure(route, link, rt);
|
||||
r = ndisc_route_configure(route, link);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not set additional route: %m");
|
||||
|
||||
|
|
@ -844,7 +642,6 @@ DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(
|
|||
static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) {
|
||||
uint32_t lifetime;
|
||||
const struct in6_addr *a;
|
||||
struct in6_addr router;
|
||||
NDiscRDNSS *rdnss;
|
||||
usec_t time_now;
|
||||
Iterator i;
|
||||
|
|
@ -853,10 +650,6 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) {
|
|||
assert(link);
|
||||
assert(rt);
|
||||
|
||||
r = sd_ndisc_router_get_address(rt, &router);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get router address from RA: %m");
|
||||
|
||||
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
|
||||
|
|
@ -870,7 +663,6 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) {
|
|||
return log_link_error_errno(link, n, "Failed to get RDNSS addresses: %m");
|
||||
|
||||
SET_FOREACH(rdnss, link->ndisc_rdnss, i)
|
||||
if (IN6_ARE_ADDR_EQUAL(&rdnss->router, &router))
|
||||
rdnss->marked = true;
|
||||
|
||||
if (lifetime == 0)
|
||||
|
|
@ -890,7 +682,6 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) {
|
|||
rdnss = set_get(link->ndisc_rdnss, &d);
|
||||
if (rdnss) {
|
||||
rdnss->marked = false;
|
||||
rdnss->router = router;
|
||||
rdnss->valid_until = time_now + lifetime * USEC_PER_SEC;
|
||||
continue;
|
||||
}
|
||||
|
|
@ -901,7 +692,6 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) {
|
|||
|
||||
*x = (NDiscRDNSS) {
|
||||
.address = a[j],
|
||||
.router = router,
|
||||
.valid_until = time_now + lifetime * USEC_PER_SEC,
|
||||
};
|
||||
|
||||
|
|
@ -931,7 +721,6 @@ DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(
|
|||
|
||||
static int ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
|
||||
_cleanup_strv_free_ char **l = NULL;
|
||||
struct in6_addr router;
|
||||
uint32_t lifetime;
|
||||
usec_t time_now;
|
||||
NDiscDNSSL *dnssl;
|
||||
|
|
@ -942,10 +731,6 @@ static int ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
|
|||
assert(link);
|
||||
assert(rt);
|
||||
|
||||
r = sd_ndisc_router_get_address(rt, &router);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get router address from RA: %m");
|
||||
|
||||
r = sd_ndisc_router_get_timestamp(rt, clock_boottime_or_monotonic(), &time_now);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get RA timestamp: %m");
|
||||
|
|
@ -959,7 +744,6 @@ static int ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
|
|||
return log_link_error_errno(link, r, "Failed to get DNSSL addresses: %m");
|
||||
|
||||
SET_FOREACH(dnssl, link->ndisc_dnssl, i)
|
||||
if (IN6_ARE_ADDR_EQUAL(&dnssl->router, &router))
|
||||
dnssl->marked = true;
|
||||
|
||||
if (lifetime == 0)
|
||||
|
|
@ -983,12 +767,10 @@ static int ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) {
|
|||
dnssl = set_get(link->ndisc_dnssl, s);
|
||||
if (dnssl) {
|
||||
dnssl->marked = false;
|
||||
dnssl->router = router;
|
||||
dnssl->valid_until = time_now + lifetime * USEC_PER_SEC;
|
||||
continue;
|
||||
}
|
||||
|
||||
s->router = router;
|
||||
s->valid_until = time_now + lifetime * USEC_PER_SEC;
|
||||
|
||||
r = set_ensure_consume(&link->ndisc_dnssl, &ndisc_dnssl_hash_ops, TAKE_PTR(s));
|
||||
|
|
@ -1083,11 +865,9 @@ static int ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
|
|||
}
|
||||
|
||||
static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
|
||||
struct in6_addr router;
|
||||
Address *address;
|
||||
Route *route;
|
||||
uint64_t flags;
|
||||
NDiscAddress *na;
|
||||
NDiscRoute *nr;
|
||||
Iterator i;
|
||||
int r;
|
||||
|
||||
assert(link);
|
||||
|
|
@ -1100,17 +880,17 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
|
|||
|
||||
link_dirty(link);
|
||||
|
||||
r = sd_ndisc_router_get_address(rt, &router);
|
||||
while ((address = set_steal_first(link->ndisc_addresses))) {
|
||||
r = set_ensure_put(&link->ndisc_addresses_old, &address_hash_ops, address);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to get router address from RA: %m");
|
||||
return log_link_error_errno(link, r, "Failed to store old NDisc SLAAC address: %m");
|
||||
}
|
||||
|
||||
SET_FOREACH(na, link->ndisc_addresses, i)
|
||||
if (IN6_ARE_ADDR_EQUAL(&na->router, &router))
|
||||
na->marked = true;
|
||||
|
||||
SET_FOREACH(nr, link->ndisc_routes, i)
|
||||
if (IN6_ARE_ADDR_EQUAL(&nr->router, &router))
|
||||
nr->marked = true;
|
||||
while ((route = set_steal_first(link->ndisc_routes))) {
|
||||
r = set_ensure_put(&link->ndisc_routes_old, &route_hash_ops, route);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Failed to store old NDisc route: %m");
|
||||
}
|
||||
|
||||
r = sd_ndisc_router_get_flags(rt, &flags);
|
||||
if (r < 0)
|
||||
|
|
@ -1153,7 +933,7 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
|
|||
else
|
||||
log_link_debug(link, "Setting NDisc routes.");
|
||||
|
||||
r = ndisc_remove_old(link);
|
||||
r = ndisc_remove_old(link, false);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "conf-parser.h"
|
||||
#include "networkd-address.h"
|
||||
#include "networkd-link.h"
|
||||
#include "networkd-route.h"
|
||||
#include "time-util.h"
|
||||
|
||||
typedef struct IPv6Token IPv6Token;
|
||||
|
|
@ -25,24 +23,9 @@ typedef enum IPv6AcceptRAStartDHCP6Client {
|
|||
_IPV6_ACCEPT_RA_START_DHCP6_CLIENT_INVALID = -1,
|
||||
} IPv6AcceptRAStartDHCP6Client;
|
||||
|
||||
typedef struct NDiscAddress {
|
||||
/* Used when GC'ing old DNS servers when configuration changes. */
|
||||
bool marked;
|
||||
struct in6_addr router;
|
||||
Address *address;
|
||||
} NDiscAddress;
|
||||
|
||||
typedef struct NDiscRoute {
|
||||
/* Used when GC'ing old DNS servers when configuration changes. */
|
||||
bool marked;
|
||||
struct in6_addr router;
|
||||
Route *route;
|
||||
} NDiscRoute;
|
||||
|
||||
typedef struct NDiscRDNSS {
|
||||
/* Used when GC'ing old DNS servers when configuration changes. */
|
||||
bool marked;
|
||||
struct in6_addr router;
|
||||
usec_t valid_until;
|
||||
struct in6_addr address;
|
||||
} NDiscRDNSS;
|
||||
|
|
@ -50,7 +33,6 @@ typedef struct NDiscRDNSS {
|
|||
typedef struct NDiscDNSSL {
|
||||
/* Used when GC'ing old domains when configuration changes. */
|
||||
bool marked;
|
||||
struct in6_addr router;
|
||||
usec_t valid_until;
|
||||
/* The domain name follows immediately. */
|
||||
} NDiscDNSSL;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#include "netlink-util.h"
|
||||
#include "networkd-ipv4ll.h"
|
||||
#include "networkd-manager.h"
|
||||
#include "networkd-ndisc.h"
|
||||
#include "networkd-route.h"
|
||||
#include "parse-util.h"
|
||||
#include "set.h"
|
||||
|
|
@ -143,9 +142,6 @@ void route_free(Route *route) {
|
|||
network_config_section_free(route->section);
|
||||
|
||||
if (route->link) {
|
||||
NDiscRoute *n;
|
||||
Iterator i;
|
||||
|
||||
set_remove(route->link->routes, route);
|
||||
set_remove(route->link->routes_foreign, route);
|
||||
set_remove(route->link->dhcp_routes, route);
|
||||
|
|
@ -154,9 +150,8 @@ void route_free(Route *route) {
|
|||
set_remove(route->link->dhcp6_routes_old, route);
|
||||
set_remove(route->link->dhcp6_pd_routes, route);
|
||||
set_remove(route->link->dhcp6_pd_routes_old, route);
|
||||
SET_FOREACH(n, route->link->ndisc_routes, i)
|
||||
if (n->route == route)
|
||||
free(set_remove(route->link->ndisc_routes, n));
|
||||
set_remove(route->link->ndisc_routes, route);
|
||||
set_remove(route->link->ndisc_routes_old, route);
|
||||
}
|
||||
|
||||
ordered_set_free_free(route->multipath_routes);
|
||||
|
|
@ -166,7 +161,7 @@ void route_free(Route *route) {
|
|||
free(route);
|
||||
}
|
||||
|
||||
void route_hash_func(const Route *route, struct siphash *state) {
|
||||
static void route_hash_func(const Route *route, struct siphash *state) {
|
||||
assert(route);
|
||||
|
||||
siphash24_compress(&route->family, sizeof(route->family), state);
|
||||
|
|
@ -201,7 +196,7 @@ void route_hash_func(const Route *route, struct siphash *state) {
|
|||
}
|
||||
}
|
||||
|
||||
int route_compare_func(const Route *a, const Route *b) {
|
||||
static int route_compare_func(const Route *a, const Route *b) {
|
||||
int r;
|
||||
|
||||
r = CMP(a->family, b->family);
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@ struct Route {
|
|||
LIST_FIELDS(Route, routes);
|
||||
};
|
||||
|
||||
void route_hash_func(const Route *route, struct siphash *state);
|
||||
int route_compare_func(const Route *a, const Route *b);
|
||||
extern const struct hash_ops route_hash_ops;
|
||||
|
||||
int route_new(Route **ret);
|
||||
|
|
|
|||
|
|
@ -1275,15 +1275,9 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
|
|||
_cleanup_free_ uint8_t *array = NULL;
|
||||
size_t allocated;
|
||||
|
||||
if (eq && streq(eq, "all")) {
|
||||
r = numa_mask_add_all(&nodes);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to create NUMA mask representing \"all\" NUMA nodes: %m");
|
||||
} else {
|
||||
r = parse_cpu_set(eq, &nodes);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to parse %s value: %s", field, eq);
|
||||
}
|
||||
|
||||
r = cpu_set_to_dbus(&nodes, &array, &allocated);
|
||||
if (r < 0)
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ int cpu_set_realloc(CPUSet *cpu_set, unsigned ncpus) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int cpu_set_add(CPUSet *cpu_set, unsigned cpu) {
|
||||
static int cpu_set_add(CPUSet *cpu_set, unsigned cpu) {
|
||||
int r;
|
||||
|
||||
if (cpu >= 8192)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ static inline void cpu_set_reset(CPUSet *a) {
|
|||
}
|
||||
|
||||
int cpu_set_add_all(CPUSet *a, const CPUSet *b);
|
||||
int cpu_set_add(CPUSet *a, unsigned cpu);
|
||||
|
||||
char* cpu_set_to_string(const CPUSet *a);
|
||||
char *cpu_set_to_range_string(const CPUSet *a);
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
|
||||
#include "alloc-util.h"
|
||||
#include "cpu-set-util.h"
|
||||
#include "dirent-util.h"
|
||||
#include "fd-util.h"
|
||||
#include "fileio.h"
|
||||
#include "macro.h"
|
||||
#include "missing_syscall.h"
|
||||
|
|
@ -126,61 +124,6 @@ int numa_to_cpu_set(const NUMAPolicy *policy, CPUSet *ret) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int numa_max_node(void) {
|
||||
_cleanup_closedir_ DIR *d = NULL;
|
||||
struct dirent *de;
|
||||
int r, max_node = 0;
|
||||
|
||||
d = opendir("/sys/devices/system/node");
|
||||
if (!d)
|
||||
return -errno;
|
||||
|
||||
FOREACH_DIRENT(de, d, break) {
|
||||
int node;
|
||||
const char *n;
|
||||
|
||||
(void) dirent_ensure_type(d, de);
|
||||
|
||||
if (de->d_type != DT_DIR)
|
||||
continue;
|
||||
|
||||
n = startswith(de->d_name, "node");
|
||||
if (!n)
|
||||
continue;
|
||||
|
||||
r = safe_atoi(n, &node);
|
||||
if (r < 0)
|
||||
continue;
|
||||
|
||||
if (node > max_node)
|
||||
max_node = node;
|
||||
}
|
||||
|
||||
return max_node;
|
||||
}
|
||||
|
||||
int numa_mask_add_all(CPUSet *mask) {
|
||||
int m;
|
||||
|
||||
assert(mask);
|
||||
|
||||
m = numa_max_node();
|
||||
if (m < 0) {
|
||||
log_debug_errno(m, "Failed to determine maximum NUMA node index, assuming 1023: %m");
|
||||
m = 1023; /* CONFIG_NODES_SHIFT is set to 10 on x86_64, i.e. 1024 NUMA nodes in total */
|
||||
}
|
||||
|
||||
for (int i = 0; i <= m; i++) {
|
||||
int r;
|
||||
|
||||
r = cpu_set_add(mask, i);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char* const mpol_table[] = {
|
||||
[MPOL_DEFAULT] = "default",
|
||||
[MPOL_PREFERRED] = "preferred",
|
||||
|
|
|
|||
|
|
@ -29,7 +29,5 @@ static inline void numa_policy_reset(NUMAPolicy *p) {
|
|||
int apply_numa_policy(const NUMAPolicy *policy);
|
||||
int numa_to_cpu_set(const NUMAPolicy *policy, CPUSet *set);
|
||||
|
||||
int numa_mask_add_all(CPUSet *mask);
|
||||
|
||||
const char* mpol_to_string(int i) _const_;
|
||||
int mpol_from_string(const char *s) _pure_;
|
||||
|
|
|
|||
Loading…
Reference in New Issue