[PATCH v4] drivers/net: use 64-bit shift and avoid signed/unsigned mismatch

[Bruce Richardson]

On Fri, Feb 07, 2025 at 07:46:03AM -0800, Andre Muezerie wrote:
> On Thu, Feb 06, 2025 at 11:07:32AM +0000, Bruce Richardson wrote:
> > On Wed, Feb 05, 2025 at 11:32:24AM -0800, Andre Muezerie wrote:
> > > This patch avoids warnings like the ones below emitted by MSVC:
> > > 
> > > 1)
> > > ../drivers/net/ice/base/ice_flg_rd.c(71): warning C4334: '<<':
> > >     result of 32-bit shift implicitly converted to 64 bits
> > >     (was 64-bit shift intended?)
> > > 
> > > 2)
> > > ../drivers/net/ice/ice_dcf_sched.c(177): warning C4018: '>=':
> > >     signed/unsigned mismatch
> > > 
> > > The fix for (1) is to use 64-bit shifting when appropriate
> > > (according to what the result is used for).
> > > 
> > > The fix for (2) is to explicitly cast the variables used in the
> > > comparison.
> > > 
> > > Signed-off-by: Andre Muezerie <andremue at linux.microsoft.com>
> > > ---
> > >  drivers/net/intel/i40e/i40e_ethdev.c   | 22 +++++++++++-----------
> > >  drivers/net/intel/iavf/iavf_ethdev.c   |  2 +-
> > >  drivers/net/intel/iavf/iavf_rxtx.c     |  2 +-
> > >  drivers/net/intel/iavf/iavf_vchnl.c    |  2 +-
> > >  drivers/net/intel/ice/base/meson.build | 19 +++++++++++++------
> > >  drivers/net/intel/ice/ice_dcf_sched.c  |  2 +-
> > >  drivers/net/intel/ice/ice_ethdev.c     |  4 ++--
> > >  drivers/net/intel/ice/ice_rxtx.c       |  2 +-
> > >  drivers/net/intel/ixgbe/ixgbe_ethdev.c |  2 +-
> > >  drivers/net/vmxnet3/vmxnet3_ethdev.h   |  6 +++---
> > >  10 files changed, 35 insertions(+), 28 deletions(-)
> > > 

<snip>

> > > diff --git a/drivers/net/intel/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build
> > > index addb922ac9..dc5956f92c 100644
> > > --- a/drivers/net/intel/ice/base/meson.build
> > > +++ b/drivers/net/intel/ice/base/meson.build
> > > @@ -31,18 +31,25 @@ sources = [
> > >          'ice_vf_mbx.c',
> > >  ]
> > >  
> > > -error_cflags = [
> > > -        '-Wno-unused-but-set-variable',
> > > -        '-Wno-unused-variable',
> > > -        '-Wno-unused-parameter',
> > > -]
> > > +if is_ms_compiler
> > > +    error_cflags = [
> > > +            '/wd4101', # unreferenced local variable
> > > +            '/wd4334', # result of 32-bit shift implicitly converted to 64 bits
> > > +    ]
> > > +else
> > > +    error_cflags = [
> > > +            '-Wno-unused-but-set-variable',
> > > +            '-Wno-unused-variable',
> > > +            '-Wno-unused-parameter',
> > > +    ]
> > > +endif
> > >  
> > 
> > Do we actually need these if-else blocks here? The way
> > the code is structured is that we check if the flags work to the current
> > compiler and use only those that are relevant. Therefore, we should just be
> > able to have a list of error flags and leave meson to filter out the
> > incorrect ones.
> 
> Both approaches work. I personally find the if-else approach in this case a little more readable
> as it makes clear to which compiler the flags apply (considering that there might be multiple
> flags with the same purpose, one for each compiler). But I'm open to updating the patch following
> your suggestion.
> 

If you find it more readable, ok to keep as-is.

> > 
> > >  # Bugzilla ID: 678
> > >  if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
> > >      error_cflags += ['-Wno-array-bounds']
> > >  endif
> > >  
> > > -if is_windows and cc.get_id() != 'clang'
> > > +if is_windows and not is_ms_compiler and cc.get_id() != 'clang'
> > 
> > Are there other supported compiler options for windows other than MSVC and
> > clang? For what compiler are we adding this flag?
> 
> Yes, MinGW-w64 is also supported on Windows, so effectively this flag applies to this compiler.
> https://doc.dpdk.org/guides/windows_gsg/build_dpdk.html
> Note that this flag was already there. I just changed the expression so that it is not used with msvc.
> 

Ok, thanks for clarifying.
Do we have a flag or check for identifying MinGW, because if we do that may
be clearer in the check.

