2013-07-08 07:22:57

by Konstantin Khlebnikov

Subject: [PATCH] drivers/net: enic: release rtnl_lock on error-path

enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.

Signed-off-by: Konstantin Khlebnikov <[email protected]>
Cc: Christian Benvenuti <[email protected]>
Cc: Roopa Prabhu <[email protected]>
Cc: Neel Patel <[email protected]>
Cc: Nishank Trivedi <[email protected]>
---
drivers/net/ethernet/cisco/enic/enic_main.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 635f559..992ec2e 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1761,6 +1761,7 @@ static void enic_change_mtu_work(struct work_struct *work)
enic_synchronize_irqs(enic);
err = vnic_rq_disable(&enic->rq[0]);
if (err) {
+ rtnl_unlock();
netdev_err(netdev, "Unable to disable RQ.\n");
return;
}
@@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work)
vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
/* Need at least one buffer on ring to get going */
if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
+ rtnl_unlock();
netdev_err(netdev, "Unable to alloc receive buffers.\n");
return;
}

2013-07-08 16:35:51

by Nishank Trivedi

Subject: Re: [PATCH] drivers/net: enic: release rtnl_lock on error-path

On 7/8/13 12:22 AM, Konstantin Khlebnikov wrote:
> enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.
>
> Signed-off-by: Konstantin Khlebnikov <[email protected]>
> Cc: Christian Benvenuti <[email protected]>
> Cc: Roopa Prabhu <[email protected]>
> Cc: Neel Patel <[email protected]>
> Cc: Nishank Trivedi <[email protected]>
> ---
> drivers/net/ethernet/cisco/enic/enic_main.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
> index 635f559..992ec2e 100644
> --- a/drivers/net/ethernet/cisco/enic/enic_main.c
> +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
> @@ -1761,6 +1761,7 @@ static void enic_change_mtu_work(struct work_struct *work)
> enic_synchronize_irqs(enic);
> err = vnic_rq_disable(&enic->rq[0]);
> if (err) {
> + rtnl_unlock();
> netdev_err(netdev, "Unable to disable RQ.\n");
> return;
> }
> @@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work)
> vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
> /* Need at least one buffer on ring to get going */
> if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
> + rtnl_unlock();
> netdev_err(netdev, "Unable to alloc receive buffers.\n");
> return;
> }
>

Acked.

Thanks.

2013-07-08 16:36:37

by Neel Patel (neepatel)

Subject: RE: [PATCH] drivers/net: enic: release rtnl_lock on error-path

Looks good.

Thanks!

-----Original Message-----
From: Nishank Trivedi (nistrive)
Sent: Monday, July 08, 2013 9:26 AM
To: Konstantin Khlebnikov
Cc: [email protected]; [email protected]; Neel Patel (neepatel); Christian Benvenuti (benve)
Subject: Re: [PATCH] drivers/net: enic: release rtnl_lock on error-path

On 7/8/13 12:22 AM, Konstantin Khlebnikov wrote:
> enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.
>
> Signed-off-by: Konstantin Khlebnikov <[email protected]>
> Cc: Christian Benvenuti <[email protected]>
> Cc: Roopa Prabhu <[email protected]>
> Cc: Neel Patel <[email protected]>
> Cc: Nishank Trivedi <[email protected]>
> ---
> drivers/net/ethernet/cisco/enic/enic_main.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
> index 635f559..992ec2e 100644
> --- a/drivers/net/ethernet/cisco/enic/enic_main.c
> +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
> @@ -1761,6 +1761,7 @@ static void enic_change_mtu_work(struct work_struct *work)
> enic_synchronize_irqs(enic);
> err = vnic_rq_disable(&enic->rq[0]);
> if (err) {
> + rtnl_unlock();
> netdev_err(netdev, "Unable to disable RQ.\n");
> return;
> }
> @@ -1773,6 +1774,7 @@ static void enic_change_mtu_work(struct work_struct *work)
> vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
> /* Need at least one buffer on ring to get going */
> if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
> + rtnl_unlock();
> netdev_err(netdev, "Unable to alloc receive buffers.\n");
> return;
> }
>

Acked.

Thanks.
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2013-07-09 19:56:44

by David Miller

Subject: Re: [PATCH] drivers/net: enic: release rtnl_lock on error-path

From: Konstantin Khlebnikov <[email protected]>
Date: Mon, 08 Jul 2013 11:22:51 +0400

> enic_change_mtu_work() must call rtnl_unlock() on all exiting paths.
>
> Signed-off-by: Konstantin Khlebnikov <[email protected]>

Applied.