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

Commit ea7496f0 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

inet: frags: remove some helpers 



Remove sum_frag_mem_limit(), ip_frag_mem() & ip6_frag_mem()

Also since we use rhashtable we can bring back the number of fragments
in "grep FRAG /proc/net/sockstat /proc/net/sockstat6" that was
removed in commit 434d3054 ("inet: frag: don't account number
of fragment queues")

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit 6befe4a78b1553edb6eed3a78b4bcd9748526672)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 23ce9c5c

include/net/inet_frag.h

+0 −5
Original line number Diff line number Diff line
@@ -140,11 +140,6 @@ static inline void add_frag_mem_limit(struct netns_frags *nf, int i) 
	atomic_add(i, &nf->mem);

}



static inline int sum_frag_mem_limit(struct netns_frags *nf)

{

	return atomic_read(&nf->mem);

}



/* RFC 3168 support :

 * We want to check ECN values of all fragments, do detect invalid combinations.

 * In ipq->ecn, we store the OR value of each ip4_frag_ecn() fragment value.

include/net/ip.h

+0 −1
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ static inline struct sk_buff *ip_check_defrag(struct net *net, struct sk_buff *s 
	return skb;

}

#endif

int ip_frag_mem(struct net *net);



/*

 *	Functions provided by ip_forward.c

include/net/ipv6.h

+0 −7
Original line number Diff line number Diff line
@@ -330,13 +330,6 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev) 
	    idev->cnf.accept_ra;

}



#if IS_ENABLED(CONFIG_IPV6)

static inline int ip6_frag_mem(struct net *net)

{

	return sum_frag_mem_limit(&net->ipv6.frags);

}

#endif



#define IPV6_FRAG_HIGH_THRESH	(4 * 1024*1024)	/* 4194304 */

#define IPV6_FRAG_LOW_THRESH	(3 * 1024*1024)	/* 3145728 */

#define IPV6_FRAG_TIMEOUT	(60 * HZ)	/* 60 seconds */

net/ipv4/ip_fragment.c

+0 −5
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ static u8 ip4_frag_ecn(u8 tos) 


static struct inet_frags ip4_frags;



int ip_frag_mem(struct net *net)

{

	return sum_frag_mem_limit(&net->ipv4.frags);

}



static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,

			 struct net_device *dev);

net/ipv4/proc.c

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
static int sockstat_seq_show(struct seq_file *seq, void *v)

{

	struct net *net = seq->private;

	unsigned int frag_mem;

	int orphans, sockets;



	local_bh_disable();
@@ -74,8 +73,9 @@ static int sockstat_seq_show(struct seq_file *seq, void *v) 
		   sock_prot_inuse_get(net, &udplite_prot));

	seq_printf(seq, "RAW: inuse %d\n",

		   sock_prot_inuse_get(net, &raw_prot));

	frag_mem = ip_frag_mem(net);

	seq_printf(seq,  "FRAG: inuse %u memory %u\n", !!frag_mem, frag_mem);

	seq_printf(seq,  "FRAG: inuse %u memory %u\n",

		   atomic_read(&net->ipv4.frags.rhashtable.nelems),

		   frag_mem_limit(&net->ipv4.frags));

	return 0;

}