> > 
> > >      cflags += ['-fno-asynchronous-unwind-tables']
> > >  endif
> > >  
> > > diff --git a/drivers/net/intel/ice/ice_dcf_sched.c b/drivers/net/intel/ice/ice_dcf_sched.c
> > > index 7967c35533..2832d223d1 100644
> > > --- a/drivers/net/intel/ice/ice_dcf_sched.c
> > > +++ b/drivers/net/intel/ice/ice_dcf_sched.c
> > > @@ -174,7 +174,7 @@ ice_dcf_node_param_check(struct ice_dcf_hw *hw, uint32_t node_id,
> > >  	}
> > >  
> > >  	/* for non-leaf node */
> > > -	if (node_id >= 8 * hw->num_vfs) {
> > > +	if (node_id >= (uint32_t)(8 * hw->num_vfs)) {
> > >  		if (params->nonleaf.wfq_weight_mode) {
> > >  			error->type =
> > >  				RTE_TM_ERROR_TYPE_NODE_PARAMS_WFQ_WEIGHT_MODE;
> > > diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c
> > > index 80eee03204..6f6f618a2f 100644
> > > --- a/drivers/net/intel/ice/ice_ethdev.c
> > > +++ b/drivers/net/intel/ice/ice_ethdev.c
> > > @@ -2469,13 +2469,13 @@ ice_get_supported_rxdid(struct ice_hw *hw)
> > >  	uint32_t regval;
> > >  	int i;
> > >  
> > > -	supported_rxdid |= BIT(ICE_RXDID_LEGACY_1);
> > > +	supported_rxdid |= RTE_BIT64(ICE_RXDID_LEGACY_1);
> > >  
> > >  	for (i = ICE_RXDID_FLEX_NIC; i < ICE_FLEX_DESC_RXDID_MAX_NUM; i++) {
> > >  		regval = ICE_READ_REG(hw, GLFLXP_RXDID_FLAGS(i, 0));
> > >  		if ((regval >> GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_S)
> > >  			& GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_M)
> > > -			supported_rxdid |= BIT(i);
> > > +			supported_rxdid |= RTE_BIT64(i);
> > >  	}
> > >  	return supported_rxdid;
> > >  }
> > > diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
> > > index 8dd8644b16..87a9d93e89 100644
> > > --- a/drivers/net/intel/ice/ice_rxtx.c
> > > +++ b/drivers/net/intel/ice/ice_rxtx.c
> > > @@ -399,7 +399,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
> > >  	PMD_DRV_LOG(DEBUG, "Port (%u) - Rx queue (%u) is set with RXDID : %u",
> > >  		    rxq->port_id, rxq->queue_id, rxdid);
> > >  
> > > -	if (!(pf->supported_rxdid & BIT(rxdid))) {
> > > +	if (!(pf->supported_rxdid & RTE_BIT64(rxdid))) {
> > >  		PMD_DRV_LOG(ERR, "currently package doesn't support RXDID (%u)",
> > >  			    rxdid);
> > >  		return -EINVAL;
> > > diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
> > > index 5f18fbaad5..078f7b47c3 100644
> > > --- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
> > > +++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
> > > @@ -2722,7 +2722,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
> > >  					ixgbe_set_vf_rate_limit(
> > >  						dev, vf,
> > >  						vfinfo[vf].tx_rate[idx],
> > > -						1 << idx);
> > > +						RTE_BIT64(idx));
> > >  	}
> > >  
> > >  	ixgbe_restore_statistics_mapping(dev);
> > > diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
> > > index e9ded6663d..e59cb285f4 100644
> > > --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
> > > +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
> > > @@ -186,14 +186,14 @@ static inline uint8_t
> > >  vmxnet3_get_ring_idx(struct vmxnet3_hw *hw, uint32 rqID)
> > >  {
> > >  	return (rqID >= hw->num_rx_queues &&
> > > -		rqID < 2 * hw->num_rx_queues) ? 1 : 0;
> > > +		rqID < (uint32)2 * hw->num_rx_queues) ? 1 : 0;
> > 
> > Why uint32 rather than uint32_t which are the normal types we use in DPDK?
> > Could this also be simplified to just 2U?
> 
> Well, I had just used the same type used for rqID (a few lines above).
> BTW, there are more than 100 hits in DPDK when searching for "uint32 ".
> I'm happy to use 2U instead though.
> 

I generally don't like to see uint32 rather than the normal uint32_t type.
Probably prefer 2U though since it's shorter. However, if you don't feel
like doing a new revision, ok to keep this as you have it.

/Bruce