From patchwork Fri Jan 11 20:35:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49755 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E53F41BB72; Fri, 11 Jan 2019 21:35:31 +0100 (CET) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 5C1431BB46 for ; Fri, 11 Jan 2019 21:35:29 +0100 (CET) Received: by mail-pf1-f195.google.com with SMTP id z9so7479016pfi.2 for ; Fri, 11 Jan 2019 12:35:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fXsIIUSHwakajLsU/G+RAUZOz0ohfGrcrhU/SB5pqpM=; b=qVDTaJmnBimEWno01XIjtDG8jykM8DOi7gB42DsMXikvdzwe5N5A8mJ11vZ7VM70oA LnbNmwvznhqatmMoAcomFyw80VzrAP/DTmOGMn8USeo3ild5hIuWw81XtL8km+7Obwc6 eGy5HYboNAd7K/7igE15ExQCeKhIw2b7IdfYAMJzyQ52YBwW30qE7IWQ55ekXwvmZ/Ff oN3cBX0seXzhvSahna2yPLugk0+iLnJYkxaHmntkfvPvR0pseu/oPm2ecI03tqScjKda 7vW0xqTi3uDz+y9qIT3I2MoeZvWRWvvXKdfsttUjbo26nL4V0oNPwNKEi+yAe/W8SZuH tF8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fXsIIUSHwakajLsU/G+RAUZOz0ohfGrcrhU/SB5pqpM=; b=WtqIPtx/EOfwO9/+gDMPxFW1s8ThfhjFahuz05gaCvK0DJM8xavlsu+iWq1q5Fotki yAYsSVDD1uoHrd9tE6IN/4PWWeNezbmx9CDAYLs+HloMiTtqmUAz/qkKVFuNx0GjK6fN zORdlTd9VyRw0XUnqeIFjuEoOe8ia2qYDwKC2W25UDGIEa06l9qUUJqDak/eWqphL+Wm 1uYCF//EUkMsGWdD5Zvqfs+9VmJTFOY4KCZRDL8ynxeUiBE1SZEh4ZFI2DRlm3DtJN+g EI24oiNFDG3gbbyzYOjfrDkX/z0JySK+DvKsPvvARQpBehlBvUGvKciQY7DZ6wKSLD4S u9VQ== X-Gm-Message-State: AJcUukdpCM652wHHNBWInNRFVxvXCTAv24n6w2tnnvL2EJqzhAyYbOZ4 kHBeS70vNQYWcgsvhd6wDDrYxw== X-Google-Smtp-Source: ALg8bN6HzsRHH8dGlvCVD1ZWyQifPtyoGnlAnqF7XS3TfMcQJmpI7q5xJNwsWAEGcYzSDVDgik3C9g== X-Received: by 2002:a63:9d05:: with SMTP id i5mr13602436pgd.98.1547238928461; Fri, 11 Jan 2019 12:35:28 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:27 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Fri, 11 Jan 2019 12:35:14 -0800 Message-Id: <20190111203520.19944-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/7] net/tap: use strlcpy for interface name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" snprintf is not needed here, use strlcpy instead. Signed-off-by: Stephen Hemminger Acked-by Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 0ec030bef63c..1c00681ba0eb 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -148,7 +148,7 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive) */ ifr.ifr_flags = (pmd->type == ETH_TUNTAP_TYPE_TAP) ? IFF_TAP : IFF_TUN | IFF_POINTOPOINT; - snprintf(ifr.ifr_name, IFNAMSIZ, "%s", pmd->name); + strlcpy(ifr.ifr_name, pmd->name, IFNAMSIZ); TAP_LOG(DEBUG, "ifr_name '%s'", ifr.ifr_name); From patchwork Fri Jan 11 20:35:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49756 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C34F01BB86; Fri, 11 Jan 2019 21:35:33 +0100 (CET) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 3CFFE1BB5A for ; Fri, 11 Jan 2019 21:35:30 +0100 (CET) Received: by mail-pl1-f196.google.com with SMTP id u18so7254774plq.7 for ; Fri, 11 Jan 2019 12:35:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q6E4bqIOc7KviUIwqKfcSHKj2Z1cMb3n3SO4KTMEIRY=; b=LfK4pNqa42oZskB2d7CmQxDWpxKKsN9/zmt2RnAx/FgSiK9zP/zYuo5sBu7+tSGdmS jK6O2G+eJkWMys5phaMfTJ1gNZMtMNl3HQitdf+4c/XoR2FsI82bmPf4YQCj4B8guCgH KjzcBcpiGGBzxuaswPYnGTkl69E72FMl51XjaOjjElt0RIaKwALDEp49GODelDoXJlmf sOrMynde5/dBWHMt3sGglVprr+rHKgsRqKkOw2A4LAyjm2D9EMzO8IwmMnm7GlUuRXQL 1F+JLvWV39swSqzW76ytHUs3JxKrWPKENfXHt6l5G+Qvlnc+bIwdOGd2AK3Hap5+m3Qm cPNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q6E4bqIOc7KviUIwqKfcSHKj2Z1cMb3n3SO4KTMEIRY=; b=ZgXJgJAxh5jpOblYkLB5zc5X0lIFycRIJCa74K71zrIhGVPI8H3nM6E9bWGIo6rUyf ecpHrublNPkELN94ZwV6mWW/YoRV9FlJH6y38AMiHQa8brd+S3zRhGh5fPnvvkLgu3Xq r0vsnQb0XsId6mOK5abhHbvoMWV4Qn0t/W3qaN73LGxM8DGnAf0wpFM6gHKkA7b6xpz5 Lr5zIHSLey6L4SGKetn1fr0d0d9V1X4fpaE/ovQ0PPoX+NjQvoYtNdLUU/rFRlZSKYRD dgLTKmpFh+TE3Zh0pN0d//7hz2chWIPJAvHfNx501mzP4D4EYVOR2re20eKAqhdJX3n+ 1Ucw== X-Gm-Message-State: AJcUukccXMTsSmI7ujM54EbHYFJ5yo0Y6WuQxjttvgvdDN+CRXxiLYzU av45P+0gzI0zDooQoXFWD0KufQ== X-Google-Smtp-Source: ALg8bN7BO6oOct0+b2kQOwOJXwjBHYmTR9tGhL0UY8lkQLuE1tTL/U+n5cA30TNq7wPGHAb2ZuY0Fw== X-Received: by 2002:a17:902:7044:: with SMTP id h4mr15883635plt.35.1547238929355; Fri, 11 Jan 2019 12:35:29 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:28 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Fri, 11 Jan 2019 12:35:15 -0800 Message-Id: <20190111203520.19944-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/7] net/tap: allow full length names X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The code for set_interface_name was incorrectly assuming that space for null byte was necessary with snprintf/strlcpy. Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD") Signed-off-by: Stephen Hemminger Acked-by Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 1c00681ba0eb..11e402e42bd0 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1892,10 +1892,10 @@ set_interface_name(const char *key __rte_unused, char *name = (char *)extra_args; if (value) - strlcpy(name, value, RTE_ETH_NAME_MAX_LEN - 1); + strlcpy(name, value, RTE_ETH_NAME_MAX_LEN); else - snprintf(name, RTE_ETH_NAME_MAX_LEN - 1, "%s%d", - DEFAULT_TAP_NAME, (tap_unit - 1)); + snprintf(name, RTE_ETH_NAME_MAX_LEN, "%s%d", + DEFAULT_TAP_NAME, tap_unit - 1); return 0; } From patchwork Fri Jan 11 20:35:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49757 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5D49C1BBD1; Fri, 11 Jan 2019 21:35:35 +0100 (CET) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id A71971BB69 for ; Fri, 11 Jan 2019 21:35:31 +0100 (CET) Received: by mail-pl1-f194.google.com with SMTP id y1so7239873plp.9 for ; Fri, 11 Jan 2019 12:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sm8oylN+wibegG576IC3px05Y+1N1dPep4LHHEUGScU=; b=HK/Y6KrRe4sCA8gl0wu8dVQ/5t5TCKBRnu+RW5D+pryFh6qgt3ZA1CG8h1AG4sO58q J2Mxbr/NzoKO1tZsztY3DTEsbc35tCLw+j+5e00wUMTMHELgxSVJD/+KC902eENzEVcz mDB4kRT4DzFM7HQQvWRhMF/9wLxPNGHNr6QEb8wdA2QppY9HvTBTndU4uKmm9Io3D6Kz 7+msuFEJ1H7rgNcozf2U1Ul9MAwaAt0p41AtPsWrFygXrDmCXRBtgsl7TpqzjstZp5sC YeLdOMYwYrApCH3BJ2UYAobEfYd/f2Kd1W9bAhlbcZmPAGxYfGZtOxtVuYMpUOPYjnFp 8tfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sm8oylN+wibegG576IC3px05Y+1N1dPep4LHHEUGScU=; b=F62lSd3glWNogqQGseV8B/fM3bdzyqWzyYcUYfjTv8In2HhBdgY0+njH7NzD/Q1jFV s2a1S83xY0i9T7WkGw4HfNDjY3xD8G7z2rJ6TSl8gOnCkI6EWWJJQaJq6fs/EHhMsd5c XRCdxEMNAVrs84KZbSFKWwOE55AcRBMtvKoJMchhIygrvr58PUaDfue/KfLYF/mRblh/ ZgBjSfb4iMG7GUYOYnZIOPKd8z7xFpouNRgSKTw+JoROfafV043Zq7W1cjUvlYW3+0GU 8MoGCa8DG486jYh5BlhuPV8yyreEhW+Sd83+rYh+KQWx196Aw/XJ8DGBtCSS+yGctpLZ qLrg== X-Gm-Message-State: AJcUukdfQQ7bJyLOYOYm6uspTIqdWgGS7z2rJ0YwfMaPCImThJIgyoqg Tg+pggIAcrDVhAKl2N+JBNRN0w== X-Google-Smtp-Source: ALg8bN7EzFCFmRalrkAtyM0iS/qmI5zXG65IeIj1Zp6U3SSd6g/NV3ZN/IaqFL8foHeA30e+aLEmHQ== X-Received: by 2002:a17:902:e085:: with SMTP id cb5mr15880514plb.24.1547238930599; Fri, 11 Jan 2019 12:35:30 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:29 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Fri, 11 Jan 2019 12:35:16 -0800 Message-Id: <20190111203520.19944-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 3/7] net/tap: check interface name in kvargs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If interface name is passed to remote or iface then check the length and for invalid characters. This avoids problems where name gets truncated or rejected by kernel. Signed-off-by: Stephen Hemminger Acked-by Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 38 +++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 11e402e42bd0..d8e9ede7ac7c 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -1884,6 +1885,24 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, return -EINVAL; } +/* make sure name is a possible Linux network device name */ +static bool +is_valid_iface(const char *name) +{ + if (*name == '\0') + return false; + + if (strnlen(name, IFNAMSIZ) == IFNAMSIZ) + return false; + + while (*name) { + if (*name == '/' || *name == ':' || isspace(*name)) + return false; + name++; + } + return true; +} + static int set_interface_name(const char *key __rte_unused, const char *value, @@ -1891,12 +1910,17 @@ set_interface_name(const char *key __rte_unused, { char *name = (char *)extra_args; - if (value) + if (value) { + if (!is_valid_iface(value)) { + TAP_LOG(ERR, "TAP invalid remote interface name (%s)", + value); + return -1; + } strlcpy(name, value, RTE_ETH_NAME_MAX_LEN); - else + } else { snprintf(name, RTE_ETH_NAME_MAX_LEN, "%s%d", DEFAULT_TAP_NAME, tap_unit - 1); - + } return 0; } @@ -1907,8 +1931,14 @@ set_remote_iface(const char *key __rte_unused, { char *name = (char *)extra_args; - if (value) + if (value) { + if (!is_valid_iface(value)) { + TAP_LOG(ERR, "TAP invalid remote interface name (%s)", + value); + return -1; + } strlcpy(name, value, RTE_ETH_NAME_MAX_LEN); + } return 0; } From patchwork Fri Jan 11 20:35:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49758 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9B79E1BBDA; Fri, 11 Jan 2019 21:35:36 +0100 (CET) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id DCD371BB69 for ; Fri, 11 Jan 2019 21:35:32 +0100 (CET) Received: by mail-pl1-f195.google.com with SMTP id a14so7239153plm.12 for ; Fri, 11 Jan 2019 12:35:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/U31blkYitUbWEAHMLTOM4SNYZynDXkkW7u+srOj6V4=; b=BLwaeDuXoXA6X/d+cczMxRpMXNMKQYuA24sV4Iod1tlqdy73ryYqYrQebHJ9McAaph ajQE/qEiPikPh4PjGWuc5fOi2We5hDs5TwZFYWRzRJE0PI11F5XoY3Is0TANsYCgrRMb kFhFrnua4fhR8QhVWoO1akSzdyfGEeSBpuMGR7lF/mQrq5el5TTqnhouP3yzlFlfKW22 +hnckxuUn9RdClxY85a+roiJDLdweJKzwQMzAN98rTsQ3Ycv7P3skjkfYnm9VG0QjzID NcSkO4dAfJ9lvsyLRLjdTsWAlja4JQ99BWakaAtY2J91o0DeBQfDkesg2oTP8LhxA1mT CoSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/U31blkYitUbWEAHMLTOM4SNYZynDXkkW7u+srOj6V4=; b=U9bi7yDyPcJBmMOUO9DnMyq5ZQCSrbTFQONds3p0KjtCrzX6vGmh+Ujlam8nf3fOiq miwj06LFN6+ufzg1A2H0JJ0Z3rtunmcCqa6+/YJIl7azBYPYIHQ54KtwtOh/IRSEwg5B mRNipJ1RtRFnfV/ZkQ57yiHiNwIUgHDWbjPPwjPhYCLGbvo5DzL4DmOYNfO1ItF7VL0l pVD0ZLAcFo2zg7lC9C0criUIEWbqSWjB71Cgy7pUy11R3VXI3x+vWfqGqtOah99W+R5/ BUgk7YQcVTghWOfZjdz4gjegmetNpoV1eiYbi6vnxNTU0oDh+njTHRYX3XT9M57CeB87 jC9A== X-Gm-Message-State: AJcUukdgFlHIwkdbSxEJ6cIw9WZaCgYSCE1VmH6+gG80pSY9Ke01mSl6 9LyqXUrQ8OTBB103p7x1vU5SEw== X-Google-Smtp-Source: ALg8bN4ZQ9Orhvh8ls3+S23FcghrwX2imy8h30HXB1ZsjmCcVbnt4okFr36Z11dryD+qnZalsyQdMQ== X-Received: by 2002:a17:902:15a8:: with SMTP id m37mr16270420pla.129.1547238931956; Fri, 11 Jan 2019 12:35:31 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:30 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Fri, 11 Jan 2019 12:35:17 -0800 Message-Id: <20190111203520.19944-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 4/7] net/tap: lower the priority of log messages X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Any messages that normally occur during probe should be at DEBUG level (not NOTICE). This reduces overall log clutter. Signed-off-by: Stephen Hemminger Acked-by Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index d8e9ede7ac7c..d699b4fb095d 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2053,7 +2053,7 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } pmd_link.link_speed = ETH_SPEED_NUM_10G; - TAP_LOG(NOTICE, "Initializing pmd_tun for %s as %s", + TAP_LOG(DEBUG, "Initializing pmd_tun for %s as %s", name, tun_name); ret = eth_dev_tap_create(dev, tun_name, remote_iface, 0, @@ -2258,8 +2258,7 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) } pmd_link.link_speed = speed; - TAP_LOG(NOTICE, "Initializing pmd_tap for %s as %s", - name, tap_name); + TAP_LOG(DEBUG, "Initializing pmd_tap for %s", name); /* Register IPC feed callback */ if (!tap_devices_count) { From patchwork Fri Jan 11 20:35:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49759 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 940AC1BBE6; Fri, 11 Jan 2019 21:35:38 +0100 (CET) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 54F931BB9A for ; Fri, 11 Jan 2019 21:35:34 +0100 (CET) Received: by mail-pl1-f195.google.com with SMTP id p8so7257225plo.2 for ; Fri, 11 Jan 2019 12:35:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h9HkD8ZLwGy2kyuiB1QX6Db1tBcyNluhse7XiIZQrB8=; b=UXVX779ktNQWA2gTcDSifG4szJELaytHP92xCjbCbukykRJyUtaLfQZDN9+ZcuNFhE Y3orpd7XeDKeCRkuBc7va5UnIRSHP9pUB4KgS9JoKK0BI6PxNbcuTnvmq8+zt9k+H+K0 6dYrbt8su9/ofQ6EDnWxnxD66/+ORHkzg8509yP8jAkZYybCu2F9/FT6dXMkN1kiQ4DQ POfpZ94r7uRwltAzhNRrJJJhpys6KLnauQ/Xo72xBEwJpYy6DSsx9XJrYMpayWK3946B l3SLUWEHKxy5c1S/cV6THqNRY/5M/HExq1Ajj5MFsOqEHL0gbV9d94YH6gsna9tPlUPe A4zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h9HkD8ZLwGy2kyuiB1QX6Db1tBcyNluhse7XiIZQrB8=; b=PW1LsIH7wxPTSWtCesB3zVqjZNiRVXUz14SmW6dmY9pFPpG+B1SilJwsbuD8gcCABt oDQNp1mCPsQFk4LWGw0jiIIZxMr0lciMEagVNivyUrbjXubtxya34ADTgehV/DDI7rxj siUAybLy0X/ToZlrQbYYH6n1WWEireawazr0essphbNjDv8c/S5adZ/1FnI3d9XgUkxw GB7cvinPfolXhMBeF0Uxxg4a2CG6x3gxSTeb6GXiElV0YW4G9J5CwBQasuNowkLd7a6U 2u2hmIufnFKNIbXfJYuJfCbyVOuVxTs92kH+Hk1j5JiXjGCuyMOJC6hVCAP6Ek4hhBU0 RkIQ== X-Gm-Message-State: AJcUukd71V18xYjBK2xj6emSCGEPS+qYOlt1I3/CZIk4E7L67bC5SQdF 5N+aRm6Yye2pPS5DMrojuIEm8A== X-Google-Smtp-Source: ALg8bN6scL/ZqX6TphCwTSiAgyFFF8HWk9DP1V3w+ZuRQV2KVNjzqt7VsyRzfZECHOXKgnnTzANsIg== X-Received: by 2002:a17:902:4523:: with SMTP id m32mr15996795pld.53.1547238933474; Fri, 11 Jan 2019 12:35:33 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:32 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger , hfli@netitest.com Date: Fri, 11 Jan 2019 12:35:18 -0800 Message-Id: <20190111203520.19944-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 5/7] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Assigning tun and tap index in DPDK tap device driver is racy and fails if used with primary/secondary. Instead use the kernel feature of device wildcarding where if a name with %d is used the kernel will fill in the next available device. Reported-by: hfli@netitest.com Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD") Signed-off-by: Stephen Hemminger Acked-by Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index d699b4fb095d..ed8483cb96bc 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -79,9 +79,6 @@ static const char *valid_arguments[] = { NULL }; -static unsigned int tap_unit; -static unsigned int tun_unit; - static char tuntap_name[8]; static volatile uint32_t tap_trigger; /* Rx trigger */ @@ -151,8 +148,6 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive) IFF_TAP : IFF_TUN | IFF_POINTOPOINT; strlcpy(ifr.ifr_name, pmd->name, IFNAMSIZ); - TAP_LOG(DEBUG, "ifr_name '%s'", ifr.ifr_name); - fd = open(TUN_TAP_DEV_PATH, O_RDWR); if (fd < 0) { TAP_LOG(ERR, "Unable to create %s interface", tuntap_name); @@ -186,6 +181,13 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive) goto error; } + /* + * Name passed to kernel might be wildcard like dtun%d + * and need to find the resulting device. + */ + TAP_LOG(DEBUG, "Device name is '%s'", ifr.ifr_name); + strlcpy(pmd->name, ifr.ifr_name, RTE_ETH_NAME_MAX_LEN); + if (is_keepalive) { /* * Detach the TUN/TAP keep-alive queue @@ -1756,6 +1758,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, TAP_LOG(ERR, "Unable to create %s interface", tuntap_name); goto error_exit; } + TAP_LOG(DEBUG, "allocated %s", pmd->name); ifr.ifr_mtu = dev->data->mtu; if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, LOCAL_AND_REMOTE) < 0) @@ -1918,8 +1921,8 @@ set_interface_name(const char *key __rte_unused, } strlcpy(name, value, RTE_ETH_NAME_MAX_LEN); } else { - snprintf(name, RTE_ETH_NAME_MAX_LEN, "%s%d", - DEFAULT_TAP_NAME, tap_unit - 1); + /* use tap%d which causes kernel to choose next available */ + strlcpy(name, DEFAULT_TAP_NAME "%d", RTE_ETH_NAME_MAX_LEN); } return 0; } @@ -2032,8 +2035,8 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) return 0; } - snprintf(tun_name, sizeof(tun_name), "%s%u", - DEFAULT_TUN_NAME, tun_unit++); + /* use tun%d which causes kernel to choose next available */ + strlcpy(tun_name, DEFAULT_TUN_NAME "%d", RTE_ETH_NAME_MAX_LEN); if (params && (params[0] != '\0')) { TAP_LOG(DEBUG, "parameters (%s)", params); @@ -2053,17 +2056,15 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) } pmd_link.link_speed = ETH_SPEED_NUM_10G; - TAP_LOG(DEBUG, "Initializing pmd_tun for %s as %s", - name, tun_name); + TAP_LOG(DEBUG, "Initializing pmd_tun for %s", name); ret = eth_dev_tap_create(dev, tun_name, remote_iface, 0, - ETH_TUNTAP_TYPE_TUN); + ETH_TUNTAP_TYPE_TUN); leave: if (ret == -1) { TAP_LOG(ERR, "Failed to create pmd for %s as %s", name, tun_name); - tun_unit--; /* Restore the unit number */ } rte_kvargs_free(kvlist); @@ -2219,8 +2220,9 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) } speed = ETH_SPEED_NUM_10G; - snprintf(tap_name, sizeof(tap_name), "%s%u", - DEFAULT_TAP_NAME, tap_unit++); + + /* use tap%d which causes kernel to choose next available */ + strlcpy(tap_name, DEFAULT_TAP_NAME "%d", RTE_ETH_NAME_MAX_LEN); memset(remote_iface, 0, RTE_ETH_NAME_MAX_LEN); if (params && (params[0] != '\0')) { @@ -2283,7 +2285,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) rte_mp_action_unregister(TAP_MP_KEY); tap_devices_count--; } - tap_unit--; /* Restore the unit number */ } rte_kvargs_free(kvlist); From patchwork Fri Jan 11 20:35:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49760 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D63AB1BBEE; Fri, 11 Jan 2019 21:35:39 +0100 (CET) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id C45F01BBDC for ; Fri, 11 Jan 2019 21:35:36 +0100 (CET) Received: by mail-pf1-f195.google.com with SMTP id 64so7459425pfr.9 for ; Fri, 11 Jan 2019 12:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gU7tWRWDcg78/QteNhNJDrakoTGeFzFmIYUxBmCVUek=; b=0a2+Yx+qNSAA808LtdY1G4vALGEQ1jnAs39S5PPkHSdBLqXikcC6UucplugJ4c23Yc hzlCuKLPCzHgrX5E0eDAQiKytTUxYEy7rXpURv3vZ8k2yHgl4Efcxm3gJF4l4Akdu/cH RfiOnMpKkT5vcrumMA8n/85h62XsprZ9Si8R0QQzm4jQV3E1g9sEsbN4lksQw9Zv2Kb2 erlMDYHfWTdZyf+zagi0H8G98gwMDqbXuSkogp4TlnLmSXHwT5+slCqf9vYvZOteBL/Y ZqT8On2BFMRTlGv9wIc26E5+ODxEghWILgOxu9FpLMKyL5Xh56/D8CbX37ije0AW+dh/ 6Vog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gU7tWRWDcg78/QteNhNJDrakoTGeFzFmIYUxBmCVUek=; b=K0Tb1w77NKSEeyr2FpOUV0zl4IG41MRZ+9lbZYBOwq0be3lTCL8iZlfvxvFdFy3MpH uYmi5URSQuo7pHhRA9yBBEU1Z8buhip7KNs/BqnIojgd7DVUOqoMxoPTGZpkzMOIryHg cWJobF/rbE1pbs0rKw5Lkr54xKQrPDK8z9IZNcLQYCuFvavPBJyFajaTyin3uaMoMGQe P37W4mU+oEGqiQ/7K77uI5sMnny2p49Yx10MKo5RxH/Cvbq7W1dCXOfhP43WrcFrgKzR 4iZNWqa957wcnZ2XFJRgRBQFNtryziAdsLugBX6bJiDQJGd7joyf4TOqsaPDOF65Ezu/ o2qA== X-Gm-Message-State: AJcUukcyYlmOuPcZB4f/2utHnCdsa9mHjoZwHal8h59QTYvW/OkuzdAj A/mEqe1kckzC6BJ2mfiYottyDw== X-Google-Smtp-Source: ALg8bN4wEB+ACxs9MNTywLs+9xvA0X5DDcUbM7k6XPQvdaHAGiqGkQCP22E9JqHSgDH6NjjIkfR4Gg== X-Received: by 2002:a62:6204:: with SMTP id w4mr16176921pfb.5.1547238935909; Fri, 11 Jan 2019 12:35:35 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:34 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Fri, 11 Jan 2019 12:35:19 -0800 Message-Id: <20190111203520.19944-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 6/7] net/tap: get rid of global tuntap_name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Having a global variable which is set to "TUN" or "TAP" during probe is a potential bug if probing is ever done in different processes or contexts. Let's fix it now by using existing enum that has type of connection. Signed-off-by: Stephen Hemminger Acked-by Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index ed8483cb96bc..705c90dadee5 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -79,8 +79,6 @@ static const char *valid_arguments[] = { NULL }; -static char tuntap_name[8]; - static volatile uint32_t tap_trigger; /* Rx trigger */ static struct rte_eth_link pmd_link = { @@ -150,18 +148,17 @@ tun_alloc(struct pmd_internals *pmd, int is_keepalive) fd = open(TUN_TAP_DEV_PATH, O_RDWR); if (fd < 0) { - TAP_LOG(ERR, "Unable to create %s interface", tuntap_name); + TAP_LOG(ERR, "Unable to open %s interface", TUN_TAP_DEV_PATH); goto error; } #ifdef IFF_MULTI_QUEUE /* Grab the TUN features to verify we can work multi-queue */ if (ioctl(fd, TUNGETFEATURES, &features) < 0) { - TAP_LOG(ERR, "%s unable to get TUN/TAP features", - tuntap_name); + TAP_LOG(ERR, "unable to get TUN/TAP features"); goto error; } - TAP_LOG(DEBUG, "%s Features %08x", tuntap_name, features); + TAP_LOG(DEBUG, "%s Features %08x", TUN_TAP_DEV_PATH, features); if (features & IFF_MULTI_QUEUE) { TAP_LOG(DEBUG, " Multi-queue support for %d queues", @@ -1668,8 +1665,12 @@ static const struct eth_dev_ops ops = { .filter_ctrl = tap_dev_filter_ctrl, }; +static const char *tuntap_types[ETH_TUNTAP_TYPE_MAX] = { + "UNKNOWN", "TUN", "TAP" +}; + static int -eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, +eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, char *remote_iface, struct ether_addr *mac_addr, enum rte_tuntap_type type) { @@ -1677,12 +1678,12 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, struct rte_eth_dev *dev; struct pmd_internals *pmd; struct pmd_process_private *process_private; + const char *tuntap_name = tuntap_types[type]; struct rte_eth_dev_data *data; struct ifreq ifr; int i; - TAP_LOG(DEBUG, "%s device on numa %u", - tuntap_name, rte_socket_id()); + TAP_LOG(DEBUG, "%s device on numa %u", tuntap_name, rte_socket_id()); dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd)); if (!dev) { @@ -2016,8 +2017,6 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) char remote_iface[RTE_ETH_NAME_MAX_LEN]; struct rte_eth_dev *eth_dev; - strcpy(tuntap_name, "TUN"); - name = rte_vdev_device_name(dev); params = rte_vdev_device_args(dev); memset(remote_iface, 0, RTE_ETH_NAME_MAX_LEN); @@ -2182,8 +2181,6 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) struct rte_eth_dev *eth_dev; int tap_devices_count_increased = 0; - strcpy(tuntap_name, "TAP"); - name = rte_vdev_device_name(dev); params = rte_vdev_device_args(dev); @@ -2266,8 +2263,8 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) if (!tap_devices_count) { ret = rte_mp_action_register(TAP_MP_KEY, tap_mp_sync_queues); if (ret < 0) { - TAP_LOG(ERR, "%s: Failed to register IPC callback: %s", - tuntap_name, strerror(rte_errno)); + TAP_LOG(ERR, "tap: Failed to register IPC callback: %s", + strerror(rte_errno)); goto leave; } } @@ -2316,8 +2313,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) process_private = eth_dev->process_private; TAP_LOG(DEBUG, "Closing %s Ethernet device on numa %u", - (internals->type == ETH_TUNTAP_TYPE_TAP) ? "TAP" : "TUN", - rte_socket_id()); + tuntap_types[internals->type], rte_socket_id()); if (internals->nlsk_fd) { tap_flow_flush(eth_dev, NULL); From patchwork Fri Jan 11 20:35:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 49761 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 05EAD1BBF5; Fri, 11 Jan 2019 21:35:41 +0100 (CET) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by dpdk.org (Postfix) with ESMTP id BB7011BBEA for ; Fri, 11 Jan 2019 21:35:38 +0100 (CET) Received: by mail-pl1-f193.google.com with SMTP id w4so7253649plz.1 for ; Fri, 11 Jan 2019 12:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vJJzFZ2cAE6qSxCsYmoxT2HhCf+hA6uFX8h8hCmJn9w=; b=lTFHrnmrsNF0LudZgxZKgYc0hrtRRkhDmwz9zrUKjiambr8h1bcTF84ubKn+i4epOY 6zsY9Nbu8y8/cqvEygU7MzeJVv5HthSPQFv3XXOIu5yHqidbU5iPtDzAb1udEPdkVAKX 2nHFtQ+jjqUgys21hDoUKF8uCEWShmqK5bFTLlphZzZkTt6T411++AbqNjMgw+JJZ1ZU 6O9vhakoDldexdmrDlTV83SKWmVP36v5w+q8ns7QaHJ0WdhQCz2ct+MsWCd4w16qJBOY RnMWV2REkYdUR3WDvZgAezKuCedNiZ7GnBP4/42r8gk33xyKADvXW5QOkRwbCdug+hXR tACQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vJJzFZ2cAE6qSxCsYmoxT2HhCf+hA6uFX8h8hCmJn9w=; b=QKQ5NxC7Gh4kfpG0aBAANzB2w9myJrheWagVZ9pDZgcjxnAz97CVFJqNoSi1o34z40 +0L4GnKDsoLleev/DlI5BmG9AtklzCOKSZWO0b4FTrhjHgZSNN9yrFnehDQmBTDaykIQ WyEWn8eib/xwfnLvz95CsXHlzRSwJfuBcq0mRBo7ZA7I7YtjzOP3r8NN6YxuzEnGnyV6 p24m8hJPzWm2asEBB8TxbA3pTfcdSwrewH++vqPZOxWwSiqeOj4pBOqs2BJOEfRWyig9 /eRqxdQC8dJd0VwLpQcoy4iUJuuZQENoX6eys5tPZC+z7MynaKxbFWJqJ65VGDLOsycu +8ug== X-Gm-Message-State: AJcUukciev6Fkvt8PVzMfW+egHqecRipGtXJj4vvSYeH0O0a0r5sD1j/ hnkVl/5QU8gPfur1YILqUTpJDw== X-Google-Smtp-Source: ALg8bN7S6b0RwiVna6CDjh+ZCEl1w2ei7zub4Uxciyg0tIuetXJfomhWnN0AsRzadn58IH39mEM9ww== X-Received: by 2002:a17:902:6b09:: with SMTP id o9mr16009976plk.208.1547238937958; Fri, 11 Jan 2019 12:35:37 -0800 (PST) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id f32sm96610438pgf.80.2019.01.11.12.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 12:35:36 -0800 (PST) From: Stephen Hemminger To: keith.wiles@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Fri, 11 Jan 2019 12:35:20 -0800 Message-Id: <20190111203520.19944-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111203520.19944-1-stephen@networkplumber.org> References: <20190111180659.5972-1-stephen@networkplumber.org> <20190111203520.19944-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 7/7] net/tap: don't print pointer in info message X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Printing pointer in log is uninformative (unless in a debugger), instead print the assigned kernel device name which correlates well with what TAP is doing. Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit Acked-by: Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 705c90dadee5..586c8a952df9 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -853,6 +853,8 @@ tap_dev_stop(struct rte_eth_dev *dev) static int tap_dev_configure(struct rte_eth_dev *dev) { + struct pmd_internals *pmd = dev->data->dev_private; + if (dev->data->nb_rx_queues > RTE_PMD_TAP_MAX_QUEUES) { TAP_LOG(ERR, "%s: number of rx queues %d exceeds max num of queues %d", @@ -870,11 +872,11 @@ tap_dev_configure(struct rte_eth_dev *dev) return -1; } - TAP_LOG(INFO, "%s: %p: TX configured queues number: %u", - dev->device->name, (void *)dev, dev->data->nb_tx_queues); + TAP_LOG(INFO, "%s: %s: TX configured queues number: %u", + dev->device->name, pmd->name, dev->data->nb_tx_queues); - TAP_LOG(INFO, "%s: %p: RX configured queues number: %u", - dev->device->name, (void *)dev, dev->data->nb_rx_queues); + TAP_LOG(INFO, "%s: %s: RX configured queues number: %u", + dev->device->name, pmd->name, dev->data->nb_rx_queues); return 0; }