net/ice: fix gcc error with -DRTE_LIBRTE_ICE_16BYTE_RX_DESC

Message ID 20220207164801.2768734-1-yidingx.zhou@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series net/ice: fix gcc error with -DRTE_LIBRTE_ICE_16BYTE_RX_DESC |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS

Commit Message

Yiding Zhou Feb. 7, 2022, 4:48 p.m. UTC
  gcc will report error "unused parameter 'rxq'" when the macro
RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to avoid it

Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
Cc: stable@dpdk.org

Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 4 ++++
 1 file changed, 4 insertions(+)
  

Comments

Wang, Haiyue Feb. 7, 2022, 1:14 p.m. UTC | #1
> -----Original Message-----
> From: Yiding Zhou <yidingx.zhou@intel.com>
> Sent: Tuesday, February 8, 2022 00:48
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/ice: fix gcc error with -DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> 
> gcc will report error "unused parameter 'rxq'" when the macro
> RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to avoid it
> 
> Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
> ---
>  drivers/net/ice/ice_rxtx.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
> index 58700f1b92..97572d5952 100644
> --- a/drivers/net/ice/ice_rxtx.c
> +++ b/drivers/net/ice/ice_rxtx.c
> @@ -163,6 +163,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v1(struct ice_rx_queue *rxq,
>  			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
>  		}
>  	}
> +#else
> +	(void)rxq;
>  #endif
>  }
> 
> @@ -201,6 +203,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq,
>  			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
>  		}
>  	}
> +#else
> +	(void)rxq;
>  #endif
>  }
> 

" __rte_unused struct ice_rx_queue *rxq" could make the fix clean.

> --
> 2.25.1
  
Bruce Richardson Feb. 7, 2022, 1:46 p.m. UTC | #2
On Mon, Feb 07, 2022 at 01:14:18PM +0000, Wang, Haiyue wrote:
> > -----Original Message-----
> > From: Yiding Zhou <yidingx.zhou@intel.com>
> > Sent: Tuesday, February 8, 2022 00:48
> > To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> > Cc: dev@dpdk.org
> > Subject: [PATCH] net/ice: fix gcc error with -DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> > 
> > gcc will report error "unused parameter 'rxq'" when the macro
> > RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to avoid it
> > 
> > Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
> > ---
> >  drivers/net/ice/ice_rxtx.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
> > index 58700f1b92..97572d5952 100644
> > --- a/drivers/net/ice/ice_rxtx.c
> > +++ b/drivers/net/ice/ice_rxtx.c
> > @@ -163,6 +163,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v1(struct ice_rx_queue *rxq,
> >  			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
> >  		}
> >  	}
> > +#else
> > +	(void)rxq;
> >  #endif
> >  }
> > 
> > @@ -201,6 +203,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq,
> >  			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
> >  		}
> >  	}
> > +#else
> > +	(void)rxq;
> >  #endif
> >  }
> > 
> 
> " __rte_unused struct ice_rx_queue *rxq" could make the fix clean.
> 

+1

Or alternatively put in "RTE_SET_USED" macro after the endif. It doesn't
generate any instructions so doesn't need a #else clause.

/Bruce
  
