linux-kernel - Re: [PATCH 2/9] drivers/net: don't use flush_scheduled

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1292260139.7394.11.camel@nseg_linux_HP1.broadcom.com>
Date:	Mon, 13 Dec 2010 09:08:59 -0800
From:	"Michael Chan" <mchan@...adcom.com>
To:	"Tejun Heo" <tj@...nel.org>
cc:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"davem@...emloft.net" <davem@...emloft.net>,
	"Jay Cliburn" <jcliburn@...il.com>,
	"Divy Le Ray" <divy@...lsio.com>,
	"e1000-devel@...ts.sourceforge.net" 
	<e1000-devel@...ts.sourceforge.net>,
	"Vasanthy Kolluri" <vkolluri@...co.com>,
	"Samuel Ortiz" <samuel@...tiz.org>,
	"Lennert Buytenhek" <buytenh@...tstofly.org>,
	"Andrew Gallatin" <gallatin@...i.com>,
	"Francois Romieu" <romieu@...zoreil.com>,
	"Ramkrishna Vepa" <ramkrishna.vepa@...r.com>,
	"Matthew Carlson" <mcarlson@...adcom.com>,
	"David Brownell" <dbrownell@...rs.sourceforge.net>,
	"Shreyas Bhatewara" <sbhatewara@...are.com>
Subject: Re: [PATCH 2/9] drivers/net: don't use flush_scheduled_work()


On Sun, 2010-12-12 at 07:52 -0800, Tejun Heo wrote:
> flush_scheduled_work() is on its way out.  This patch contains simple
> conversions to replace flush_scheduled_work() usage with direct
> cancels and flushes.
> 
> Directly cancel the used works on driver detach and flush them in
> other cases.
> 
> The conversions are mostly straight forward and the only dangers are,
> 
> * Forgetting to cancel/flush one or more used works.
> 
> * Cancelling when a work should be flushed (ie. the work must be
>   executed once scheduled whether the driver is detaching or not).
> 
> I've gone over the changes multiple times but it would be much
> appreciated if you can review with the above points in mind.
> 
> Signed-off-by: Tejun Heo <tj@...nel.org>
> Cc: "David S. Miller" <davem@...emloft.net>
> Cc: Jay Cliburn <jcliburn@...il.com>
> Cc: Michael Chan <mchan@...adcom.com>
> Cc: Divy Le Ray <divy@...lsio.com>
> Cc: e1000-devel@...ts.sourceforge.net
> Cc: Vasanthy Kolluri <vkolluri@...co.com>
> Cc: Samuel Ortiz <samuel@...tiz.org>
> Cc: Lennert Buytenhek <buytenh@...tstofly.org>
> Cc: Andrew Gallatin <gallatin@...i.com>
> Cc: Francois Romieu <romieu@...zoreil.com>
> Cc: Ramkrishna Vepa <ramkrishna.vepa@...r.com>
> Cc: Matt Carlson <mcarlson@...adcom.com>
> Cc: David Brownell <dbrownell@...rs.sourceforge.net>
> Cc: Shreyas Bhatewara <sbhatewara@...are.com>
> Cc: netdev@...r.kernel.org
> ---

> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
> index 03209a3..5c811f3 100644
> --- a/drivers/net/bnx2.c
> +++ b/drivers/net/bnx2.c
> @@ -8393,7 +8393,7 @@ bnx2_remove_one(struct pci_dev *pdev)
>         struct net_device *dev = pci_get_drvdata(pdev);
>         struct bnx2 *bp = netdev_priv(dev);
> 
> -       flush_scheduled_work();
> +       cancel_work_sync(&bp->reset_task);

I think we can just remove flush_scheduled_work() altogether in
bnx2_remove_one().  The work has already been canceled in bnx2_close(),
so there is no possibility of it to be scheduled at this point.

> 
>         unregister_netdev(dev);
> 
> @@ -8431,7 +8431,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t
> state)
>         if (!netif_running(dev))
>                 return 0;
> 
> -       flush_scheduled_work();
> +       cancel_work_sync(&bp->reset_task);

This part ok.  Thanks.

Acked-by: Michael Chan <mchan@...adcom.com>

>         bnx2_netif_stop(bp, true);
>         netif_device_detach(dev);
>         del_timer_sync(&bp->timer);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/