From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bart Van Assche Subject: [PATCH 2/2] vhost: Avoid that vhost_work_flush() returns early Date: Wed, 14 Aug 2013 09:03:28 +0200 Message-ID: <520B2BC0.3050807@acm.org> References: <520B2B47.9040002@acm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Asias He , kvm-devel To: "Michael S. Tsirkin" Return-path: Received: from juliette.telenet-ops.be ([195.130.137.74]:43818 "EHLO juliette.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752942Ab3HNHD2 (ORCPT ); Wed, 14 Aug 2013 03:03:28 -0400 In-Reply-To: <520B2B47.9040002@acm.org> Sender: kvm-owner@vger.kernel.org List-ID: If two or more items are queued on dev->work_list before vhost_worker() starts processing these then the value of work->done_seq will be set to the sequence number of a work item that has not yet been processed. Avoid this by letting vhost_worker() count the number of items that have already been processed. Signed-off-by: Bart Van Assche Cc: Michael S. Tsirkin Cc: Asias He --- drivers/vhost/vhost.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index e7ffc10..11d668a 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -202,7 +202,7 @@ static int vhost_worker(void *data) { struct vhost_dev *dev = data; struct vhost_work *work; - unsigned seq; + unsigned seq = 0; mm_segment_t oldfs = get_fs(); set_fs(USER_DS); @@ -216,14 +216,13 @@ static int vhost_worker(void *data) work = list_first_entry(&dev->work_list, struct vhost_work, node); list_del_init(&work->node); - seq = work->queue_seq; spin_unlock_irq(&dev->work_lock); __set_current_state(TASK_RUNNING); work->fn(work); spin_lock_irq(&dev->work_lock); - work->done_seq = seq; + work->done_seq = ++seq; if (work->flushing) wake_up_all(&work->done); } -- 1.7.10.4