From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top, Paul Holzinger <pholzing@redhat.com>
Subject: Re: [PATCH 2/7] netlink, pasta: Split MTU setting functionality out of nl_link_up()
Date: Thu, 15 Aug 2024 12:41:16 +1000 [thread overview]
Message-ID: <Zr1qzPZiV059Q9Ei@zatzit.fritz.box> (raw)
In-Reply-To: <20240814225429.3707908-3-sbrivio@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 3846 bytes --]
On Thu, Aug 15, 2024 at 12:54:24AM +0200, Stefano Brivio wrote:
> As we'll use nl_link_up() for more than just bringing up devices, it
> will become awkward to carry empty MTU values around whenever we call
> it.
I prefer clearer single purpose functions too.
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
>
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
> ---
> netlink.c | 35 +++++++++++++++++++++++++----------
> netlink.h | 3 ++-
> pasta.c | 7 +++++--
> 3 files changed, 32 insertions(+), 13 deletions(-)
>
> diff --git a/netlink.c b/netlink.c
> index e6a315e..e33765e 100644
> --- a/netlink.c
> +++ b/netlink.c
> @@ -942,14 +942,14 @@ int nl_link_set_mac(int s, unsigned int ifi, const void *mac)
> }
>
> /**
> - * nl_link_up() - Bring link up
> + * nl_link_set_mtu() - Set link MTU
> * @s: Netlink socket
> * @ifi: Interface index
> - * @mtu: If non-zero, set interface MTU
> + * @mtu: Interface MTU
> *
> * Return: 0 on success, negative error code on failure
> */
> -int nl_link_up(int s, unsigned int ifi, int mtu)
> +int nl_link_set_mtu(int s, unsigned int ifi, int mtu)
> {
> struct req_t {
> struct nlmsghdr nlh;
> @@ -959,17 +959,32 @@ int nl_link_up(int s, unsigned int ifi, int mtu)
> } req = {
> .ifm.ifi_family = AF_UNSPEC,
> .ifm.ifi_index = ifi,
> - .ifm.ifi_flags = IFF_UP,
> - .ifm.ifi_change = IFF_UP,
> .rta.rta_type = IFLA_MTU,
> .rta.rta_len = RTA_LENGTH(sizeof(unsigned int)),
> .mtu = mtu,
> };
> - ssize_t len = sizeof(req);
>
> - if (!mtu)
> - /* Shorten request to drop MTU attribute */
> - len = offsetof(struct req_t, rta);
> + return nl_do(s, &req, RTM_NEWLINK, 0, sizeof(req));
> +}
> +
> +/**
> + * nl_link_up() - Bring link up
> + * @s: Netlink socket
> + * @ifi: Interface index
> + *
> + * Return: 0 on success, negative error code on failure
> + */
> +int nl_link_up(int s, unsigned int ifi)
> +{
> + struct req_t {
> + struct nlmsghdr nlh;
> + struct ifinfomsg ifm;
> + } req = {
> + .ifm.ifi_family = AF_UNSPEC,
> + .ifm.ifi_index = ifi,
> + .ifm.ifi_flags = IFF_UP,
> + .ifm.ifi_change = IFF_UP,
> + };
>
> - return nl_do(s, &req, RTM_NEWLINK, 0, len);
> + return nl_do(s, &req, RTM_NEWLINK, 0, sizeof(req));
> }
> diff --git a/netlink.h b/netlink.h
> index 3a1f0de..87d27ae 100644
> --- a/netlink.h
> +++ b/netlink.h
> @@ -23,6 +23,7 @@ int nl_addr_dup(int s_src, unsigned int ifi_src,
> int s_dst, unsigned int ifi_dst, sa_family_t af);
> int nl_link_get_mac(int s, unsigned int ifi, void *mac);
> int nl_link_set_mac(int s, unsigned int ifi, const void *mac);
> -int nl_link_up(int s, unsigned int ifi, int mtu);
> +int nl_link_set_mtu(int s, unsigned int ifi, int mtu);
> +int nl_link_up(int s, unsigned int ifi);
>
> #endif /* NETLINK_H */
> diff --git a/pasta.c b/pasta.c
> index 615ff7b..3a0652e 100644
> --- a/pasta.c
> +++ b/pasta.c
> @@ -288,7 +288,7 @@ void pasta_ns_conf(struct ctx *c)
> {
> int rc = 0;
>
> - rc = nl_link_up(nl_sock_ns, 1 /* lo */, 0);
> + rc = nl_link_up(nl_sock_ns, 1 /* lo */);
> if (rc < 0)
> die("Couldn't bring up loopback interface in namespace: %s",
> strerror(-rc));
> @@ -303,7 +303,10 @@ void pasta_ns_conf(struct ctx *c)
> strerror(-rc));
>
> if (c->pasta_conf_ns) {
> - nl_link_up(nl_sock_ns, c->pasta_ifi, c->mtu);
> + if (c->mtu != -1)
> + nl_link_set_mtu(nl_sock_ns, c->pasta_ifi, c->mtu);
> +
> + nl_link_up(nl_sock_ns, c->pasta_ifi);
>
> if (c->ifi4) {
> if (c->ip4.no_copy_addrs) {
--
David Gibson (he or they) | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you, not the other way
| around.
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-08-15 3:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 22:54 [PATCH 0/7] Prevent DAD for link-local addresses in containers Stefano Brivio
2024-08-14 22:54 ` [PATCH 1/7] netlink: Fix typo in function comment for nl_addr_get() Stefano Brivio
2024-08-15 2:39 ` David Gibson
2024-08-14 22:54 ` [PATCH 2/7] netlink, pasta: Split MTU setting functionality out of nl_link_up() Stefano Brivio
2024-08-15 2:41 ` David Gibson [this message]
2024-08-14 22:54 ` [PATCH 3/7] netlink, pasta: Turn nl_link_up() into a generic function to set link flags Stefano Brivio
2024-08-15 2:42 ` David Gibson
2024-08-14 22:54 ` [PATCH 4/7] netlink, pasta: Disable DAD for link-local addresses on namespace interface Stefano Brivio
2024-08-15 3:01 ` David Gibson
2024-08-15 6:52 ` Stefano Brivio
2024-08-14 22:54 ` [PATCH 5/7] netlink, pasta: Fetch link-local address from namespace interface once it's up Stefano Brivio
2024-08-15 3:04 ` David Gibson
2024-08-15 6:53 ` Stefano Brivio
2024-08-14 22:54 ` [PATCH 6/7] pasta: Disable neighbour solicitations on device up to prevent DAD Stefano Brivio
2024-08-15 3:06 ` David Gibson
2024-08-14 22:54 ` [PATCH 7/7] netlink: Fix typo in function comment for nl_addr_set() Stefano Brivio
2024-08-15 3:07 ` 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=Zr1qzPZiV059Q9Ei@zatzit.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=pholzing@redhat.com \
--cc=sbrivio@redhat.com \
/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).