From patchwork Wed Apr 17 08:39:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 237169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 441592C0145 for ; Wed, 17 Apr 2013 18:42:11 +1000 (EST) Received: from localhost ([::1]:36929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USNwP-0001gJ-GO for incoming@patchwork.ozlabs.org; Wed, 17 Apr 2013 04:42:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USNua-0000CX-6A for qemu-devel@nongnu.org; Wed, 17 Apr 2013 04:40:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USNuY-0003Ff-Rv for qemu-devel@nongnu.org; Wed, 17 Apr 2013 04:40:16 -0400 Received: from mail-ia0-x230.google.com ([2607:f8b0:4001:c02::230]:43723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USNuY-0003FS-Ku for qemu-devel@nongnu.org; Wed, 17 Apr 2013 04:40:14 -0400 Received: by mail-ia0-f176.google.com with SMTP id i9so1196788iad.35 for ; Wed, 17 Apr 2013 01:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=jZJ4bgkd2c8gFV+UCKDTGGODAXTnmz4xHXTVUt5/sgw=; b=bolod5syv7Li+66pAbLT04v79BIxw+h6m6rbKcnBR0fFoxPt8eVM6WqBq0JOwwd6Dl JJBKzPCegedQOnU2Fx5w3OjACBEFMBKyfMIYqS9xWih8XravDYi+QUwIDxFQ+j43Sbay wmJhoznWOUMQ8tS6QHKio5AZamJlg0FWZxriDin2+Eh2aF+cjsTr797GYtgOGhAllkHh JGn0j6SLjDIX3gpNBiO94G6pwnTvMc//+FCIDVCnnPCVNFzN1AnpGvbJoNBazTfV3nB3 q0PFSI9JcyDRhClfuWXUCe3hYN9zCAj4JjB/W9x8uLBue0XsaDJm454wFY8sa9lj3yca ETVA== X-Received: by 10.50.77.33 with SMTP id p1mr257789igw.36.1366188014116; Wed, 17 Apr 2013 01:40:14 -0700 (PDT) Received: from localhost ([114.245.251.229]) by mx.google.com with ESMTPS id dy5sm6212731igc.1.2013.04.17.01.40.09 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 01:40:13 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Wed, 17 Apr 2013 16:39:13 +0800 Message-Id: <1366187964-14265-5-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1366187964-14265-1-git-send-email-qemulist@gmail.com> References: <1366187964-14265-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c02::230 Cc: mdroth , Paolo Bonzini , Stefan Hajnoczi , Anthony Liguori , Jan Kiszka Subject: [Qemu-devel] [RFC PATCH v4 04/15] net: resolve race of tap backend and its peer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan When vhost net enabled, we should be sure that the user space fd handler is not in flight Signed-off-by: Liu Ping Fan --- net/tap.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/net/tap.c b/net/tap.c index 35cbb6e..b5629e3 100644 --- a/net/tap.c +++ b/net/tap.c @@ -41,6 +41,7 @@ #include "qemu/error-report.h" #include "net/tap.h" +#include "util/event_gsource.h" #include "hw/vhost_net.h" @@ -327,6 +328,10 @@ static void tap_poll(NetClientState *nc, bool enable) tap_read_poll(s, enable); tap_write_poll(s, enable); + if (!enable) { + /* need sync so vhost can take over polling */ + g_source_remove_poll(&s->nsrc->source, &s->nsrc->gfd); + } } int tap_get_fd(NetClientState *nc)