* [PATCH net v2] Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()"
@ 2021-07-20 13:26 Jia He
2021-07-20 14:30 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Jia He @ 2021-07-20 13:26 UTC (permalink / raw)
To: Ariel Elior, GR-everest-linux-l2, David S. Miller, Jakub Kicinski
Cc: netdev, linux-kernel, nd, Jia He, Prabhakar Kushwaha
This reverts commit 6206b7981a36476f4695d661ae139f7db36a802d.
That patch added additional spin_{un}lock_bh(), which was harmless
but pointless. The orginal code path has guaranteed the pair of
spin_{un}lock_bh().
We'd better revert it before we find the exact root cause of the
bug_on mentioned in that patch.
Fixes: 6206b7981a36 ("qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()")
Cc: David S. Miller <davem@davemloft.net>
Cc: Prabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: Jia He <justin.he@arm.com>
---
v2: correct the hash value of reverted commit, and add the fixes tag
drivers/net/ethernet/qlogic/qed/qed_mcp.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 79d879a5d663..4387292c37e2 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -474,18 +474,14 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
- if (!qed_mcp_has_pending_cmd(p_hwfn)) {
- spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
+ if (!qed_mcp_has_pending_cmd(p_hwfn))
break;
- }
rc = qed_mcp_update_pending_cmd(p_hwfn, p_ptt);
- if (!rc) {
- spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
+ if (!rc)
break;
- } else if (rc != -EAGAIN) {
+ else if (rc != -EAGAIN)
goto err;
- }
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
@@ -502,8 +498,6 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
return -EAGAIN;
}
- spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
-
/* Send the mailbox command */
qed_mcp_reread_offsets(p_hwfn, p_ptt);
seq_num = ++p_hwfn->mcp_info->drv_mb_seq;
@@ -530,18 +524,14 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
- if (p_cmd_elem->b_is_completed) {
- spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
+ if (p_cmd_elem->b_is_completed)
break;
- }
rc = qed_mcp_update_pending_cmd(p_hwfn, p_ptt);
- if (!rc) {
- spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
+ if (!rc)
break;
- } else if (rc != -EAGAIN) {
+ else if (rc != -EAGAIN)
goto err;
- }
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
} while (++cnt < max_retries);
@@ -564,7 +554,6 @@ _qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,
return -EAGAIN;
}
- spin_lock_bh(&p_hwfn->mcp_info->cmd_lock);
qed_mcp_cmd_del_elem(p_hwfn, p_cmd_elem);
spin_unlock_bh(&p_hwfn->mcp_info->cmd_lock);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net v2] Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()"
2021-07-20 13:26 [PATCH net v2] Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()" Jia He
@ 2021-07-20 14:30 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-07-20 14:30 UTC (permalink / raw)
To: Jia He
Cc: aelior, GR-everest-linux-l2, davem, kuba, netdev, linux-kernel,
nd, pkushwaha
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Tue, 20 Jul 2021 21:26:55 +0800 you wrote:
> This reverts commit 6206b7981a36476f4695d661ae139f7db36a802d.
>
> That patch added additional spin_{un}lock_bh(), which was harmless
> but pointless. The orginal code path has guaranteed the pair of
> spin_{un}lock_bh().
>
> We'd better revert it before we find the exact root cause of the
> bug_on mentioned in that patch.
>
> [...]
Here is the summary with links:
- [net,v2] Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()"
https://git.kernel.org/netdev/net/c/91bed5565bba
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-20 14:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-20 13:26 [PATCH net v2] Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()" Jia He
2021-07-20 14:30 ` patchwork-bot+netdevbpf
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).