From patchwork Thu Jun 13 09:03:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 251017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AF3D52C009A for ; Thu, 13 Jun 2013 19:08:04 +1000 (EST) Received: from localhost ([::1]:49178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un3Vi-0003Rb-En for incoming@patchwork.ozlabs.org; Thu, 13 Jun 2013 05:08:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un3Ss-000797-IE for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:05:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un3Sn-0003hb-8b for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:05:06 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:60069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un3Sm-0003hR-V4 for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:05:01 -0400 Received: by mail-pd0-f174.google.com with SMTP id 10so10114658pdc.19 for ; Thu, 13 Jun 2013 02:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=t3oYS7xeOcim485uWqrGdJHdwwp1IMYkJR3qXy9M7L8=; b=T2zhcNcauMpLVdIMsoUpvX7k/dS8nasR+mevBLk68GJ6wyP2ZeU3vRaaWvU7KAtfEm hQ5mgkmEt43rbmQBT1bOng1AoNrcFwpgrpzFy+vi4I665FO147y0FMLwvazX5ffeXENd TTHMLJcMq0zZyk4DiRwbd7FVGpvQ7CjLhQmA6nU6/hBmrjC1V6jHvuL1Mg+OfSc7tCR1 4HwqWfoWNdrezR/wysxrGUppP39+EeJtJhcScI99DNgWSuf86GGWJHRanhpIj7Jt7Uua mTpI5IrUdKEL3APm51BoEUH+b9KpTjNC4QJJXOIrjB9qnUbKLJ3YHe1S6guKz+55r8K+ +OUg== X-Received: by 10.66.136.17 with SMTP id pw17mr1813986pab.202.1371114300134; Thu, 13 Jun 2013 02:05:00 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id sq5sm3154480pab.11.2013.06.13.02.04.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:04:59 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2013 17:03:06 +0800 Message-Id: <1371114186-8854-7-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371114186-8854-1-git-send-email-qemulist@gmail.com> References: <1371114186-8854-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.174 Cc: mdroth , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v2 6/6] net: hub use lock to protect ports list 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 Hub ports will run on multi-threads, so use lock to protect them. Signed-off-by: Liu Ping Fan --- net/hub.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/net/hub.c b/net/hub.c index 9c6c559..2970f8e 100644 --- a/net/hub.c +++ b/net/hub.c @@ -37,6 +37,7 @@ struct NetHub { int id; QLIST_ENTRY(NetHub) next; int num_ports; + QemuMutex ports_lock; QLIST_HEAD(, NetHubPort) ports; }; @@ -47,6 +48,7 @@ static ssize_t net_hub_receive(NetHub *hub, NetHubPort *source_port, { NetHubPort *port; + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { if (port == source_port) { continue; @@ -54,6 +56,7 @@ static ssize_t net_hub_receive(NetHub *hub, NetHubPort *source_port, qemu_send_packet(&port->nc, buf, len); } + qemu_mutex_unlock(&hub->ports_lock); return len; } @@ -63,6 +66,7 @@ static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort *source_port, NetHubPort *port; ssize_t len = iov_size(iov, iovcnt); + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { if (port == source_port) { continue; @@ -70,6 +74,7 @@ static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort *source_port, qemu_sendv_packet(&port->nc, iov, iovcnt); } + qemu_mutex_unlock(&hub->ports_lock); return len; } @@ -80,6 +85,7 @@ static NetHub *net_hub_new(int id) hub = g_malloc(sizeof(*hub)); hub->id = id; hub->num_ports = 0; + qemu_mutex_init(&hub->ports_lock); QLIST_INIT(&hub->ports); QLIST_INSERT_HEAD(&hubs, hub, next); @@ -93,16 +99,19 @@ static int net_hub_port_can_receive(NetClientState *nc) NetHubPort *src_port = DO_UPCAST(NetHubPort, nc, nc); NetHub *hub = src_port->hub; + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { if (port == src_port) { continue; } if (qemu_can_send_packet(&port->nc)) { + qemu_mutex_unlock(&hub->ports_lock); return 1; } } + qemu_mutex_unlock(&hub->ports_lock); return 0; } @@ -155,8 +164,9 @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name) port = DO_UPCAST(NetHubPort, nc, nc); port->id = id; port->hub = hub; - + qemu_mutex_lock(&hub->ports_lock); QLIST_INSERT_HEAD(&hub->ports, port, next); + qemu_mutex_unlock(&hub->ports_lock); return port; } @@ -197,14 +207,17 @@ NetClientState *net_hub_find_client_by_name(int hub_id, const char *name) QLIST_FOREACH(hub, &hubs, next) { if (hub->id == hub_id) { + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { peer = port->nc.peer; if (peer && strcmp(peer->name, name) == 0) { netclient_ref(peer); + qemu_mutex_unlock(&hub->ports_lock); return peer; } } + qemu_mutex_unlock(&hub->ports_lock); } } return NULL; @@ -221,13 +234,16 @@ NetClientState *net_hub_port_find(int hub_id) QLIST_FOREACH(hub, &hubs, next) { if (hub->id == hub_id) { + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { nc = port->nc.peer; if (!nc) { netclient_ref(&port->nc); + qemu_mutex_unlock(&hub->ports_lock); return &(port->nc); } } + qemu_mutex_unlock(&hub->ports_lock); break; } } @@ -247,12 +263,14 @@ void net_hub_info(Monitor *mon) QLIST_FOREACH(hub, &hubs, next) { monitor_printf(mon, "hub %d\n", hub->id); + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { if (port->nc.peer) { monitor_printf(mon, " \\ "); print_net_client(mon, port->nc.peer); } } + qemu_mutex_unlock(&hub->ports_lock); } } @@ -309,6 +327,7 @@ void net_hub_check_clients(void) QLIST_FOREACH(hub, &hubs, next) { int has_nic = 0, has_host_dev = 0; + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &hub->ports, next) { peer = port->nc.peer; if (!peer) { @@ -331,6 +350,7 @@ void net_hub_check_clients(void) break; } } + qemu_mutex_unlock(&hub->ports_lock); if (has_host_dev && !has_nic) { fprintf(stderr, "Warning: vlan %d with no nics\n", hub->id); } @@ -346,12 +366,15 @@ bool net_hub_flush(NetClientState *nc) { NetHubPort *port; NetHubPort *source_port = DO_UPCAST(NetHubPort, nc, nc); + NetHub *hub = source_port->hub; int ret = 0; + qemu_mutex_lock(&hub->ports_lock); QLIST_FOREACH(port, &source_port->hub->ports, next) { if (port != source_port) { ret += qemu_net_queue_flush(port->nc.send_queue); } } + qemu_mutex_unlock(&hub->ports_lock); return ret ? true : false; }