Message ID | 20210409130726.665490-1-colin.king@canonical.com |
---|---|
State | New |
Headers | show |
Series | net: thunderx: Fix unintentional sign extension issue | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Fri, 9 Apr 2021 14:07:26 +0100 you wrote: > From: Colin Ian King <colin.king@canonical.com> > > The shifting of the u8 integers rq->caching by 26 bits to > the left will be promoted to a 32 bit signed int and then > sign-extended to a u64. In the event that rq->caching is > greater than 0x1f then all then all the upper 32 bits of > the u64 end up as also being set because of the int > sign-extension. Fix this by casting the u8 values to a > u64 before the 26 bit left shift. > > [...] Here is the summary with links: - net: thunderx: Fix unintentional sign extension issue https://git.kernel.org/netdev/net-next/c/e701a2584036 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index f782e6af45e9..50bbe79fb93d 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -776,7 +776,7 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs, mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG; mbx.rq.qs_num = qs->vnic_id; mbx.rq.rq_num = qidx; - mbx.rq.cfg = (rq->caching << 26) | (rq->cq_qs << 19) | + mbx.rq.cfg = ((u64)rq->caching << 26) | (rq->cq_qs << 19) | (rq->cq_idx << 16) | (rq->cont_rbdr_qs << 9) | (rq->cont_qs_rbdr_idx << 8) | (rq->start_rbdr_qs << 1) | (rq->start_qs_rbdr_idx);