2016-04-05 20:58:27

by Bjorn Helgaas

Subject: [PATCH] Revert "netpoll: Fix extra refcount release in netpoll_cleanup()"

This reverts commit 543e3a8da5a4c453e992d5351ef405d5e32f27d7.

Direct callers of __netpoll_setup() depend on it to set np->dev,
so we can't simply move that assignment up to netpoll_stup().

Reported-by: Bart Van Assche <[email protected]>
Signed-off-by: Bjorn Helgaas <[email protected]>
---
net/core/netpoll.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index a57bd17..94acfc8 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -603,6 +603,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
const struct net_device_ops *ops;
int err;

+ np->dev = ndev;
strlcpy(np->dev_name, ndev->name, IFNAMSIZ);
INIT_WORK(&np->cleanup_work, netpoll_async_cleanup);

@@ -669,7 +670,6 @@ int netpoll_setup(struct netpoll *np)
goto unlock;
}
dev_hold(ndev);
- np->dev = ndev;

if (netdev_master_upper_dev_get(ndev)) {
np_err(np, "%s is a slave device, aborting\n", np->dev_name);
@@ -770,7 +770,6 @@ int netpoll_setup(struct netpoll *np)
return 0;

put:
- np->dev = NULL;
dev_put(ndev);
unlock:
rtnl_unlock();

2016-04-06 13:48:42

by Neil Horman

Subject: Re: [PATCH] Revert "netpoll: Fix extra refcount release in netpoll_cleanup()"

On Tue, Apr 05, 2016 at 03:58:22PM -0500, Bjorn Helgaas wrote:
> This reverts commit 543e3a8da5a4c453e992d5351ef405d5e32f27d7.
>
> Direct callers of __netpoll_setup() depend on it to set np->dev,
> so we can't simply move that assignment up to netpoll_stup().
>
> Reported-by: Bart Van Assche <[email protected]>
> Signed-off-by: Bjorn Helgaas <[email protected]>
> ---
> net/core/netpoll.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index a57bd17..94acfc8 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -603,6 +603,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
> const struct net_device_ops *ops;
> int err;
>
> + np->dev = ndev;
> strlcpy(np->dev_name, ndev->name, IFNAMSIZ);
> INIT_WORK(&np->cleanup_work, netpoll_async_cleanup);
>
> @@ -669,7 +670,6 @@ int netpoll_setup(struct netpoll *np)
> goto unlock;
> }
> dev_hold(ndev);
> - np->dev = ndev;
>
> if (netdev_master_upper_dev_get(ndev)) {
> np_err(np, "%s is a slave device, aborting\n", np->dev_name);
> @@ -770,7 +770,6 @@ int netpoll_setup(struct netpoll *np)
> return 0;
>
> put:
> - np->dev = NULL;
> dev_put(ndev);
> unlock:
> rtnl_unlock();
>
Acked-by: Neil Horman <[email protected]>

2016-04-06 14:28:20

by Bart Van Assche

Subject: Re: [PATCH] Revert "netpoll: Fix extra refcount release in netpoll_cleanup()"

On 04/05/16 13:58, Bjorn Helgaas wrote:
> This reverts commit 543e3a8da5a4c453e992d5351ef405d5e32f27d7.
>
> Direct callers of __netpoll_setup() depend on it to set np->dev,
> so we can't simply move that assignment up to netpoll_stup().
>
> Reported-by: Bart Van Assche <[email protected]>
> Signed-off-by: Bjorn Helgaas <[email protected]>

Tested-by: Bart Van Assche <[email protected]>

Thanks!

Bart.