From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20057.outbound.protection.outlook.com [40.107.2.57]) by dpdk.org (Postfix) with ESMTP id 1692B1B61F; Mon, 5 Feb 2018 17:17:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gDLQPCVFdYt2g3Yp77GJCpUxP7RzxsQZ5+fw2V22vQg=; b=Wbo8cYqsq+3qjQxGKE/0cmwYEy5sxtXMQTulzpcEw/8pKPJ1snwEPbxL8BqcN0U9MeJLoFsLQ8csJiWGPHu36lUdwcNqBMtZrqF/hdTuO2IBxvg6MSAgzefEe24F730V2EwRQbxkNXlBbhM/3iYB04pjDopZE7OpG7XQpGOgUxA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from mellanox.com (37.142.13.130) by HE1PR05MB3212.eurprd05.prod.outlook.com (2603:10a6:7:35::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Mon, 5 Feb 2018 16:17:35 +0000 From: Moti Haimovsky To: pascal.mazon@6wind.com Cc: dev@dpdk.org, Moti Haimovsky , stable@dpdk.org Date: Mon, 5 Feb 2018 18:17:20 +0200 Message-Id: <1517847440-42660-1-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: AM5PR0502CA0007.eurprd05.prod.outlook.com (2603:10a6:203:91::17) To HE1PR05MB3212.eurprd05.prod.outlook.com (2603:10a6:7:35::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 78a0b40b-7f49-4558-af1e-08d56cb3f837 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR05MB3212; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3212; 3:eOW5srWvP9/V75Vr9LPa61dAYufp7F3zbmumnUIpKSi6aBycvDYv5I9+evoQqlfgzSQKaqMclIdRfxyfFpeQkCgVt6RWfT5iFqC52SWIJ6MldezThh41u13FVe6T/EgSNrl5S+D55CgWt+JzhFf1drX24kru8qZLm+udM0b/4Z3YC2hU2VnMASK+OFUb1ZepbVx1lwA2L5/30bYHcfZ0DdpnvwKAeLrQKgjiXQ1RPqRCEzgolDLBx95PBQ8lFe9z; 25:ChMnWoc7JqLzf0SLsnrkpFuODHccReFHa9k2VfKi0j619SY+ELgNz9HwRZmaPBT5uKH2VqvgqzDlFtO7ohwkC2PHQKVC4fZKFs9t1TurAXoaUJMtz64LDSKrIFeciJ5+z8j6ndyJQYZUoU3XTqG5UI4AJp5sksTNHPSabEptogITFuLAo9JIwCe6Vnna4XkgFvZen65VNffOTgA4BU8FIBzwEhCjEDsfFEuqxlc6beVHbEyK8yThizSOiDXZhIfQRCYNEw7DiZ1sgynRva21ViKDpm3/R8gYvFN2CzDro1DO8rq1CO+m7uAFvi9Dw+Auj8ZybE2gfgW/z9caF56+uQ==; 31:/lFWT0XbEFHllBECOyCytDvhwDIZ8ZRO3ND0xPZ947EHU53PkHPV4lJZQu0Utn3F8nr0XhDJ8GsynxhxGKel7Ywohlm+70VbU3uA8XC5AN9O5JO7EXZva37NJQSYGNGwTnM8NArZBBcPrSSEUQFjNC6ccboO2WshBZ5tzKTq3P3zz38Pcq8V9m6PTpxf40Y0OXgyeQxjKBs9tShlW0voXxofyHSQVTfGDX6lobB+XA0= X-MS-TrafficTypeDiagnostic: HE1PR05MB3212: X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3212; 20:uvwh7e05pfau2WEU7jdpNzq68o09M3FI8zrRjq3R4brgHEU84YJhi7Gkn7YvWI85vskHXZJO/DcfpeUczFMmSEXpkFHcyLLIgYvGGSdP7aY16mrSt7A0NA/m+XHW3afp0xlUmuPMywDwYgSSdIBBRJQRVWd8KdLJauGIygs6b0c03du4Fk02RC3UpqIha2GqN887/JKKZDZV6vG6eTsVGUbXzGmCZciRBNfJZDdTL4sdMXSXhbYbnTVBzM2syZ5FAx8VldavbSEYvAYTvT+yaZ378x/RCfe2/TjbWzU0vdEKlR80377CZHVmoiadTszAQ0D5VUenM5USnKGLxp9ITFZEyLPBWKvhw5YF0eiUUvmSDT0/EHD1yCppY/dF8RAnlvmfuv/jnQ8QNxRsfq2/MrQqdbLTB5ujK/eAgMPtsfO+PLwg7LjOQ6P4CHYwZ3AW0Zij+tNfYd86gBerdiwEOUbeVwucE+JJ2k91um6MT0f5qdDFoLtLeh5lyPr7dcSf; 4:wDWvUH8AW7wSDepNJpt6RnXN9Z51LTcIXW6QWvEPCcNnZMF9MPYoq+KR1wTyMFkL1hFJocw3FDce5mexZPnMk8xDyAubGwbDSWN6pFY95NX8hMfSVL+jCQb6Txm0I9jv1KKMaCCfPRz125HNamJCe8+EAmloU8QM+5B7OSmMPY6aqqWrjchz1wfXuwufbw5VLIEeta/1V5I93lUgcsiZr+jW4E8fzz/7dVf2SRPrlrg9ysm4p9He/VwaDgTXDkjJVO8rG1yHxfnan4vUx8k+Rm3MicFY/mDnL6WNO3PC5pBBJyVARrtg0BC7Jym/NtmQ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231101)(2400082)(944501161)(3002001)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:HE1PR05MB3212; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB3212; X-Forefront-PRVS: 0574D4712B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(39380400002)(366004)(39860400002)(189003)(199004)(4720700003)(6116002)(36756003)(106356001)(2361001)(51416003)(68736007)(6666003)(1857600001)(186003)(105586002)(6916009)(66066001)(5660300001)(97736004)(305945005)(2351001)(69596002)(48376002)(47776003)(53936002)(16526019)(7696005)(5890100001)(386003)(59450400001)(2906002)(33026002)(52116002)(21086003)(25786009)(316002)(55016002)(50466002)(16586007)(50226002)(478600001)(81156014)(26005)(86362001)(8936002)(81166006)(8676002)(4326008)(7736002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3212; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB3212; 23:UrRpSdSCmMY6HueYXgV7/l1TnC/YyqiKtwHFpI1K8?= =?us-ascii?Q?/3G9GiHhbPZara6ZicIL42QIeOPBbeMA+wWOCpJRQW5oQO8zlK9tT/ul/ta9?= =?us-ascii?Q?IDzUfhMjzztr3D8O5lP/b4Wk15XZhMwJBu+JN5+hpxSbV4/a2c/c+IkpnmPb?= =?us-ascii?Q?wSYJ40MCdBLx0o9xJz17/b7YSiXzpmC0pH/dbu2mItkarZDeO4P/Tl0CDD12?= =?us-ascii?Q?8LYqrtTr/O82J/ifRkWNLPO0eA/OeAC+4NQAxMyUc1duY67igS4dYXaDU1mG?= =?us-ascii?Q?ZCHkZ+PVx51e1PUzkOoZeWEbS6HLIHgsGK+TBuki9okI/SxYTRBwZlPigsCs?= =?us-ascii?Q?pticix+VwskkM+uo6qVGWixcfAPYWx5zoIctBCOtxYWkRogQVqMco+vQM3xT?= =?us-ascii?Q?5uNuuJTo1SU6VMLZWMrAdtW+muB5TMuW5XdQXkX96FmwPDKma83fmc1ZbNCL?= =?us-ascii?Q?pjOLQnCviyddFxHqffpW4sQvXQPrROpw3yWpKsrDNei7dmsaRuJA9usKWU4t?= =?us-ascii?Q?TEzAm3i0OtRns0TNi3w46N8GG6igPs19Afju4E62EwTKz2gnx1Cg01geryUA?= =?us-ascii?Q?gahEqdfp8/niimzhAiOKUfTzyiyr5SisQsGwjCiwPHV1VcM18X/s9BKrDbEz?= =?us-ascii?Q?/3aSUN8r9oR8XMv5eASM0mXlu0x6HEF9SUKNemHYLIITxCajqkqq0wkvcCzS?= =?us-ascii?Q?0JCZ+uRUdAhGeyssqtIcgeDdiCZOO5255WvXMiWNVcrdYEsnvvpl1OCMeu6W?= =?us-ascii?Q?1YHd2Mmio22ESX5iwAuMbZdgVzjwiKiCYUqS5moRlczkxGh5yCSdHRIVL2rb?= =?us-ascii?Q?UVdDomhIZjieAkBjnTeJ8MQuRxJJv7YuAAxPNbQ8qHfn4eGMH/q9EfeIybnm?= =?us-ascii?Q?/gcsMbf9A+IKhIDIayNsWndNz2mBsFRoYC44OmcHduF5hTh9hG2jQh7fUigI?= =?us-ascii?Q?n00J6y2zjql5pqKicxnTKqDAJvwkj9H6RY5umRvEsOhx76GgSOOXXPQPMCWL?= =?us-ascii?Q?MGztFtaPA+IbSIORSnMokqhmsfRCTdz6TPi7X6i5KqQzuM5JjRHMBoEt+Hbv?= =?us-ascii?Q?2l4wJhTWTlTPeVJHHHJPZfyKYhmepQ+bx9sYDlolxfqP90JRPpvjzNwohdhY?= =?us-ascii?Q?i6PaSv5UNreFSdwTRv4TIdolO/3Ysu8bYM0ENa4TTlTfZDIr9yvWDFJjA0zk?= =?us-ascii?Q?08Zt+Bo08vXHUFCSMjvEbsMN3FlQbLVuqOhqyGlnw1LLNCjDHq5nCRYlC55D?= =?us-ascii?Q?GPFtE22WanedytIY70=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3212; 6:QbQmxXcxtlZ4P1KF54h7lLHDxChJwYVcUeR6TnFJj2mmnJHt3Nq3nbhc9eBz6n/2nnvgBHE2N0+vk7IjdqOqTd0Vbqb5btsEJPoY5l/TpANPBoQhlChvOnbKCZa62bAZIWf0XFT/+2mSWItsFYvn1/Th9hfPF9qdZW/IkT+5wpVzT4rkIanjVfovfruQsAxk3cd+Ml73qDa6hXbCExgTTn1P/f1HV7WF5lcr/2C8bzymLL9m/mGy2LKWldb8mrs33mma762L2ux0ZDAoKRkrexvN5lfz9HJAyySU7ZuBpiti9Brl7vqwSv6b+YPG+z8YF8lphO7hqfeQOnq1brCip/f0Ad0TbZZvMVop8UZuTtY=; 5:vc4eEqjNXZfgzwNqXbocmyAt7HITxp0lzxCAkZlBj9iT5V82kCR0cDB2BxFaIN5mPw/bbSZYK8haChxokj8KkBtLD6YMReMD5Enx/msapkkMRfkkheAZLdLUBj5zb9CHQzqt1uGWQA3F6L/bsr0bGdI5ezias9l3nJh8f8zkAVY=; 24:gbbkoanAulsyVKrn6BcLD++B7uEWKH7XG2iw+K+kQlT/ExDk+ml/10KS+l/Wa6jqBnE4e34cjk3eC5osfu8E49GWL7xf68q0FCmyO866/AI=; 7:anXKML9cAuddkf8cXDh8wwejEMOEsOcLmw8/ryRwF+wiwpM4k3JtiC78Ety6Gdvs3gnMS9Sw9C9xM4JXuRInMW6dmZ1eAB+/hVvi2RtBD5pkCWoHqIDihgTX8+EoNqqJuo6ELUk2IspdFfdUxcFWJHZGMQxVRtizkktCiO291cK0OIL0+IvmEbFDGeyRyu70OD7NogBG+3Nfge9VfY2AoMolUqAfCE2EmvByv+7w65IEdz0lQNgdmrzjJrcOfRm0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2018 16:17:35.4169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78a0b40b-7f49-4558-af1e-08d56cb3f837 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3212 Subject: [dpdk-dev] [PATCH] net/tap: fix res cleanup when tap create fails 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: , X-List-Received-Date: Mon, 05 Feb 2018 16:17:38 -0000 This patch complements the partial cleanup done inside eth_dev_tap_create when the routine failed. Such a failure left a non-functional device attached to the system. Fixes: 050fe6e9ff97 ("drivers/net: use ethdev allocation helper for vdev") Cc: stable@dpdk.org Signed-off-by: Moti Haimovsky --- drivers/net/tap/rte_eth_tap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index dc3847e..8931dec 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1347,13 +1347,13 @@ enum ioctl_mode { data = rte_zmalloc_socket(tap_name, sizeof(*data), 0, numa_node); if (!data) { RTE_LOG(ERR, PMD, "TAP Failed to allocate data\n"); - goto error_exit; + goto error_exit_nodev; } dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd)); if (!dev) { RTE_LOG(ERR, PMD, "TAP Unable to allocate device struct\n"); - goto error_exit; + goto error_exit_nodev; } pmd = dev->data->dev_private; @@ -1524,6 +1524,11 @@ enum ioctl_mode { tap_flow_implicit_flush(pmd, NULL); error_exit: + if (pmd->ioctl_sock > 0) + close(pmd->ioctl_sock); + rte_eth_dev_release_port(dev); + +error_exit_nodev: RTE_LOG(ERR, PMD, "TAP Unable to initialize %s\n", rte_vdev_device_name(vdev)); -- 1.8.3.1