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

Commit 0e60d245 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

inet: frag: change *_frag_mem_limit functions to take netns_frags as argument 



Followup patch will call it after inet_frag_queue was freed, so q->net
doesn't work anymore (but netf = q->net; free(q); mem_limit(netf) would).

Tested-by: default avatarFrank Schreuder <fschreuder@transip.nl>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1fe1944

include/net/inet_frag.h

+4 −4
Original line number Diff line number Diff line
@@ -141,14 +141,14 @@ static inline int frag_mem_limit(struct netns_frags *nf) 
	return percpu_counter_read(&nf->mem);

}



static inline void sub_frag_mem_limit(struct inet_frag_queue *q, int i)

static inline void sub_frag_mem_limit(struct netns_frags *nf, int i)

{

	__percpu_counter_add(&q->net->mem, -i, frag_percpu_counter_batch);

	__percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch);

}



static inline void add_frag_mem_limit(struct inet_frag_queue *q, int i)

static inline void add_frag_mem_limit(struct netns_frags *nf, int i)

{

	__percpu_counter_add(&q->net->mem, i, frag_percpu_counter_batch);

	__percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch);

}



static inline void init_frag_mem_limit(struct netns_frags *nf)

net/ieee802154/6lowpan/reassembly.c

+3 −3
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int lowpan_frag_queue(struct lowpan_frag_queue *fq, 
	} else {

		fq->q.meat += skb->len;

	}

	add_frag_mem_limit(&fq->q, skb->truesize);

	add_frag_mem_limit(fq->q.net, skb->truesize);



	if (fq->q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &&

	    fq->q.meat == fq->q.len) {
@@ -287,7 +287,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev, 
		clone->data_len = clone->len;

		head->data_len -= clone->len;

		head->len -= clone->len;

		add_frag_mem_limit(&fq->q, clone->truesize);

		add_frag_mem_limit(fq->q.net, clone->truesize);

	}



	WARN_ON(head == NULL);
@@ -310,7 +310,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev, 
		}

		fp = next;

	}

	sub_frag_mem_limit(&fq->q, sum_truesize);

	sub_frag_mem_limit(fq->q.net, sum_truesize);



	head->next = NULL;

	head->dev = dev;

net/ipv4/inet_fragment.c

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f) 
		fp = xp;

	}

	sum = sum_truesize + f->qsize;

	sub_frag_mem_limit(q, sum);

	sub_frag_mem_limit(q->net, sum);



	if (f->destructor)

		f->destructor(q);
@@ -388,7 +388,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf, 


	q->net = nf;

	f->constructor(q, arg);

	add_frag_mem_limit(q, f->qsize);

	add_frag_mem_limit(nf, f->qsize);



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

	spin_lock_init(&q->lock);

net/ipv4/ip_fragment.c

+5 −5
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int ip_frag_reinit(struct ipq *qp) 
		kfree_skb(fp);

		fp = xp;

	} while (fp);

	sub_frag_mem_limit(&qp->q, sum_truesize);

	sub_frag_mem_limit(qp->q.net, sum_truesize);



	qp->q.flags = 0;

	qp->q.len = 0;
@@ -455,7 +455,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) 
				qp->q.fragments = next;



			qp->q.meat -= free_it->len;

			sub_frag_mem_limit(&qp->q, free_it->truesize);

			sub_frag_mem_limit(qp->q.net, free_it->truesize);

			kfree_skb(free_it);

		}

	}
@@ -479,7 +479,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) 
	qp->q.stamp = skb->tstamp;

	qp->q.meat += skb->len;

	qp->ecn |= ecn;

	add_frag_mem_limit(&qp->q, skb->truesize);

	add_frag_mem_limit(qp->q.net, skb->truesize);

	if (offset == 0)

		qp->q.flags |= INET_FRAG_FIRST_IN;
@@ -587,7 +587,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, 
		head->len -= clone->len;

		clone->csum = 0;

		clone->ip_summed = head->ip_summed;

		add_frag_mem_limit(&qp->q, clone->truesize);

		add_frag_mem_limit(qp->q.net, clone->truesize);

	}



	skb_push(head, head->data - skb_network_header(head));
@@ -615,7 +615,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, 
		}

		fp = next;

	}

	sub_frag_mem_limit(&qp->q, sum_truesize);

	sub_frag_mem_limit(qp->q.net, sum_truesize);



	head->next = NULL;

	head->dev = dev;

net/ipv6/netfilter/nf_conntrack_reasm.c

+3 −3
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, 
	fq->ecn |= ecn;

	if (payload_len > fq->q.max_size)

		fq->q.max_size = payload_len;

	add_frag_mem_limit(&fq->q, skb->truesize);

	add_frag_mem_limit(fq->q.net, skb->truesize);



	/* The first fragment.

	 * nhoffset is obtained from the first fragment, of course.
@@ -430,7 +430,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev) 
		clone->ip_summed = head->ip_summed;



		NFCT_FRAG6_CB(clone)->orig = NULL;

		add_frag_mem_limit(&fq->q, clone->truesize);

		add_frag_mem_limit(fq->q.net, clone->truesize);

	}



	/* We have to remove fragment header from datagram and to relocate
@@ -454,7 +454,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev) 
			head->csum = csum_add(head->csum, fp->csum);

		head->truesize += fp->truesize;

	}

	sub_frag_mem_limit(&fq->q, head->truesize);

	sub_frag_mem_limit(fq->q.net, head->truesize);



	head->ignore_df = 1;

	head->next = NULL;