Commit b60d4e58 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski
Browse files

ipv6: remove daddr temp buffer in __ip6_make_skb 



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: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 406c4a0a

net/ipv6/ip6_output.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -1843,7 +1843,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, 
{

{

	struct sk_buff *skb, *tmp_skb;

	struct sk_buff *skb, *tmp_skb;

	struct sk_buff **tail_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 ipv6_pinfo *np = inet6_sk(sk);

	struct net *net = sock_net(sk);

	struct net *net = sock_net(sk);

	struct ipv6hdr *hdr;

	struct ipv6hdr *hdr;
@@ -1873,9 +1873,9 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, 




	/* Allow local fragmentation. */

	/* Allow local fragmentation. */

	skb->ignore_df = ip6_sk_ignore_df(sk);

	skb->ignore_df = ip6_sk_ignore_df(sk);



	*final_dst = fl6->daddr;

	__skb_pull(skb, skb_network_header_len(skb));

	__skb_pull(skb, skb_network_header_len(skb));



	final_dst = &fl6->daddr;

	if (opt && opt->opt_flen)

	if (opt && opt->opt_flen)

		ipv6_push_frag_opts(skb, opt, &proto);

		ipv6_push_frag_opts(skb, opt, &proto);

	if (opt && opt->opt_nflen)

	if (opt && opt->opt_nflen)
@@ -1895,7 +1895,6 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, 




	skb->priority = sk->sk_priority;

	skb->priority = sk->sk_priority;

	skb->mark = cork->base.mark;

	skb->mark = cork->base.mark;



	skb->tstamp = cork->base.transmit_time;

	skb->tstamp = cork->base.transmit_time;





	ip6_cork_steal_dst(skb, cork);

	ip6_cork_steal_dst(skb, cork);