2021-03-02 08:24:45 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
|
|
|
Date: Wed, 24 Jun 2020 16:06:03 -0600
|
2021-03-02 08:24:45 +00:00
|
|
|
Subject: [PATCH] wireguard: receive: account for napi_gro_receive never
|
|
|
|
|
returning GRO_DROP
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
|
|
|
|
|
commit df08126e3833e9dca19e2407db5f5860a7c194fb upstream.
|
|
|
|
|
|
|
|
|
|
The napi_gro_receive function no longer returns GRO_DROP ever, making
|
|
|
|
|
handling GRO_DROP dead code. This commit removes that dead code.
|
|
|
|
|
Further, it's not even clear that device drivers have any business in
|
|
|
|
|
taking action after passing off received packets; that's arguably out of
|
|
|
|
|
their hands.
|
|
|
|
|
|
|
|
|
|
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
|
|
|
|
|
Fixes: 6570bc79c0df ("net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()")
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireguard/receive.c | 10 ++--------
|
|
|
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireguard/receive.c
|
|
|
|
|
+++ b/drivers/net/wireguard/receive.c
|
|
|
|
|
@@ -414,14 +414,8 @@ static void wg_packet_consume_data_done(
|
|
|
|
|
if (unlikely(routed_peer != peer))
|
|
|
|
|
goto dishonest_packet_peer;
|
|
|
|
|
|
|
|
|
|
- if (unlikely(napi_gro_receive(&peer->napi, skb) == GRO_DROP)) {
|
|
|
|
|
- ++dev->stats.rx_dropped;
|
|
|
|
|
- net_dbg_ratelimited("%s: Failed to give packet to userspace from peer %llu (%pISpfsc)\n",
|
|
|
|
|
- dev->name, peer->internal_id,
|
|
|
|
|
- &peer->endpoint.addr);
|
|
|
|
|
- } else {
|
|
|
|
|
- update_rx_stats(peer, message_data_len(len_before_trim));
|
|
|
|
|
- }
|
|
|
|
|
+ napi_gro_receive(&peer->napi, skb);
|
|
|
|
|
+ update_rx_stats(peer, message_data_len(len_before_trim));
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
dishonest_packet_peer:
|
