From patchwork Wed Jul 13 21:00:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 9228489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B69460868 for ; Wed, 13 Jul 2016 21:10:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3815427F94 for ; Wed, 13 Jul 2016 21:10:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2ACB427FE4; Wed, 13 Jul 2016 21:10:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9881327F94 for ; Wed, 13 Jul 2016 21:10:35 +0000 (UTC) Received: from localhost ([::1]:49955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNRQQ-0002qV-OX for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Jul 2016 17:10:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNRGp-0007AA-Cm for qemu-devel@nongnu.org; Wed, 13 Jul 2016 17:00:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNRGl-0001EI-Io for qemu-devel@nongnu.org; Wed, 13 Jul 2016 17:00:39 -0400 Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]:35714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNRGl-0001Du-94 for qemu-devel@nongnu.org; Wed, 13 Jul 2016 17:00:35 -0400 Received: by mail-lf0-x234.google.com with SMTP id f93so48251363lfi.2 for ; Wed, 13 Jul 2016 14:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pq9CNYUnU+xAH3qLEFxM8bEY7UMNZB3Yb8LXpqTRUUo=; b=O9vCEyjVBOzAKVXO/EWCzdsOjo/qbyc3QW4/UyH9a880n8koypr66kmDeNK1I13Pms g3/Mufwv5fR00BeYQqpqWfUWXjXXwyKUDEIaTDXczm4OfgTtz+cSMrm4Cg0eOQF3JaZ7 LI0avAmwTnlGCO60PQVv4wPSU5ye5Ve7j0ojg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pq9CNYUnU+xAH3qLEFxM8bEY7UMNZB3Yb8LXpqTRUUo=; b=QwpyngzDOBwgPWdkjowL53SQNmzCo5kSET6ZGSsnPKreSZfIua0NO24m63BnhNoEc6 l1OCPv/OfXFPoCc2mRAcql00xyuPOu8FJ23bumS4h4wA7RXBf/FFRwimLSrViBRRvxAN iYgq222u+nPX0X2QAVGCkXI3GU7/tsKbFu9L3diSQYyceMjFkebOgEiPIWQvhYi5CsPW yfFmZKjJJmrLmor5e8RdcFdk0pQjm6kqnWXMf6PS12KDuZfTAr6DnEug9cEBJz8rbObo SS3zwzIDynfMJQhu3dUa86SX0Pbi1pr1rExUtY4C0lyqGYqPVoMROKeTmLBa6qF1yKuN QHIQ== X-Gm-Message-State: ALyK8tIHHacif6+BTEO68+kgCYvkql6y+ZwCHPCKwdTdx7F8M5eSWygo3GCemnqyXa1Iaxm8 X-Received: by 10.25.206.148 with SMTP id e142mr5362541lfg.182.1468443634418; Wed, 13 Jul 2016 14:00:34 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-120-37.2com.net. [46.188.120.37]) by smtp.gmail.com with ESMTPSA id 16sm152403lja.31.2016.07.13.14.00.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jul 2016 14:00:33 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 00:00:13 +0300 Message-Id: <1468443622-17368-4-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468443622-17368-1-git-send-email-sergey.fedorov@linaro.org> References: <1468443622-17368-1-git-send-email-sergey.fedorov@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::234 Subject: [Qemu-devel] [PATCH v3 03/12] cpus: Move common code out of {async_, }run_on_cpu() 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: MTTCG Devel , Peter Maydell , Sergey Fedorov , patches@linaro.org, Peter Crosthwaite , Alvise Rigo , "Emilio G. Cota" , Paolo Bonzini , serge.fdrv@gmail.com, Richard Henderson , =?UTF-8?Q?Alex_Benn=c3=a9e?= , =?UTF-8?B?S09OUkFEIEZyw6lkw6lyaWM=?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov Move the code common between run_on_cpu() and async_run_on_cpu() into a new function queue_work_on_cpu(). Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée --- cpus.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/cpus.c b/cpus.c index 049c2d04e150..04687c85bcd4 100644 --- a/cpus.c +++ b/cpus.c @@ -910,6 +910,22 @@ void qemu_init_cpu_loop(void) qemu_thread_get_self(&io_thread); } +static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi) +{ + qemu_mutex_lock(&cpu->work_mutex); + if (cpu->queued_work_first == NULL) { + cpu->queued_work_first = wi; + } else { + cpu->queued_work_last->next = wi; + } + cpu->queued_work_last = wi; + wi->next = NULL; + wi->done = false; + qemu_mutex_unlock(&cpu->work_mutex); + + qemu_cpu_kick(cpu); +} + void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data) { struct qemu_work_item wi; @@ -923,18 +939,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data) wi.data = data; wi.free = false; - qemu_mutex_lock(&cpu->work_mutex); - if (cpu->queued_work_first == NULL) { - cpu->queued_work_first = &wi; - } else { - cpu->queued_work_last->next = &wi; - } - cpu->queued_work_last = &wi; - wi.next = NULL; - wi.done = false; - qemu_mutex_unlock(&cpu->work_mutex); - - qemu_cpu_kick(cpu); + queue_work_on_cpu(cpu, &wi); while (!atomic_mb_read(&wi.done)) { CPUState *self_cpu = current_cpu; @@ -957,18 +962,7 @@ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data) wi->data = data; wi->free = true; - qemu_mutex_lock(&cpu->work_mutex); - if (cpu->queued_work_first == NULL) { - cpu->queued_work_first = wi; - } else { - cpu->queued_work_last->next = wi; - } - cpu->queued_work_last = wi; - wi->next = NULL; - wi->done = false; - qemu_mutex_unlock(&cpu->work_mutex); - - qemu_cpu_kick(cpu); + queue_work_on_cpu(cpu, wi); } static void qemu_kvm_destroy_vcpu(CPUState *cpu)