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

Commit d1701bc2 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

net: Add the get current NAPI context API 



Commit 69235aa8 ("net: Remove the get current NAPI context API")
removed the definition of get_current_napi_context() as rmnet_data
was no longer using it. However, the rmnet_data change to use its
NAPI in multiple contexts was prone to race in hotplug scenarios.

Add back get_current_napi_context() and current_napi to the
softnet_data struct

CRs-Fixed: 966095
Change-Id: I7cf1c5e39a5ccbd7a74a096b11efd179a4d0d034
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 2f867742

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -2330,6 +2330,7 @@ struct softnet_data { 
	struct Qdisc		*output_queue;

	struct Qdisc		**output_queue_tailp;

	struct list_head	poll_list;

	struct napi_struct	*current_napi;

	struct sk_buff		*completion_queue;

	struct sk_buff_head	process_queue;
@@ -2848,6 +2849,7 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi); 
gro_result_t napi_gro_frags(struct napi_struct *napi);

struct packet_offload *gro_find_receive_by_type(__be16 type);

struct packet_offload *gro_find_complete_by_type(__be16 type);

extern struct napi_struct *get_current_napi_context(void);



static inline void napi_free_frags(struct napi_struct *napi)

{

net/core/dev.c

+17 −3
Original line number Diff line number Diff line
@@ -4437,8 +4437,7 @@ static int process_backlog(struct napi_struct *napi, int quota) 
			local_irq_disable();

			input_queue_head_incr(sd);

			if (++work >= quota) {

				local_irq_enable();

				return work;

				goto state_changed;

			}

		}
@@ -4456,14 +4455,17 @@ static int process_backlog(struct napi_struct *napi, int quota) 
			napi->state = 0;

			rps_unlock(sd);



			break;

			goto state_changed;

		}



		skb_queue_splice_tail_init(&sd->input_pkt_queue,

					   &sd->process_queue);

		rps_unlock(sd);

	}

state_changed:

	local_irq_enable();

	napi_gro_flush(napi, false);

	sd->current_napi = NULL;



	return work;

}
@@ -4486,11 +4488,14 @@ EXPORT_SYMBOL(__napi_schedule); 


void __napi_complete(struct napi_struct *n)

{

	struct softnet_data *sd = &__get_cpu_var(softnet_data);



	BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));

	BUG_ON(n->gro_list);



	list_del(&n->poll_list);

	smp_mb__before_atomic();

	sd->current_napi = NULL;

	clear_bit(NAPI_STATE_SCHED, &n->state);

}

EXPORT_SYMBOL(__napi_complete);
@@ -4598,6 +4603,14 @@ void netif_napi_del(struct napi_struct *napi) 
}

EXPORT_SYMBOL(netif_napi_del);



struct napi_struct *get_current_napi_context(void)

{

	struct softnet_data *sd = &__get_cpu_var(softnet_data);



	return sd->current_napi;

}

EXPORT_SYMBOL(get_current_napi_context);



static void net_rx_action(struct softirq_action *h)

{

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
@@ -4639,6 +4652,7 @@ static void net_rx_action(struct softirq_action *h) 
		 */

		work = 0;

		if (test_bit(NAPI_STATE_SCHED, &n->state)) {

			sd->current_napi = n;

			work = n->poll(n, weight);

			trace_napi_poll(n);

		}