]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
wireguard: socket: mark skbs as not on list when receiving via gro
authorJason A. Donenfeld <Jason@zx2c4.com>
Thu, 2 Jan 2020 16:47:51 +0000 (17:47 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 5 Jan 2020 22:08:32 +0000 (14:08 -0800)
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>
drivers/net/wireguard/socket.c

index c46256d0d81c16e968343fc92539c70a237a090c..262f3b5c819d5a3c7c3b2691ddc510298dc4b31a 100644 (file)
@@ -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;