Message ID | 20240903-octeontx2-sparse-v1-2-f190309ecb0a@kernel.org (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | octeontx2: Address some Sparse warnings | expand |
>-----Original Message----- >From: Simon Horman <horms@kernel.org> >Sent: Tuesday, September 3, 2024 9:57 PM >To: Sunil Kovvuri Goutham <sgoutham@marvell.com>; Linu Cherian ><lcherian@marvell.com>; Geethasowjanya Akula <gakula@marvell.com>; >Jerin Jacob <jerinj@marvell.com>; Hariprasad Kelam <hkelam@marvell.com>; >Subbaraya Sundeep Bhatta <sbhatta@marvell.com> >Cc: David S. Miller <davem@davemloft.net>; Eric Dumazet ><edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni ><pabeni@redhat.com>; Nathan Chancellor <nathan@kernel.org>; Nick >Desaulniers <ndesaulniers@google.com>; Bill Wendling ><morbo@google.com>; Justin Stitt <justinstitt@google.com>; >netdev@vger.kernel.org; llvm@lists.linux.dev >Subject: [EXTERNAL] [PATCH net-next 2/2] octeontx2-pf: Make iplen __be16 in >otx2_sqe_add_ext() > >In otx2_sqe_add_ext() iplen is used to hold a 16-bit big-endian value, but it's >type is u16, indicating a host byte order integer. > >Address this mismatch by changing the type of iplen to __be16. > >Flagged by Sparse as: > >.../otx2_txrx.c:699:31: warning: incorrect type in assignment (different base >types) >.../otx2_txrx.c:699:31: expected unsigned short [usertype] iplen >.../otx2_txrx.c:699:31: got restricted __be16 [usertype] >.../otx2_txrx.c:701:54: warning: incorrect type in assignment (different base >types) >.../otx2_txrx.c:701:54: expected restricted __be16 [usertype] tot_len >.../otx2_txrx.c:701:54: got unsigned short [usertype] iplen >.../otx2_txrx.c:704:60: warning: incorrect type in assignment (different base >types) >.../otx2_txrx.c:704:60: expected restricted __be16 [usertype] payload_len >.../otx2_txrx.c:704:60: got unsigned short [usertype] iplen > >Introduced in >commit dc1a9bf2c816 ("octeontx2-pf: Add UDP segmentation offload >support") > >No functional change intended. >Compile tested only. > >Signed-off-by: Simon Horman <horms@kernel.org> >--- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c >b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c >index 3eb85949677a..933e18ba2fb2 100644 >--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c >+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c >@@ -687,7 +687,7 @@ static void otx2_sqe_add_ext(struct otx2_nic *pfvf, >struct otx2_snd_queue *sq, > } else if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) { > __be16 l3_proto = vlan_get_protocol(skb); > struct udphdr *udph = udp_hdr(skb); >- u16 iplen; >+ __be16 iplen; > > ext->lso_sb = skb_transport_offset(skb) + > sizeof(struct udphdr); > >-- >2.45.2 Tested-by: Geetha sowjanya <gakula@marvell.com>
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c index 3eb85949677a..933e18ba2fb2 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c @@ -687,7 +687,7 @@ static void otx2_sqe_add_ext(struct otx2_nic *pfvf, struct otx2_snd_queue *sq, } else if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) { __be16 l3_proto = vlan_get_protocol(skb); struct udphdr *udph = udp_hdr(skb); - u16 iplen; + __be16 iplen; ext->lso_sb = skb_transport_offset(skb) + sizeof(struct udphdr);
In otx2_sqe_add_ext() iplen is used to hold a 16-bit big-endian value, but it's type is u16, indicating a host byte order integer. Address this mismatch by changing the type of iplen to __be16. Flagged by Sparse as: .../otx2_txrx.c:699:31: warning: incorrect type in assignment (different base types) .../otx2_txrx.c:699:31: expected unsigned short [usertype] iplen .../otx2_txrx.c:699:31: got restricted __be16 [usertype] .../otx2_txrx.c:701:54: warning: incorrect type in assignment (different base types) .../otx2_txrx.c:701:54: expected restricted __be16 [usertype] tot_len .../otx2_txrx.c:701:54: got unsigned short [usertype] iplen .../otx2_txrx.c:704:60: warning: incorrect type in assignment (different base types) .../otx2_txrx.c:704:60: expected restricted __be16 [usertype] payload_len .../otx2_txrx.c:704:60: got unsigned short [usertype] iplen Introduced in commit dc1a9bf2c816 ("octeontx2-pf: Add UDP segmentation offload support") No functional change intended. Compile tested only. Signed-off-by: Simon Horman <horms@kernel.org> --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)