From patchwork Sat Jun 20 20:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 217459 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=-8.1 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_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 5774FC433E0 for ; Sat, 20 Jun 2020 20:41:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34C3E22B4B for ; Sat, 20 Jun 2020 20:41:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nRPtSwIL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728845AbgFTUlD (ORCPT ); Sat, 20 Jun 2020 16:41:03 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50453 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728731AbgFTUlC (ORCPT ); Sat, 20 Jun 2020 16:41:02 -0400 Received: by mail-wm1-f68.google.com with SMTP id l17so11500410wmj.0 for ; Sat, 20 Jun 2020 13:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=9VisfBKwEdlL5gfhqyqG2mtBtVY9G2cVZRgFvwxUHBw=; b=nRPtSwILvaCIbd1tbS885ELCNxyGb2fRVweab/gcKGNL5MSSpkAhcx5vnUHKtmJYmt x40tB/KezRPhv99aAPFkNbSJjwVuXS8VcAQ5Kikt0ND+fVghJFVKbAi5YTiUb/3qU3ss FvO90KlZZwbU3EzlkyTUgezFmBfrBBTYXHXWqxJBcvtmj/BaMbFOBvZscX0J/YRTYt9w dEjXKbfUado0PbjinFRfE1vh+mK9PQu7rT40K1RrGYhlyPbz1rw9CQjFUABkZsrm69N/ btEX9KcpKezxRgOKUh9nh8i/G1rS6lyHJgxNz3k8jFjl8F2u66tEKG/jYmBWp8H/C9JY AbYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9VisfBKwEdlL5gfhqyqG2mtBtVY9G2cVZRgFvwxUHBw=; b=mMcVUT1lxwRlQsUSzqCHR0BSCNL39Rrf81upS9UWHB9kRxdtxOdUzkfXEP9Z0621tO +W/Xk9i1kDFB6YpBDymR1SUEKboJnqFpU69z3TBzAxrsAoO66t4+bDc/C9Slxr+HwMjH wpyPNKWoIFDeShTU7eTU2IqudrNvc3GImwyrpntZCR0Lj0Wd2wqyjH9148v8vbbUlaPf moS2AIjHy0MQDhv/MfuhtcDRL4khLUnJVTYUQtRvvRK8ul2xdVBVFwHe3gobKUbp9yZ6 bGTnBVSeAHv0UGI6h9m9FWdn5CiI6wjuKkIjyGVFU/5K56cOMVy3f8qKO87bgmZBs0aP bryA== X-Gm-Message-State: AOAM530XZsOEaAAt3EWOfzOGXutzbohOMck97qwJIY04/z1QzeSSXMxf AXK37wt2XLfP43HkaxaTV63X9gkY X-Google-Smtp-Source: ABdhPJz0oYW9oQriiwsGE0Z9mAPZD240fdk9xKOPYUc4usnsk8zNau2cWnFAQM9Gx+yF6F/I0GF0/Q== X-Received: by 2002:a1c:8186:: with SMTP id c128mr10749379wmd.114.1592685601021; Sat, 20 Jun 2020 13:40:01 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:b4cc:8098:204b:37c5? (p200300ea8f235700b4cc8098204b37c5.dip0.t-ipconnect.de. [2003:ea:8f23:5700:b4cc:8098:204b:37c5]) by smtp.googlemail.com with ESMTPSA id v24sm13311433wrd.92.2020.06.20.13.40.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 20 Jun 2020 13:40:00 -0700 (PDT) Subject: [PATCH net-next 1/7] net: core: try to runtime-resume detached device in __dev_open From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Message-ID: <89c52082-13ad-25ca-88b1-133573037e95@gmail.com> Date: Sat, 20 Jun 2020 22:35:42 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A netdevice may be marked as detached because the parent is runtime-suspended and not accessible whilst interface or link is down. An example are PCI network devices that go into PCI D3hot, see e.g. __igc_shutdown() or rtl8169_net_suspend(). If netdevice is down and marked as detached we can only open it if we runtime-resume it before __dev_open() calls netif_device_present(). Therefore, if netdevice is detached, try to runtime-resume the parent and only return with an error if it's still detached. Signed-off-by: Heiner Kallweit --- net/core/dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 6bc238814..ffa8c371d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -143,6 +143,7 @@ #include #include #include +#include #include "net-sysfs.h" @@ -1492,8 +1493,13 @@ static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack) ASSERT_RTNL(); - if (!netif_device_present(dev)) - return -ENODEV; + if (!netif_device_present(dev)) { + /* may be detached because parent is runtime-suspended */ + if (dev->dev.parent) + pm_runtime_resume(dev->dev.parent); + if (!netif_device_present(dev)) + return -ENODEV; + } /* Block netpoll from trying to do any rx path servicing. * If we don't do this there is a chance ndo_poll_controller From patchwork Sat Jun 20 20:37:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 217458 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=-8.1 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_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 49645C433E0 for ; Sat, 20 Jun 2020 20:41:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26D2623359 for ; Sat, 20 Jun 2020 20:41:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dtVYkQAD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728868AbgFTUlL (ORCPT ); Sat, 20 Jun 2020 16:41:11 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35994 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728835AbgFTUlH (ORCPT ); Sat, 20 Jun 2020 16:41:07 -0400 Received: by mail-wr1-f66.google.com with SMTP id k6so490028wrn.3 for ; Sat, 20 Jun 2020 13:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Qv76KDmBqfD0rp4FDfAP06h705PU7V5OkYcrdIsdhwQ=; b=dtVYkQADZvlbCKjj8qI0LFB6eo2H10wrB7mFVIaZtaBliGRJLp5V9gAshIWzhoFuk6 sC2iWxUvUCD12VDhzH2nedV3D6lJEg369TZIYwyq0iShmGfthp5MUgmiX4D5IkPhShoX T7OTHMaVnqnUhp8QGLIRpuo6O2DmkK2+3CH9xYFnBEmytKyNC6/PCOyrWidqtg9J4n+H 9tTT/NToVHLTVjX2Kq79dKtJJGF2MWgzDLnW8Fr5N6PXpDpJkBIdU+5KGqinlrOJgVc5 RCRg/CEXilBNAY7vMZjU/TF8p/uhm7kcLtPN5HfLw1SVf9dDJNJ6/1kXOoPUog7brQOg byew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Qv76KDmBqfD0rp4FDfAP06h705PU7V5OkYcrdIsdhwQ=; b=UGtzUHfA4GCoevzjer9arJawCcqko+KiMCfVxS7TzhSaR2XWcdpTqGD97MNABhlYTN 2xYbuLUKWjNNVZB1r14S+9vioSKT+ezqM+RcnDroHQ4v9m80Osr4Bj27QtpCOUDRwSWF OG+plIF2RjRfMchILIUrMOUQrLkoY1xcN0P5GO5V3phfx4mc6uSIY4kUSdNNHvWo69vF RC/WSw7R2UBJyVOwO4svp8qDDClErp0rU8SNJQLFE+Rjwz/JDcuJ6bkqV41yTSHJCem0 sEGwShsUVIsBxxCdAxU73hSzpXxUv3RQkQDFmZsVXMiLZExzp06ya4u6piiVFqxbeHu9 upyQ== X-Gm-Message-State: AOAM531K6WJklyev1iJJlDp0Wltxd6IBFWOqKJsz5YsZGh8JULFufRbK cpfPMg34TzuGd/4wVpsOl9JUgMam X-Google-Smtp-Source: ABdhPJwzMOxohSIPacIaItRIwDku2rxtbg4DSUdkdpBn+V/+SsDnFwfyNaEcL12ZrkIlT1bDs7ESjA== X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr11233722wrt.220.1592685604140; Sat, 20 Jun 2020 13:40:04 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:b4cc:8098:204b:37c5? (p200300ea8f235700b4cc8098204b37c5.dip0.t-ipconnect.de. [2003:ea:8f23:5700:b4cc:8098:204b:37c5]) by smtp.googlemail.com with ESMTPSA id f11sm11723687wrj.2.2020.06.20.13.40.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 20 Jun 2020 13:40:03 -0700 (PDT) Subject: [PATCH net-next 4/7] r8169: add rtl8169_up From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Message-ID: <47d5eb6f-08f0-a538-794b-8ac43743678f@gmail.com> Date: Sat, 20 Jun 2020 22:37:50 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Factor out bringing device up to a new function rtl8169_up(), similar to rtl8169_down() for bringing the device down. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 48 ++++++++--------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index c8e0f2bb5..2414df29c 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4616,6 +4616,19 @@ static void rtl8169_down(struct rtl8169_private *tp) rtl_unlock_work(tp); } +static void rtl8169_up(struct rtl8169_private *tp) +{ + rtl_lock_work(tp); + rtl_pll_power_up(tp); + rtl8169_init_phy(tp); + napi_enable(&tp->napi); + set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); + rtl_reset_work(tp); + + phy_start(tp->phydev); + rtl_unlock_work(tp); +} + static int rtl8169_close(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); @@ -4691,25 +4704,10 @@ static int rtl_open(struct net_device *dev) if (retval) goto err_free_irq; - rtl_lock_work(tp); - - set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); - - napi_enable(&tp->napi); - - rtl8169_init_phy(tp); - - rtl_pll_power_up(tp); - - rtl_hw_start(tp); - + rtl8169_up(tp); rtl8169_init_counter_offsets(tp); - - phy_start(tp->phydev); netif_start_queue(dev); - rtl_unlock_work(tp); - pm_runtime_put_sync(&pdev->dev); out: return retval; @@ -4798,20 +4796,6 @@ static int __maybe_unused rtl8169_suspend(struct device *device) return 0; } -static void __rtl8169_resume(struct rtl8169_private *tp) -{ - rtl_pll_power_up(tp); - rtl8169_init_phy(tp); - - phy_start(tp->phydev); - - rtl_lock_work(tp); - napi_enable(&tp->napi); - set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); - rtl_reset_work(tp); - rtl_unlock_work(tp); -} - static int __maybe_unused rtl8169_resume(struct device *device) { struct rtl8169_private *tp = dev_get_drvdata(device); @@ -4819,7 +4803,7 @@ static int __maybe_unused rtl8169_resume(struct device *device) rtl_rar_set(tp, tp->dev->dev_addr); if (netif_running(tp->dev)) - __rtl8169_resume(tp); + rtl8169_up(tp); netif_device_attach(tp->dev); @@ -4855,7 +4839,7 @@ static int rtl8169_runtime_resume(struct device *device) rtl_unlock_work(tp); if (tp->TxDescArray) - __rtl8169_resume(tp); + rtl8169_up(tp); netif_device_attach(tp->dev); From patchwork Sat Jun 20 20:38:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 217456 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=-8.1 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_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 6D38FC433DF for ; Sat, 20 Jun 2020 20:41:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E38A23B07 for ; Sat, 20 Jun 2020 20:41:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gayh1feT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728890AbgFTUlR (ORCPT ); Sat, 20 Jun 2020 16:41:17 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45124 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728851AbgFTUlI (ORCPT ); Sat, 20 Jun 2020 16:41:08 -0400 Received: by mail-wr1-f66.google.com with SMTP id c3so12903080wru.12 for ; Sat, 20 Jun 2020 13:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=iLtQTzUGDzz0+ZAHaTXEYjZL3GPDc0BZiL2YU9EKvqk=; b=Gayh1feTSQn5aMiucUaEIESoROBx6te79ZxpgOzVCSFkna6H33w3anpQFVChhUkGAA tGohYX09yS3+EmTaLNkqKrad440meuzjZJU8O+RNlhvk/JO2XQSa17lPi82u/wtorzuo HFCMLOZ2sz6jOdpxj4erP2T5cV8D0oprgevUzuu58PaKtQxEpDkHFF6IQGDSzJjOludG iT6Kh3NtBh6k8EG56CRMBBn/YDpLLw1fpuYWY6jdnVI5pH3oUpcnJOuutcHdVgv+yu4d Ayjprx3MbbT7AYZkRrnQO3j3maBBnAyvVJ3dGREAb124QfYtwpv0rHggzNXQj5nSHf8j q1cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=iLtQTzUGDzz0+ZAHaTXEYjZL3GPDc0BZiL2YU9EKvqk=; b=ikuyP50/EYlx94e0/18pJsWjA0i0yRO/FfNk6bjAvfEhUBngeyTKTuoB5xIAmqHl+e 88dnlSZ5ZC2Va2BlfwisyK/TUyYsbto43rhFdJ2YJp//iy2n1RLbGyerAZ+xInT0n03i nTe4OjLVT2QXwbMsL4H97FDsfzoXM2SQydUIJ/j81MBbnTsiO8OG4i0n/7ueX1wJeiAg eSA2TRBFSvY1XauaNcaDI/9MYRu/24IbkJlM0e5L+4n4T6UcQSY92asYDiUFgcMqol98 +F7VDj61mka7m916cUAI6sL/gqpCgEorXgOxPWzoAmXUphjzWGrcu+0eoBigbM1YKu/C 5ETw== X-Gm-Message-State: AOAM531SXCGsO0mGsBhdEGEc40MOU4avoxpiJG+VvgDvuLgGdmPWTetF 4ZXemNEWJQLyVJcYPDicWiv/7N9j X-Google-Smtp-Source: ABdhPJwciQlCSryrQOkUOMtbyEDbnn0Q/MG+aebbOZe7EhAeEVfTCOZcquMXTPhBcT52QPPPZETl+w== X-Received: by 2002:adf:afc3:: with SMTP id y3mr10489634wrd.277.1592685605072; Sat, 20 Jun 2020 13:40:05 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:b4cc:8098:204b:37c5? (p200300ea8f235700b4cc8098204b37c5.dip0.t-ipconnect.de. [2003:ea:8f23:5700:b4cc:8098:204b:37c5]) by smtp.googlemail.com with ESMTPSA id v11sm1118wmb.3.2020.06.20.13.40.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 20 Jun 2020 13:40:05 -0700 (PDT) Subject: [PATCH net-next 5/7] r8169: use RTNL to protect critical sections From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Message-ID: <5816fd36-55fb-d51c-c320-a7e338b40c40@gmail.com> Date: Sat, 20 Jun 2020 22:38:24 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Most relevant ops (open, close, ethtool ops) are protected with RTNL lock by net core. Make sure that such ops can't be interrupted by e.g. (runtime-)suspending by taking the RTNL lock in suspend ops and the PCI error handler. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 2414df29c..e70797311 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4527,6 +4527,7 @@ static void rtl_task(struct work_struct *work) struct rtl8169_private *tp = container_of(work, struct rtl8169_private, wk.work); + rtnl_lock(); rtl_lock_work(tp); if (!netif_running(tp->dev) || @@ -4539,6 +4540,7 @@ static void rtl_task(struct work_struct *work) } out_unlock: rtl_unlock_work(tp); + rtnl_unlock(); } static int rtl8169_poll(struct napi_struct *napi, int budget) @@ -4791,7 +4793,9 @@ static int __maybe_unused rtl8169_suspend(struct device *device) { struct rtl8169_private *tp = dev_get_drvdata(device); + rtnl_lock(); rtl8169_net_suspend(tp); + rtnl_unlock(); return 0; } @@ -4819,11 +4823,13 @@ static int rtl8169_runtime_suspend(struct device *device) return 0; } + rtnl_lock(); rtl_lock_work(tp); __rtl8169_set_wol(tp, WAKE_PHY); rtl_unlock_work(tp); rtl8169_net_suspend(tp); + rtnl_unlock(); return 0; } @@ -4885,7 +4891,9 @@ static void rtl_shutdown(struct pci_dev *pdev) { struct rtl8169_private *tp = pci_get_drvdata(pdev); + rtnl_lock(); rtl8169_net_suspend(tp); + rtnl_unlock(); /* Restore original MAC address */ rtl_rar_set(tp, tp->dev->perm_addr); From patchwork Sat Jun 20 20:38:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 217457 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=-8.1 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_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 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 74804C433E0 for ; Sat, 20 Jun 2020 20:41:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5077523A7A for ; Sat, 20 Jun 2020 20:41:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c7GTmwTm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728876AbgFTUlO (ORCPT ); Sat, 20 Jun 2020 16:41:14 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42520 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728852AbgFTUlJ (ORCPT ); Sat, 20 Jun 2020 16:41:09 -0400 Received: by mail-wr1-f65.google.com with SMTP id o11so5247378wrv.9 for ; Sat, 20 Jun 2020 13:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=SpaZV1YCSt3jeu+jmAY4g0P9iqD7BbLIXZJ2ro7kUSg=; b=c7GTmwTmFTp4uuPLXjp0KgDPXIox1X0i2IYTPVv7Sy1h++05Lbtomz5cGrRZV9B5Wa fjgcZEfuKFePrKAaeNVT/QdYTNkWe8KYgPVos0VixwL64irBoLhbtXKjmUxAHcS0d2X+ +O/f1rqwpk7dUlwiin9oxUei2tLrzH7d6ArJ6cUXIT3Ls/GBNTNy96WpKspwhR/jjXVo ncHO9bWWv2Oee+N8ayrKtW+eI4P1jClE2IQdoQ2Vlg05Gh2qXJxRa4X0g0ewn2cq7pRl 041zkvrmkI+JnCQE8JkBeanrXcM1NQ4W9DlJYpK/8Lmd6nByaxVVUgij/TH8tb5Dt0Iq 1obA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SpaZV1YCSt3jeu+jmAY4g0P9iqD7BbLIXZJ2ro7kUSg=; b=qqN7Ea9mXS4O3ZXqK246ENz6DBf/HObgcfyJPOfKGjXVr0Sj6pu88xyeRkzt0lCaXw Op9Ei+8IqnwC+aLqU/RpX0SXBllqQ6J5dFugjth2qxmVSWSBrxRo/tuSWsepnSNyvHI5 FlyD0t0H8w5vc14lTV8N0Gak9jW643JUjbmro+7DWnVk4PBYkq7Tszg40RHidlvqHWFK bwKoqZtBVacMpOL50xrjSM/plaa9J4jf97lqV3y5/7QqUd6awzjdEKZecfr1aTVR/xp7 TOpwi6x9D4zWBpfpzPyh6h+hIgOLntuX0I7Gvee0i0voRqQW/pOBP23YPXsPUh6/yZ6N Mxig== X-Gm-Message-State: AOAM533ruWff5EmwJ612+sU/R5YaZa7k884p3h3DJjqBjHoTIUlwVh3e N+ac3gqaUQ02xvG4jt3fA29NiIpN X-Google-Smtp-Source: ABdhPJyRp3e8qo7n/x9B4k5kPvcDzVy3Q5n9VAWOjswFB4sZufvJ8HS50JWUD7gMbJPOLtE9n9SLzQ== X-Received: by 2002:adf:aad3:: with SMTP id i19mr10789240wrc.359.1592685606100; Sat, 20 Jun 2020 13:40:06 -0700 (PDT) Received: from ?IPv6:2003:ea:8f23:5700:b4cc:8098:204b:37c5? (p200300ea8f235700b4cc8098204b37c5.dip0.t-ipconnect.de. [2003:ea:8f23:5700:b4cc:8098:204b:37c5]) by smtp.googlemail.com with ESMTPSA id e2sm9428996wrt.76.2020.06.20.13.40.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 20 Jun 2020 13:40:05 -0700 (PDT) Subject: [PATCH net-next 6/7] r8169: remove driver-specific mutex From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers , Jakub Kicinski Cc: "netdev@vger.kernel.org" References: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Message-ID: <90cb5574-1d39-3902-de6e-7b84c06c4a61@gmail.com> Date: Sat, 20 Jun 2020 22:38:55 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <2e68df85-4f64-d45b-3c4c-bb8cb9a4411d@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the critical sections are protected with RTNL lock, we don't need a separate mutex any longer. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 45 ----------------------- 1 file changed, 45 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index e70797311..e09732c9d 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -611,7 +611,6 @@ struct rtl8169_private { struct { DECLARE_BITMAP(flags, RTL_FLAG_MAX); - struct mutex mutex; struct work_struct work; } wk; @@ -663,16 +662,6 @@ static inline struct device *tp_to_dev(struct rtl8169_private *tp) return &tp->pci_dev->dev; } -static void rtl_lock_work(struct rtl8169_private *tp) -{ - mutex_lock(&tp->wk.mutex); -} - -static void rtl_unlock_work(struct rtl8169_private *tp) -{ - mutex_unlock(&tp->wk.mutex); -} - static void rtl_lock_config_regs(struct rtl8169_private *tp) { RTL_W8(tp, Cfg9346, Cfg9346_Lock); @@ -1348,10 +1337,8 @@ static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { struct rtl8169_private *tp = netdev_priv(dev); - rtl_lock_work(tp); wol->supported = WAKE_ANY; wol->wolopts = tp->saved_wolopts; - rtl_unlock_work(tp); } static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) @@ -1426,13 +1413,9 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) if (wol->wolopts & ~WAKE_ANY) return -EINVAL; - rtl_lock_work(tp); - tp->saved_wolopts = wol->wolopts; __rtl8169_set_wol(tp, tp->saved_wolopts); - rtl_unlock_work(tp); - return 0; } @@ -1495,8 +1478,6 @@ static int rtl8169_set_features(struct net_device *dev, { struct rtl8169_private *tp = netdev_priv(dev); - rtl_lock_work(tp); - rtl_set_rx_config_features(tp, features); if (features & NETIF_F_RXCSUM) @@ -1514,8 +1495,6 @@ static int rtl8169_set_features(struct net_device *dev, RTL_W16(tp, CPlusCmd, tp->cp_cmd); rtl_pci_commit(tp); - rtl_unlock_work(tp); - return 0; } @@ -1541,10 +1520,8 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, u32 *dw = p; int i; - rtl_lock_work(tp); for (i = 0; i < R8169_REGS_SIZE; i += 4) memcpy_fromio(dw++, data++, 4); - rtl_unlock_work(tp); } static const char rtl8169_gstrings[][ETH_GSTRING_LEN] = { @@ -1860,8 +1837,6 @@ static int rtl_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) units = DIV_ROUND_UP(ec->rx_coalesce_usecs * 1000U, scale); w |= FIELD_PREP(RTL_COALESCE_RX_USECS, units); - rtl_lock_work(tp); - RTL_W16(tp, IntrMitigate, w); /* Meaning of PktCntrDisable bit changed from RTL8168e-vl */ @@ -1877,8 +1852,6 @@ static int rtl_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) RTL_W16(tp, CPlusCmd, tp->cp_cmd); rtl_pci_commit(tp); - rtl_unlock_work(tp); - return 0; } @@ -2165,8 +2138,6 @@ static void rtl8169_init_phy(struct rtl8169_private *tp) static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) { - rtl_lock_work(tp); - rtl_unlock_config_regs(tp); RTL_W32(tp, MAC4, addr[4] | addr[5] << 8); @@ -2179,8 +2150,6 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) rtl_rar_exgmac_set(tp, addr); rtl_lock_config_regs(tp); - - rtl_unlock_work(tp); } static int rtl_set_mac_address(struct net_device *dev, void *p) @@ -4528,7 +4497,6 @@ static void rtl_task(struct work_struct *work) container_of(work, struct rtl8169_private, wk.work); rtnl_lock(); - rtl_lock_work(tp); if (!netif_running(tp->dev) || !test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags)) @@ -4539,7 +4507,6 @@ static void rtl_task(struct work_struct *work) netif_wake_queue(tp->dev); } out_unlock: - rtl_unlock_work(tp); rtnl_unlock(); } @@ -4602,8 +4569,6 @@ static int r8169_phy_connect(struct rtl8169_private *tp) static void rtl8169_down(struct rtl8169_private *tp) { - rtl_lock_work(tp); - /* Clear all task flags */ bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); @@ -4614,13 +4579,10 @@ static void rtl8169_down(struct rtl8169_private *tp) rtl8169_cleanup(tp, true); rtl_pll_power_down(tp); - - rtl_unlock_work(tp); } static void rtl8169_up(struct rtl8169_private *tp) { - rtl_lock_work(tp); rtl_pll_power_up(tp); rtl8169_init_phy(tp); napi_enable(&tp->napi); @@ -4628,7 +4590,6 @@ static void rtl8169_up(struct rtl8169_private *tp) rtl_reset_work(tp); phy_start(tp->phydev); - rtl_unlock_work(tp); } static int rtl8169_close(struct net_device *dev) @@ -4824,10 +4785,7 @@ static int rtl8169_runtime_suspend(struct device *device) } rtnl_lock(); - rtl_lock_work(tp); __rtl8169_set_wol(tp, WAKE_PHY); - rtl_unlock_work(tp); - rtl8169_net_suspend(tp); rtnl_unlock(); @@ -4840,9 +4798,7 @@ static int rtl8169_runtime_resume(struct device *device) rtl_rar_set(tp, tp->dev->dev_addr); - rtl_lock_work(tp); __rtl8169_set_wol(tp, tp->saved_wolopts); - rtl_unlock_work(tp); if (tp->TxDescArray) rtl8169_up(tp); @@ -5299,7 +5255,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; } - mutex_init(&tp->wk.mutex); INIT_WORK(&tp->wk.work, rtl_task); u64_stats_init(&tp->rx_stats.syncp); u64_stats_init(&tp->tx_stats.syncp);