From: Paolo Abeni <pabeni@redhat.com>
To: Kuniyuki Iwashima <kuniyu@amazon.com>,
"David S. Miller" <davem@davemloft.net>,
David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>
Cc: Simon Horman <horms@kernel.org>,
Kuniyuki Iwashima <kuni1840@gmail.com>,
netdev@vger.kernel.org
Subject: Re: [PATCH RESEND v2 net-next 10/14] ipv6: Factorise ip6_route_multipath_add().
Date: Wed, 16 Apr 2025 11:57:23 +0200 [thread overview]
Message-ID: <c9bee472-c94e-4878-8cc2-1512b2c54db5@redhat.com> (raw)
In-Reply-To: <20250414181516.28391-11-kuniyu@amazon.com>
On 4/14/25 8:14 PM, Kuniyuki Iwashima wrote:
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index 49eea7e1e2da..c026f8fe5f78 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -5315,29 +5315,131 @@ struct rt6_nh {
> struct fib6_info *fib6_info;
> struct fib6_config r_cfg;
> struct list_head next;
> + int weight;
> };
>
> -static int ip6_route_info_append(struct list_head *rt6_nh_list,
> - struct fib6_info *rt,
> - struct fib6_config *r_cfg)
> +static void ip6_route_mpath_info_cleanup(struct list_head *rt6_nh_list)
> {
> - struct rt6_nh *nh;
> - int err = -EEXIST;
> + struct rt6_nh *nh, *nh_next;
>
> - list_for_each_entry(nh, rt6_nh_list, next) {
> - /* check if fib6_info already exists */
> - if (rt6_duplicate_nexthop(nh->fib6_info, rt))
> - return err;
> + list_for_each_entry_safe(nh, nh_next, rt6_nh_list, next) {
> + struct fib6_info *rt = nh->fib6_info;
> +
> + if (rt) {
> + free_percpu(rt->fib6_nh->nh_common.nhc_pcpu_rth_output);
> + free_percpu(rt->fib6_nh->rt6i_pcpu);
> + ip_fib_metrics_put(rt->fib6_metrics);
> + kfree(rt);
> + }
> +
> + list_del(&nh->next);
Somewhat unrelated, but the field 'next' has IMHO a quite misleading
name, and it would be great to rename it to something else ('list'),
could you please consider including such change?
Thanks,
Paolo
next prev parent reply other threads:[~2025-04-16 9:57 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 18:14 [PATCH RESEND v2 net-next 00/14] ipv6: No RTNL for IPv6 routing table Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 01/14] ipv6: Validate RTA_GATEWAY of RTA_MULTIPATH in rtm_to_fib6_config() Kuniyuki Iwashima
2025-04-16 8:22 ` Paolo Abeni
2025-04-17 17:53 ` Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 02/14] ipv6: Get rid of RTNL for SIOCDELRT and RTM_DELROUTE Kuniyuki Iwashima
2025-04-16 8:49 ` Paolo Abeni
2025-04-16 18:45 ` Kuniyuki Iwashima
2025-04-17 6:46 ` Paolo Abeni
2025-04-17 17:45 ` Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 03/14] ipv6: Move some validation from ip6_route_info_create() to rtm_to_fib6_config() Kuniyuki Iwashima
2025-04-16 8:54 ` Paolo Abeni
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 04/14] ipv6: Check GATEWAY in rtm_to_fib6_multipath_config() Kuniyuki Iwashima
2025-04-16 9:06 ` Paolo Abeni
2025-04-16 18:48 ` Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 05/14] ipv6: Move nexthop_find_by_id() after fib6_info_alloc() Kuniyuki Iwashima
2025-04-16 9:13 ` Paolo Abeni
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 06/14] ipv6: Split ip6_route_info_create() Kuniyuki Iwashima
2025-04-16 9:12 ` Paolo Abeni
2025-04-16 18:50 ` Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 07/14] ipv6: Preallocate rt->fib6_nh->rt6i_pcpu in ip6_route_info_create() Kuniyuki Iwashima
2025-04-16 9:21 ` Paolo Abeni
2025-04-16 9:37 ` Paolo Abeni
2025-04-16 18:55 ` Kuniyuki Iwashima
2025-04-16 9:23 ` Paolo Abeni
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 08/14] ipv6: Preallocate nhc_pcpu_rth_output " Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 09/14] ipv6: Don't pass net to ip6_route_info_append() Kuniyuki Iwashima
2025-04-16 9:39 ` Paolo Abeni
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 10/14] ipv6: Factorise ip6_route_multipath_add() Kuniyuki Iwashima
2025-04-16 9:57 ` Paolo Abeni [this message]
2025-04-16 18:58 ` Kuniyuki Iwashima
2025-04-14 18:14 ` [PATCH RESEND v2 net-next 11/14] ipv6: Protect fib6_link_table() with spinlock Kuniyuki Iwashima
2025-04-16 10:00 ` Paolo Abeni
2025-04-14 18:15 ` [PATCH RESEND v2 net-next 12/14] ipv6: Defer fib6_purge_rt() in fib6_add_rt2node() to fib6_add() Kuniyuki Iwashima
2025-04-16 13:59 ` Paolo Abeni
2025-04-14 18:15 ` [PATCH RESEND v2 net-next 13/14] ipv6: Protect nh->f6i_list with spinlock and flag Kuniyuki Iwashima
2025-04-16 15:17 ` Paolo Abeni
2025-04-16 19:02 ` Kuniyuki Iwashima
2025-04-14 18:15 ` [PATCH RESEND v2 net-next 14/14] ipv6: Get rid of RTNL for SIOCADDRT and RTM_NEWROUTE Kuniyuki Iwashima
2025-04-16 15:26 ` Paolo Abeni
2025-04-16 19:04 ` Kuniyuki Iwashima
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=c9bee472-c94e-4878-8cc2-1512b2c54db5@redhat.com \
--to=pabeni@redhat.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=kuniyu@amazon.com \
--cc=netdev@vger.kernel.org \
/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.
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 NNTP newsgroup(s).