Commit 6d71ec6c authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller

net: hns3: bugfix for is_valid_csq_clean_head()

The HEAD pointer of the hardware command queue maybe equal to the command
queue's next_to_use in the driver, so that does not belong to the invalid
HEAD pointer, since the hardware may not process the command in time,
causing the HEAD pointer to be too late to update. The variables' name
in this function is unreadable, so give them a more readable one.

Fixes: 3ff50490 ("net: hns3: fix a dead loop in hclge_cmd_csq_clean")
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5faaf075
...@@ -24,15 +24,15 @@ static int hclge_ring_space(struct hclge_cmq_ring *ring) ...@@ -24,15 +24,15 @@ static int hclge_ring_space(struct hclge_cmq_ring *ring)
return ring->desc_num - used - 1; return ring->desc_num - used - 1;
} }
static int is_valid_csq_clean_head(struct hclge_cmq_ring *ring, int h) static int is_valid_csq_clean_head(struct hclge_cmq_ring *ring, int head)
{ {
int u = ring->next_to_use; int ntu = ring->next_to_use;
int c = ring->next_to_clean; int ntc = ring->next_to_clean;
if (unlikely(h >= ring->desc_num)) if (ntu > ntc)
return 0; return head >= ntc && head <= ntu;
return u > c ? (h > c && h <= u) : (h > c || h <= u); return head >= ntc || head <= ntu;
} }
static int hclge_alloc_cmd_desc(struct hclge_cmq_ring *ring) static int hclge_alloc_cmd_desc(struct hclge_cmq_ring *ring)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment