From: Pavel Begunkov <asml.silence@gmail.com>
To: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
linux-kernel@vger.kernel.org,
Pavel Begunkov <asml.silence@gmail.com>
Subject: [PATCH net-next v3 04/10] udp/ipv6: optimise udpv6_sendmsg() daddr checks
Date: Fri, 13 May 2022 16:26:09 +0100 [thread overview]
Message-ID: <96848ef2c22f73cd819c719fec0ce7a608d1c93e.1652368648.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1652368648.git.asml.silence@gmail.com>
All paths taking udpv6_sendmsg() to the ipv6_addr_v4mapped() check set a
non zero daddr, we can safely kill the NULL check just before it.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
net/ipv6/udp.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e0b1bea998ce..8a37e2d7b14b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1386,19 +1386,18 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
daddr = &sk->sk_v6_daddr;
}
- if (daddr) {
- if (ipv6_addr_v4mapped(daddr)) {
- struct sockaddr_in sin;
- sin.sin_family = AF_INET;
- sin.sin_port = sin6 ? sin6->sin6_port : inet->inet_dport;
- sin.sin_addr.s_addr = daddr->s6_addr32[3];
- msg->msg_name = &sin;
- msg->msg_namelen = sizeof(sin);
+ if (ipv6_addr_v4mapped(daddr)) {
+ struct sockaddr_in sin;
+
+ sin.sin_family = AF_INET;
+ sin.sin_port = sin6 ? sin6->sin6_port : inet->inet_dport;
+ sin.sin_addr.s_addr = daddr->s6_addr32[3];
+ msg->msg_name = &sin;
+ msg->msg_namelen = sizeof(sin);
do_udp_sendmsg:
- if (ipv6_only_sock(sk))
- return -ENETUNREACH;
- return udp_sendmsg(sk, msg, len);
- }
+ if (ipv6_only_sock(sk))
+ return -ENETUNREACH;
+ return udp_sendmsg(sk, msg, len);
}
ulen += sizeof(struct udphdr);
--
2.36.0
next prev parent reply other threads:[~2022-05-13 15:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 15:26 [PATCH net-next v3 00/10] UDP/IPv6 refactoring Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 01/10] ipv6: optimise ipcm6 cookie init Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 02/10] udp/ipv6: move pending section of udpv6_sendmsg Pavel Begunkov
2022-05-16 13:11 ` Paolo Abeni
2022-05-16 20:09 ` Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 03/10] udp/ipv6: prioritise the ip6 path over ip4 checks Pavel Begunkov
2022-05-16 13:14 ` Paolo Abeni
2022-05-16 20:10 ` Pavel Begunkov
2022-05-13 15:26 ` Pavel Begunkov [this message]
2022-05-13 15:26 ` [PATCH net-next v3 05/10] udp/ipv6: optimise out daddr reassignment Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 06/10] udp/ipv6: clean up udpv6_sendmsg's saddr init Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 07/10] ipv6: partially inline fl6_update_dst() Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 08/10] ipv6: refactor opts push in __ip6_make_skb() Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 09/10] ipv6: improve opt-less __ip6_make_skb() Pavel Begunkov
2022-05-13 15:26 ` [PATCH net-next v3 10/10] ipv6: clean up ip6_setup_cork Pavel Begunkov
2022-05-16 13:48 ` [PATCH net-next v3 00/10] UDP/IPv6 refactoring Paolo Abeni
2022-05-16 14:47 ` David Ahern
2022-05-16 20:48 ` Pavel Begunkov
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=96848ef2c22f73cd819c719fec0ce7a608d1c93e.1652368648.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@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.
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).