* [PATCH 2/2] net/mlx4_core: clean up srq_res_start_move_to()
@ 2014-01-07 13:02 Paul Bolle
2014-01-14 6:40 ` Jack Morgenstein
0 siblings, 1 reply; 5+ messages in thread
From: Paul Bolle @ 2014-01-07 13:02 UTC (permalink / raw)
To: Or Gerlitz, Jack Morgenstein, Rony Efraim, Hadar Hen Zion,
David S. Miller
Cc: netdev, linux-kernel
Building resource_tracker.o triggers a GCC warning:
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c: In function 'mlx4_HW2SW_SRQ_wrapper':
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:3202:17: warning: 'srq' may be used uninitialized in this function [-Wmaybe-uninitialized]
atomic_dec(&srq->mtt->ref_count);
^
This is a false positive. But a cleanup of srq_res_start_move_to() can
help GCC here. The code currently uses a switch statement where a plain
if/else would do, since only two of the switch's four cases can ever
occur. Dropping that switch makes the warning go away.
While we're at it, do some coding style cleanups (missing braces),
convert state to the correct type, and drop a test that always evaluates
to true.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 45 ++++++++--------------
1 file changed, 16 insertions(+), 29 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index a41f01e..8ace450 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -1372,7 +1372,7 @@ static int cq_res_start_move_to(struct mlx4_dev *dev, int slave, int cqn,
}
static int srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
- enum res_cq_states state, struct res_srq **srq)
+ enum res_srq_states state, struct res_srq **srq)
{
struct mlx4_priv *priv = mlx4_priv(dev);
struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
@@ -1381,39 +1381,26 @@ static int srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
spin_lock_irq(mlx4_tlock(dev));
r = res_tracker_lookup(&tracker->res_tree[RES_SRQ], index);
- if (!r)
+ if (!r) {
err = -ENOENT;
- else if (r->com.owner != slave)
+ } else if (r->com.owner != slave) {
err = -EPERM;
- else {
- switch (state) {
- case RES_SRQ_BUSY:
+ } else if (state == RES_SRQ_ALLOCATED) {
+ if (r->com.state != RES_SRQ_HW)
err = -EINVAL;
- break;
-
- case RES_SRQ_ALLOCATED:
- if (r->com.state != RES_SRQ_HW)
- err = -EINVAL;
- else if (atomic_read(&r->ref_count))
- err = -EBUSY;
- break;
-
- case RES_SRQ_HW:
- if (r->com.state != RES_SRQ_ALLOCATED)
- err = -EINVAL;
- break;
-
- default:
+ else if (atomic_read(&r->ref_count))
+ err = -EBUSY;
+ } else {
+ /* state == RES_SRQ_HW */
+ if (r->com.state != RES_SRQ_ALLOCATED)
err = -EINVAL;
- }
+ }
- if (!err) {
- r->com.from_state = r->com.state;
- r->com.to_state = state;
- r->com.state = RES_SRQ_BUSY;
- if (srq)
- *srq = r;
- }
+ if (!err) {
+ r->com.from_state = r->com.state;
+ r->com.to_state = state;
+ r->com.state = RES_SRQ_BUSY;
+ *srq = r;
}
spin_unlock_irq(mlx4_tlock(dev));
--
1.8.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] net/mlx4_core: clean up srq_res_start_move_to()
2014-01-07 13:02 [PATCH 2/2] net/mlx4_core: clean up srq_res_start_move_to() Paul Bolle
@ 2014-01-14 6:40 ` Jack Morgenstein
2014-01-14 19:46 ` [PATCH v2 " Paul Bolle
0 siblings, 1 reply; 5+ messages in thread
From: Jack Morgenstein @ 2014-01-14 6:40 UTC (permalink / raw)
To: Paul Bolle
Cc: Or Gerlitz, Rony Efraim, Hadar Hen Zion, David S. Miller, netdev,
linux-kernel
On Tue, 07 Jan 2014 14:02:14 +0100
Paul Bolle <pebolle@tiscali.nl> wrote:
> diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
> b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index
> a41f01e..8ace450 100644 ---
> a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++
> b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -1372,7
> +1372,7 @@ static int cq_res_start_move_to(struct mlx4_dev *dev, int
> slave, int cqn, }
> static int srq_res_start_move_to(struct mlx4_dev *dev, int slave,
> int index,
> - enum res_cq_states state, struct res_srq **srq)
> + enum res_srq_states state, struct res_srq **srq) {
ACK
> + /* state == RES_SRQ_HW */
> + if (r->com.state != RES_SRQ_ALLOCATED)
if (state != RES_SRQ_HW || r->com.state != RES_SRQ_ALLOCATED)
> err = -EINVAL;
> - }
> + }
>
> - if (!err) {
> - r->com.from_state = r->com.state;
> - r->com.to_state = state;
> - r->com.state = RES_SRQ_BUSY;
> - if (srq)
> - *srq = r;
> - }
> + if (!err) {
> + r->com.from_state = r->com.state;
> + r->com.to_state = state;
> + r->com.state = RES_SRQ_BUSY;
please leave in the if (srq). Not currently needed, but if this
changes in the future, we will get an Oops.
> + *srq = r;
> }
>
> spin_unlock_irq(mlx4_tlock(dev));
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] net/mlx4_core: clean up srq_res_start_move_to()
2014-01-14 6:40 ` Jack Morgenstein
@ 2014-01-14 19:46 ` Paul Bolle
2014-01-16 7:47 ` Jack Morgenstein
2014-01-17 0:05 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Paul Bolle @ 2014-01-14 19:46 UTC (permalink / raw)
To: Or Gerlitz, Jack Morgenstein, Rony Efraim, Hadar Hen Zion,
David S. Miller
Cc: netdev, linux-kernel
Building resource_tracker.o triggers a GCC warning:
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c: In function 'mlx4_HW2SW_SRQ_wrapper':
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:3202:17: warning: 'srq' may be used uninitialized in this function [-Wmaybe-uninitialized]
atomic_dec(&srq->mtt->ref_count);
^
This is a false positive. But a cleanup of srq_res_start_move_to() can
help GCC here. The code currently uses a switch statement where a plain
if/else would do, since only two of the switch's four cases can ever
occur. Dropping that switch makes the warning go away.
While we're at it, add some missing braces, and convert state to the
correct type.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
v2: adjust to Jack's review.
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 46 ++++++++--------------
1 file changed, 16 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 15cd659..4acd84c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -1371,7 +1371,7 @@ static int cq_res_start_move_to(struct mlx4_dev *dev, int slave, int cqn,
}
static int srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
- enum res_cq_states state, struct res_srq **srq)
+ enum res_srq_states state, struct res_srq **srq)
{
struct mlx4_priv *priv = mlx4_priv(dev);
struct mlx4_resource_tracker *tracker = &priv->mfunc.master.res_tracker;
@@ -1380,39 +1380,25 @@ static int srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
spin_lock_irq(mlx4_tlock(dev));
r = res_tracker_lookup(&tracker->res_tree[RES_SRQ], index);
- if (!r)
+ if (!r) {
err = -ENOENT;
- else if (r->com.owner != slave)
+ } else if (r->com.owner != slave) {
err = -EPERM;
- else {
- switch (state) {
- case RES_SRQ_BUSY:
- err = -EINVAL;
- break;
-
- case RES_SRQ_ALLOCATED:
- if (r->com.state != RES_SRQ_HW)
- err = -EINVAL;
- else if (atomic_read(&r->ref_count))
- err = -EBUSY;
- break;
-
- case RES_SRQ_HW:
- if (r->com.state != RES_SRQ_ALLOCATED)
- err = -EINVAL;
- break;
-
- default:
+ } else if (state == RES_SRQ_ALLOCATED) {
+ if (r->com.state != RES_SRQ_HW)
err = -EINVAL;
- }
+ else if (atomic_read(&r->ref_count))
+ err = -EBUSY;
+ } else if (state != RES_SRQ_HW || r->com.state != RES_SRQ_ALLOCATED) {
+ err = -EINVAL;
+ }
- if (!err) {
- r->com.from_state = r->com.state;
- r->com.to_state = state;
- r->com.state = RES_SRQ_BUSY;
- if (srq)
- *srq = r;
- }
+ if (!err) {
+ r->com.from_state = r->com.state;
+ r->com.to_state = state;
+ r->com.state = RES_SRQ_BUSY;
+ if (srq)
+ *srq = r;
}
spin_unlock_irq(mlx4_tlock(dev));
--
1.8.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] net/mlx4_core: clean up srq_res_start_move_to()
2014-01-14 19:46 ` [PATCH v2 " Paul Bolle
@ 2014-01-16 7:47 ` Jack Morgenstein
2014-01-17 0:05 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Jack Morgenstein @ 2014-01-16 7:47 UTC (permalink / raw)
To: Paul Bolle
Cc: Or Gerlitz, Rony Efraim, Hadar Hen Zion, David S. Miller, netdev,
linux-kernel
ACK. OK.
-Jack
On Tue, 14 Jan 2014 20:46:52 +0100
Paul Bolle <pebolle@tiscali.nl> wrote:
> Building resource_tracker.o triggers a GCC warning:
> drivers/net/ethernet/mellanox/mlx4/resource_tracker.c: In
> function 'mlx4_HW2SW_SRQ_wrapper':
> drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:3202:17:
> warning: 'srq' may be used uninitialized in this function
> [-Wmaybe-uninitialized] atomic_dec(&srq->mtt->ref_count); ^
>
> This is a false positive. But a cleanup of srq_res_start_move_to() can
> help GCC here. The code currently uses a switch statement where a
> plain if/else would do, since only two of the switch's four cases can
> ever occur. Dropping that switch makes the warning go away.
>
> While we're at it, add some missing braces, and convert state to the
> correct type.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> v2: adjust to Jack's review.
>
> .../net/ethernet/mellanox/mlx4/resource_tracker.c | 46
> ++++++++-------------- 1 file changed, 16 insertions(+), 30
> deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
> b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index
> 15cd659..4acd84c 100644 ---
> a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++
> b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -1371,7
> +1371,7 @@ static int cq_res_start_move_to(struct mlx4_dev *dev, int
> slave, int cqn, }
> static int srq_res_start_move_to(struct mlx4_dev *dev, int slave,
> int index,
> - enum res_cq_states state, struct
> res_srq **srq)
> + enum res_srq_states state, struct
> res_srq **srq) {
> struct mlx4_priv *priv = mlx4_priv(dev);
> struct mlx4_resource_tracker *tracker =
> &priv->mfunc.master.res_tracker; @@ -1380,39 +1380,25 @@ static int
> srq_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
> spin_lock_irq(mlx4_tlock(dev));
> r = res_tracker_lookup(&tracker->res_tree[RES_SRQ], index);
> - if (!r)
> + if (!r) {
> err = -ENOENT;
> - else if (r->com.owner != slave)
> + } else if (r->com.owner != slave) {
> err = -EPERM;
> - else {
> - switch (state) {
> - case RES_SRQ_BUSY:
> - err = -EINVAL;
> - break;
> -
> - case RES_SRQ_ALLOCATED:
> - if (r->com.state != RES_SRQ_HW)
> - err = -EINVAL;
> - else if (atomic_read(&r->ref_count))
> - err = -EBUSY;
> - break;
> -
> - case RES_SRQ_HW:
> - if (r->com.state != RES_SRQ_ALLOCATED)
> - err = -EINVAL;
> - break;
> -
> - default:
> + } else if (state == RES_SRQ_ALLOCATED) {
> + if (r->com.state != RES_SRQ_HW)
> err = -EINVAL;
> - }
> + else if (atomic_read(&r->ref_count))
> + err = -EBUSY;
> + } else if (state != RES_SRQ_HW || r->com.state !=
> RES_SRQ_ALLOCATED) {
> + err = -EINVAL;
> + }
>
> - if (!err) {
> - r->com.from_state = r->com.state;
> - r->com.to_state = state;
> - r->com.state = RES_SRQ_BUSY;
> - if (srq)
> - *srq = r;
> - }
> + if (!err) {
> + r->com.from_state = r->com.state;
> + r->com.to_state = state;
> + r->com.state = RES_SRQ_BUSY;
> + if (srq)
> + *srq = r;
> }
>
> spin_unlock_irq(mlx4_tlock(dev));
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] net/mlx4_core: clean up srq_res_start_move_to()
2014-01-14 19:46 ` [PATCH v2 " Paul Bolle
2014-01-16 7:47 ` Jack Morgenstein
@ 2014-01-17 0:05 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2014-01-17 0:05 UTC (permalink / raw)
To: pebolle; +Cc: ogerlitz, jackm, ronye, hadarh, netdev, linux-kernel
From: Paul Bolle <pebolle@tiscali.nl>
Date: Tue, 14 Jan 2014 20:46:52 +0100
> Building resource_tracker.o triggers a GCC warning:
> drivers/net/ethernet/mellanox/mlx4/resource_tracker.c: In function 'mlx4_HW2SW_SRQ_wrapper':
> drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:3202:17: warning: 'srq' may be used uninitialized in this function [-Wmaybe-uninitialized]
> atomic_dec(&srq->mtt->ref_count);
> ^
>
> This is a false positive. But a cleanup of srq_res_start_move_to() can
> help GCC here. The code currently uses a switch statement where a plain
> if/else would do, since only two of the switch's four cases can ever
> occur. Dropping that switch makes the warning go away.
>
> While we're at it, add some missing braces, and convert state to the
> correct type.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-17 0:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-07 13:02 [PATCH 2/2] net/mlx4_core: clean up srq_res_start_move_to() Paul Bolle
2014-01-14 6:40 ` Jack Morgenstein
2014-01-14 19:46 ` [PATCH v2 " Paul Bolle
2014-01-16 7:47 ` Jack Morgenstein
2014-01-17 0:05 ` 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).