Re: [dpdk-dev] [PATCH v2] testpmd: fix build on FreeBSD

["Liu, Yong" <yong.liu@intel.com>]

> -----Original Message-----
> From: Qiu, Michael
> Sent: Tuesday, March 22, 2016 5:05 PM
> To: Liu, Yong; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] testpmd: fix build on FreeBSD
> 
> On 3/22/2016 2:51 PM, Marvin Liu wrote:
> > Build log:
> > /root/dpdk/app/test-pmd/cmdline.c:6687:45: error: no member named
> > 's6_addr32' in 'struct in6_addr'
> >     rte_be_to_cpu_32(res->ip_value.addr.ipv6.s6_addr32[i]);
> >
> > This is caused by macro "s6_addr32" not defined on FreeBSD and testpmd
> > swap big endian parameter to host endian. Move the swap action to i40e
> > ethdev will fix this issue.
> >
> > Fixes: 7b1312891b69 ("ethdev: add IP in GRE tunnel")
> >
> > Signed-off-by: Marvin Liu <yong.liu@intel.com>
> >
> > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> > index 9d52b8c..4f3d1e4 100644
> > --- a/app/test-pmd/cmdline.c
> > +++ b/app/test-pmd/cmdline.c
> > @@ -6678,14 +6678,12 @@ cmd_tunnel_filter_parsed(void *parsed_result,
> >
> >  	if (res->ip_value.family == AF_INET) {
> >  		tunnel_filter_conf.ip_addr.ipv4_addr =
> > -			rte_be_to_cpu_32(res->ip_value.addr.ipv4.s_addr);
> > +			res->ip_value.addr.ipv4.s_addr;
> >  		tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV4;
> >  	} else {
> > -		int i;
> > -		for (i = 0; i < 4; i++) {
> > -			tunnel_filter_conf.ip_addr.ipv6_addr[i] =
> > -			rte_be_to_cpu_32(res->ip_value.addr.ipv6.s6_addr32[i]);
> > -		}
> > +		memcpy(&(tunnel_filter_conf.ip_addr.ipv6_addr),
> > +			&(res->ip_value.addr.ipv6),
> > +			sizeof(struct in6_addr));
> >  		tunnel_filter_conf.ip_type = RTE_TUNNEL_IPTYPE_IPV6;
> >  	}
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.c
> b/drivers/net/i40e/i40e_ethdev.c
> > index 10e0d38..43c2d5c 100644
> > --- a/drivers/net/i40e/i40e_ethdev.c
> > +++ b/drivers/net/i40e/i40e_ethdev.c
> > @@ -6015,6 +6015,7 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
> >  			uint8_t add)
> >  {
> >  	uint16_t ip_type;
> > +	uint32_t ipv4_addr;
> >  	uint8_t i, tun_type = 0;
> >  	/* internal varialbe to convert ipv6 byte order */
> >  	uint32_t convert_ipv6[4];
> > @@ -6040,14 +6041,15 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
> >  	pfilter->inner_vlan = rte_cpu_to_le_16(tunnel_filter->inner_vlan);
> >  	if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) {
> >  		ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV4;
> > +		ipv4_addr = rte_be_to_cpu_32(tunnel_filter-
> >ip_addr.ipv4_addr);
> 
> As I checked "ipv4_addr" is the host Endian, so does it need to covert
> again? Maybe I'm wrong.
> 

Michael,
This logic is for i40e API required little endian. Variable "ipv4_addr" parsed by cmdline library has been in big endian.
To fulfill the special requirement of admin queue, i40e drive will do the swap.

> Thanks,
> Michael
> >  		rte_memcpy(&pfilter->ipaddr.v4.data,
> > -				&rte_cpu_to_le_32(tunnel_filter-
> >ip_addr.ipv4_addr),
> > +				&rte_cpu_to_le_32(ipv4_addr),
> >  				sizeof(pfilter->ipaddr.v4.data));
> >  	} else {
> >  		ip_type = I40E_AQC_ADD_CLOUD_FLAGS_IPV6;
> >  		for (i = 0; i < 4; i++) {
> >  			convert_ipv6[i] =
> > -			rte_cpu_to_le_32(tunnel_filter->ip_addr.ipv6_addr[i]);
> > +			rte_cpu_to_le_32(rte_be_to_cpu_32(tunnel_filter-
> >ip_addr.ipv6_addr[i]));
> >  		}
> >  		rte_memcpy(&pfilter->ipaddr.v6.data, &convert_ipv6,
> >  				sizeof(pfilter->ipaddr.v6.data));