From patchwork Fri Feb 2 09:50:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhoujian (jay)" X-Patchwork-Id: 868741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zY50H3TVQz9sR8 for ; Sat, 3 Feb 2018 05:21:19 +1100 (AEDT) Received: from localhost ([::1]:46658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehfxd-0007NQ-G5 for incoming@patchwork.ozlabs.org; Fri, 02 Feb 2018 13:21:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehfJu-0004H0-5H for qemu-devel@nongnu.org; Fri, 02 Feb 2018 12:41:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehfIq-0004HS-4f for qemu-devel@nongnu.org; Fri, 02 Feb 2018 12:40:13 -0500 Received: from [45.249.212.32] (port=55633 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ehfIp-0004At-4k for qemu-devel@nongnu.org; Fri, 02 Feb 2018 12:39:07 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id D91B899C35AA0; Fri, 2 Feb 2018 17:52:29 +0800 (CST) Received: from localhost (10.177.19.14) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.361.1; Fri, 2 Feb 2018 17:52:22 +0800 From: Jay Zhou To: Date: Fri, 2 Feb 2018 17:50:55 +0800 Message-ID: <1517565055-14588-1-git-send-email-jianjay.zhou@huawei.com> X-Mailer: git-send-email 2.6.1.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.177.19.14] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 45.249.212.32 Subject: [Qemu-devel] [PATCH v3] tap: close fd conditionally when error occured X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: weidong.huang@huawei.com, mst@redhat.com, jasowang@redhat.com, arei.gonglei@huawei.com, jianjay.zhou@huawei.com, imammedo@redhat.com, wangxinxin.wang@huawei.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If netdev_add tap,id=net0,...,vhost=on failed in net_init_tap_one(), the followed up device_add virtio-net-pci,netdev=net0 will fail too, prints: TUNSETOFFLOAD ioctl() failed: Bad file descriptor TUNSETOFFLOAD ioctl() failed: Bad file descriptor The reason is that the fd of tap is closed when error occured after calling net_init_tap_one(). The fd should be closed when calling net_init_tap_one failed: - if tap_set_sndbuf() failed - if tap_set_sndbuf() succeeded but vhost failed to open or initialize with vhostforce flag on The fd should not be closed just because vhost failed to open or initialize but without vhostforce flag. So the followed up device_add can fall back to userspace virtio successfully. Suggested-by: Michael S. Tsirkin Suggested-by: Igor Mammedov Suggested-by: Jason Wang Signed-off-by: Jay Zhou --- net/tap.c | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/net/tap.c b/net/tap.c index 979e622..c46ab14 100644 --- a/net/tap.c +++ b/net/tap.c @@ -651,7 +651,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, tap_set_sndbuf(s->fd, tap, &err); if (err) { error_propagate(errp, err); - return; + goto error; } if (tap->has_fd || tap->has_fds) { @@ -686,15 +686,26 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, if (vhostfdname) { vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err); if (vhostfd == -1) { - error_propagate(errp, err); - return; + if (tap->has_vhostforce && tap->vhostforce) { + error_propagate(errp, err); + goto error; + } else { + warn_report_err(err); + return; + } } } else { vhostfd = open("/dev/vhost-net", O_RDWR); if (vhostfd < 0) { - error_setg_errno(errp, errno, - "tap: open vhost char device failed"); - return; + if (tap->has_vhostforce && tap->vhostforce) { + error_setg_errno(errp, errno, + "tap: open vhost char device failed"); + goto error; + } else { + warn_report("tap: open vhost char device failed: %s", + strerror(errno)); + return; + } } fcntl(vhostfd, F_SETFL, O_NONBLOCK); } @@ -702,12 +713,23 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, s->vhost_net = vhost_net_init(&options); if (!s->vhost_net) { - error_setg(errp, - "vhost-net requested but could not be initialized"); - return; + if (tap->has_vhostforce && tap->vhostforce) { + error_setg(errp, + "vhost-net requested but could not be initialized"); + goto error; + } else { + warn_report("vhost-net requested but could not be initialized"); + return; + } } } else if (vhostfdname) { - error_setg(errp, "vhostfd(s)= is not valid without vhost"); + warn_report("vhostfd(s)= is not valid without vhost"); + return; + } + +error: + if (!tap->has_fd && !tap->has_fds) { + close(fd); } } @@ -877,7 +899,6 @@ free_fail: vnet_hdr, fd, &err); if (err) { error_propagate(errp, err); - close(fd); return -1; } } else { @@ -916,7 +937,6 @@ free_fail: vhostfdname, vnet_hdr, fd, &err); if (err) { error_propagate(errp, err); - close(fd); return -1; } }