Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/35133/?format=api
{ "id": 35133, "url": "http://patches.dpdk.org/api/patches/35133/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1518446689-26839-1-git-send-email-vipin.varghese@intel.com/", "project": { "id": 1, "url": "http://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": "<1518446689-26839-1-git-send-email-vipin.varghese@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1518446689-26839-1-git-send-email-vipin.varghese@intel.com", "date": "2018-02-12T14:44:49", "name": "[dpdk-dev,v1] net/tap: allow user MAC to be passed as args", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c25824a14af3429769a692d4decfb48f153a3222", "submitter": { "id": 882, "url": "http://patches.dpdk.org/api/people/882/?format=api", "name": "Varghese, Vipin", "email": "vipin.varghese@intel.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1518446689-26839-1-git-send-email-vipin.varghese@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/35133/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/35133/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C07701B367;\n\tMon, 12 Feb 2018 15:44:32 +0100 (CET)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby dpdk.org (Postfix) with ESMTP id A99EC1B366\n\tfor <dev@dpdk.org>; Mon, 12 Feb 2018 15:44:31 +0100 (CET)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t12 Feb 2018 06:44:30 -0800", "from unknown (HELO localhost.localdomain) ([10.224.122.203])\n\tby orsmga008.jf.intel.com with ESMTP; 12 Feb 2018 06:44:28 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.46,501,1511856000\"; d=\"scan'208\";a=\"17502820\"", "From": "Vipin Varghese <vipin.varghese@intel.com>", "To": "dev@dpdk.org,\n\tpascal.mazon@6wind.com", "Cc": "ferruh.yigit@intel.com, deepak.k.jain@intel.com,\n\tVipin Varghese <vipin.varghese@intel.com>", "Date": "Mon, 12 Feb 2018 20:14:49 +0530", "Message-Id": "<1518446689-26839-1-git-send-email-vipin.varghese@intel.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<a09d0ef98a2cb7935f691ae66af34dc1e123d914.1517840652.git.pascal.mazon@6wind.com>", "References": "<a09d0ef98a2cb7935f691ae66af34dc1e123d914.1517840652.git.pascal.mazon@6wind.com>", "Subject": "[dpdk-dev] [PATCH v1] net/tap: allow user MAC to be passed as args", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://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": "<https://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": "Allow TAP PMD to pass user desired MAC address as argument.\nThe argument value is processed as string delimited by ':',\nis parsed and converted to HEX MAC address after validation.\n\nSigned-off-by: Vipin Varghese <vipin.varghese@intel.com>\nSigned-off-by: Pascal Mazon <pascal.mazon@6wind.com>\n---\n\nChanges:\n - seggrated the function for hex sting validation - Ferruh\n - Fixed the logic lookup for MAC address\n---\n drivers/net/tap/rte_eth_tap.c | 75 +++++++++++++++++++++++++++++++++----------\n 1 file changed, 58 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 9d39384..5f67d51 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -48,6 +48,10 @@\n #define ETH_TAP_MAC_ARG \"mac\"\n #define ETH_TAP_MAC_FIXED \"fixed\"\n \n+#define ETH_TAP_USR_MAC_FMT \"xx:xx:xx:xx:xx:xx\"\n+#define ETH_TAP_CMP_MAC_FMT \"0123456789ABCDEFabcdef\"\n+#define ETH_TAP_MAC_ARG_FMT ETH_TAP_MAC_FIXED \"|\" ETH_TAP_USR_MAC_FMT\n+\n static struct rte_vdev_driver pmd_tap_drv;\n \n static const char *valid_arguments[] = {\n@@ -1335,7 +1339,7 @@ enum ioctl_mode {\n \n static int\n eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,\n-\t\t char *remote_iface, int fixed_mac_type)\n+\t\t char *remote_iface, struct ether_addr *mac_addr)\n {\n \tint numa_node = rte_socket_id();\n \tstruct rte_eth_dev *dev;\n@@ -1397,16 +1401,10 @@ enum ioctl_mode {\n \t\tpmd->txq[i].fd = -1;\n \t}\n \n-\tif (fixed_mac_type) {\n-\t\t/* fixed mac = 00:64:74:61:70:<iface_idx> */\n-\t\tstatic int iface_idx;\n-\t\tchar mac[ETHER_ADDR_LEN] = \"\\0dtap\";\n-\n-\t\tmac[ETHER_ADDR_LEN - 1] = iface_idx++;\n-\t\trte_memcpy(&pmd->eth_addr, mac, ETHER_ADDR_LEN);\n-\t} else {\n+\tif (is_zero_ether_addr(mac_addr))\n \t\teth_random_addr((uint8_t *)&pmd->eth_addr);\n-\t}\n+\telse\n+\t\trte_memcpy(&pmd->eth_addr, mac_addr, sizeof(mac_addr));\n \n \t/* Immediately create the netdevice (this will create the 1st queue). */\n \t/* rx queue */\n@@ -1567,15 +1565,58 @@ enum ioctl_mode {\n \treturn 0;\n }\n \n+static int parse_user_mac(struct ether_addr *user_mac,\n+\t\tconst char *value)\n+{\n+\tunsigned int index = 0;\n+\tchar mac_temp[strlen(ETH_TAP_USR_MAC_FMT) + 1], *mac_byte = NULL;\n+\n+\tif (user_mac == NULL || value == NULL)\n+\t\treturn 0;\n+\n+\tsnprintf(mac_temp, sizeof(mac_temp), \"%s\", value);\n+\tmac_byte = strtok(mac_temp, \":\");\n+\n+\twhile ((mac_byte != NULL) &&\n+\t\t\t(strlen(mac_byte) <= 2) &&\n+\t\t\t(strlen(mac_byte) == strspn(mac_byte,\n+\t\t\t\t\tETH_TAP_CMP_MAC_FMT))) {\n+\t\tuser_mac->addr_bytes[index++] = strtoul(mac_byte, NULL, 16);\n+\t\tmac_byte = strtok(NULL, \":\");\n+\t}\n+\n+\treturn index;\n+}\n+\n static int\n set_mac_type(const char *key __rte_unused,\n \t const char *value,\n \t void *extra_args)\n {\n-\tif (value &&\n-\t !strncasecmp(ETH_TAP_MAC_FIXED, value, strlen(ETH_TAP_MAC_FIXED)))\n-\t\t*(int *)extra_args = 1;\n+\tstruct ether_addr *user_mac = extra_args;\n+\n+\tif (!value)\n+\t\treturn 0;\n+\n+\tif (!strncasecmp(ETH_TAP_MAC_FIXED, value, strlen(ETH_TAP_MAC_FIXED))) {\n+\t\tstatic int iface_idx;\n+\n+\t\t/* fixed mac = 00:64:74:61:70:<iface_idx> */\n+\t\tmemcpy((char *)user_mac->addr_bytes, \"\\0dtap\", ETHER_ADDR_LEN);\n+\t\tuser_mac->addr_bytes[ETHER_ADDR_LEN - 1] = iface_idx++ + '0';\n+\t\tgoto success;\n+\t}\n+\n+\tif (parse_user_mac(user_mac, value) != 6)\n+\t\tgoto error;\n+success:\n+\tRTE_LOG(DEBUG, PMD, \"TAP user MAC param (%s)\\n\", value);\n \treturn 0;\n+\n+error:\n+\tRTE_LOG(ERR, PMD, \"TAP user MAC (%s) is not in format (%s|%s)\\n\",\n+\t\tvalue, ETH_TAP_MAC_FIXED, ETH_TAP_USR_MAC_FMT);\n+\treturn -1;\n }\n \n /* Open a TAP interface device.\n@@ -1589,7 +1630,7 @@ enum ioctl_mode {\n \tint speed;\n \tchar tap_name[RTE_ETH_NAME_MAX_LEN];\n \tchar remote_iface[RTE_ETH_NAME_MAX_LEN];\n-\tint fixed_mac_type = 0;\n+\tstruct ether_addr user_mac;\n \n \tname = rte_vdev_device_name(dev);\n \tparams = rte_vdev_device_args(dev);\n@@ -1626,7 +1667,7 @@ enum ioctl_mode {\n \t\t\t\tret = rte_kvargs_process(kvlist,\n \t\t\t\t\t\t\t ETH_TAP_MAC_ARG,\n \t\t\t\t\t\t\t &set_mac_type,\n-\t\t\t\t\t\t\t &fixed_mac_type);\n+\t\t\t\t\t\t\t &user_mac);\n \t\t\t\tif (ret == -1)\n \t\t\t\t\tgoto leave;\n \t\t\t}\n@@ -1637,7 +1678,7 @@ enum ioctl_mode {\n \tRTE_LOG(NOTICE, PMD, \"Initializing pmd_tap for %s as %s\\n\",\n \t\tname, tap_name);\n \n-\tret = eth_dev_tap_create(dev, tap_name, remote_iface, fixed_mac_type);\n+\tret = eth_dev_tap_create(dev, tap_name, remote_iface, &user_mac);\n \n leave:\n \tif (ret == -1) {\n@@ -1701,5 +1742,5 @@ enum ioctl_mode {\n RTE_PMD_REGISTER_ALIAS(net_tap, eth_tap);\n RTE_PMD_REGISTER_PARAM_STRING(net_tap,\n \t\t\t ETH_TAP_IFACE_ARG \"=<string> \"\n-\t\t\t ETH_TAP_MAC_ARG \"=\" ETH_TAP_MAC_FIXED \" \"\n+\t\t\t ETH_TAP_MAC_ARG \"=\" ETH_TAP_MAC_ARG_FMT \" \"\n \t\t\t ETH_TAP_REMOTE_ARG \"=<string>\");\n", "prefixes": [ "dpdk-dev", "v1" ] }