From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id AACA31B03F for ; Sun, 11 Feb 2018 05:02:55 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 4EDEF20D9C; Sat, 10 Feb 2018 23:02:55 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Sat, 10 Feb 2018 23:02:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=ItijnWdgU7o4CLdAZhcrmPLREJeZozdzn+SZFHguQ wY=; b=kaN30y5aKsLSWt6AImPPCmXcZqAcwvSrx9gvfjy0QWkL1649pE9D5EMzc Hkt13aX0lL3jd9nfr5vgqRaltC8xrbw8Cz4GMFp6Df9N39q3Z7w+gHgI5RYcviAY jqMalGesmFWS+qPKg1FI3c8tyxWcrzmY9yKzrrQftE4tg4QLbhyq4aouqi7OFQFC MFBIaE+PnowG2m0NziG8po5gL2BpDEMaZIegroU8J13QtFPRsLVU+KHCM4h66aQN XPyMwFlFk7r/oxjSB09FkUHbBRlgE1hmoRDmm0Tn6BDGT6rtG6eQlqP5E9AacfQ3 X/gLYvjNgRhoDwbY2ptEu22OpJmng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=ItijnWdgU7o4CLdAZ hcrmPLREJeZozdzn+SZFHguQwY=; b=XzDYEJfWlyh/Qko+lp0mmKmW19rQjCH+t GkE+yh7J/5rIumsGZuLwY539MtGg+k7O7hJZWPATRgHz+xHhmx7CRCjkPoWERTVq oFLzSurVxhp7cy1H2Xl0Fwb8d4QA4pU4gxrEWkusSyStoB+3fQ4zpbcS7/bkJ5UP 5Q3CSV372BWmYtK1kI9tX/m32jCwSxhTp+S3+Qr05LInHGeO+rX7ZqytZPJw4GNM V1i6DCI7Ztrfnkw1RlZzdXJXZHGZV4dxNflnM92EtPF+Yd4Y+LKWpikRPI59ym5s 73ET08zA/irzoth6crnF220I09zR5fdpwhS7uDWtaSlvLBmV9HxzQ== X-ME-Sender: Received: from yliu-mob.mtl.com (unknown [115.150.101.1]) by mail.messagingengine.com (Postfix) with ESMTPA id C817624434; Sat, 10 Feb 2018 23:02:53 -0500 (EST) From: Yuanhan Liu To: Moti Haimovsky Cc: Pascal Mazon , dpdk stable Date: Sun, 11 Feb 2018 12:02:47 +0800 Message-Id: <1518321771-23153-1-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-stable] patch 'net/tap: fix cleanup on allocation failure' has been queued to LTS release 17.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Feb 2018 04:02:55 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 344d489593d878837c45815ba5b8cf3ef5689826 Mon Sep 17 00:00:00 2001 From: Moti Haimovsky Date: Mon, 5 Feb 2018 18:17:20 +0200 Subject: [PATCH] net/tap: fix cleanup on allocation failure [ upstream commit cb7e68da630abe7bb7b69885cc2a1a8e6d705943 ] 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") Signed-off-by: Moti Haimovsky Acked-by: Pascal Mazon --- 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 036028f..b8187f9 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1240,13 +1240,13 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, 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; @@ -1416,6 +1416,11 @@ error_remote: 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)); -- 2.7.4