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

Commit 80c888a1 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

net: Add the get current NAPI context API 



Commit 69235aa80090 ("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: 1078373
Change-Id: I7cf1c5e39a5ccbd7a74a096b11efd179a4d0d034
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent f151d68a

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -2778,6 +2778,7 @@ extern int netdev_flow_limit_table_len; 
 */

struct softnet_data {

	struct list_head	poll_list;

	struct napi_struct	*current_napi;

	struct sk_buff_head	process_queue;



	/* stats */
@@ -3275,6 +3276,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

+19 −2
Original line number Diff line number Diff line
@@ -4858,8 +4858,7 @@ static int process_backlog(struct napi_struct *napi, int quota) 
			rcu_read_unlock();

			input_queue_head_incr(sd);

			if (++work >= quota)

				return work;



				goto state_changed;

		}



		local_irq_disable();
@@ -4883,6 +4882,10 @@ static int process_backlog(struct napi_struct *napi, int quota) 
		local_irq_enable();

	}



state_changed:

	napi_gro_flush(napi, false);

	sd->current_napi = NULL;



	return work;

}
@@ -4917,10 +4920,13 @@ EXPORT_SYMBOL(__napi_schedule_irqoff); 


void __napi_complete(struct napi_struct *n)

{

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);



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



	list_del_init(&n->poll_list);

	smp_mb__before_atomic();

	sd->current_napi = NULL;

	clear_bit(NAPI_STATE_SCHED, &n->state);

}

EXPORT_SYMBOL(__napi_complete);
@@ -5136,6 +5142,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 = this_cpu_ptr(&softnet_data);



	return sd->current_napi;

}

EXPORT_SYMBOL(get_current_napi_context);



static int napi_poll(struct napi_struct *n, struct list_head *repoll)

{

	void *have;
@@ -5155,6 +5169,9 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll) 
	 */

	work = 0;

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

		struct softnet_data *sd = this_cpu_ptr(&softnet_data);



		sd->current_napi = n;

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

		trace_napi_poll(n, work, weight);

	}