diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-01-02 17:47:51 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-07-07 13:26:40 +0200 |
| commit | 7e6136ea2ee74b32d2f8942f8d97bf65262c619f (patch) | |
| tree | 7ddd5ae78ac483034d74c431967c2f5b8fdbdb7a | |
| parent | 2056e6971aa3aef827475c3fc1df1c07f9db3a7e (diff) | |
| download | wireguard-linux-trimmed-7e6136ea2ee74b32d2f8942f8d97bf65262c619f.tar.gz wireguard-linux-trimmed-7e6136ea2ee74b32d2f8942f8d97bf65262c619f.zip | |
wireguard: socket: mark skbs as not on list when receiving via gro
commit 937f24d132a86b82a9d43ad4b9a7e5a627ed630f 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>
| -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 c46256d..262f3b5 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; |