bnx2x: bail out if unable to acquire stats_sema
PATCH 1/1 bnx2x: bail out if unable to acquire stats_sema
If we fail to acquire stats_sema in the specified time limit, the chip is probably dead. It probably does not matter whether we try to continue or not, but certainly we should not up() the semaphore afterwards.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +18 -6
@@ -538,16 +538,20 @@ static void __bnx2x_stats_start(struct bnx2x *bp)static void bnx2x_stats_start (struct bnx2x *bp) { -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }__bnx2x_stats_start (bp);up (&bp->stats_sema); }static void bnx2x_stats_pmf_start (struct bnx2x *bp) { -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }bnx2x_stats_comp (bp);__bnx2x_stats_pmf_update (bp);__bnx2x_stats_start (bp);
@@ -556,8 +560,10 @@ static void bnx2x_stats_pmf_start(struct bnx2x *bp)static void bnx2x_stats_pmf_update (struct bnx2x *bp) { -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }__bnx2x_stats_pmf_update (bp);up (&bp->stats_sema); }
@@ -569,8 +575,10 @@ static void bnx2x_stats_restart(struct bnx2x *bp)*/ if (IS_VF (bp))return ; -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }bnx2x_stats_comp (bp);__bnx2x_stats_start (bp);up (&bp->stats_sema);
@@ -1361,8 +1369,10 @@ static void bnx2x_stats_stop(struct bnx2x *bp) {int update =0 ; -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + } bp->stats_started = false;
@@ -1997,8 +2007,10 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,void bnx2x_stats_safe_exec (struct bnx2x *bp,void (func_to_exec )(void *cookie),void *cookie){ -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }bnx2x_stats_comp (bp);func_to_exec (cookie);__bnx2x_stats_start (bp);
Signature · 1 line
1.8.3.1
Quoted 90 lines
-----Original Message-----
From: Michal Schmidt [mailto:[email protected]]
Sent: Tuesday, September 03, 2013 6:46 PM
To: [email protected]
Cc: [email protected]; Dmitry Kravkov; Ariel Elior; Eilon Greenstein
Subject: [PATCH net] bnx2x: bail out if unable to acquirestats_semaIf we fail to acquire
stats_semain the specified time limit, the chip is probably dead. It probably does not matter whether we try to continue or not, but certainly we should notup()the semaphore afterwards.Signed-off-by Michal Schmidt <[email protected]>--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +18
-7@@ -538,16 +538,20 @@ static void __bnx2x_stats_start(struct bnx2x *bp)static void bnx2x_stats_start (struct bnx2x *bp) { -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }__bnx2x_stats_start (bp);up (&bp->stats_sema); }static void bnx2x_stats_pmf_start (struct bnx2x *bp) { -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }bnx2x_stats_comp (bp);__bnx2x_stats_pmf_update (bp);__bnx2x_stats_start (bp);@@ -556,8 +560,10 @@ static void bnx2x_stats_pmf_start(struct bnx2x *bp)static void bnx2x_stats_pmf_update (struct bnx2x *bp) { -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }__bnx2x_stats_pmf_update (bp);up (&bp->stats_sema); }@@ -569,8 +575,10 @@ static void bnx2x_stats_restart(struct bnx2x *bp)*/ if (IS_VF (bp))return ; -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + }bnx2x_stats_comp (bp);__bnx2x_stats_start (bp);up (&bp->stats_sema);@@ -1361,8 +1369,10 @@ static void bnx2x_stats_stop(struct bnx2x *bp) {int update =0 ; -if (down_timeout (&bp->stats_sema,HZ /10 )) +if (down_timeout (&bp->stats_sema,HZ /10 )) {BNX2X_ERR ("Unable to acquire stats lock\n" ); +return ; + } bp->stats_started = false;@@ -1997,8 +2007,10 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats, void bnx2x_stats_safe_exec(struct bnx2x *bp, void (func_to_exec)(void *cookie), void *cookie){ - if (down_timeout(&bp->stats_sema, HZ/10)) + if (down_timeout(&bp->stats_sema, HZ/10)) { BNX2X_ERR("Unable to acquire stats lock\n"); +return ; + }bnx2x_stats_comp (bp);func_to_exec (cookie);__bnx2x_stats_start (bp); --
Quoted 2 lines
1.8.3.1
Quoted 7 lines · Dmitry Kravkov
Quoted 7 lines
-----Original Message-----
From: Michal Schmidt [mailto:[email protected]]
Sent: Tuesday, September 03, 2013 6:46 PM
To: [email protected]
Cc: [email protected]; Dmitry Kravkov; Ariel Elior; Eilon Greenstein
Subject: [PATCH net] bnx2x: bail out if unable to acquirestats_sema
Quoted 8 lines
Quoted 8 lines
If we fail to acquire
stats_semain the specified time limit, the chip is probably dead. It probably does not matter whether we try to continue or not, but certainly we should notup()the semaphore afterwards.Signed-off-by Michal Schmidt <[email protected]>--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 24+++++++++++++++++------
It seems like this patch has the downside that if the down_timeout() fails, then bnx2x_stats_handle() ends up updating the stats state machine's state without really executing the real body of the action().
In fact it seems like there is a more general pre-existing problem of this flavor with the bnx2x stats state machine: the bnx2x_stats_handle() function updates the state machine bp->stats_state while holding the spin lock, but does not execute the action() while holding any sort of synchronization, so AFAICT there is nothing to guarantee that the state machine actions happen in the order the state machine wants them to happen. For example, if stats events fire such that we want to execute actions that disable and then enable stats, we could instead end up executing the actions in the order that would attempt to enable and then disable them, if we get unlucky with respect to when interrupts fire, etc.
It seems to me that instead of having all of the callees of bnx2x_stats_handle() try to down/up the semaphore, instead bnx2x_stats_handle() should try to down the stats_sema at the top, and then if successful, it should change the bp->stats_state, call the action, and up the stats_sema. Would that work?
neal
Quoted 34 lines · Neal Cardwell
Quoted 7 lines · Dmitry Kravkov
Quoted 7 lines
-----Original Message-----
From: Michal Schmidt [mailto:[email protected]]
Sent: Tuesday, September 03, 2013 6:46 PM
To: [email protected]
Cc: [email protected]; Dmitry Kravkov; Ariel Elior; Eilon Greenstein
Subject: [PATCH net] bnx2x: bail out if unable to acquirestats_semaQuoted 8 lines
Quoted 8 lines
If we fail to acquire
stats_semain the specified time limit, the chip is probably dead. It probably does not matter whether we try to continue or not, but certainly we should notup()the semaphore afterwards.Signed-off-by Michal Schmidt <[email protected]>--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 24+++++++++++++++++------
It seems like this patch has the downside that if the
down_timeout()fails, thenbnx2x_stats_handle()ends up updating the stats state machine's state without really executing the real body of theaction().In fact it seems like there is a more general pre-existing problem of this flavor with the bnx2x stats state machine: the
bnx2x_stats_handle()function updates the state machinebp->stats_statewhile holding the spin lock, but does not execute theaction()while holding any sort of synchronization, so AFAICT there is nothing to guarantee that the state machine actions happen in the order the state machine wants them to happen. For example, if stats events fire such that we want to execute actions that disable and then enable stats, we could instead end up executing the actions in the order that would attempt to enable and then disable them, if we get unlucky with respect to when interrupts fire, etc.
Quoted 6 lines
It seems to me that instead of having all of the callees of
bnx2x_stats_handle()try to down/up the semaphore, insteadbnx2x_stats_handle()should try to down thestats_semaat the top, and then if successful, it should change thebp->stats_state, call the action, and up thestats_sema. Would that work?
handle() is called from sleepable context (open/close) and timer context, then it's not possible to use semaphore for pretection
Quoted 5 lines
neal
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Best regards, Dmitry
Quoted 35 lines · Dmitry Kravkov
Quoted 34 lines · Neal Cardwell
Quoted 7 lines · Dmitry Kravkov
Quoted 7 lines
-----Original Message-----
From: Michal Schmidt [mailto:[email protected]]
Sent: Tuesday, September 03, 2013 6:46 PM
To: [email protected]
Cc: [email protected]; Dmitry Kravkov; Ariel Elior; Eilon Greenstein
Subject: [PATCH net] bnx2x: bail out if unable to acquirestats_semaQuoted 8 lines
Quoted 8 lines
If we fail to acquire
stats_semain the specified time limit, the chip is probably dead. It probably does not matter whether we try to continue or not, but certainly we should notup()the semaphore afterwards.Signed-off-by Michal Schmidt <[email protected]>--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 24+++++++++++++++++------
It seems like this patch has the downside that if the
down_timeout()fails, thenbnx2x_stats_handle()ends up updating the stats state machine's state without really executing the real body of theaction().In fact it seems like there is a more general pre-existing problem of this flavor with the bnx2x stats state machine: the
bnx2x_stats_handle()function updates the state machinebp->stats_statewhile holding the spin lock, but does not execute theaction()while holding any sort of synchronization, so AFAICT there is nothing to guarantee that the state machine actions happen in the order the state machine wants them to happen. For example, if stats events fire such that we want to execute actions that disable and then enable stats, we could instead end up executing the actions in the order that would attempt to enable and then disable them, if we get unlucky with respect to when interrupts fire, etc.
Quoted 8 lines
Quoted 6 lines
It seems to me that instead of having all of the callees of
bnx2x_stats_handle()try to down/up the semaphore, insteadbnx2x_stats_handle()should try to down thestats_semaat the top, and then if successful, it should change thebp->stats_state, call the action, and up thestats_sema. Would that work?
handle()is called from sleepable context (open/close) and timer context, then it's not possible to use semaphore for pretection
But it seems like all of the callees of bnx2x_stats_handle() are already using the stats_sema for protection, and the only difference is that bnx2x_stats_update uses down_trylock and the other callees use down_timeout. What about making this explicit in bnx2x_stats_handle, with something like:
if (event == STATS_EVENT_UPDATE) {
if (down_trylock(&bp->stats_sema)) {
BNX2X_ERR("stats down_trylock failed\n");
goto out;
}
else {
if (down_timeout(&bp->stats_sema, HZ/10)) {
BNX2X_ERR("stats down_timeout failed\n");
goto out; }
}bp->stats_state = ...;
action = ...;
action(bp);up(&bp->stats_sema);
That would allow us to protect the bnx2x state machine so that the action() events happen in the correct order, and we don't (e.g.) accidentally end up doing an enable-then-disable when we wanted disable-then-enable.
Would that work?
neal
Quoted 11 lines
Quoted 5 lines
neal
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
Best regards,
Dmitry
Quoted 82 lines
-----Original Message-----
From: Neal Cardwell [mailto:[email protected]]
Sent: Saturday, September 07, 2013 6:54 AM
To: Dmitry Kravkov
Cc: Dmitry Kravkov; Michal Schmidt; [email protected]; [email protected]; Ariel Elior; Eilon Greenstein; Havard Skinnemoen; Eric Dumazet
Subject: Re: [PATCH net] bnx2x: bail out if unable to acquirestats_semaQuoted 1 line · Dmitry Kravkov
On Wed, Sep 4, 2013 at 8:17 PM, Neal Cardwell <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
On Tue, Sep 3, 2013 at 11:51 AM, Dmitry Kravkov
Quoted 9 lines · <[email protected]> wrote:
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
-----Original Message-----
From: Michal Schmidt [mailto:[email protected]]
Sent: Tuesday, September 03, 2013 6:46 PM
To: [email protected]
Cc: [email protected]; Dmitry Kravkov; Ariel Elior; Eilon Greenstein
Subject: [PATCH net] bnx2x: bail out if unable to acquirestats_semaQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
If we fail to acquire
stats_semain the specified time limit, the chip is probably dead. It probably does not matter whether we try to continue or not, but certainly we should notup()the semaphoreafterwards.
Quoted 23 lines
Quoted 23 lines
Quoted 5 lines
Quoted 5 lines
Signed-off-by Michal Schmidt <[email protected]>--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 24+++++++++++++++++------
It seems like this patch has the downside that if the
down_timeout()fails, thenbnx2x_stats_handle()ends up updating the stats state machine's state without really executing the real body of theaction().In fact it seems like there is a more general pre-existing problem of this flavor with the bnx2x stats state machine: the
bnx2x_stats_handle()function updates the state machinebp->stats_statewhile holding the spin lock, but does not execute theaction()while holding any sort of synchronization, so AFAICT there is nothing to guarantee that the state machine actions happen in the order the state machine wants them to happen. For example, if stats events fire such that we want to execute actions that disable and then enable stats, we could instead end up executing the actions in the order that would attempt to enable and then disable them, if we get unlucky with respect to when interrupts fire, etc.Quoted 8 lines
Quoted 6 lines
It seems to me that instead of having all of the callees of
bnx2x_stats_handle()try to down/up the semaphore, insteadbnx2x_stats_handle()should try to down thestats_semaat the top, and then if successful, it should change thebp->stats_state, call the action, and up thestats_sema. Would that work?
handle()is called from sleepable context (open/close) and timer context, then it's not possible to use semaphore for pretectionBut it seems like all of the callees of
bnx2x_stats_handle()are already using thestats_semafor protection, and the only difference is thatbnx2x_stats_updateusesdown_trylockand the other callees usedown_timeout. What about making this explicit inbnx2x_stats_handle, with something like:if (event ==
STATS_EVENT_UPDATE) {if (down_trylock(&bp->stats_sema)) { BNX2X_ERR("stats down_trylock failed\n"); goto out; } else { if (down_timeout(&bp->stats_sema, HZ/10)) { BNX2X_ERR("stats down_timeout failed\n"); goto out;}
}bp->stats_state= ...;
action = ...;
action(bp);up(&bp->stats_sema);
Quoted 6 lines
That would allow us to protect the bnx2x state machine so that the
action()events happen in the correct order, and we don't (e.g.) accidentally end up doing an enable-then-disable when we wanted disable-then- enable.Would that work?
Looks like there is no a lot of difference from current implementation - I will try it and report back...
Quoted 4 lines
neal