From: David Ahern <dsahern@gmail.com>
To: "Maciej Żenczykowski" <zenczykowski@gmail.com>,
"Maciej Żenczykowski" <maze@google.com>,
"David S . Miller" <davem@davemloft.net>
Cc: Linux Network Development Mailing List <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>,
Willem de Bruijn <willemb@google.com>,
Lorenzo Colitti <lorenzo@google.com>,
Sunmeet Gill <sgill@quicinc.com>,
Vinay Paradkar <vparadka@qti.qualcomm.com>,
Tyler Wear <twear@quicinc.com>, David Ahern <dsahern@kernel.org>
Subject: Re: [PATCH 1/2] net/ipv6: always honour route mtu during forwarding
Date: Thu, 8 Oct 2020 09:31:11 -0700 [thread overview]
Message-ID: <902c6608-dbf8-2ba9-4202-c43dac322b3e@gmail.com> (raw)
In-Reply-To: <20201008033102.623894-1-zenczykowski@gmail.com>
On 10/7/20 8:31 PM, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
>
> This matches the new ipv4 behaviour as of commit:
> commit 02a1b175b0e92d9e0fa5df3957ade8d733ceb6a0
> Author: Maciej Żenczykowski <maze@google.com>
> Date: Wed Sep 23 13:18:15 2020 -0700
>
> net/ipv4: always honour route mtu during forwarding
just summarize that as:
commit 02a1b175b0e9 ("net/ipv4: always honour route mtu during forwarding")
> diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
> index 2a5277758379..598415743f46 100644
> --- a/include/net/ip6_route.h
> +++ b/include/net/ip6_route.h
> @@ -311,19 +311,13 @@ static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info *
> static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst)
> {
> struct inet6_dev *idev;
> - unsigned int mtu;
> + unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
newline here for readability
> + if (mtu)
> + return mtu;
>
> - if (dst_metric_locked(dst, RTAX_MTU)) {
> - mtu = dst_metric_raw(dst, RTAX_MTU);
> - if (mtu)
> - return mtu;
> - }
> -
> - mtu = IPV6_MIN_MTU;
> rcu_read_lock();
> idev = __in6_dev_get(dst->dev);
> - if (idev)
> - mtu = idev->cnf.mtu6;
> + mtu = idev ? idev->cnf.mtu6 : IPV6_MIN_MTU;
> rcu_read_unlock();
>
> return mtu;
>
besides the nit comments, the change looks fine to me. Please add test
cases to tools/testing/selftests/net/pmtu.sh for this change.
prev parent reply other threads:[~2020-10-08 16:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 3:31 [PATCH 1/2] net/ipv6: always honour route mtu during forwarding Maciej Żenczykowski
2020-10-08 3:31 ` [PATCH 2/2] net/ipv6: ensure ip6_dst_mtu_forward() returns at least IPV6_MIN_MTU Maciej Żenczykowski
2020-10-08 6:04 ` [PATCH 1/2] net/ipv6: always honour route mtu during forwarding Lorenzo Colitti
2020-10-08 6:22 ` Maciej Żenczykowski
2020-10-08 16:31 ` David Ahern [this message]
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=902c6608-dbf8-2ba9-4202-c43dac322b3e@gmail.com \
--to=dsahern@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=lorenzo@google.com \
--cc=maze@google.com \
--cc=netdev@vger.kernel.org \
--cc=sgill@quicinc.com \
--cc=twear@quicinc.com \
--cc=vparadka@qti.qualcomm.com \
--cc=willemb@google.com \
--cc=zenczykowski@gmail.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.
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).