diff options
| author |   Thomas Gschwantner <tharre3@gmail.com> | 2018-07-18 17:47:50 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-18 19:48:17 +0200 |
| commit | fe5f0f661797b41648eac64b40e5038b25175047 (patch) | |
| tree | be603b24838b5c7ffd6d0e96344f39e559969dad /src | |
| parent | device: destroy workqueue before freeing queue (diff) | |
| download | wireguard-monolithic-historical-fe5f0f661797b41648eac64b40e5038b25175047.tar.xz wireguard-monolithic-historical-fe5f0f661797b41648eac64b40e5038b25175047.zip | |
recieve: disable NAPI busy polling
This avoids adding one reference per peer to the napi_hash hashtable, as
normally done by netif_napi_add(). Since we potentially could have up to
2^20 peers this would make busy polling very slow globally.
This approach is preferable to having only a single napi struct because
we get one gro_list per peer, which means packets can be combined nicely
even if we have a large number of peers.
This is also done by gro_cells_init() in net/core/gro_cells.c .
Signed-off-by: Thomas Gschwantner <tharre3@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat/compat.h | 9 | ||||
| -rw-r--r-- | src/peer.c | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/compat/compat.h b/src/compat/compat.h index 997ae39..7943ab8 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -601,6 +601,15 @@ static inline void *skb_put_data(struct sk_buff *skb, const void *data, unsigned #define napi_complete_done(n, work_done) napi_complete(n) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#include <linux/netdevice.h> +/* NAPI_STATE_SCHED gets set by netif_napi_add anyway, so this is safe. + * Also, kernels without NAPI_STATE_NO_BUSY_POLL don't have a call to + * napi_hash_add inside of netif_napi_add. + */ +#define NAPI_STATE_NO_BUSY_POLL NAPI_STATE_SCHED +#endif + /* https://lkml.kernel.org/r/20170624021727.17835-1-Jason@zx2c4.com */ #if IS_ENABLED(CONFIG_NF_CONNTRACK) #include <linux/ip.h> @@ -56,6 +56,7 @@ struct wireguard_peer *peer_create(struct wireguard_device *wg, const u8 public_ list_add_tail(&peer->peer_list, &wg->peer_list); pubkey_hashtable_add(&wg->peer_hashtable, peer); peer->last_sent_handshake = ktime_get_boot_fast_ns() - (u64)(REKEY_TIMEOUT + 1) * NSEC_PER_SEC; + set_bit(NAPI_STATE_NO_BUSY_POLL, &peer->napi.state); netif_napi_add(wg->dev, &peer->napi, packet_rx_poll, NAPI_POLL_WEIGHT); napi_enable(&peer->napi); pr_debug("%s: Peer %llu created\n", wg->dev->name, peer->internal_id); |