Commit 86e93e47 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

inet: frag: move evictor calls into frag_find function 



First step to move eviction handling into a work queue.

We lose two spots that accounted evicted fragments in MIB counters.

Accounting will be restored since the upcoming work-queue evictor
invokes the frag queue timer callbacks instead.

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

include/net/inet_frag.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f); 
void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);

void inet_frag_destroy(struct inet_frag_queue *q,

				struct inet_frags *f, int *work);

int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force);

struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,

		struct inet_frags *f, void *key, unsigned int hash)

	__releases(&f->lock);

net/ieee802154/reassembly.c

+0 −2
Original line number Diff line number Diff line
@@ -369,8 +369,6 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type) 
	if (frag_info->d_size > ieee802154_lowpan->max_dsize)

		goto err;



	inet_frag_evictor(&ieee802154_lowpan->frags, &lowpan_frags, false);



	fq = fq_find(net, frag_info, &source, &dest);

	if (fq != NULL) {

		int ret;

net/ipv4/inet_fragment.c

+9 −7
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ const u8 ip_frag_ecn_table[16] = { 
};

EXPORT_SYMBOL(ip_frag_ecn_table);



static int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force);



static unsigned int

inet_frag_hashfn(const struct inet_frags *f, const struct inet_frag_queue *q)

{
@@ -203,16 +205,11 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f, 
}

EXPORT_SYMBOL(inet_frag_destroy);



int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force)

static int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force)

{

	struct inet_frag_queue *q;

	int work, evicted = 0;



	if (!force) {

		if (frag_mem_limit(nf) <= nf->high_thresh)

			return 0;

	}



	work = frag_mem_limit(nf) - nf->low_thresh;

	while (work > 0 || force) {

		spin_lock(&nf->lru_lock);
@@ -242,7 +239,6 @@ int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force) 


	return evicted;

}

EXPORT_SYMBOL(inet_frag_evictor);



static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,

		struct inet_frag_queue *qp_in, struct inet_frags *f,
@@ -296,6 +292,9 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf, 
{

	struct inet_frag_queue *q;



	if (frag_mem_limit(nf) > nf->high_thresh)

		return NULL;



	q = kzalloc(f->qsize, GFP_ATOMIC);

	if (q == NULL)

		return NULL;
@@ -332,6 +331,9 @@ struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, 
	struct inet_frag_queue *q;

	int depth = 0;



	if (frag_mem_limit(nf) > nf->high_thresh)

		inet_frag_evictor(nf, f, false);



	hash &= (INETFRAGS_HASHSZ - 1);

	hb = &f->hash[hash];

net/ipv4/ip_fragment.c

+0 −15
Original line number Diff line number Diff line
@@ -177,18 +177,6 @@ static void ipq_kill(struct ipq *ipq) 
	inet_frag_kill(&ipq->q, &ip4_frags);

}



/* Memory limiting on fragments.  Evictor trashes the oldest

 * fragment queue until we are back under the threshold.

 */

static void ip_evictor(struct net *net)

{

	int evicted;



	evicted = inet_frag_evictor(&net->ipv4.frags, &ip4_frags, false);

	if (evicted)

		IP_ADD_STATS_BH(net, IPSTATS_MIB_REASMFAILS, evicted);

}



/*

 * Oops, a fragment queue timed out.  Kill it and send an ICMP reply.

 */
@@ -655,9 +643,6 @@ int ip_defrag(struct sk_buff *skb, u32 user) 
	net = skb->dev ? dev_net(skb->dev) : dev_net(skb_dst(skb)->dev);

	IP_INC_STATS_BH(net, IPSTATS_MIB_REASMREQDS);



	/* Start by cleaning up the memory. */

	ip_evictor(net);



	/* Lookup (or create) queue header */

	if ((qp = ip_find(net, ip_hdr(skb), user)) != NULL) {

		int ret;

net/ipv6/netfilter/nf_conntrack_reasm.c

+0 −4
Original line number Diff line number Diff line
@@ -594,10 +594,6 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user) 
	hdr = ipv6_hdr(clone);

	fhdr = (struct frag_hdr *)skb_transport_header(clone);



	local_bh_disable();

	inet_frag_evictor(&net->nf_frag.frags, &nf_frags, false);

	local_bh_enable();



	fq = fq_find(net, fhdr->identification, user, &hdr->saddr, &hdr->daddr,

		     ip6_frag_ecn(hdr));

	if (fq == NULL) {