From nobody Fri Nov 7 23:00:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548812096380602.048355956502; Tue, 29 Jan 2019 17:34:56 -0800 (PST) Received: from localhost ([127.0.0.1]:58440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goemA-0004XB-7m for importer@patchew.org; Tue, 29 Jan 2019 20:34:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goe49-0000QY-PV for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goe48-0001eZ-R4 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:21 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55213) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goe48-0001HW-MV for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:20 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 133F42211F; Tue, 29 Jan 2019 19:48:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 29 Jan 2019 19:48:32 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id A9A69E4667; Tue, 29 Jan 2019 19:48:31 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=zATs2ANPjN3p6xLoLz8Cgyl8hjsMkcF5SoAMeXeCMHA=; b=g2Ak5 9DoZ18fW3srtjKbSDKVxT9hUH7X0bjd2DIUOYHRbgE8+nSKNQmcW5ISQi3w7r9WR Wh1Poywp+4lofFxIYdqItJ1E3Gv+iEZh0Vc+z3qPegk4ezLA+8zgliva4UQvrA16 E0LzEjjFvkSvXIo6+Kg+bIHdPX4XMK36FBIc7s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=zATs2ANPjN3p6xLoLz8Cgyl8hjsMk cF5SoAMeXeCMHA=; b=farW4QcPmSn39+p3l983eto4Ux70Y9pn0LmHoSGsMqLuO yzNaIVBEkDkkou7deasQbSwPT9uDnTR0HXRJhS//IIDCJmjvUxNnMSrA+Ooj2ftm 4zbBzthFWG2hLbBnwjOxNg/sS0vFP9+9toHo+fIXOVDnJr6ivGj8hhcLjMkWrtxa 3tMx1rcfLxrEwhsMSBt/YBsDuRGfohb/a1gnkFvR3kp3gAJqhGzAUhvGwsQnh0dn 0zSnKOi85SYaU/ByA6NhUtigpu/4CV9j//8b+XOnx4m4vCY8M6vIQYBBI92/BLEN sYdYUDJmeQPpZl+VGgjbicodFLmbNinyy0Rul/poQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeefgddvkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojg hfsedttdertdertddtnecuhfhrohhmpedfgfhmihhlihhoucfirdcuvehothgrfdcuoegt ohhtrgessghrrggrphdrohhrgheqnecukfhppeduvdekrdehledrvddtrddvudeinecurf grrhgrmhepmhgrihhlfhhrohhmpegtohhtrgessghrrggrphdrohhrghenucevlhhushht vghrufhiiigvpeduje X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 19:48:10 -0500 Message-Id: <20190130004811.27372-73-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130004811.27372-1-cota@braap.org> References: <20190130004811.27372-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v6 72/73] cpu: add async_run_on_cpu_no_bql 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: Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some async jobs do not need the BQL. Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota --- include/qom/cpu.h | 14 ++++++++++++++ cpus-common.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 30ed2fae0b..bb0729f969 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -884,9 +884,23 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, r= un_on_cpu_data data); * @data: Data to pass to the function. * * Schedules the function @func for execution on the vCPU @cpu asynchronou= sly. + * See also: async_run_on_cpu_no_bql() */ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data= data); =20 +/** + * async_run_on_cpu_no_bql: + * @cpu: The vCPU to run on. + * @func: The function to be executed. + * @data: Data to pass to the function. + * + * Schedules the function @func for execution on the vCPU @cpu asynchronou= sly. + * This function is run outside the BQL. + * See also: async_run_on_cpu() + */ +void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func, + run_on_cpu_data data); + /** * async_safe_run_on_cpu: * @cpu: The vCPU to run on. diff --git a/cpus-common.c b/cpus-common.c index 1241024b2c..5832a8bf37 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -109,6 +109,7 @@ struct qemu_work_item { run_on_cpu_func func; run_on_cpu_data data; bool free, exclusive, done; + bool bql; }; =20 /* Called with the CPU's lock held */ @@ -155,6 +156,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, ru= n_on_cpu_data data) wi.done =3D false; wi.free =3D false; wi.exclusive =3D false; + wi.bql =3D true; =20 cpu_mutex_lock(cpu); queue_work_on_cpu_locked(cpu, &wi); @@ -179,6 +181,21 @@ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func f= unc, run_on_cpu_data data) wi->func =3D func; wi->data =3D data; wi->free =3D true; + wi->bql =3D true; + + queue_work_on_cpu(cpu, wi); +} + +void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func, + run_on_cpu_data data) +{ + struct qemu_work_item *wi; + + wi =3D g_malloc0(sizeof(struct qemu_work_item)); + wi->func =3D func; + wi->data =3D data; + wi->free =3D true; + /* wi->bql initialized to false */ =20 queue_work_on_cpu(cpu, wi); } @@ -323,6 +340,7 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_fu= nc func, wi->data =3D data; wi->free =3D true; wi->exclusive =3D true; + /* wi->bql initialized to false */ =20 queue_work_on_cpu(cpu, wi); } @@ -347,6 +365,7 @@ static void process_queued_cpu_work_locked(CPUState *cp= u) * BQL, so it goes to sleep; start_exclusive() is sleeping too= , so * neither CPU can proceed. */ + g_assert(!wi->bql); if (has_bql) { qemu_mutex_unlock_iothread(); } @@ -357,12 +376,22 @@ static void process_queued_cpu_work_locked(CPUState *= cpu) qemu_mutex_lock_iothread(); } } else { - if (has_bql) { - wi->func(cpu, wi->data); + if (wi->bql) { + if (has_bql) { + wi->func(cpu, wi->data); + } else { + qemu_mutex_lock_iothread(); + wi->func(cpu, wi->data); + qemu_mutex_unlock_iothread(); + } } else { - qemu_mutex_lock_iothread(); - wi->func(cpu, wi->data); - qemu_mutex_unlock_iothread(); + if (has_bql) { + qemu_mutex_unlock_iothread(); + wi->func(cpu, wi->data); + qemu_mutex_lock_iothread(); + } else { + wi->func(cpu, wi->data); + } } } cpu_mutex_lock(cpu); --=20 2.17.1