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

Commit 3fd588eb authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

inet: frag: remove lru list 



no longer used.

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

include/net/inet_frag.h

+2 −30
Original line number Original line Diff line number Diff line
@@ -4,9 +4,6 @@ 
#include <linux/percpu_counter.h>

#include <linux/percpu_counter.h>





struct netns_frags {

struct netns_frags {

	struct list_head	lru_list;

	spinlock_t		lru_lock;



	/* The percpu_counter "mem" need to be cacheline aligned.

	/* The percpu_counter "mem" need to be cacheline aligned.

	 *  mem.count must not share cacheline with other writers

	 *  mem.count must not share cacheline with other writers

	 */

	 */
@@ -21,7 +18,6 @@ struct netns_frags { 
struct inet_frag_queue {

struct inet_frag_queue {

	spinlock_t		lock;

	spinlock_t		lock;

	struct timer_list	timer;      /* when will this queue expire? */

	struct timer_list	timer;      /* when will this queue expire? */

	struct list_head	lru_list;   /* lru list member */

	struct hlist_node	list;

	struct hlist_node	list;

	atomic_t		refcnt;

	atomic_t		refcnt;

	struct sk_buff		*fragments; /* list of received fragments */

	struct sk_buff		*fragments; /* list of received fragments */
@@ -91,8 +87,7 @@ void inet_frags_init_net(struct netns_frags *nf); 
void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f);

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_kill(struct inet_frag_queue *q, struct inet_frags *f);

void inet_frag_destroy(struct inet_frag_queue *q,

void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f);

				struct inet_frags *f, int *work);

struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,

struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,

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

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

	__releases(&f->lock);

	__releases(&f->lock);
@@ -102,7 +97,7 @@ void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, 
static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)

static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)

{

{

	if (atomic_dec_and_test(&q->refcnt))

	if (atomic_dec_and_test(&q->refcnt))

		inet_frag_destroy(q, f, NULL);

		inet_frag_destroy(q, f);

}

}





/* Memory Tracking Functions. */

/* Memory Tracking Functions. */
@@ -145,29 +140,6 @@ static inline unsigned int sum_frag_mem_limit(struct netns_frags *nf) 
	return res;

	return res;

}

}





static inline void inet_frag_lru_move(struct inet_frag_queue *q)

{

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

	if (!list_empty(&q->lru_list))

		list_move_tail(&q->lru_list, &q->net->lru_list);

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

}



static inline void inet_frag_lru_del(struct inet_frag_queue *q)

{

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

	list_del_init(&q->lru_list);

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

}



static inline void inet_frag_lru_add(struct netns_frags *nf,

				     struct inet_frag_queue *q)

{

	spin_lock(&nf->lru_lock);

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

	spin_unlock(&nf->lru_lock);

}



/* RFC 3168 support :

/* RFC 3168 support :

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

 * 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.

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

net/ieee802154/reassembly.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -219,7 +219,6 @@ static int lowpan_frag_queue(struct lowpan_frag_queue *fq, 
		return res;

		return res;

	}

	}





	inet_frag_lru_move(&fq->q);

	return -1;

	return -1;

err:

err:

	kfree_skb(skb);

	kfree_skb(skb);

net/ipv4/inet_fragment.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -194,8 +194,6 @@ EXPORT_SYMBOL(inet_frags_init); 
void inet_frags_init_net(struct netns_frags *nf)

void inet_frags_init_net(struct netns_frags *nf)

{

{

	init_frag_mem_limit(nf);

	init_frag_mem_limit(nf);

	INIT_LIST_HEAD(&nf->lru_list);

	spin_lock_init(&nf->lru_lock);

}

}

EXPORT_SYMBOL(inet_frags_init_net);

EXPORT_SYMBOL(inet_frags_init_net);
@@ -237,7 +235,6 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f) 
	spin_unlock(&hb->chain_lock);

	spin_unlock(&hb->chain_lock);





	read_unlock(&f->lock);

	read_unlock(&f->lock);

	inet_frag_lru_del(fq);

}

}





void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)

void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)
@@ -261,8 +258,7 @@ static inline void frag_kfree_skb(struct netns_frags *nf, struct inet_frags *f, 
	kfree_skb(skb);

	kfree_skb(skb);

}

}





void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f,

void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)

					int *work)

{

{

	struct sk_buff *fp;

	struct sk_buff *fp;

	struct netns_frags *nf;

	struct netns_frags *nf;
@@ -282,14 +278,11 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f, 
		fp = xp;

		fp = xp;

	}

	}

	sum = sum_truesize + f->qsize;

	sum = sum_truesize + f->qsize;

	if (work)

		*work -= sum;

	sub_frag_mem_limit(q, sum);

	sub_frag_mem_limit(q, sum);





	if (f->destructor)

	if (f->destructor)

		f->destructor(q);

		f->destructor(q);

	kfree(q);

	kfree(q);



}

}

EXPORT_SYMBOL(inet_frag_destroy);

EXPORT_SYMBOL(inet_frag_destroy);
@@ -333,7 +326,7 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf, 




	atomic_inc(&qp->refcnt);

	atomic_inc(&qp->refcnt);

	hlist_add_head(&qp->list, &hb->chain);

	hlist_add_head(&qp->list, &hb->chain);

	inet_frag_lru_add(nf, qp);



	spin_unlock(&hb->chain_lock);

	spin_unlock(&hb->chain_lock);

	read_unlock(&f->lock);

	read_unlock(&f->lock);
@@ -361,7 +354,6 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf, 
	setup_timer(&q->timer, f->frag_expire, (unsigned long)q);

	setup_timer(&q->timer, f->frag_expire, (unsigned long)q);

	spin_lock_init(&q->lock);

	spin_lock_init(&q->lock);

	atomic_set(&q->refcnt, 1);

	atomic_set(&q->refcnt, 1);

	INIT_LIST_HEAD(&q->lru_list);





	return q;

	return q;

}

}

net/ipv4/ip_fragment.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -489,7 +489,6 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) 
	}

	}





	skb_dst_drop(skb);

	skb_dst_drop(skb);

	inet_frag_lru_move(&qp->q);

	return -EINPROGRESS;

	return -EINPROGRESS;





err:

err:

net/ipv6/netfilter/nf_conntrack_reasm.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,6 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, 
		fq->q.last_in |= INET_FRAG_FIRST_IN;

		fq->q.last_in |= INET_FRAG_FIRST_IN;

	}

	}





	inet_frag_lru_move(&fq->q);

	return 0;

	return 0;





discard_fq:

discard_fq: