From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Cc: Callum Parsey <callum@neoninteger.au>,
me@yawnt.com, David Gibson <david@gibson.dropbear.id.au>,
lemmi@nerd2nerd.org
Subject: [PATCH 08/10] netlink: Add functionality to copy addresses from outer namespace
Date: Sun, 14 May 2023 20:14:13 +0200 [thread overview]
Message-ID: <20230514181415.313420-9-sbrivio@redhat.com> (raw)
In-Reply-To: <20230514181415.313420-1-sbrivio@redhat.com>
Similarly to what we've just done with routes, support NL_DUP for
addresses (currently not exposed): nl_addr() can optionally copy
mulitple addresses to the target namespace, by fixing up data from
the dump with appropriate flags and interface index, and repeating
it back to the kernel on the socket opened in the target namespace.
Link-local addresses are not copied: the family is set to AF_UNSPEC,
which means the kernel will ignore them. Same for addresses from a
mismatching address (pre-4.19 kernels without support for
NETLINK_GET_STRICT_CHK).
Ignore IFA_LABEL attributes by changing their type to IFA_UNSPEC,
because in general they will report mismatching names, and we don't
really need to use labels as we already know the interface index.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
conf.c | 8 ++++---
netlink.c | 62 +++++++++++++++++++++++++++++++++++++++++--------------
netlink.h | 4 ++--
pasta.c | 8 +++----
4 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/conf.c b/conf.c
index 76d5f41..1b6cda0 100644
--- a/conf.c
+++ b/conf.c
@@ -645,8 +645,10 @@ static unsigned int conf_ip4(unsigned int ifi,
if (IN4_IS_ADDR_UNSPECIFIED(&ip4->gw))
nl_route(NL_GET, ifi, 0, AF_INET, &ip4->gw);
- if (IN4_IS_ADDR_UNSPECIFIED(&ip4->addr))
- nl_addr(0, ifi, AF_INET, &ip4->addr, &ip4->prefix_len, NULL);
+ if (IN4_IS_ADDR_UNSPECIFIED(&ip4->addr)) {
+ nl_addr(NL_GET, ifi, 0, AF_INET,
+ &ip4->addr, &ip4->prefix_len, NULL);
+ }
if (!ip4->prefix_len) {
in_addr_t addr = ntohl(ip4->addr.s_addr);
@@ -696,7 +698,7 @@ static unsigned int conf_ip6(unsigned int ifi,
if (IN6_IS_ADDR_UNSPECIFIED(&ip6->gw))
nl_route(NL_GET, ifi, 0, AF_INET6, &ip6->gw);
- nl_addr(0, ifi, AF_INET6,
+ nl_addr(NL_GET, ifi, 0, AF_INET6,
IN6_IS_ADDR_UNSPECIFIED(&ip6->addr) ? &ip6->addr : NULL,
&prefix_len, &ip6->addr_ll);
diff --git a/netlink.c b/netlink.c
index 0ff94ae..70218cd 100644
--- a/netlink.c
+++ b/netlink.c
@@ -322,19 +322,18 @@ next:
}
/**
- * nl_addr() - Get/set IP addresses
- * @ns: Use netlink socket in namespace
- * @ifi: Interface index
+ * nl_addr() - Get/set/copy IP addresses for given interface and address family
+ * @op: Requested operation
+ * @ifi: Interface index in outer network namespace
+ * @ifi_ns: Interface index in target namespace for NL_SET, NL_DUP
* @af: Address family
- * @addr: Global address to fill if zero, to set if not, ignored if NULL
+ * @addr: Global address to fill on NL_GET, to set on NL_SET
* @prefix_len: Mask or prefix length, set or fetched (for IPv4)
- * @addr_l: Link-scoped address to fill, NULL if not requested
+ * @addr_l: Link-scoped address to fill on NL_GET
*/
-void nl_addr(int ns, unsigned int ifi, sa_family_t af,
- void *addr, int *prefix_len, void *addr_l)
+void nl_addr(enum nl_op op, unsigned int ifi, unsigned int ifi_ns,
+ sa_family_t af, void *addr, int *prefix_len, void *addr_l)
{
- int set = addr && ((af == AF_INET6 && !IN6_IS_ADDR_UNSPECIFIED(addr)) ||
- (af == AF_INET && *(uint32_t *)addr));
struct req_t {
struct nlmsghdr nlh;
struct ifaddrmsg ifa;
@@ -353,23 +352,23 @@ void nl_addr(int ns, unsigned int ifi, sa_family_t af,
} a6;
} set;
} req = {
- .nlh.nlmsg_type = set ? RTM_NEWADDR : RTM_GETADDR,
+ .nlh.nlmsg_type = op == NL_SET ? RTM_NEWADDR : RTM_GETADDR,
.nlh.nlmsg_flags = NLM_F_REQUEST,
.nlh.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg)),
.nlh.nlmsg_seq = nl_seq++,
.ifa.ifa_family = af,
.ifa.ifa_index = ifi,
- .ifa.ifa_prefixlen = *prefix_len,
+ .ifa.ifa_prefixlen = op == NL_SET ? *prefix_len : 0,
};
+ ssize_t n, nlmsgs_size;
struct ifaddrmsg *ifa;
struct nlmsghdr *nh;
struct rtattr *rta;
char buf[NLBUFSIZ];
- ssize_t n;
size_t na;
- if (set) {
+ if (op == NL_SET) {
if (af == AF_INET6) {
size_t rta_len = RTA_LENGTH(sizeof(req.set.a6.l));
@@ -404,21 +403,47 @@ void nl_addr(int ns, unsigned int ifi, sa_family_t af,
req.nlh.nlmsg_flags |= NLM_F_DUMP;
}
- if ((n = nl_req(ns, buf, &req, req.nlh.nlmsg_len)) < 0 || set)
+ if ((n = nl_req(op == NL_SET, buf, &req, req.nlh.nlmsg_len)) < 0)
+ return;
+
+ if (op == NL_SET)
return;
nh = (struct nlmsghdr *)buf;
+ nlmsgs_size = n;
+
for ( ; NLMSG_OK(nh, n); nh = NLMSG_NEXT(nh, n)) {
if (nh->nlmsg_type != RTM_NEWADDR)
goto next;
+ if (op == NL_DUP) {
+ nh->nlmsg_seq = nl_seq++;
+ nh->nlmsg_pid = 0;
+ nh->nlmsg_flags &= ~NLM_F_DUMP_FILTERED;
+ nh->nlmsg_flags |= NLM_F_REQUEST | NLM_F_ACK |
+ NLM_F_CREATE;
+ }
+
ifa = (struct ifaddrmsg *)NLMSG_DATA(nh);
+
+ if (op == NL_DUP && (ifa->ifa_scope == RT_SCOPE_LINK ||
+ ifa->ifa_index != ifi)) {
+ ifa->ifa_family = AF_UNSPEC;
+ goto next;
+ }
+
if (ifa->ifa_index != ifi)
goto next;
+ if (op == NL_DUP)
+ ifa->ifa_index = ifi_ns;
+
for (rta = IFA_RTA(ifa), na = RTM_PAYLOAD(nh); RTA_OK(rta, na);
rta = RTA_NEXT(rta, na)) {
- if (rta->rta_type != IFA_ADDRESS)
+ if (op == NL_DUP && rta->rta_type == IFA_LABEL)
+ rta->rta_type = IFA_UNSPEC;
+
+ if (op == NL_DUP || rta->rta_type != IFA_ADDRESS)
continue;
if (af == AF_INET && addr && !*(uint32_t *)addr) {
@@ -439,6 +464,13 @@ next:
if (nh->nlmsg_type == NLMSG_DONE)
break;
}
+
+ if (op == NL_DUP) {
+ char resp[NLBUFSIZ];
+
+ nh = (struct nlmsghdr *)buf;
+ nl_req(1, resp, nh, nlmsgs_size);
+ }
}
/**
diff --git a/netlink.h b/netlink.h
index 217cf1e..cd0e666 100644
--- a/netlink.h
+++ b/netlink.h
@@ -16,8 +16,8 @@ void nl_sock_init(const struct ctx *c, bool ns);
unsigned int nl_get_ext_if(sa_family_t af);
void nl_route(enum nl_op op, unsigned int ifi, unsigned int ifi_ns,
sa_family_t af, void *gw);
-void nl_addr(int ns, unsigned int ifi, sa_family_t af,
- void *addr, int *prefix_len, void *addr_l);
+void nl_addr(enum nl_op op, unsigned int ifi, unsigned int ifi_ns,
+ sa_family_t af, void *addr, int *prefix_len, void *addr_l);
void nl_link(int ns, unsigned int ifi, void *mac, int up, int mtu);
#endif /* NETLINK_H */
diff --git a/pasta.c b/pasta.c
index 120cc1e..749fd11 100644
--- a/pasta.c
+++ b/pasta.c
@@ -273,16 +273,16 @@ void pasta_ns_conf(struct ctx *c)
nl_link(1, c->pasta_ifi, c->mac_guest, 1, c->mtu);
if (c->ifi4) {
- nl_addr(1, c->pasta_ifi, AF_INET, &c->ip4.addr,
- &c->ip4.prefix_len, NULL);
+ nl_addr(NL_SET, c->ifi4, c->pasta_ifi, AF_INET,
+ &c->ip4.addr, &c->ip4.prefix_len, NULL);
nl_route(op_routes, c->ifi4, c->pasta_ifi, AF_INET,
&c->ip4.gw);
}
if (c->ifi6) {
int prefix_len = 64;
- nl_addr(1, c->pasta_ifi, AF_INET6, &c->ip6.addr,
- &prefix_len, NULL);
+ nl_addr(NL_SET, c->ifi6, c->pasta_ifi, AF_INET6,
+ &c->ip6.addr, &prefix_len, NULL);
nl_route(op_routes, c->ifi6, c->pasta_ifi, AF_INET6,
&c->ip6.gw);
}
--
@@ -273,16 +273,16 @@ void pasta_ns_conf(struct ctx *c)
nl_link(1, c->pasta_ifi, c->mac_guest, 1, c->mtu);
if (c->ifi4) {
- nl_addr(1, c->pasta_ifi, AF_INET, &c->ip4.addr,
- &c->ip4.prefix_len, NULL);
+ nl_addr(NL_SET, c->ifi4, c->pasta_ifi, AF_INET,
+ &c->ip4.addr, &c->ip4.prefix_len, NULL);
nl_route(op_routes, c->ifi4, c->pasta_ifi, AF_INET,
&c->ip4.gw);
}
if (c->ifi6) {
int prefix_len = 64;
- nl_addr(1, c->pasta_ifi, AF_INET6, &c->ip6.addr,
- &prefix_len, NULL);
+ nl_addr(NL_SET, c->ifi6, c->pasta_ifi, AF_INET6,
+ &c->ip6.addr, &prefix_len, NULL);
nl_route(op_routes, c->ifi6, c->pasta_ifi, AF_INET6,
&c->ip6.gw);
}
--
2.39.2
next prev parent reply other threads:[~2023-05-14 18:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-14 18:14 [PATCH 00/10] RFC/RFT: Optionally copy all routes and addresses for pasta, allow gateway-less routes Stefano Brivio
2023-05-14 18:14 ` [PATCH 01/10] netlink: Fix comment about response buffer size for nl_req() Stefano Brivio
2023-05-16 3:23 ` David Gibson
2023-05-14 18:14 ` [PATCH 02/10] pasta: Improve error handling on failure to join network namespace Stefano Brivio
2023-05-16 3:24 ` David Gibson
2023-05-14 18:14 ` [PATCH 03/10] netlink: Add functionality to copy routes from outer namespace Stefano Brivio
2023-05-14 18:14 ` [PATCH 04/10] conf: --config-net option is for pasta mode only Stefano Brivio
2023-05-16 3:59 ` David Gibson
2023-05-14 18:14 ` [PATCH 05/10] conf, pasta: With --config-net, copy all routes by default Stefano Brivio
2023-05-14 18:14 ` [PATCH 06/10] Revert "conf: Adjust netmask on mismatch between IPv4 address/netmask and gateway" Stefano Brivio
2023-05-16 4:00 ` David Gibson
2023-05-14 18:14 ` [PATCH 07/10] conf: Don't exit if sourced default route has no gateway Stefano Brivio
2023-05-14 18:14 ` Stefano Brivio [this message]
2023-05-14 18:14 ` [PATCH 09/10] conf, pasta: With --config-net, copy all addresses by default Stefano Brivio
2023-05-14 18:14 ` [PATCH 10/10] passt.h: Fix description of pasta_ifi in struct ctx Stefano Brivio
2023-05-16 4:03 ` David Gibson
2023-05-16 5:06 ` [PATCH 00/10] RFC/RFT: Optionally copy all routes and addresses for pasta, allow gateway-less routes David Gibson
2023-05-16 21:42 ` Stefano Brivio
2023-05-17 1:15 ` David Gibson
2023-05-17 6:52 ` Stefano Brivio
2023-05-18 3:26 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230514181415.313420-9-sbrivio@redhat.com \
--to=sbrivio@redhat.com \
--cc=callum@neoninteger.au \
--cc=david@gibson.dropbear.id.au \
--cc=lemmi@nerd2nerd.org \
--cc=me@yawnt.com \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).