From patchwork Fri Jan 19 08:44:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 125123 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp197794ljf; Fri, 19 Jan 2018 01:01:18 -0800 (PST) X-Google-Smtp-Source: ACJfBovxPOYSWEK2daTHzzoG0EJjJtuW5yJyu88u/XKWIOdOd45U/q3FO1pH3mHXE/xw+3RCVN9V X-Received: by 10.129.193.14 with SMTP id f14mr8982248ywi.508.1516352478830; Fri, 19 Jan 2018 01:01:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516352478; cv=none; d=google.com; s=arc-20160816; b=oCt/wKcAS/lEjXFkayzfdfj/U1lXWU0Q6jw4VOlKn5j1D3uwq/QebUtoTT51X4nvYt CREqmbUpglYE9ymU68INyw1owSToFsmmfAy7H66Zp7/FK7cmwkbu5NQp4SB3jv58Phzw gOrJFzwy1i+7oZi8Auqg4KykuLBJ7NzsHbcU7/QYmLn6z45I+bn/DcXTUDFr30ZVS4Xg VKf7Mu5KO4tab6jW+JE0PGMmmyGG6iUH4jVMS28I+t8ftLsynMyf/DQ8/5Pk3sk1O6ji m/DVhAFYDo8dmKlrClxP7mPd42u9ZnUeMIqSX9d5QOny/Jk60sICGfyxRunpsTUiE4+g hjvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=i1bq7mgwL6GD+8h38TC3Ho/RpK01gnYMaNzsRL3wKCc=; b=EjXc2fYrtWFNAI0NNOqmwyXZ+SNENGtIC/ZuVGTa5x+9GALkL2xMjFa8KKQ8Vj1tJg XxoXaR8AT1wPIBdjXX1AeLHbrvX7GbFQI+gChiryleFrAbEivepA97mqSeAg8sjzu+uO a2jDSoG/n59dz9/XCNDwcWhAfsnGJo5nulvp38eR38W5sIoBYMErCuHE7YdMnMJjq9iS LLJbNKZmgalQDvlIt85Z95CyN6yar9WatjWCWZ3pygKW5EnLXBaRfNbhdNhmmuQ/OAFu ofIvKJC/wL9ciFKXJwXdxhtwYvV2Ar0arhDV63dy3rsdOmNxjoLyM4hUnK3uaa3IF8Rm MEqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k11si2245039ywl.783.2018.01.19.01.01.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Jan 2018 01:01:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:35895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecSY2-0007M6-7G for patch@linaro.org; Fri, 19 Jan 2018 04:01:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecSHb-0001Ra-7C for qemu-devel@nongnu.org; Fri, 19 Jan 2018 03:44:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecSHW-0005VC-A9 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 03:44:19 -0500 Received: from mail.ispras.ru ([83.149.199.45]:53714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecSHW-0005Us-2A for qemu-devel@nongnu.org; Fri, 19 Jan 2018 03:44:14 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id C081454006A; Fri, 19 Jan 2018 11:44:12 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 11:44:17 +0300 Message-ID: <20180119084417.7100.69568.stgit@pasha-VirtualBox> In-Reply-To: <20180119084235.7100.98318.stgit@pasha-VirtualBox> References: <20180119084235.7100.98318.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [RFC PATCH v4 13/23] cpus: only take BQL for sleeping threads 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: kwolf@redhat.com, peter.maydell@linaro.org, pavel.dovgaluk@ispras.ru, mst@redhat.com, jasowang@redhat.com, quintela@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, boost.lists@gmail.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Now the only real need to hold the BQL is for when we sleep on the cpu->halt conditional. The lock is actually dropped while the thread sleeps so the actual window for contention is pretty small. This also means we can remove the special case hack for exclusive work and simply declare that work no longer has an implicit BQL held. This isn't a major problem async work is generally only changing things in the context of its own vCPU. If it needs to work across vCPUs it should be using the exclusive mechanism or possibly taking the lock itself. Signed-off-by: Alex Bennée Tested-by: Pavel Dovgalyuk --- cpus-common.c | 13 +++++-------- cpus.c | 7 ++++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cpus-common.c b/cpus-common.c index 59f751e..64661c3 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -310,6 +310,11 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func, queue_work_on_cpu(cpu, wi); } +/* Work items run outside of the BQL. This is essential for avoiding a + * deadlock for exclusive work but also applies to non-exclusive work. + * If the work requires cross-vCPU changes then it should use the + * exclusive mechanism. + */ void process_queued_cpu_work(CPUState *cpu) { struct qemu_work_item *wi; @@ -327,17 +332,9 @@ void process_queued_cpu_work(CPUState *cpu) } qemu_mutex_unlock(&cpu->work_mutex); if (wi->exclusive) { - /* Running work items outside the BQL avoids the following deadlock: - * 1) start_exclusive() is called with the BQL taken while another - * CPU is running; 2) cpu_exec in the other CPU tries to takes the - * BQL, so it goes to sleep; start_exclusive() is sleeping too, so - * neither CPU can proceed. - */ - qemu_mutex_unlock_iothread(); start_exclusive(); wi->func(cpu, wi->data); end_exclusive(); - qemu_mutex_lock_iothread(); } else { wi->func(cpu, wi->data); } diff --git a/cpus.c b/cpus.c index ca86d9f..c841333 100644 --- a/cpus.c +++ b/cpus.c @@ -1143,23 +1143,24 @@ static void qemu_wait_io_event_common(CPUState *cpu) static void qemu_tcg_rr_wait_io_event(CPUState *cpu) { while (all_cpu_threads_idle()) { + qemu_mutex_lock_iothread(); stop_tcg_kick_timer(); qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); + qemu_mutex_unlock_iothread(); } start_tcg_kick_timer(); qemu_wait_io_event_common(cpu); - - qemu_mutex_unlock_iothread(); } static void qemu_wait_io_event(CPUState *cpu) { - qemu_mutex_lock_iothread(); while (cpu_thread_is_idle(cpu)) { + qemu_mutex_lock_iothread(); qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); + qemu_mutex_unlock_iothread(); } #ifdef _WIN32