提交 97dd1abd 编写于 作者: A Alexander Lobakin 提交者: David S. Miller

net: qed: fix left elements count calculation

qed_chain_get_element_left{,_u32} returned 0 when the difference
between producer and consumer page count was equal to the total
page count.
Fix this by conditional expanding of producer value (vs
unconditional). This allowed to eliminate normalizaton against
total page count, which was the cause of this bug.

Misc: replace open-coded constants with common defines.

Fixes: a91eb52a ("qed: Revisit chain implementation")
Signed-off-by: NAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: NIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: NMichal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 b4730ae6
...@@ -207,28 +207,34 @@ static inline u32 qed_chain_get_cons_idx_u32(struct qed_chain *p_chain) ...@@ -207,28 +207,34 @@ static inline u32 qed_chain_get_cons_idx_u32(struct qed_chain *p_chain)
static inline u16 qed_chain_get_elem_left(struct qed_chain *p_chain) static inline u16 qed_chain_get_elem_left(struct qed_chain *p_chain)
{ {
u16 elem_per_page = p_chain->elem_per_page;
u32 prod = p_chain->u.chain16.prod_idx;
u32 cons = p_chain->u.chain16.cons_idx;
u16 used; u16 used;
used = (u16) (((u32)0x10000 + if (prod < cons)
(u32)p_chain->u.chain16.prod_idx) - prod += (u32)U16_MAX + 1;
(u32)p_chain->u.chain16.cons_idx);
used = (u16)(prod - cons);
if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR) if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR)
used -= p_chain->u.chain16.prod_idx / p_chain->elem_per_page - used -= prod / elem_per_page - cons / elem_per_page;
p_chain->u.chain16.cons_idx / p_chain->elem_per_page;
return (u16)(p_chain->capacity - used); return (u16)(p_chain->capacity - used);
} }
static inline u32 qed_chain_get_elem_left_u32(struct qed_chain *p_chain) static inline u32 qed_chain_get_elem_left_u32(struct qed_chain *p_chain)
{ {
u16 elem_per_page = p_chain->elem_per_page;
u64 prod = p_chain->u.chain32.prod_idx;
u64 cons = p_chain->u.chain32.cons_idx;
u32 used; u32 used;
used = (u32) (((u64)0x100000000ULL + if (prod < cons)
(u64)p_chain->u.chain32.prod_idx) - prod += (u64)U32_MAX + 1;
(u64)p_chain->u.chain32.cons_idx);
used = (u32)(prod - cons);
if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR) if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR)
used -= p_chain->u.chain32.prod_idx / p_chain->elem_per_page - used -= (u32)(prod / elem_per_page - cons / elem_per_page);
p_chain->u.chain32.cons_idx / p_chain->elem_per_page;
return p_chain->capacity - used; return p_chain->capacity - used;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册