Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6a7719a authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

ipv4: hash net ptr into fragmentation bucket selection 



As namespaces are sometimes used with overlapping ip address ranges,
we should also use the namespace as input to the hash to select the ip
fragmentation counter bucket.

Cc: Eric Dumazet <edumazet@google.com>
Cc: Flavio Leitner <fbl@redhat.com>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fa38a38

drivers/net/ppp/pptp.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) 
	nf_reset(skb);



	skb->ip_summed = CHECKSUM_NONE;

	ip_select_ident(skb, NULL);

	ip_select_ident(sock_net(sk), skb, NULL);

	ip_send_check(iph);



	ip_local_out(skb);

include/net/ip.h

+7 −5
Original line number Diff line number Diff line
@@ -318,9 +318,10 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb) 
}



u32 ip_idents_reserve(u32 hash, int segs);

void __ip_select_ident(struct iphdr *iph, int segs);

void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);



static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)

static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,

					struct sock *sk, int segs)

{

	struct iphdr *iph = ip_hdr(skb);
@@ -337,13 +338,14 @@ static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, in 
			iph->id = 0;

		}

	} else {

		__ip_select_ident(iph, segs);

		__ip_select_ident(net, iph, segs);

	}

}



static inline void ip_select_ident(struct sk_buff *skb, struct sock *sk)

static inline void ip_select_ident(struct net *net, struct sk_buff *skb,

				   struct sock *sk)

{

	ip_select_ident_segs(skb, sk, 1);

	ip_select_ident_segs(net, skb, sk, 1);

}



static inline __wsum inet_compute_pseudo(struct sk_buff *skb, int proto)

net/ipv4/igmp.c

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, unsigned int mtu) 
	pip->saddr    = fl4.saddr;

	pip->protocol = IPPROTO_IGMP;

	pip->tot_len  = 0;	/* filled in later */

	ip_select_ident(skb, NULL);

	ip_select_ident(net, skb, NULL);

	((u8 *)&pip[1])[0] = IPOPT_RA;

	((u8 *)&pip[1])[1] = 4;

	((u8 *)&pip[1])[2] = 0;
@@ -714,7 +714,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, 
	iph->daddr    = dst;

	iph->saddr    = fl4.saddr;

	iph->protocol = IPPROTO_IGMP;

	ip_select_ident(skb, NULL);

	ip_select_ident(net, skb, NULL);

	((u8 *)&iph[1])[0] = IPOPT_RA;

	((u8 *)&iph[1])[1] = 4;

	((u8 *)&iph[1])[2] = 0;

net/ipv4/ip_output.c

+4 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk, 
	iph->daddr    = (opt && opt->opt.srr ? opt->opt.faddr : daddr);

	iph->saddr    = saddr;

	iph->protocol = sk->sk_protocol;

	ip_select_ident(skb, sk);

	ip_select_ident(sock_net(sk), skb, sk);



	if (opt && opt->opt.optlen) {

		iph->ihl += opt->opt.optlen>>2;
@@ -430,7 +430,8 @@ int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl) 
		ip_options_build(skb, &inet_opt->opt, inet->inet_daddr, rt, 0);

	}



	ip_select_ident_segs(skb, sk, skb_shinfo(skb)->gso_segs ?: 1);

	ip_select_ident_segs(sock_net(sk), skb, sk,

			     skb_shinfo(skb)->gso_segs ?: 1);



	/* TODO : should we use skb->sk here instead of sk ? */

	skb->priority = sk->sk_priority;
@@ -1379,7 +1380,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	iph->ttl = ttl;

	iph->protocol = sk->sk_protocol;

	ip_copy_addrs(iph, fl4);

	ip_select_ident(skb, sk);

	ip_select_ident(net, skb, sk);



	if (opt) {

		iph->ihl += opt->optlen>>2;

net/ipv4/ip_tunnel_core.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, 
	iph->daddr	=	dst;

	iph->saddr	=	src;

	iph->ttl	=	ttl;

	__ip_select_ident(iph, skb_shinfo(skb)->gso_segs ?: 1);

	__ip_select_ident(sock_net(sk), iph, skb_shinfo(skb)->gso_segs ?: 1);



	err = ip_local_out_sk(sk, skb);

	if (unlikely(net_xmit_eval(err)))