mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
c0cb86e1d5
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> (cherry picked from commit3888fa7880) (cherry picked from commitd540725871) (cherry picked from commit196f3d586f) (cherry picked from commit3500fd7938) (cherry picked from commit23b801d3ba) (cherry picked from commit0c0cb97da7) (cherry picked from commit2a27f6f90a) Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Thu, 2 Jan 2020 17:47:51 +0100
|
|
Subject: [PATCH] wireguard: socket: mark skbs as not on list when receiving
|
|
via gro
|
|
|
|
commit 736775d06bac60d7a353e405398b48b2bd8b1e54 upstream.
|
|
|
|
Certain drivers will pass gro skbs to udp, at which point the udp driver
|
|
simply iterates through them and passes them off to encap_rcv, which is
|
|
where we pick up. At the moment, we're not attempting to coalesce these
|
|
into bundles, but we also don't want to wind up having cascaded lists of
|
|
skbs treated separately. The right behavior here, then, is to just mark
|
|
each incoming one as not on a list. This can be seen in practice, for
|
|
example, with Qualcomm's rmnet_perf driver.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Tested-by: Yaroslav Furman <yaro330@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/wireguard/socket.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/wireguard/socket.c
|
|
+++ b/drivers/net/wireguard/socket.c
|
|
@@ -333,6 +333,7 @@ static int wg_receive(struct sock *sk, s
|
|
wg = sk->sk_user_data;
|
|
if (unlikely(!wg))
|
|
goto err;
|
|
+ skb_mark_not_on_list(skb);
|
|
wg_packet_receive(wg, skb);
|
|
return 0;
|
|
|