Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/49748/?format=api
{ "id": 49748, "url": "https://patches.dpdk.org/api/patches/49748/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190111180659.5972-6-stephen@networkplumber.org/", "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": "<20190111180659.5972-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190111180659.5972-6-stephen@networkplumber.org", "date": "2019-01-11T18:06:58", "name": "[5/6] net/tap: let kernel choose tun device name", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "505f5286cad0ebbb56f9585bbcd452ed6aeed7a4", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190111180659.5972-6-stephen@networkplumber.org/mbox/", "series": [ { "id": 3137, "url": "https://patches.dpdk.org/api/series/3137/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=3137", "date": "2019-01-11T18:06:53", "name": "net/tap: fixes and cleanups", "version": 1, "mbox": "https://patches.dpdk.org/series/3137/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/49748/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/49748/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 EA1EB1BB15;\n\tFri, 11 Jan 2019 19:07:19 +0100 (CET)", "from mail-pf1-f195.google.com (mail-pf1-f195.google.com\n\t[209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 43E281BAB5\n\tfor <dev@dpdk.org>; Fri, 11 Jan 2019 19:07:13 +0100 (CET)", "by mail-pf1-f195.google.com with SMTP id c73so7283027pfe.13\n\tfor <dev@dpdk.org>; Fri, 11 Jan 2019 10:07:13 -0800 (PST)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\tn186sm107213303pfn.137.2019.01.11.10.07.11\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 11 Jan 2019 10:07:11 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=iYercn/9dovQc4ZsrI8Aq+pLR0u7zsthimC3WBnn2XQ=;\n\tb=vOeJUiZeHgu+LKI9dhHdDRVRzVS5W9DnZiUVr0uw/c6jdgtdW+BZCK2fZez6c6AJxb\n\tBKrNFeOepKBxhs+taaT7z3KZjqHobP46LCpdcDPfmlaQ06GD9o/o/ky9E06mxJtW3Yle\n\tnmNMhvdIIT/2xgjt0n6T0jWxO+ZAZ4f1CpH8UVjVbio6khbjRK/2Aw73SrnWCIZeFNW9\n\tg/o2WbC1A/4mF7de1ISFA7SPkNJsNpQxcEBqZ+4uyfBgE0Nm2LUZmYNbpmj4fa9s5CVa\n\t2Wh2RZ20jlmlSc14CsCOPZzTv+pc90RLiPnKHPnFKlKLORw5C8ICTeEigBbsXnSVBdrE\n\tjm7g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=iYercn/9dovQc4ZsrI8Aq+pLR0u7zsthimC3WBnn2XQ=;\n\tb=LfsVSfLkfpagdDFtSZyUM3Nojey4fnDMzk6LnTAILCvFVLHhPUBknQzCd5vV1vQzm4\n\tp5OxwP8lIsNLODL18QLUZzQRDpP4Jsdafq1jltoZ3QW9BhlIvf95dW/2t2Wrb0rPPdn2\n\tBa/94goc4KvdFMGMENhkpf6IzUQCoHBfw6N57K9cD8Ie+q46jeOv2THUHUust9MakZMZ\n\tTVqPSp6qxJ9CTc5UXUOQbr7AlMs1cPZAlFYNGkM4teWIbA3avpd6sAxkc5neRH2PJbjq\n\tmq8FdgjW9gPi4gAj/2nI/Z/bVspNSDfeOmtmPQzSwEW9BeuFH7a+P8Dsml+5iBJG8eLu\n\t5+8A==", "X-Gm-Message-State": "AJcUukdG/BMmvxFFYIlIW+j9XtC6CrjdJJhJhKj52XGXeqErNkUMe1pS\n\t5u3i7gzHvJwzxOiQbAg/1OkWVhilKlI=", "X-Google-Smtp-Source": "ALg8bN4w8kg+QT6XqfBnLTz+YNaWT/U82HWCXO9HmJEG5TN01TynsY/u0HKBrSVXEPmwyNM8EhPJ9Q==", "X-Received": "by 2002:a65:520a:: with SMTP id\n\to10mr14684791pgp.276.1547230032093; \n\tFri, 11 Jan 2019 10:07:12 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n\thfli@netitest.com", "Date": "Fri, 11 Jan 2019 10:06:58 -0800", "Message-Id": "<20190111180659.5972-6-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190111180659.5972-1-stephen@networkplumber.org>", "References": "<20190111180659.5972-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 5/6] net/tap: let kernel choose tun device name", "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://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Assigning tun and tap index in DPDK tap device driver is racy and\nfails if used with primary/secondary process model. Instead, use the\nkernel feature of device wildcarding where if a name with %d is used\nthe kernel will fill in the next available device.\n\nReported-by: hfli@netitest.com\nFixes: 02f96a0a82d1 (\"net/tap: add TUN/TAP device PMD\")\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/tap/rte_eth_tap.c | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 50d6729cb609..b836c1ae3d4e 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -79,9 +79,6 @@ static const char *valid_arguments[] = {\n \tNULL\n };\n \n-static unsigned int tap_unit;\n-static unsigned int tun_unit;\n-\n static char tuntap_name[8];\n \n static volatile uint32_t tap_trigger;\t/* Rx trigger */\n@@ -151,8 +148,6 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive)\n \t\tIFF_TAP : IFF_TUN | IFF_POINTOPOINT;\n \tstrlcpy(ifr.ifr_name, pmd->name, IFNAMSIZ);\n \n-\tTAP_LOG(DEBUG, \"ifr_name '%s'\", ifr.ifr_name);\n-\n \tfd = open(TUN_TAP_DEV_PATH, O_RDWR);\n \tif (fd < 0) {\n \t\tTAP_LOG(ERR, \"Unable to create %s interface\", tuntap_name);\n@@ -186,6 +181,13 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive)\n \t\tgoto error;\n \t}\n \n+\t/*\n+\t * Name passed to kernel might be wildcard like dtun%d\n+\t * and need to find the resulting device.\n+\t */\n+\tTAP_LOG(DEBUG, \"Device name is '%s'\", ifr.ifr_name);\n+\tstrlcpy(pmd->name, ifr.ifr_name, RTE_ETH_NAME_MAX_LEN);\n+\n \tif (is_keepalive) {\n \t\t/*\n \t\t * Detach the TUN/TAP keep-alive queue\n@@ -1756,6 +1758,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,\n \t\tTAP_LOG(ERR, \"Unable to create %s interface\", tuntap_name);\n \t\tgoto error_exit;\n \t}\n+\tTAP_LOG(INFO, \"allocated %s\", pmd->name);\n \n \tifr.ifr_mtu = dev->data->mtu;\n \tif (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0)\n@@ -1917,8 +1920,8 @@ set_interface_name(const char *key __rte_unused,\n \t\t}\n \t\tstrlcpy(name, value, RTE_ETH_NAME_MAX_LEN);\n \t} else {\n-\t\tsnprintf(name, RTE_ETH_NAME_MAX_LEN, \"%s%d\",\n-\t\t\t DEFAULT_TAP_NAME, tun_unit - 1);\n+\t\tsnprintf(name, RTE_ETH_NAME_MAX_LEN, \"%s%%d\",\n+\t\t\t DEFAULT_TAP_NAME);\n \t}\n \treturn 0;\n }\n@@ -2031,8 +2034,8 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev)\n \t\treturn 0;\n \t}\n \n-\tsnprintf(tun_name, sizeof(tun_name), \"%s%u\",\n-\t\t DEFAULT_TUN_NAME, tun_unit++);\n+\tsnprintf(tun_name, sizeof(tun_name), \"%s%%d\",\n+\t\t DEFAULT_TUN_NAME);\n \n \tif (params && (params[0] != '\\0')) {\n \t\tTAP_LOG(DEBUG, \"parameters (%s)\", params);\n@@ -2052,17 +2055,15 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev)\n \t}\n \tpmd_link.link_speed = ETH_SPEED_NUM_10G;\n \n-\tTAP_LOG(DEBUG, \"Initializing pmd_tun for %s as %s\",\n-\t\tname, tun_name);\n+\tTAP_LOG(DEBUG, \"Initializing pmd_tun for %s\", name);\n \n \tret = eth_dev_tap_create(dev, tun_name, remote_iface, 0,\n-\t\tETH_TUNTAP_TYPE_TUN);\n+\t\t\t\t ETH_TUNTAP_TYPE_TUN);\n \n leave:\n \tif (ret == -1) {\n \t\tTAP_LOG(ERR, \"Failed to create pmd for %s as %s\",\n \t\t\tname, tun_name);\n-\t\ttun_unit--; /* Restore the unit number */\n \t}\n \trte_kvargs_free(kvlist);\n \n@@ -2218,8 +2219,8 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)\n \t}\n \n \tspeed = ETH_SPEED_NUM_10G;\n-\tsnprintf(tap_name, sizeof(tap_name), \"%s%u\",\n-\t\t DEFAULT_TAP_NAME, tap_unit++);\n+\tsnprintf(tap_name, sizeof(tap_name),\n+\t\t \"%s%%d\", DEFAULT_TAP_NAME);\n \tmemset(remote_iface, 0, RTE_ETH_NAME_MAX_LEN);\n \n \tif (params && (params[0] != '\\0')) {\n@@ -2282,7 +2283,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)\n \t\t\t\trte_mp_action_unregister(TAP_MP_KEY);\n \t\t\ttap_devices_count--;\n \t\t}\n-\t\ttap_unit--;\t\t/* Restore the unit number */\n \t}\n \trte_kvargs_free(kvlist);\n \n", "prefixes": [ "5/6" ] }