lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 173/265] wireguard: receive: account for napi_gro_receive never returning GRO_DROP
    Date
    From: "Jason A. Donenfeld" <Jason@zx2c4.com>

    [ Upstream commit df08126e3833e9dca19e2407db5f5860a7c194fb ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireguard/receive.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/wireguard/receive.c b/drivers/net/wireguard/receive.c
    index 91438144e4f7a..9b2ab6fc91cdd 100644
    --- a/drivers/net/wireguard/receive.c
    +++ b/drivers/net/wireguard/receive.c
    @@ -414,14 +414,8 @@ static void wg_packet_consume_data_done(struct wg_peer *peer,
    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:
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 23:58    [W:4.375 / U:0.916 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site