DPDK patches and discussions
 help / color / mirror / Atom feed
From: Xutao Sun <xutao.sun@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v3 1/4] lib/ether: optimize the'rte_eth_tunnel_filter_conf' structure
Date: Thu, 28 Jan 2016 18:26:15 +0800	[thread overview]
Message-ID: <1453976778-27807-2-git-send-email-xutao.sun@intel.com> (raw)
In-Reply-To: <1453976778-27807-1-git-send-email-xutao.sun@intel.com>

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>
---
 app/test-pmd/cmdline.c               |  6 ++++--
 doc/guides/rel_notes/deprecation.rst |  5 -----
 doc/guides/rel_notes/release_2_3.rst |  2 ++
 drivers/net/i40e/i40e_ethdev.c       | 12 ++++++------
 lib/librte_ether/rte_eth_ctrl.h      |  4 ++--
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 6d28c1b..67df259 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6640,8 +6640,10 @@ cmd_tunnel_filter_parsed(void *parsed_result,
 	struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
 	int ret = 0;
 
-	tunnel_filter_conf.outer_mac = &res->outer_mac;
-	tunnel_filter_conf.inner_mac = &res->inner_mac;
+	rte_memcpy(&tunnel_filter_conf.outer_mac, &res->outer_mac,
+			ETHER_ADDR_LEN);
+	rte_memcpy(&tunnel_filter_conf.inner_mac, &res->inner_mac,
+			ETHER_ADDR_LEN);
 	tunnel_filter_conf.inner_vlan = res->inner_vlan;
 
 	if (res->ip_value.family == AF_INET) {
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index e94d4a2..a895364 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -32,11 +32,6 @@ Deprecation Notices
   RTE_ETH_FLOW_MAX. The release 2.2 does not contain these ABI changes,
   but release 2.3 will.
 
-* ABI changes are planned for rte_eth_tunnel_filter_conf. Change the fields
-  of outer_mac and inner_mac from pointer to struct in order to keep the
-  code's readability. The release 2.2 does not contain these ABI changes, but
-  release 2.3 will, and no backwards compatibility is planned.
-
 * The scheduler statistics structure will change to allow keeping track of
   RED actions.
 
diff --git a/doc/guides/rel_notes/release_2_3.rst b/doc/guides/rel_notes/release_2_3.rst
index 99de186..ee7fd48 100644
--- a/doc/guides/rel_notes/release_2_3.rst
+++ b/doc/guides/rel_notes/release_2_3.rst
@@ -39,6 +39,8 @@ API Changes
 ABI Changes
 -----------
 
+* The fields of outer_mac and inner_mac were changed from pointer
+  to struct in order to keep the code's readability.
 
 Shared Library Versions
 -----------------------
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index bf6220d..1dd1077 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

  parent reply	other threads:[~2016-01-28 10:26 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     ` Xutao Sun [this message]
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
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=1453976778-27807-2-git-send-email-xutao.sun@intel.com \
    --to=xutao.sun@intel.com \
    --cc=dev@dpdk.org \
    /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).