From 6008eacbf2c7a5f31b0c9d5d0a629cbdfbb8f222 Mon Sep 17 00:00:00 2001 From: Jonathan Neuschäfer Date: Thu, 5 Jul 2018 22:27:29 +0200 Subject: receive: use NAPI on the receive path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested-by: Jason A. Donenfeld [Jason: fixed up the flushing of the rx_queue in peer_remove] Signed-off-by: Jonathan Neuschäfer --- src/queueing.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/queueing.h') diff --git a/src/queueing.h b/src/queueing.h index 0057cfa..c17b0d8 100644 --- a/src/queueing.h +++ b/src/queueing.h @@ -26,8 +26,9 @@ struct multicore_worker __percpu *packet_alloc_percpu_multicore_worker(work_func /* receive.c APIs: */ void packet_receive(struct wireguard_device *wg, struct sk_buff *skb); void packet_handshake_receive_worker(struct work_struct *work); -/* Workqueue workers: */ -void packet_rx_worker(struct work_struct *work); +/* NAPI poll function: */ +int packet_rx_poll(struct napi_struct *napi, int budget); +/* Workqueue worker: */ void packet_decrypt_worker(struct work_struct *work); /* send.c APIs: */ @@ -138,6 +139,15 @@ static inline void queue_enqueue_per_peer(struct crypt_queue *queue, struct sk_b peer_put(peer); } +static inline void queue_enqueue_per_peer_napi(struct crypt_queue *queue, struct sk_buff *skb, enum packet_state state) +{ + struct wireguard_peer *peer = peer_rcu_get(PACKET_PEER(skb)); + + atomic_set(&PACKET_CB(skb)->state, state); + napi_schedule(&peer->napi); + peer_put(peer); +} + #ifdef DEBUG bool packet_counter_selftest(void); #endif -- cgit v1.2.3-59-g8ed1b