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

Commit c42858ea authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

gro_cells: remove spinlock protecting receive queues 



As David pointed out, spinlock are no longer needed
to protect the per cpu queues used in gro cells infrastructure.

Also use new napi_complete_done() API so that gro_flush_timeout
tweaks have an effect.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7040592

include/net/gro_cells.h

+5 −13
Original line number Diff line number Diff line
@@ -32,37 +32,28 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s 
		return;

	}



	/* We run in BH context */

	spin_lock(&cell->napi_skbs.lock);



	__skb_queue_tail(&cell->napi_skbs, skb);

	if (skb_queue_len(&cell->napi_skbs) == 1)

		napi_schedule(&cell->napi);



	spin_unlock(&cell->napi_skbs.lock);

}



/* called unser BH context */

/* called under BH context */

static inline int gro_cell_poll(struct napi_struct *napi, int budget)

{

	struct gro_cell *cell = container_of(napi, struct gro_cell, napi);

	struct sk_buff *skb;

	int work_done = 0;



	spin_lock(&cell->napi_skbs.lock);

	while (work_done < budget) {

		skb = __skb_dequeue(&cell->napi_skbs);

		if (!skb)

			break;

		spin_unlock(&cell->napi_skbs.lock);

		napi_gro_receive(napi, skb);

		work_done++;

		spin_lock(&cell->napi_skbs.lock);

	}



	if (work_done < budget)

		napi_complete(napi);

	spin_unlock(&cell->napi_skbs.lock);

		napi_complete_done(napi, work_done);

	return work_done;

}
@@ -77,7 +68,7 @@ static inline int gro_cells_init(struct gro_cells *gcells, struct net_device *de 
	for_each_possible_cpu(i) {

		struct gro_cell *cell = per_cpu_ptr(gcells->cells, i);



		skb_queue_head_init(&cell->napi_skbs);

		__skb_queue_head_init(&cell->napi_skbs);

		netif_napi_add(dev, &cell->napi, gro_cell_poll, 64);

		napi_enable(&cell->napi);

	}
@@ -92,8 +83,9 @@ static inline void gro_cells_destroy(struct gro_cells *gcells) 
		return;

	for_each_possible_cpu(i) {

		struct gro_cell *cell = per_cpu_ptr(gcells->cells, i);



		netif_napi_del(&cell->napi);

		skb_queue_purge(&cell->napi_skbs);

		__skb_queue_purge(&cell->napi_skbs);

	}

	free_percpu(gcells->cells);

	gcells->cells = NULL;