diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-01-02 17:47:51 +0100 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-31 19:40:41 +0200 |
commit | 0ed456705198d13d03b37d1206e4f1fd17256f2d (patch) | |
tree | c56f971d6963f20459dd9c785f99c991e479573d /drivers/net/wireguard/socket.c | |
parent | 217a653792a450c891979f8a8d7340c8a4db4cc1 (diff) |
UPSTREAM: wireguard: socket: mark skbs as not on list when receiving via gro
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>
(cherry picked from commit 736775d06bac60d7a353e405398b48b2bd8b1e54)
Bug: 152722841
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icee93ca63e947dc93838bd40f8b51751c417f0f6
Diffstat (limited to 'drivers/net/wireguard/socket.c')
-rw-r--r-- | drivers/net/wireguard/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index c46256d0d81c..262f3b5c819d 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -333,6 +333,7 @@ static int wg_receive(struct sock *sk, struct sk_buff *skb) wg = sk->sk_user_data; if (unlikely(!wg)) goto err; + skb_mark_not_on_list(skb); wg_packet_receive(wg, skb); return 0; |