Yiding Zhou Feb. 8, 2022, 5:35 a.m. UTC | #3
> -----Original Message-----
> From: Richardson, Bruce <bruce.richardson@intel.com>
> Sent: Monday, February 7, 2022 9:46 PM
> To: Wang, Haiyue <haiyue.wang@intel.com>
> Cc: Zhou, YidingX <yidingx.zhou@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> dev@dpdk.org
> Subject: Re: [PATCH] net/ice: fix gcc error with -
> DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> 
> On Mon, Feb 07, 2022 at 01:14:18PM +0000, Wang, Haiyue wrote:
> > > -----Original Message-----
> > > From: Yiding Zhou <yidingx.zhou@intel.com>
> > > Sent: Tuesday, February 8, 2022 00:48
> > > To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > > <qi.z.zhang@intel.com>
> > > Cc: dev@dpdk.org
> > > Subject: [PATCH] net/ice: fix gcc error with
> > > -DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> > >
> > > gcc will report error "unused parameter 'rxq'" when the macro
> > > RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to avoid
> > > it
> > >
> > > Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
> > > Cc: stable@dpdk.org
> > >
> > > Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
> > > ---
> > >  drivers/net/ice/ice_rxtx.c | 4 ++++
> > >  1 file changed, 4 insertions(+)
> > >
> > > diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
> > > index 58700f1b92..97572d5952 100644
> > > --- a/drivers/net/ice/ice_rxtx.c
> > > +++ b/drivers/net/ice/ice_rxtx.c
> > > @@ -163,6 +163,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v1(struct
> ice_rx_queue *rxq,
> > >  			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb)
> = metadata;
> > >  		}
> > >  	}
> > > +#else
> > > +	(void)rxq;
> > >  #endif
> > >  }
> > >
> > > @@ -201,6 +203,8 @@ ice_rxd_to_pkt_fields_by_comms_aux_v2(struct
> ice_rx_queue *rxq,
> > >  			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb)
> = metadata;
> > >  		}
> > >  	}
> > > +#else
> > > +	(void)rxq;
> > >  #endif
> > >  }
> > >
> >
> > " __rte_unused struct ice_rx_queue *rxq" could make the fix clean.
> >
> 
> +1
> 
> Or alternatively put in "RTE_SET_USED" macro after the endif. It doesn't
> generate any instructions so doesn't need a #else clause.
> 
Thanks for your advice. Using RTE_SET_USED macro is better.
> /Bruce
  
Ling, WeiX Feb. 10, 2022, 3:09 a.m. UTC | #4
> -----Original Message-----
> From: Zhou, YidingX <yidingx.zhou@intel.com>
> Sent: Tuesday, February 8, 2022 1:35 PM
> To: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Haiyue
> <haiyue.wang@intel.com>
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH] net/ice: fix gcc error with -
> DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> 
> 
> 
> > -----Original Message-----
> > From: Richardson, Bruce <bruce.richardson@intel.com>
> > Sent: Monday, February 7, 2022 9:46 PM
> > To: Wang, Haiyue <haiyue.wang@intel.com>
> > Cc: Zhou, YidingX <yidingx.zhou@intel.com>; Yang, Qiming
> > <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> > dev@dpdk.org
> > Subject: Re: [PATCH] net/ice: fix gcc error with -
> > DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> >
> > On Mon, Feb 07, 2022 at 01:14:18PM +0000, Wang, Haiyue wrote:
> > > > -----Original Message-----
> > > > From: Yiding Zhou <yidingx.zhou@intel.com>
> > > > Sent: Tuesday, February 8, 2022 00:48
> > > > To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > > > <qi.z.zhang@intel.com>
> > > > Cc: dev@dpdk.org
> > > > Subject: [PATCH] net/ice: fix gcc error with
> > > > -DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> > > >
> > > > gcc will report error "unused parameter 'rxq'" when the macro
> > > > RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to avoid
> > > > it
> > > >
> > > > Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
> > > > Cc: stable@dpdk.org
> > > >
> > > > Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
> > > > ---

Tested-by: Wei Ling <weix.ling@intel.com>
  
