Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 34798,
    "url": "https://patches.dpdk.org/api/patches/34798/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1517422961-21284-1-git-send-email-vipin.varghese@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": "<1517422961-21284-1-git-send-email-vipin.varghese@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1517422961-21284-1-git-send-email-vipin.varghese@intel.com",
    "date": "2018-01-31T18:22:41",
    "name": "[dpdk-dev] net/tap: allow user MAC to be passed as args",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "56bfcdf836b50799a38c2bf4eb5ceed6dce94e1a",
    "submitter": {
        "id": 882,
        "url": "https://patches.dpdk.org/api/people/882/?format=api",
        "name": "Varghese, Vipin",
        "email": "vipin.varghese@intel.com"
    },
    "delegate": {
        "id": 319,
        "url": "https://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1517422961-21284-1-git-send-email-vipin.varghese@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/34798/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/34798/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 76BA91B800;\n\tWed, 31 Jan 2018 19:22:47 +0100 (CET)",
            "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby dpdk.org (Postfix) with ESMTP id 701FB1B7F9\n\tfor <dev@dpdk.org>; Wed, 31 Jan 2018 19:22:46 +0100 (CET)",
            "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t31 Jan 2018 10:22:45 -0800",
            "from unknown (HELO localhost.localdomain) ([10.224.122.203])\n\tby fmsmga002.fm.intel.com with ESMTP; 31 Jan 2018 10:22:43 -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,441,1511856000\"; d=\"scan'208\";a=\"15938148\"",
        "From": "Vipin Varghese <vipin.varghese@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "pascal.mazon@6wind.com, ferruh.yigit@intel.com, deepak.k.jain@intel.com, \n\tVipin Varghese <vipin.varghese@intel.com>",
        "Date": "Wed, 31 Jan 2018 23:52:41 +0530",
        "Message-Id": "<1517422961-21284-1-git-send-email-vipin.varghese@intel.com>",
        "X-Mailer": "git-send-email 1.9.1",
        "Subject": "[dpdk-dev] [PATCH] 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, where each 2 bytes\nare converted to HEX MAC address after validation.\n\nSigned-off-by: Vipin Varghese <vipin.varghese@intel.com>\n---\n doc/guides/nics/tap.rst       |  6 +++++\n drivers/net/tap/rte_eth_tap.c | 62 +++++++++++++++++++++++++++++++++++++++----\n 2 files changed, 63 insertions(+), 5 deletions(-)",
    "diff": "diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst\nindex dc6f834..6b083c8 100644\n--- a/doc/guides/nics/tap.rst\n+++ b/doc/guides/nics/tap.rst\n@@ -69,6 +69,12 @@ for each interface string containing ``mac=fixed``. The MAC address is formatted\n as 00:'d':'t':'a':'p':[00-FF]. Convert the characters to hex and you get the\n actual MAC address: ``00:64:74:61:70:[00-FF]``.\n \n+   --vdev=net_tap0,mac=\"00:64:74:61:70:11\"\n+\n+The MAC address will have a user value passed as string. The MAC address is in\n+format with delimeter ``:``. The string is byte converted to hex and you get\n+the actual MAC address: ``00:64:74:61:70:11``.\n+\n It is possible to specify a remote netdevice to capture packets from by adding\n ``remote=foo1``, for example::\n \ndiff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 29d6356..3489b04 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -49,7 +49,14 @@\n #define ETH_TAP_MAC_ARG         \"mac\"\n #define ETH_TAP_MAC_FIXED       \"fixed\"\n \n+#define ETH_TAP_MAC_STR_FXD     1\n+#define ETH_TAP_MAC_STR_USR     2\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+static unsigned char user_mac[ETHER_ADDR_LEN];\n \n static const char *valid_arguments[] = {\n \tETH_TAP_IFACE_ARG,\n@@ -1397,13 +1404,20 @@ enum ioctl_mode {\n \t\tpmd->txq[i].fd = -1;\n \t}\n \n-\tif (fixed_mac_type) {\n+\tif (fixed_mac_type == ETH_TAP_MAC_STR_FXD) {\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 if (fixed_mac_type == ETH_TAP_MAC_STR_USR) {\n+\t\tRTE_LOG(INFO, PMD,\n+\t\t\t\"%s; user MAC (%02x:%02x:%02x:%02x:%02x:%02x) argument\\n\",\n+\t\t\tpmd->name,\n+\t\t\tuser_mac[0], user_mac[1], user_mac[2],\n+\t\t\tuser_mac[3], user_mac[4], user_mac[5]);\n+\t\t\trte_memcpy(&pmd->eth_addr, user_mac, ETHER_ADDR_LEN);\n \t} else {\n \t\teth_random_addr((uint8_t *)&pmd->eth_addr);\n \t}\n@@ -1577,10 +1591,48 @@ enum ioctl_mode {\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+\tchar mac_temp[20] = {0}, *mac_byte = NULL;\n+\tunsigned int index = 0;\n+\n+\tif (!value)\n+\t\treturn 0;\n+\n+\tif (!strncasecmp(ETH_TAP_MAC_FIXED, value,\n+\t\t\tstrlen(ETH_TAP_MAC_FIXED))) {\n+\t\t*(int *)extra_args = ETH_TAP_MAC_STR_FXD;\n+\t\tgoto success;\n+\t}\n+\n+\tif (strlen(value) == 17) {\n+\t\tstrncpy(mac_temp, value, 18);\n+\t\tmac_temp[19] = '\\0';\n+\t\tmac_byte = strtok(mac_temp, \":\");\n+\n+\t\twhile ((mac_byte != NULL) &&\n+\t\t\t\tstrspn(mac_byte, ETH_TAP_CMP_MAC_FMT) &&\n+\t\t\t\tstrspn((mac_byte + 1), ETH_TAP_CMP_MAC_FMT) &&\n+\t\t\t\tstrlen(mac_byte) == 2) {\n+\t\t\tuser_mac[index] = strtoul(mac_byte, NULL, 16);\n+\t\t\tmac_byte = strtok(NULL, \":\");\n+\t\t\tindex += 1;\n+\t\t}\n+\n+\t\tif (index != 6)\n+\t\t\tgoto error;\n+\n+\t\t*(int *)extra_args = ETH_TAP_MAC_STR_USR;\n+\t} else {\n+\t\tgoto error;\n+\t}\n+\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@@ -1716,5 +1768,5 @@ enum ioctl_mode {\n RTE_PMD_REGISTER_PARAM_STRING(net_tap,\n \t\t\t      ETH_TAP_IFACE_ARG \"=<string> \"\n \t\t\t      ETH_TAP_SPEED_ARG \"=<int> \"\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"
    ]
}