> -----Original Message-----
> From: Sun, Xutao
> Sent: Friday, February 19, 2016 3:32 PM
> To: dev at dpdk.org
> Cc: Zhang, Helin; Wu, Jingjing; De Lara Guarch, Pablo; Sun, Xutao; Liu,
> Jijiang
> Subject: [PATCH v5 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf'
> structure
>
> Change the fields of outer_mac and inner_mac from pointer to struct in
> order to keep the code's readability.
>
> Signed-off-by: Xutao Sun <xutao.sun at intel.com>
> Signed-off-by: Jijiang Liu <jijiang.liu at intel.com>
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index a520cc5..3ee629a 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -553,7 +553,37 @@ tunnel_filter add
> Add a tunnel filter on a port::
>
> testpmd> tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) \
> - (inner_vlan) (tunnel_type) (filter_type) (tenant_id) (queue_id)
> + (inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|\
> + imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id)
> + (queue_id)
> +
> +The available information categories are:
> +
> +* ``vxlan``: Set tunnel type as VXLAN.
> +
> +* ``nvgre``: Set tunnel type as NVGRE.
> +
> +* ``ipingre``: Set tunnel type as IP-in-GRE.
> +
> +* ``imac-ivlan``: Set filter type as Inner MAC and VLAN.
> +
> +* ``imac-ivlan-tenid``: Set filter type as Inner MAC, VLAN and tenant ID.
> +
> +* ``imac-tenid``: Set filter type as Inner MAC and tenant ID.
> +
> +* ``imac``: Set filter type as Inner MAC.
> +
> +* ``omac-imac-tenid``: Set filter type as Outer MAC, Inner MAC and tenant
> ID.
> +
> +* ``oip``: Set filter type as Outer IP.
> +
> +* ``iip``: Set filter type as Inner IP.
> +
Doc for tunnel_filter is extended, and ipingre type is also mentioned here.
This part seems no relationship with the commit log "Change the fields of
outer_mac
and inner_mac from pointer to struct in order to keep the code's readability".
It's better to move to latter patch.
> +Example::
> +
> + testpmd> tunnel_filter add 0 68:05:CA:28:09:82 00:00:00:00:00:00 \
> + 192.168.2.2 0 ipingre oip 1 1
> +
> + Set an IP-in-GRE tunnel on port 0, and the filter type is Outer IP.
>
> tunnel_filter remove
> ~~~~~~~~~~~~~~~~~~~~
> @@ -561,7 +591,8 @@ tunnel_filter remove Remove a tunnel filter on a
> port::
>
> testpmd> tunnel_filter rm (port_id) (outer_mac) (inner_mac) (ip_addr) \
> - (inner_vlan) (tunnel_type) (filter_type) (tenant_id) (queue_id)
> + (inner_vlan) (vxlan|nvgre|ipingre) (imac-ivlan|imac-ivlan-tenid|\
> + imac-tenid|imac|omac-imac-tenid|oip|iip) (tenant_id)
> + (queue_id)
>
> rx_vxlan_port add
> ~~~~~~~~~~~~~~~~~
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index ef24122..7c22358 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -5828,10 +5828,10 @@ i40e_dev_tunnel_filter_set(struct i40e_pf *pf,
> }
> pfilter = cld_filter;
>
> - (void)rte_memcpy(&pfilter->outer_mac, tunnel_filter->outer_mac,
> - sizeof(struct ether_addr));
> - (void)rte_memcpy(&pfilter->inner_mac, tunnel_filter->inner_mac,
> - sizeof(struct ether_addr));
> + (void)rte_memcpy(&pfilter->outer_mac, &tunnel_filter->outer_mac,
> + ETHER_ADDR_LEN);
> + (void)rte_memcpy(&pfilter->inner_mac, &tunnel_filter->inner_mac,
> + ETHER_ADDR_LEN);
>
> pfilter->inner_vlan = tunnel_filter->inner_vlan;
> if (tunnel_filter->ip_type == RTE_TUNNEL_IPTYPE_IPV4) { @@ -
> 6131,13 +6131,13 @@ i40e_tunnel_filter_param_check(struct i40e_pf *pf,
> }
>
> if ((filter->filter_type & ETH_TUNNEL_FILTER_OMAC) &&
> - (is_zero_ether_addr(filter->outer_mac))) {
> + (is_zero_ether_addr(&filter->outer_mac))) {
> PMD_DRV_LOG(ERR, "Cannot add NULL outer MAC
> address");
> return -EINVAL;
> }
>
> if ((filter->filter_type & ETH_TUNNEL_FILTER_IMAC) &&
> - (is_zero_ether_addr(filter->inner_mac))) {
> + (is_zero_ether_addr(&filter->inner_mac))) {
> PMD_DRV_LOG(ERR, "Cannot add NULL inner MAC address");
> return -EINVAL;
> }
> diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h
> index ce224ad..30cbde7 100644
> --- a/lib/librte_ether/rte_eth_ctrl.h
> +++ b/lib/librte_ether/rte_eth_ctrl.h
> @@ -280,8 +280,8 @@ enum rte_tunnel_iptype {
> * Tunneling Packet filter configuration.
> */
> struct rte_eth_tunnel_filter_conf {
> - struct ether_addr *outer_mac; /**< Outer MAC address filter. */
> - struct ether_addr *inner_mac; /**< Inner MAC address filter. */
> + struct ether_addr outer_mac; /**< Outer MAC address filter. */
> + struct ether_addr inner_mac; /**< Inner MAC address filter. */
> uint16_t inner_vlan; /**< Inner VLAN filter. */
> enum rte_tunnel_iptype ip_type; /**< IP address type. */
> union {
> --
> 1.9.3
