Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: qed: fix left elements count calculation

Browse source 
[ Upstream commit 97dd1abd026ae4e6a82fa68645928404ad483409 ]

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: a91eb52abb ("qed: Revisit chain implementation")
Signed-off-by: Alexander Lobakin <alobakin@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alexander Lobakin 2020-06-23 16:51:29 +03:00 committed by Sasha Levin
parent d6d76e0280
commit d10d0539c5
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/linux/qed/qed_chain.h
View file

@ -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;
} }