From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7E06C4360F for ; Wed, 3 Apr 2019 17:54:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7106F2084B for ; Wed, 3 Apr 2019 17:54:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="et7NEeM2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726218AbfDCRyV (ORCPT ); Wed, 3 Apr 2019 13:54:21 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45057 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726144AbfDCRyU (ORCPT ); Wed, 3 Apr 2019 13:54:20 -0400 Received: by mail-wr1-f66.google.com with SMTP id s15so3309329wra.12 for ; Wed, 03 Apr 2019 10:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=eZxfXI2OkDG4xNCkLXr3Ad9B+sQleb0O84bpLkzXtww=; b=et7NEeM27bD5wTT4McEhuvHMbY28j1o6mCD7ErHvaCGZ58N6hMLXdKZtcf//9oBZKY sB85qvEX8PxeqvPh8s1bRhHP719TFEVzOBOz/RDEojH4uT+GGaZnqLP/fCYZubnDQWgr yaEtfgHSu+fix5RU/r8IY3zXdWRph/GUTF5WfujuUXPi34rln7t4bUOKV9NvXoFKxVLW Hbsrh1OfoQEmmm2lgEHAi13ms/bUXl9CMf8ltv2ocGv/GAtaO3trUV06AAo/Um9HEekj BIJsUjMQaGUGtDC0RethiclyyfzYXdRoW2XjoVvNIq7byuo4i1Wl90NWTjDKGkGFcKQg SSpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=eZxfXI2OkDG4xNCkLXr3Ad9B+sQleb0O84bpLkzXtww=; b=D3fE30pwfYMnWh++nOfK4N/DYL0Z/RVYQEgS8T9rmlOi1/zkizD7Z/LMjHmhlfNzPi lOaWVWlbzMV7Gwi2YuATUgPfA+WpfanAmdJ227lBxMrxv0psrhoPJ0xeIrVlkm+E/Lc4 BdLIhhqifZV3qhTH3yYWKRZkj50Fr7utp+U1CmLZh9jKkqhH3Loasnq+9ArQDx0yyuQD kOe9Z72lBug7olGstryOh3keTPcCgIS9Gbya6pXQu6a+o9d4QVgeBLsZErs3MLlAn+vq osjvc+4971fBoyVZaSmSdh8NRxlN4O/PiXMO++mb/jc/7bb0hn8gLVZ+6hguT1uJ6D1u EA0g== X-Gm-Message-State: APjAAAWgsbLHieYcDA9ChsWiy3Lr1dZ4EUbyf3rsR0MCPV8zaHMNT41H KanP3eq3iz+Nw0T4hHjl2fpavM+v X-Google-Smtp-Source: APXvYqwVD1NgGRq93iPDHPd+T7yHKaR92f7V18Wf1yaHtN8nWc4ZzomIlXLn+xQx6EGzu9W/i4UrPQ== X-Received: by 2002:adf:eed1:: with SMTP id a17mr665182wrp.268.1554314059003; Wed, 03 Apr 2019 10:54:19 -0700 (PDT) Received: from ?IPv6:2003:ea:8be1:dd00:ed2b:516:5ae8:487f? (p200300EA8BE1DD00ED2B05165AE8487F.dip0.t-ipconnect.de. [2003:ea:8be1:dd00:ed2b:516:5ae8:487f]) by smtp.googlemail.com with ESMTPSA id a8sm22405354wmf.33.2019.04.03.10.54.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 10:54:18 -0700 (PDT) To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" , Eric Dumazet From: Heiner Kallweit Subject: [PATCH net-next] Revert "r8169: use netif_receive_skb_list batching" Message-ID: Date: Wed, 3 Apr 2019 19:54:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 6578229d4efb7ea6287861bfc2bd306140458e07. netif_receive_skb_list() doesn't support GRO, therefore we may have scenarios with decreased performance. See discussion here [0]. [0] https://marc.info/?t=155403847400001&r=1&w=2 Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 8a8a4f70db1e..88eb9e05d2a1 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6426,7 +6426,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget { unsigned int cur_rx, rx_left; unsigned int count; - LIST_HEAD(rx_list); cur_rx = tp->cur_rx; @@ -6502,7 +6501,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget if (skb->pkt_type == PACKET_MULTICAST) dev->stats.multicast++; - list_add_tail(&skb->list, &rx_list); + napi_gro_receive(&tp->napi, skb); u64_stats_update_begin(&tp->rx_stats.syncp); tp->rx_stats.packets++; @@ -6517,8 +6516,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget count = cur_rx - tp->cur_rx; tp->cur_rx = cur_rx; - netif_receive_skb_list(&rx_list); - return count; } -- 2.21.0