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

Commit 434d3054 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

inet: frag: don't account number of fragment queues 



The 'nqueues' counter is protected by the lru list lock,
once thats removed this needs to be converted to atomic
counter.  Given this isn't used for anything except for
reporting it to userspace via /proc, just remove it.

We still report the memory currently used by fragment
reassembly queues.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b13d3cbf

include/net/inet_frag.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <linux/percpu_counter.h>

#include <linux/percpu_counter.h>





struct netns_frags {

struct netns_frags {

	int			nqueues;

	struct list_head	lru_list;

	struct list_head	lru_list;

	spinlock_t		lru_lock;

	spinlock_t		lru_lock;
@@ -158,7 +157,6 @@ static inline void inet_frag_lru_del(struct inet_frag_queue *q) 
{

{

	spin_lock(&q->net->lru_lock);

	spin_lock(&q->net->lru_lock);

	list_del_init(&q->lru_list);

	list_del_init(&q->lru_list);

	q->net->nqueues--;

	spin_unlock(&q->net->lru_lock);

	spin_unlock(&q->net->lru_lock);

}

}
@@ -167,7 +165,6 @@ static inline void inet_frag_lru_add(struct netns_frags *nf, 
{

{

	spin_lock(&nf->lru_lock);

	spin_lock(&nf->lru_lock);

	list_add_tail(&q->lru_list, &nf->lru_list);

	list_add_tail(&q->lru_list, &nf->lru_list);

	q->net->nqueues++;

	spin_unlock(&nf->lru_lock);

	spin_unlock(&nf->lru_lock);

}

}

include/net/ip.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -495,7 +495,6 @@ static inline struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user) 
}

}

#endif

#endif

int ip_frag_mem(struct net *net);

int ip_frag_mem(struct net *net);

int ip_frag_nqueues(struct net *net);





/*

/*

 *	Functions provided by ip_forward.c

 *	Functions provided by ip_forward.c

include/net/ipv6.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -299,11 +299,6 @@ static inline bool ipv6_accept_ra(struct inet6_dev *idev) 
}

}





#if IS_ENABLED(CONFIG_IPV6)

#if IS_ENABLED(CONFIG_IPV6)

static inline int ip6_frag_nqueues(struct net *net)

{

	return net->ipv6.frags.nqueues;

}



static inline int ip6_frag_mem(struct net *net)

static inline int ip6_frag_mem(struct net *net)

{

{

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

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

net/ipv4/inet_fragment.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -193,7 +193,6 @@ EXPORT_SYMBOL(inet_frags_init); 




void inet_frags_init_net(struct netns_frags *nf)

void inet_frags_init_net(struct netns_frags *nf)

{

{

	nf->nqueues = 0;

	init_frag_mem_limit(nf);

	init_frag_mem_limit(nf);

	INIT_LIST_HEAD(&nf->lru_list);

	INIT_LIST_HEAD(&nf->lru_list);

	spin_lock_init(&nf->lru_lock);

	spin_lock_init(&nf->lru_lock);

net/ipv4/ip_fragment.c

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




static struct inet_frags ip4_frags;

static struct inet_frags ip4_frags;





int ip_frag_nqueues(struct net *net)

{

	return net->ipv4.frags.nqueues;

}



int ip_frag_mem(struct net *net)

int ip_frag_mem(struct net *net)

{

{

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

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