From: Pavel Begunkov <asml.silence@gmail.com>
To: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
linux-kernel@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
Pavel Begunkov <asml.silence@gmail.com>
Subject: [PATCH net-next v2 03/10] ipv6: remove daddr temp buffer in __ip6_make_skb
Date: Thu, 27 Jan 2022 00:36:24 +0000 [thread overview]
Message-ID: <e622cbe82ae21b740cb818abc9f6efe02cb0dede.1643243772.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1643243772.git.asml.silence@gmail.com>
ipv6_push_nfrag_opts() doesn't change passed daddr, and so
__ip6_make_skb() doesn't actually need to keep an on-stack copy of
fl6->daddr. Set initially final_dst to fl6->daddr,
ipv6_push_nfrag_opts() will override it if needed, and get rid of extra
copies.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
net/ipv6/ip6_output.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 14d607ccfeea..4acd577d5ec5 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1843,7 +1843,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,
{
struct sk_buff *skb, *tmp_skb;
struct sk_buff **tail_skb;
- struct in6_addr final_dst_buf, *final_dst = &final_dst_buf;
+ struct in6_addr *final_dst;
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sock_net(sk);
struct ipv6hdr *hdr;
@@ -1873,9 +1873,9 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,
/* Allow local fragmentation. */
skb->ignore_df = ip6_sk_ignore_df(sk);
-
- *final_dst = fl6->daddr;
__skb_pull(skb, skb_network_header_len(skb));
+
+ final_dst = &fl6->daddr;
if (opt && opt->opt_flen)
ipv6_push_frag_opts(skb, opt, &proto);
if (opt && opt->opt_nflen)
@@ -1895,7 +1895,6 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,
skb->priority = sk->sk_priority;
skb->mark = cork->base.mark;
-
skb->tstamp = cork->base.transmit_time;
ip6_cork_steal_dst(skb, cork);
--
2.34.1
next prev parent reply other threads:[~2022-01-27 0:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 0:36 [PATCH net-next v2 00/10] udp/ipv6 optimisations Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 01/10] ipv6: optimise dst refcounting on skb init Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 02/10] udp6: shuffle up->pending AF_INET bits Pavel Begunkov
2022-01-27 0:36 ` Pavel Begunkov [this message]
2022-01-27 0:36 ` [PATCH net-next v2 04/10] ipv6: clean up cork setup/release Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 05/10] ipv6: don't zero inet_cork_full::fl after use Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 06/10] ipv6: pass full cork into __ip6_append_data() Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 07/10] udp6: pass flow in ip6_make_skb together with cork Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 08/10] udp6: don't make extra copies of iflow Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 09/10] ipv6: optimise dst refcounting on cork init Pavel Begunkov
2022-01-27 0:36 ` [PATCH net-next v2 10/10] ipv6: partially inline ipv6_fixup_options Pavel Begunkov
2022-01-27 15:17 ` [PATCH net-next v2 00/10] udp/ipv6 optimisations Willem de Bruijn
2022-01-28 4:20 ` patchwork-bot+netdevbpf
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=e622cbe82ae21b740cb818abc9f6efe02cb0dede.1643243772.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemdebruijn.kernel@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).