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

net: move skb_defer_free_flush() up 



We plan using skb_defer_free_flush() from napi_threaded_poll()
in the following patch.

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

net/core/dev.c

+21 −21
Original line number Diff line number Diff line
@@ -6598,6 +6598,27 @@ static int napi_thread_wait(struct napi_struct *napi) 
	return -1;

}



static void skb_defer_free_flush(struct softnet_data *sd)

{

	struct sk_buff *skb, *next;



	/* Paired with WRITE_ONCE() in skb_attempt_defer_free() */

	if (!READ_ONCE(sd->defer_list))

		return;



	spin_lock(&sd->defer_lock);

	skb = sd->defer_list;

	sd->defer_list = NULL;

	sd->defer_count = 0;

	spin_unlock(&sd->defer_lock);



	while (skb != NULL) {

		next = skb->next;

		napi_consume_skb(skb, 1);

		skb = next;

	}

}



static int napi_threaded_poll(void *data)

{

	struct napi_struct *napi = data;
@@ -6624,27 +6645,6 @@ static int napi_threaded_poll(void *data) 
	return 0;

}



static void skb_defer_free_flush(struct softnet_data *sd)

{

	struct sk_buff *skb, *next;



	/* Paired with WRITE_ONCE() in skb_attempt_defer_free() */

	if (!READ_ONCE(sd->defer_list))

		return;



	spin_lock(&sd->defer_lock);

	skb = sd->defer_list;

	sd->defer_list = NULL;

	sd->defer_count = 0;

	spin_unlock(&sd->defer_lock);



	while (skb != NULL) {

		next = skb->next;

		napi_consume_skb(skb, 1);

		skb = next;

	}

}



static __latent_entropy void net_rx_action(struct softirq_action *h)

{

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);