netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
@ 2020-05-22 16:39 Grygorii Strashko
  2020-05-22 16:50 ` Suman Anna
  2020-05-23 23:35 ` David Miller
  0 siblings, 2 replies; 4+ messages in thread
From: Grygorii Strashko @ 2020-05-22 16:39 UTC (permalink / raw)
  To: David S. Miller, Jakub Kicinski
  Cc: netdev, Sekhar Nori, linux-kernel, linux-omap, Suman Anna,
	Grygorii Strashko

vlan_for_each() are required to be called with rtnl_lock taken, otherwise
ASSERT_RTNL() warning will be triggered - which happens now during System
resume from suspend:
  cpsw_suspend()
  |- cpsw_ndo_stop()
    |- __hw_addr_ref_unsync_dev()
      |- cpsw_purge_all_mc()
         |- vlan_for_each()
            |- ASSERT_RTNL();

Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls.

Fixes: 15180eca569b net: ethernet: ti: cpsw: fix vlan mcast
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
 drivers/net/ethernet/ti/cpsw.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index c2c5bf87da01..ffeb8633e530 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1753,11 +1753,15 @@ static int cpsw_suspend(struct device *dev)
 	struct cpsw_common *cpsw = dev_get_drvdata(dev);
 	int i;
 
+	rtnl_lock();
+
 	for (i = 0; i < cpsw->data.slaves; i++)
 		if (cpsw->slaves[i].ndev)
 			if (netif_running(cpsw->slaves[i].ndev))
 				cpsw_ndo_stop(cpsw->slaves[i].ndev);
 
+	rtnl_unlock();
+
 	/* Select sleep pin state */
 	pinctrl_pm_select_sleep_state(dev);
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
  2020-05-22 16:39 [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend Grygorii Strashko
@ 2020-05-22 16:50 ` Suman Anna
  2020-05-22 17:08   ` Grygorii Strashko
  2020-05-23 23:35 ` David Miller
  1 sibling, 1 reply; 4+ messages in thread
From: Suman Anna @ 2020-05-22 16:50 UTC (permalink / raw)
  To: Grygorii Strashko, David S. Miller, Jakub Kicinski
  Cc: netdev, Sekhar Nori, linux-kernel, linux-omap

On 5/22/20 11:39 AM, Grygorii Strashko wrote:
> vlan_for_each() are required to be called with rtnl_lock taken, otherwise
> ASSERT_RTNL() warning will be triggered - which happens now during System
> resume from suspend:
>    cpsw_suspend()
>    |- cpsw_ndo_stop()
>      |- __hw_addr_ref_unsync_dev()
>        |- cpsw_purge_all_mc()
>           |- vlan_for_each()
>              |- ASSERT_RTNL();
> 
> Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls.
> 
> Fixes: 15180eca569b net: ethernet: ti: cpsw: fix vlan mcast

Format for this should be
Fixes: 15180eca569b ("net: ethernet: ti: cpsw: fix vlan mcast")

regards
Suman

> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
> ---
>   drivers/net/ethernet/ti/cpsw.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
> index c2c5bf87da01..ffeb8633e530 100644
> --- a/drivers/net/ethernet/ti/cpsw.c
> +++ b/drivers/net/ethernet/ti/cpsw.c
> @@ -1753,11 +1753,15 @@ static int cpsw_suspend(struct device *dev)
>   	struct cpsw_common *cpsw = dev_get_drvdata(dev);
>   	int i;
>   
> +	rtnl_lock();
> +
>   	for (i = 0; i < cpsw->data.slaves; i++)
>   		if (cpsw->slaves[i].ndev)
>   			if (netif_running(cpsw->slaves[i].ndev))
>   				cpsw_ndo_stop(cpsw->slaves[i].ndev);
>   
> +	rtnl_unlock();
> +
>   	/* Select sleep pin state */
>   	pinctrl_pm_select_sleep_state(dev);
>   
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
  2020-05-22 16:50 ` Suman Anna
@ 2020-05-22 17:08   ` Grygorii Strashko
  0 siblings, 0 replies; 4+ messages in thread
From: Grygorii Strashko @ 2020-05-22 17:08 UTC (permalink / raw)
  To: Suman Anna, David S. Miller, Jakub Kicinski
  Cc: netdev, Sekhar Nori, linux-kernel, linux-omap



On 22/05/2020 19:50, Suman Anna wrote:
> On 5/22/20 11:39 AM, Grygorii Strashko wrote:
>> vlan_for_each() are required to be called with rtnl_lock taken, otherwise
>> ASSERT_RTNL() warning will be triggered - which happens now during System
>> resume from suspend:
>>    cpsw_suspend()
>>    |- cpsw_ndo_stop()
>>      |- __hw_addr_ref_unsync_dev()
>>        |- cpsw_purge_all_mc()
>>           |- vlan_for_each()
>>              |- ASSERT_RTNL();
>>
>> Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls.
>>
>> Fixes: 15180eca569b net: ethernet: ti: cpsw: fix vlan mcast
> 
> Format for this should be
> Fixes: 15180eca569b ("net: ethernet: ti: cpsw: fix vlan mcast")

Right sorry

> 
> regards
> Suman
> 
>> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
>> ---
>>   drivers/net/ethernet/ti/cpsw.c | 4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
>> index c2c5bf87da01..ffeb8633e530 100644
>> --- a/drivers/net/ethernet/ti/cpsw.c
>> +++ b/drivers/net/ethernet/ti/cpsw.c
>> @@ -1753,11 +1753,15 @@ static int cpsw_suspend(struct device *dev)
>>       struct cpsw_common *cpsw = dev_get_drvdata(dev);
>>       int i;
>> +    rtnl_lock();
>> +
>>       for (i = 0; i < cpsw->data.slaves; i++)
>>           if (cpsw->slaves[i].ndev)
>>               if (netif_running(cpsw->slaves[i].ndev))
>>                   cpsw_ndo_stop(cpsw->slaves[i].ndev);
>> +    rtnl_unlock();
>> +
>>       /* Select sleep pin state */
>>       pinctrl_pm_select_sleep_state(dev);
>>
> 

-- 
Best regards,
grygorii

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
  2020-05-22 16:39 [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend Grygorii Strashko
  2020-05-22 16:50 ` Suman Anna
@ 2020-05-23 23:35 ` David Miller
  1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2020-05-23 23:35 UTC (permalink / raw)
  To: grygorii.strashko; +Cc: kuba, netdev, nsekhar, linux-kernel, linux-omap, s-anna

From: Grygorii Strashko <grygorii.strashko@ti.com>
Date: Fri, 22 May 2020 19:39:31 +0300

> vlan_for_each() are required to be called with rtnl_lock taken, otherwise
> ASSERT_RTNL() warning will be triggered - which happens now during System
> resume from suspend:
>   cpsw_suspend()
>   |- cpsw_ndo_stop()
>     |- __hw_addr_ref_unsync_dev()
>       |- cpsw_purge_all_mc()
>          |- vlan_for_each()
>             |- ASSERT_RTNL();
> 
> Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls.
> 
> Fixes: 15180eca569b net: ethernet: ti: cpsw: fix vlan mcast
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-05-23 23:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 16:39 [PATCH] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend Grygorii Strashko
2020-05-22 16:50 ` Suman Anna
2020-05-22 17:08   ` Grygorii Strashko
2020-05-23 23:35 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).