From patchwork Thu Oct 18 20:19:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 986210 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="StS1Jx6+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42bgPk3sNmz9sBn for ; Fri, 19 Oct 2018 07:19:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727305AbeJSEWQ (ORCPT ); Fri, 19 Oct 2018 00:22:16 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39896 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725735AbeJSEWP (ORCPT ); Fri, 19 Oct 2018 00:22:15 -0400 Received: by mail-wr1-f66.google.com with SMTP id 61-v6so35076021wrb.6 for ; Thu, 18 Oct 2018 13:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=QWQrNJPB+Ttr+pzFz2BCT4pslxTLZHq/b2OokufqERg=; b=StS1Jx6+YJSMgJNZXk3sAnoby9T+ar7NM8KJHohiLBfykx1mk8Shmxbpz2eLkeJjfi cK1JmueA4jJ+iDaFRyiEhPZJkvlkSdr4/fWKH9QllajtZuikni7theKUbJUTs4tfLEBa 0nSzD/9jLzT2OKkiR2LD8ie0EkgIbxRs7UCpKWLXU+jBtOamb9m+Y6beCi/YZThHvREb eseHp6cV69RyqceVIe+kfSegRq0XoPXP5CX6u4KoWycuu1JhAhRV9Qi3jzrWaWnJbHkw aK0lAkzQ1AaMeNkcd8/4d8kA0cge7fZ8ij4nRwArS/gZfaHBuYDAv/KrNwljEKC1YBJ7 h6dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=QWQrNJPB+Ttr+pzFz2BCT4pslxTLZHq/b2OokufqERg=; b=GCOXYoGb8d7eQDHCZuaJOnAZYqgkLiJYvB5ZGsf+9Q1dvCnnNTfNq/QDEfoiEoTkuq RqDuukTSx/CRExh+9H0PWh11KXZqm79dde9u+C1XA1HCoG8WbCXlayLZbbUH7FcRyECu QpGzENVchyTjEpr1bkY2m0E42WByRtcWN2vouSRRWrKgcOqGeHSxxT/15MP7ZB9O5a68 EmJ3T75F/Cn0tY5J0pGR7HPwx5oTtz6Ehhv6fBItmhldpSh3gGk0KhF15k6KpCJkaSX7 UCIbTEdNHl1y2mM1NypVLr6LvFrqtDT6vj9nyD2k/bR5rxrbg09KQUWe8rVfPW1xZ1/2 IxZg== X-Gm-Message-State: ABuFfogxIutvGyUH1X+qrxZkh7hw3FdNzfjgd3qwR4S1NIxVdP8+xcy1 St7Q3MHwhMBFMXwWjb6toJKRKZByEng= X-Google-Smtp-Source: ACcGV63/+TR6VI4qJ/74n9QnPPfLDJJyCwF7KWqvU0v0cLJ4YjnMbVybWHKqtJmtbantQDS6bPCE6Q== X-Received: by 2002:adf:c989:: with SMTP id f9-v6mr30147251wrh.148.1539893974462; Thu, 18 Oct 2018 13:19:34 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3f00:bc84:89cc:d913:5704? (p200300EA8BD43F00BC8489CCD9135704.dip0.t-ipconnect.de. [2003:ea:8bd4:3f00:bc84:89cc:d913:5704]) by smtp.googlemail.com with ESMTPSA id e142-v6sm2386501wmf.20.2018.10.18.13.19.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 13:19:33 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH net-next] r8169: handle all interrupt events in the hard irq handler To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" Message-ID: Date: Thu, 18 Oct 2018 22:19:28 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Having a separate "slow event" handler isn't needed because all interrupt events trigger asynchronous activity. And in case of SYSErr we have bigger problems than performance anyway. This patch also allows to get rid of acking interrupt events in the NAPI poll callback. Signed-off-by: Heiner Kallweit --- This patch will apply to net-next only after 6b839b6cf9ea ("r8169: fix NAPI handling under high load") was merged from net to net-next. --- drivers/net/ethernet/realtek/r8169.c | 65 ++++++++-------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 03d5fb7c7..3075b493d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -631,7 +631,6 @@ struct rtl8169_tc_offsets { enum rtl_flag { RTL_FLAG_TASK_ENABLED = 0, - RTL_FLAG_TASK_SLOW_PENDING, RTL_FLAG_TASK_RESET_PENDING, RTL_FLAG_MAX }; @@ -6460,42 +6459,29 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) if (status == 0xffff || !(status & (RTL_EVENT_NAPI | tp->event_slow))) return IRQ_NONE; - rtl_irq_disable(tp); - napi_schedule_irqoff(&tp->napi); - - return IRQ_HANDLED; -} - -/* - * Workqueue context. - */ -static void rtl_slow_event_work(struct rtl8169_private *tp) -{ - struct net_device *dev = tp->dev; - u16 status; + if (unlikely(status & SYSErr)) { + rtl8169_pcierr_interrupt(tp->dev); + goto out; + } - status = rtl_get_events(tp) & tp->event_slow; - rtl_ack_events(tp, status); + if (status & LinkChg) + phy_mac_interrupt(tp->dev->phydev); - if (unlikely(status & RxFIFOOver)) { - switch (tp->mac_version) { - /* Work around for rx fifo overflow */ - case RTL_GIGA_MAC_VER_11: - netif_stop_queue(dev); - /* XXX - Hack alert. See rtl_task(). */ - set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags); - default: - break; - } + if (unlikely(status & RxFIFOOver && + tp->mac_version == RTL_GIGA_MAC_VER_11)) { + netif_stop_queue(tp->dev); + /* XXX - Hack alert. See rtl_task(). */ + set_bit(RTL_FLAG_TASK_RESET_PENDING, tp->wk.flags); } - if (unlikely(status & SYSErr)) - rtl8169_pcierr_interrupt(dev); - - if (status & LinkChg) - phy_mac_interrupt(dev->phydev); + if (status & RTL_EVENT_NAPI) { + rtl_irq_disable(tp); + napi_schedule_irqoff(&tp->napi); + } +out: + rtl_ack_events(tp, status); - rtl_irq_enable_all(tp); + return IRQ_HANDLED; } static void rtl_task(struct work_struct *work) @@ -6504,8 +6490,6 @@ static void rtl_task(struct work_struct *work) int bitnr; void (*action)(struct rtl8169_private *); } rtl_work[] = { - /* XXX - keep rtl_slow_event_work() as first element. */ - { RTL_FLAG_TASK_SLOW_PENDING, rtl_slow_event_work }, { RTL_FLAG_TASK_RESET_PENDING, rtl_reset_work }, }; struct rtl8169_private *tp = @@ -6535,27 +6519,16 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) { struct rtl8169_private *tp = container_of(napi, struct rtl8169_private, napi); struct net_device *dev = tp->dev; - u16 enable_mask = RTL_EVENT_NAPI | tp->event_slow; int work_done; - u16 status; - - status = rtl_get_events(tp); - rtl_ack_events(tp, status & ~tp->event_slow); work_done = rtl_rx(dev, tp, (u32) budget); rtl_tx(dev, tp); - if (status & tp->event_slow) { - enable_mask &= ~tp->event_slow; - - rtl_schedule_task(tp, RTL_FLAG_TASK_SLOW_PENDING); - } - if (work_done < budget) { napi_complete_done(napi, work_done); - rtl_irq_enable(tp, enable_mask); + rtl_irq_enable_all(tp); mmiowb(); }