From patchwork Sun Apr 23 16:08:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 9694869 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 E5C72602A7 for ; Sun, 23 Apr 2017 16:09:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D901F262F2 for ; Sun, 23 Apr 2017 16:09:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDB01267EC; Sun, 23 Apr 2017 16:09:51 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 0F67A262F2 for ; Sun, 23 Apr 2017 16:09:50 +0000 (UTC) Received: from localhost ([::1]:39814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2K57-0007ae-Nv for patchwork-qemu-devel@patchwork.kernel.org; Sun, 23 Apr 2017 12:09:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2K4Z-0007aL-LL for qemu-devel@nongnu.org; Sun, 23 Apr 2017 12:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2K4Y-0002fh-KJ for qemu-devel@nongnu.org; Sun, 23 Apr 2017 12:09:15 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:100::1]:43278) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2K4Y-0002eR-EB for qemu-devel@nongnu.org; Sun, 23 Apr 2017 12:09:14 -0400 Received: from [2001:bc8:30d7:120:9bb5:8936:7e6a:9e36] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1d2K4U-0005VQ-2J; Sun, 23 Apr 2017 18:09:10 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.89) (envelope-from ) id 1d2K4T-0000ut-Dn; Sun, 23 Apr 2017 18:09:09 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sun, 23 Apr 2017 18:08:53 +0200 Message-Id: <20170423160854.3478-1-aurelien@aurel32.net> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:bc8:30d7:100::1 Subject: [Qemu-devel] [PATCH] s390x/misc_helper.c: wrap s390_virtio_hypercall in 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: Alexander Graf , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP s390_virtio_hypercall can trigger IO events and interrupts, most notably when using virtio-ccw devices. Signed-off-by: Aurelien Jarno Reviewed-by: Alexander Graf --- roms/qemu-palcode | 2 +- roms/seabios | 2 +- target/s390x/misc_helper.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roms/qemu-palcode b/roms/qemu-palcode index f3c7e44c70..c87a92639b 160000 --- a/roms/qemu-palcode +++ b/roms/qemu-palcode @@ -1 +1 @@ -Subproject commit f3c7e44c70254975df2a00af39701eafbac4d471 +Subproject commit c87a92639b28ac42bc8f6c67443543b405dc479b diff --git a/roms/seabios b/roms/seabios index 5f4c7b13cd..e2fc41e24e 160000 --- a/roms/seabios +++ b/roms/seabios @@ -1 +1 @@ -Subproject commit 5f4c7b13cdf9c450eb55645f4362ea58fa61b79b +Subproject commit e2fc41e24ee0ada60fc511d60b15a41b294538be diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 4946b56ab3..aec737d707 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -307,7 +307,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) switch (num) { case 0x500: /* KVM hypercall */ + qemu_mutex_lock_iothread(); r = s390_virtio_hypercall(env); + qemu_mutex_unlock_iothread(); break; case 0x44: /* yield */