From patchwork Wed Aug 14 07:02:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 2844199 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5EEEE9F2F4 for ; Wed, 14 Aug 2013 07:02:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F3DC2032D for ; Wed, 14 Aug 2013 07:02:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4995620326 for ; Wed, 14 Aug 2013 07:02:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755279Ab3HNHCe (ORCPT ); Wed, 14 Aug 2013 03:02:34 -0400 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 S1752942Ab3HNHCd (ORCPT ); Wed, 14 Aug 2013 03:02:33 -0400 Received: from [192.168.1.100] ([178.119.235.68]) by juliette.telenet-ops.be with bizsmtp id CX2Y1m01U1VD9XW06X2YcA; Wed, 14 Aug 2013 09:02:32 +0200 Message-ID: <520B2B88.6020307@acm.org> Date: Wed, 14 Aug 2013 09:02:32 +0200 From: Bart Van Assche User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: "Michael S. Tsirkin" CC: Asias He , kvm-devel Subject: [PATCH 1/2] vhost: Reduce vhost_work_flush() wakeup latency References: <520B2B47.9040002@acm.org> In-Reply-To: <520B2B47.9040002@acm.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the TIF_NEED_RESCHED task flag is set, wake up any vhost_work_flush() waiters before rescheduling instead of after rescheduling. Signed-off-by: Bart Van Assche Cc: Michael S. Tsirkin Cc: Asias He --- drivers/vhost/vhost.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index e58cf00..e7ffc10 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -201,47 +201,43 @@ static void vhost_vq_reset(struct vhost_dev *dev, static int vhost_worker(void *data) { struct vhost_dev *dev = data; - struct vhost_work *work = NULL; - unsigned uninitialized_var(seq); + struct vhost_work *work; + unsigned seq; mm_segment_t oldfs = get_fs(); set_fs(USER_DS); use_mm(dev->mm); - for (;;) { + spin_lock_irq(&dev->work_lock); + while (!kthread_should_stop()) { /* mb paired w/ kthread_stop */ set_current_state(TASK_INTERRUPTIBLE); - - spin_lock_irq(&dev->work_lock); - if (work) { - work->done_seq = seq; - if (work->flushing) - wake_up_all(&work->done); - } - - if (kthread_should_stop()) { - spin_unlock_irq(&dev->work_lock); - __set_current_state(TASK_RUNNING); - break; - } if (!list_empty(&dev->work_list)) { work = list_first_entry(&dev->work_list, struct vhost_work, node); list_del_init(&work->node); seq = work->queue_seq; - } else - work = NULL; - spin_unlock_irq(&dev->work_lock); + spin_unlock_irq(&dev->work_lock); - if (work) { __set_current_state(TASK_RUNNING); work->fn(work); - if (need_resched()) - schedule(); - } else + + spin_lock_irq(&dev->work_lock); + work->done_seq = seq; + if (work->flushing) + wake_up_all(&work->done); + } + if (list_empty(&dev->work_list) || need_resched()) { + spin_unlock_irq(&dev->work_lock); + schedule(); + spin_lock_irq(&dev->work_lock); + } } + spin_unlock_irq(&dev->work_lock); + + __set_current_state(TASK_RUNNING); unuse_mm(dev->mm); set_fs(oldfs); return 0;