Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/5337/?format=api
{ "id": 5337, "url": "https://patches.dpdk.org/api/patches/5337/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1433917473-21508-2-git-send-email-jingjing.wu@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1433917473-21508-2-git-send-email-jingjing.wu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1433917473-21508-2-git-send-email-jingjing.wu@intel.com", "date": "2015-06-10T06:24:30", "name": "[dpdk-dev,v4,1/4] ethdev: rename rte_eth_vmdq_mirror_conf", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3e0dc45af365d942dbc018945b6ab0150764b78c", "submitter": { "id": 47, "url": "https://patches.dpdk.org/api/people/47/?format=api", "name": "Jingjing Wu", "email": "jingjing.wu@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1433917473-21508-2-git-send-email-jingjing.wu@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/5337/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/5337/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id C6041BDC2;\n\tWed, 10 Jun 2015 08:25:15 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 2B67E5ABA\n\tfor <dev@dpdk.org>; Wed, 10 Jun 2015 08:25:12 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga103.fm.intel.com with ESMTP; 09 Jun 2015 23:25:03 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga003.jf.intel.com with ESMTP; 09 Jun 2015 23:25:03 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t5A6P1Fg003859;\n\tWed, 10 Jun 2015 14:25:01 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t5A6OwGK021552; Wed, 10 Jun 2015 14:25:00 +0800", "(from wujingji@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t5A6OwnJ021548; \n\tWed, 10 Jun 2015 14:24:58 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,586,1427785200\"; d=\"scan'208\";a=\"585190009\"", "From": "Jingjing Wu <jingjing.wu@intel.com>", "To": "dev@dpdk.org", "Date": "Wed, 10 Jun 2015 14:24:30 +0800", "Message-Id": "<1433917473-21508-2-git-send-email-jingjing.wu@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1433917473-21508-1-git-send-email-jingjing.wu@intel.com>", "References": "<1433492166-30758-1-git-send-email-jingjing.wu@intel.com>\n\t<1433917473-21508-1-git-send-email-jingjing.wu@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 1/4] ethdev: rename rte_eth_vmdq_mirror_conf", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "rename rte_eth_vmdq_mirror_conf to rte_eth_mirror_conf and move\nthe maximum rule id check from ethdev level to driver\n\nSigned-off-by: Jingjing Wu <jingjing.wu@intel.com>\n---\n app/test-pmd/cmdline.c | 22 +++++++++++-----------\n drivers/net/ixgbe/ixgbe_ethdev.c | 11 +++++++----\n drivers/net/ixgbe/ixgbe_ethdev.h | 4 +++-\n lib/librte_ether/rte_ethdev.c | 18 ++----------------\n lib/librte_ether/rte_ethdev.h | 19 ++++++++++---------\n 5 files changed, 33 insertions(+), 41 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex f01db2a..d693bde 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -6604,11 +6604,11 @@ cmd_set_mirror_mask_parsed(void *parsed_result,\n {\n \tint ret,nb_item,i;\n \tstruct cmd_set_mirror_mask_result *res = parsed_result;\n-\tstruct rte_eth_vmdq_mirror_conf mr_conf;\n+\tstruct rte_eth_mirror_conf mr_conf;\n \n-\tmemset(&mr_conf,0,sizeof(struct rte_eth_vmdq_mirror_conf));\n+\tmemset(&mr_conf, 0, sizeof(struct rte_eth_mirror_conf));\n \n-\tunsigned int vlan_list[ETH_VMDQ_MAX_VLAN_FILTERS];\n+\tunsigned int vlan_list[ETH_MIRROR_MAX_VLANS];\n \n \tmr_conf.dst_pool = res->dstpool_id;\n \n@@ -6618,11 +6618,11 @@ cmd_set_mirror_mask_parsed(void *parsed_result,\n \t} else if(!strcmp(res->what, \"vlan-mirror\")) {\n \t\tmr_conf.rule_type_mask = ETH_VMDQ_VLAN_MIRROR;\n \t\tnb_item = parse_item_list(res->value, \"core\",\n-\t\t\t\t\tETH_VMDQ_MAX_VLAN_FILTERS,vlan_list,1);\n+\t\t\t\t\tETH_MIRROR_MAX_VLANS, vlan_list, 1);\n \t\tif (nb_item <= 0)\n \t\t\treturn;\n \n-\t\tfor(i=0; i < nb_item; i++) {\n+\t\tfor (i = 0; i < nb_item; i++) {\n \t\t\tif (vlan_list[i] > ETHER_MAX_VLAN_ID) {\n \t\t\t\tprintf(\"Invalid vlan_id: must be < 4096\\n\");\n \t\t\t\treturn;\n@@ -6634,10 +6634,10 @@ cmd_set_mirror_mask_parsed(void *parsed_result,\n \t}\n \n \tif(!strcmp(res->on, \"on\"))\n-\t\tret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,\n+\t\tret = rte_eth_mirror_rule_set(res->port_id, &mr_conf,\n \t\t\t\t\t\tres->rule_id, 1);\n \telse\n-\t\tret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,\n+\t\tret = rte_eth_mirror_rule_set(res->port_id, &mr_conf,\n \t\t\t\t\t\tres->rule_id, 0);\n \tif(ret < 0)\n \t\tprintf(\"mirror rule add error: (%s)\\n\", strerror(-ret));\n@@ -6711,9 +6711,9 @@ cmd_set_mirror_link_parsed(void *parsed_result,\n {\n \tint ret;\n \tstruct cmd_set_mirror_link_result *res = parsed_result;\n-\tstruct rte_eth_vmdq_mirror_conf mr_conf;\n+\tstruct rte_eth_mirror_conf mr_conf;\n \n-\tmemset(&mr_conf,0,sizeof(struct rte_eth_vmdq_mirror_conf));\n+\tmemset(&mr_conf, 0, sizeof(struct rte_eth_mirror_conf));\n \tif(!strcmp(res->what, \"uplink-mirror\")) {\n \t\tmr_conf.rule_type_mask = ETH_VMDQ_UPLINK_MIRROR;\n \t}else if(!strcmp(res->what, \"downlink-mirror\"))\n@@ -6722,10 +6722,10 @@ cmd_set_mirror_link_parsed(void *parsed_result,\n \tmr_conf.dst_pool = res->dstpool_id;\n \n \tif(!strcmp(res->on, \"on\"))\n-\t\tret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,\n+\t\tret = rte_eth_mirror_rule_set(res->port_id, &mr_conf,\n \t\t\t\t\t\tres->rule_id, 1);\n \telse\n-\t\tret = rte_eth_mirror_rule_set(res->port_id,&mr_conf,\n+\t\tret = rte_eth_mirror_rule_set(res->port_id, &mr_conf,\n \t\t\t\t\t\tres->rule_id, 0);\n \n \t/* check the return value and print it if is < 0 */\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 0d9f9b2..9e767fa 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -209,7 +209,7 @@ static int ixgbe_set_pool_tx(struct rte_eth_dev *dev,uint16_t pool,uint8_t on);\n static int ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,\n \t\tuint64_t pool_mask,uint8_t vlan_on);\n static int ixgbe_mirror_rule_set(struct rte_eth_dev *dev,\n-\t\tstruct rte_eth_vmdq_mirror_conf *mirror_conf,\n+\t\tstruct rte_eth_mirror_conf *mirror_conf,\n \t\tuint8_t rule_id, uint8_t on);\n static int ixgbe_mirror_rule_reset(struct rte_eth_dev *dev,\n \t\tuint8_t\trule_id);\n@@ -3388,7 +3388,7 @@ ixgbe_set_pool_vlan_filter(struct rte_eth_dev *dev, uint16_t vlan,\n \n static int\n ixgbe_mirror_rule_set(struct rte_eth_dev *dev,\n-\t\t\tstruct rte_eth_vmdq_mirror_conf *mirror_conf,\n+\t\t\tstruct rte_eth_mirror_conf *mirror_conf,\n \t\t\tuint8_t rule_id, uint8_t on)\n {\n \tuint32_t mr_ctl,vlvf;\n@@ -3412,7 +3412,10 @@ ixgbe_mirror_rule_set(struct rte_eth_dev *dev,\n \t\tIXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tif (ixgbe_vmdq_mode_check(hw) < 0)\n-\t\treturn (-ENOTSUP);\n+\t\treturn -ENOTSUP;\n+\n+\tif (rule_id >= IXGBE_MAX_MIRROR_RULES)\n+\t\treturn -EINVAL;\n \n \t/* Check if vlan mask is valid */\n \tif ((mirror_conf->rule_type_mask & ETH_VMDQ_VLAN_MIRROR) && (on)) {\n@@ -3526,7 +3529,7 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)\n \t\treturn (-ENOTSUP);\n \n \tmemset(&mr_info->mr_conf[rule_id], 0,\n-\t\tsizeof(struct rte_eth_vmdq_mirror_conf));\n+\t\tsizeof(struct rte_eth_mirror_conf));\n \n \t/* clear PFVMCTL register */\n \tIXGBE_WRITE_REG(hw, IXGBE_MRCTL(rule_id), mr_ctl);\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h\nindex 19237b8..755b674 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.h\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.h\n@@ -177,8 +177,10 @@ struct ixgbe_uta_info {\n \tuint32_t uta_shadow[IXGBE_MAX_UTA];\n };\n \n+#define IXGBE_MAX_MIRROR_RULES 4 /* Maximum nb. of mirror rules. */\n+\n struct ixgbe_mirror_info {\n-\tstruct rte_eth_vmdq_mirror_conf mr_conf[ETH_VMDQ_NUM_MIRROR_RULE];\n+\tstruct rte_eth_mirror_conf mr_conf[IXGBE_MAX_MIRROR_RULES];\n \t/**< store PF mirror rules configuration*/\n };\n \ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 024fe8b..43c7295 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -3034,7 +3034,7 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate,\n \n int\n rte_eth_mirror_rule_set(uint8_t port_id,\n-\t\t\tstruct rte_eth_vmdq_mirror_conf *mirror_conf,\n+\t\t\tstruct rte_eth_mirror_conf *mirror_conf,\n \t\t\tuint8_t rule_id, uint8_t on)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n@@ -3051,7 +3051,7 @@ rte_eth_mirror_rule_set(uint8_t port_id,\n \n \tif (mirror_conf->dst_pool >= ETH_64_POOLS) {\n \t\tPMD_DEBUG_TRACE(\"Invalid dst pool, pool id must\"\n-\t\t\t\"be 0-%d\\n\",ETH_64_POOLS - 1);\n+\t\t\t\"be 0-%d\\n\", ETH_64_POOLS - 1);\n \t\treturn -EINVAL;\n \t}\n \n@@ -3062,13 +3062,6 @@ rte_eth_mirror_rule_set(uint8_t port_id,\n \t\treturn -EINVAL;\n \t}\n \n-\tif(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)\n-\t{\n-\t\tPMD_DEBUG_TRACE(\"Invalid rule_id, rule_id must be 0-%d\\n\",\n-\t\t\tETH_VMDQ_NUM_MIRROR_RULE - 1);\n-\t\treturn -EINVAL;\n-\t}\n-\n \tdev = &rte_eth_devices[port_id];\n \tFUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_set, -ENOTSUP);\n \n@@ -3085,13 +3078,6 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)\n \t\treturn -ENODEV;\n \t}\n \n-\tif(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)\n-\t{\n-\t\tPMD_DEBUG_TRACE(\"Invalid rule_id, rule_id must be 0-%d\\n\",\n-\t\t\tETH_VMDQ_NUM_MIRROR_RULE-1);\n-\t\treturn -EINVAL;\n-\t}\n-\n \tdev = &rte_eth_devices[port_id];\n \tFUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_reset, -ENOTSUP);\n \ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex 16dbe00..ae22fea 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -467,8 +467,8 @@ struct rte_eth_rss_conf {\n #define ETH_VMDQ_ACCEPT_BROADCAST 0x0008 /**< accept broadcast packets. */\n #define ETH_VMDQ_ACCEPT_MULTICAST 0x0010 /**< multicast promiscuous. */\n \n-/* Definitions used for VMDQ mirror rules setting */\n-#define ETH_VMDQ_NUM_MIRROR_RULE 4 /**< Maximum nb. of mirror rules. . */\n+/** Maximum nb. of vlan per mirror rule */\n+#define ETH_MIRROR_MAX_VLANS 64\n \n #define ETH_VMDQ_POOL_MIRROR 0x0001 /**< Virtual Pool Mirroring. */\n #define ETH_VMDQ_UPLINK_MIRROR 0x0002 /**< Uplink Port Mirroring. */\n@@ -480,18 +480,19 @@ struct rte_eth_rss_conf {\n */\n struct rte_eth_vlan_mirror {\n \tuint64_t vlan_mask; /**< mask for valid VLAN ID. */\n-\tuint16_t vlan_id[ETH_VMDQ_MAX_VLAN_FILTERS];\n-\t/** VLAN ID list for vlan mirror. */\n+\t/** VLAN ID list for vlan mirroring. */\n+\tuint16_t vlan_id[ETH_MIRROR_MAX_VLANS];\n };\n \n /**\n * A structure used to configure traffic mirror of an Ethernet port.\n */\n-struct rte_eth_vmdq_mirror_conf {\n+struct rte_eth_mirror_conf {\n \tuint8_t rule_type_mask; /**< Mirroring rule type mask we want to set */\n-\tuint8_t dst_pool; /**< Destination pool for this mirror rule. */\n+\tuint8_t dst_pool; /**< Destination pool for this mirror rule. */\n \tuint64_t pool_mask; /**< Bitmap of pool for pool mirroring */\n-\tstruct rte_eth_vlan_mirror vlan; /**< VLAN ID setting for VLAN mirroring */\n+\t/** VLAN ID setting for VLAN mirroring. */\n+\tstruct rte_eth_vlan_mirror vlan;\n };\n \n /**\n@@ -1211,7 +1212,7 @@ typedef int (*eth_set_vf_rate_limit_t)(struct rte_eth_dev *dev,\n /**< @internal Set VF TX rate */\n \n typedef int (*eth_mirror_rule_set_t)(struct rte_eth_dev *dev,\n-\t\t\t\t struct rte_eth_vmdq_mirror_conf *mirror_conf,\n+\t\t\t\t struct rte_eth_mirror_conf *mirror_conf,\n \t\t\t\t uint8_t rule_id,\n \t\t\t\t uint8_t on);\n /**< @internal Add a traffic mirroring rule on an Ethernet device */\n@@ -3168,7 +3169,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,\n * - (-EINVAL) if the mr_conf information is not correct.\n */\n int rte_eth_mirror_rule_set(uint8_t port_id,\n-\t\t\tstruct rte_eth_vmdq_mirror_conf *mirror_conf,\n+\t\t\tstruct rte_eth_mirror_conf *mirror_conf,\n \t\t\tuint8_t rule_id,\n \t\t\tuint8_t on);\n \n", "prefixes": [ "dpdk-dev", "v4", "1/4" ] }