From: "Wu, Jingjing" <jingjing.wu@intel.com>
To: "Sun, Xutao" <xutao.sun@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v5 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
Date: Thu, 25 Feb 2016 01:22:45 +0000 [thread overview]
Message-ID: <9BB6961774997848B5B42BEC655768F8DC918D@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <1455867097-19173-2-git-send-email-xutao.sun@intel.com>
> -----Original Message-----
> From: Sun, Xutao
> Sent: Friday, February 19, 2016 3:32 PM
> To: dev@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@intel.com>
> Signed-off-by: Jijiang Liu <jijiang.liu@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
next prev parent reply other threads:[~2016-02-25 1:54 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 7:25 [dpdk-dev] [PATCH 0/4] Add tunnel filter support for IP in GRE on i40e Xutao Sun
2016-01-25 7:25 ` [dpdk-dev] [PATCH 1/4] lib/ether: optimize the 'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-01-25 7:25 ` [dpdk-dev] [PATCH 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-01-25 7:25 ` [dpdk-dev] [PATCH 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-01-25 7:25 ` [dpdk-dev] [PATCH 4/4] app/test-pmd: test " Xutao Sun
2016-01-28 7:30 ` [dpdk-dev] [PATCH v2 0/4] Add tunnel filter support for IP in GRE on i40e Xutao Sun
2016-01-28 7:30 ` [dpdk-dev] [PATCH v2 1/4] lib/ether: optimize the 'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-01-28 8:21 ` Thomas Monjalon
2016-01-28 9:05 ` Sun, Xutao
2016-01-28 7:30 ` [dpdk-dev] [PATCH v2 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-01-28 7:30 ` [dpdk-dev] [PATCH v2 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-01-28 7:30 ` [dpdk-dev] [PATCH v2 4/4] app/test-pmd: test " Xutao Sun
[not found] ` <1453976778-27807-1-git-send-email-xutao.sun@intel.com>
2016-01-28 10:26 ` [dpdk-dev] [PATCH v3 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-01-28 10:26 ` [dpdk-dev] [PATCH v3 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-01-28 10:26 ` [dpdk-dev] [PATCH v3 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-01-28 10:26 ` [dpdk-dev] [PATCH v3 4/4] app/test-pmd: test " Xutao Sun
2016-02-12 13:46 ` De Lara Guarch, Pablo
2016-02-18 7:19 ` Sun, Xutao
2016-02-18 9:58 ` [dpdk-dev] [PATCH v4 0/4] Add tunnel filter support for IP in GRE on i40e Xutao Sun
2016-02-18 9:58 ` [dpdk-dev] [PATCH v4 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-02-18 9:58 ` [dpdk-dev] [PATCH v4 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-02-18 9:58 ` [dpdk-dev] [PATCH v4 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-02-18 9:58 ` [dpdk-dev] [PATCH v4 4/4] app/test-pmd: test " Xutao Sun
2016-02-18 12:16 ` De Lara Guarch, Pablo
2016-02-19 2:40 ` Sun, Xutao
2016-02-19 7:31 ` [dpdk-dev] [PATCH v5 0/4] Add tunnel filter support for IP in GRE on i40e Xutao Sun
2016-02-19 7:31 ` [dpdk-dev] [PATCH v5 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-02-25 1:22 ` Wu, Jingjing [this message]
2016-02-19 7:31 ` [dpdk-dev] [PATCH v5 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-02-19 7:31 ` [dpdk-dev] [PATCH v5 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-02-25 1:50 ` Wu, Jingjing
2016-02-19 7:31 ` [dpdk-dev] [PATCH v5 4/4] app/test-pmd: test " Xutao Sun
2016-03-01 3:47 ` [dpdk-dev] [PATCH v6 0/4] Add tunnel filter support for IP in GRE on i40e Xutao Sun
2016-03-01 3:47 ` [dpdk-dev] [PATCH v6 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-03-01 8:53 ` Panu Matilainen
2016-03-02 3:10 ` Sun, Xutao
2016-03-02 7:12 ` Panu Matilainen
2016-03-01 3:47 ` [dpdk-dev] [PATCH v6 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-03-01 3:47 ` [dpdk-dev] [PATCH v6 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-03-01 3:47 ` [dpdk-dev] [PATCH v6 4/4] app/test-pmd: test " Xutao Sun
2016-03-01 8:41 ` [dpdk-dev] [PATCH v7 0/4] Add tunnel filter support for IP in GRE on i40e Xutao Sun
2016-03-01 8:41 ` [dpdk-dev] [PATCH v7 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure Xutao Sun
2016-03-08 23:08 ` Thomas Monjalon
2016-03-08 23:20 ` Thomas Monjalon
2016-03-01 8:41 ` [dpdk-dev] [PATCH v7 2/4] lib/ether: add IP in GRE type Xutao Sun
2016-03-01 8:41 ` [dpdk-dev] [PATCH v7 3/4] driver/i40e: implement tunnel filter for IP in GRE Xutao Sun
2016-03-01 8:41 ` [dpdk-dev] [PATCH v7 4/4] app/test-pmd: test " Xutao Sun
2016-03-02 7:04 ` [dpdk-dev] [PATCH v7 0/4] Add tunnel filter support for IP in GRE on i40e Liu, Yong
2016-03-02 7:31 ` Wu, Jingjing
2016-03-10 3:05 ` [dpdk-dev] [PATCH v8 0/4] This patch set adds " Jingjing Wu
2016-03-10 3:05 ` [dpdk-dev] [PATCH v8 1/4] lib/ether: optimize struct rte_eth_tunnel_filter_conf Jingjing Wu
2016-03-13 12:01 ` Thomas Monjalon
2016-03-10 3:06 ` [dpdk-dev] [PATCH v8 2/4] lib/ether: add IP in GRE type Jingjing Wu
2016-03-10 3:06 ` [dpdk-dev] [PATCH v8 3/4] driver/i40e: implement tunnel filter for IP in GRE Jingjing Wu
2016-03-10 3:06 ` [dpdk-dev] [PATCH v8 4/4] app/test-pmd: test " Jingjing Wu
2016-03-13 14:18 ` [dpdk-dev] [PATCH v8 0/4] This patch set adds tunnel filter support for IP in GRE on i40e Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9BB6961774997848B5B42BEC655768F8DC918D@SHSMSX104.ccr.corp.intel.com \
--to=jingjing.wu@intel.com \
--cc=dev@dpdk.org \
--cc=xutao.sun@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).