Qi Zhang Feb. 10, 2022, 9:30 a.m. UTC | #5
> -----Original Message-----
> From: Ling, WeiX <weix.ling@intel.com>
> Sent: Thursday, February 10, 2022 11:09 AM
> To: Zhou, YidingX <yidingx.zhou@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH] net/ice: fix gcc error with -
> DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> 
> > -----Original Message-----
> > From: Zhou, YidingX <yidingx.zhou@intel.com>
> > Sent: Tuesday, February 8, 2022 1:35 PM
> > To: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Haiyue
> > <haiyue.wang@intel.com>
> > Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; dev@dpdk.org
> > Subject: RE: [PATCH] net/ice: fix gcc error with -
> > DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> >
> >
> >
> > > -----Original Message-----
> > > From: Richardson, Bruce <bruce.richardson@intel.com>
> > > Sent: Monday, February 7, 2022 9:46 PM
> > > To: Wang, Haiyue <haiyue.wang@intel.com>
> > > Cc: Zhou, YidingX <yidingx.zhou@intel.com>; Yang, Qiming
> > > <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> > > dev@dpdk.org
> > > Subject: Re: [PATCH] net/ice: fix gcc error with -
> > > DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> > >
> > > On Mon, Feb 07, 2022 at 01:14:18PM +0000, Wang, Haiyue wrote:
> > > > > -----Original Message-----
> > > > > From: Yiding Zhou <yidingx.zhou@intel.com>
> > > > > Sent: Tuesday, February 8, 2022 00:48
> > > > > To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > > > > <qi.z.zhang@intel.com>
> > > > > Cc: dev@dpdk.org
> > > > > Subject: [PATCH] net/ice: fix gcc error with
> > > > > -DRTE_LIBRTE_ICE_16BYTE_RX_DESC
> > > > >
> > > > > gcc will report error "unused parameter 'rxq'" when the macro
> > > > > RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to
> > > > > avoid it
> > > > >
> > > > > Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
> > > > > Cc: stable@dpdk.org
> > > > >
> > > > > Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
> > > > > ---
> 
> Tested-by: Wei Ling <weix.ling@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  
Ferruh Yigit Feb. 10, 2022, 10:12 a.m. UTC | #6
On 2/10/2022 9:30 AM, Zhang, Qi Z wrote:
> 
> 
>> -----Original Message-----
>> From: Ling, WeiX <weix.ling@intel.com>
>> Sent: Thursday, February 10, 2022 11:09 AM
>> To: Zhou, YidingX <yidingx.zhou@intel.com>; Richardson, Bruce
>> <bruce.richardson@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>
>> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
>> <qi.z.zhang@intel.com>; dev@dpdk.org
>> Subject: RE: [PATCH] net/ice: fix gcc error with -
>> DRTE_LIBRTE_ICE_16BYTE_RX_DESC
>>
>>> -----Original Message-----
>>> From: Zhou, YidingX <yidingx.zhou@intel.com>
>>> Sent: Tuesday, February 8, 2022 1:35 PM
>>> To: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Haiyue
>>> <haiyue.wang@intel.com>
>>> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
>>> <qi.z.zhang@intel.com>; dev@dpdk.org
>>> Subject: RE: [PATCH] net/ice: fix gcc error with -
>>> DRTE_LIBRTE_ICE_16BYTE_RX_DESC
>>>
>>>
>>>
>>>> -----Original Message-----
>>>> From: Richardson, Bruce <bruce.richardson@intel.com>
>>>> Sent: Monday, February 7, 2022 9:46 PM
>>>> To: Wang, Haiyue <haiyue.wang@intel.com>
>>>> Cc: Zhou, YidingX <yidingx.zhou@intel.com>; Yang, Qiming
>>>> <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
>>>> dev@dpdk.org
>>>> Subject: Re: [PATCH] net/ice: fix gcc error with -
>>>> DRTE_LIBRTE_ICE_16BYTE_RX_DESC
>>>>
>>>> On Mon, Feb 07, 2022 at 01:14:18PM +0000, Wang, Haiyue wrote:
>>>>>> -----Original Message-----
>>>>>> From: Yiding Zhou <yidingx.zhou@intel.com>
>>>>>> Sent: Tuesday, February 8, 2022 00:48
>>>>>> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
>>>>>> <qi.z.zhang@intel.com>
>>>>>> Cc: dev@dpdk.org
>>>>>> Subject: [PATCH] net/ice: fix gcc error with
>>>>>> -DRTE_LIBRTE_ICE_16BYTE_RX_DESC
>>>>>>
>>>>>> gcc will report error "unused parameter 'rxq'" when the macro
>>>>>> RTE_LIBRTE_ICE_16BYTE_RX_DESC is defined. use "(void)rxq" to
>>>>>> avoid it
>>>>>>
>>>>>> Fixes: 7a340b0b4e03 ("net/ice: refactor Rx FlexiMD handling")
>>>>>> Cc: stable@dpdk.org
>>>>>>
>>>>>> Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
>>>>>> ---
>>
>> Tested-by: Wei Ling <weix.ling@intel.com>
> 
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
> 
> Applied to dpdk-next-net-intel.
> 

Hi Qi,

Just to confirm, there is a v2 of this patch, which version is merged?
  

Patch

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 58700f1b92..97572d5952 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -163,6 +163,8 @@  ice_rxd_to_pkt_fields_by_comms_aux_v1(struct ice_rx_queue *rxq,
 			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
 		}
 	}
+#else
+	(void)rxq;
 #endif
 }
 
@@ -201,6 +203,8 @@  ice_rxd_to_pkt_fields_by_comms_aux_v2(struct ice_rx_queue *rxq,
 			*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
 		}
 	}
+#else
+	(void)rxq;
 #endif
 }