From nobody Sun May 5 05:31:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516713738255770.8477890496608; Tue, 23 Jan 2018 05:22:18 -0800 (PST) Received: from localhost ([::1]:57967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edyWh-0000uj-Bk for importer@patchew.org; Tue, 23 Jan 2018 08:22:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edyVN-0000P2-4B for qemu-devel@nongnu.org; Tue, 23 Jan 2018 08:20:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edyVJ-0005G0-VR for qemu-devel@nongnu.org; Tue, 23 Jan 2018 08:20:49 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48456 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edyVJ-0005Fd-Pd for qemu-devel@nongnu.org; Tue, 23 Jan 2018 08:20:45 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0NDEqHp079487 for ; Tue, 23 Jan 2018 08:20:45 -0500 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0b-001b2d01.pphosted.com with ESMTP id 2fp3d8xk26-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 23 Jan 2018 08:20:44 -0500 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Jan 2018 08:20:44 -0500 Received: from b01cxnp23033.gho.pok.ibm.com (9.57.198.28) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 23 Jan 2018 08:20:42 -0500 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0NDKfkh3342602; Tue, 23 Jan 2018 13:20:41 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8C8F9AE03B; Tue, 23 Jan 2018 08:21:56 -0500 (EST) Received: from pacoca.br.ibm.com (unknown [9.7.46.252]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id 0F6A5AE034; Tue, 23 Jan 2018 08:21:54 -0500 (EST) From: Jose Ricardo Ziviani To: qemu-devel@nongnu.org, mst@redhat.com, ghammer@redhat.com Date: Tue, 23 Jan 2018 11:20:21 -0200 X-Mailer: git-send-email 2.14.3 X-TM-AS-GCONF: 00 x-cbid: 18012313-0056-0000-0000-0000040E5A91 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008413; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000247; SDB=6.00979192; UDB=6.00496286; IPR=6.00758498; BA=6.00005791; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019166; XFM=3.00000015; UTC=2018-01-23 13:20:43 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18012313-0057-0000-0000-00000845BD5C Message-Id: <20180123132021.27593-1-joserz@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-23_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801230182 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH] Revert "virtio: postpone the execution of event_notifier_cleanup function" 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: pbonzini@redhat.com, danielhb@linux.vnet.ibm.com, anton@samba.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This reverts commit 4fe6d78b2e241f41208dfb07605aace4becfc747. As reported http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg0545= 7.html The referred commit is causing regression issues in virtio. Signed-off-by: Jose Ricardo Ziviani Reported-by: Anton Blanchard Tested-by: Laurent Vivier --- accel/kvm/kvm-all.c | 4 ---- hw/virtio/virtio-bus.c | 19 ++++++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 071f4f57c0..f290f487a5 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -812,10 +812,6 @@ static void kvm_mem_ioeventfd_del(MemoryListener *list= ener, if (r < 0) { abort(); } - - if (e->cleanup) { - e->cleanup(e); - } } =20 static void kvm_io_ioeventfd_add(MemoryListener *listener, diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index 8106346927..3042232daf 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -256,15 +256,6 @@ bool virtio_bus_ioeventfd_enabled(VirtioBusState *bus) return k->ioeventfd_assign && k->ioeventfd_enabled(proxy); } =20 -static void virtio_bus_cleanup_event_notifier(EventNotifier *notifier) -{ - /* Test and clear notifier after disabling event, - * in case poll callback didn't have time to run. - */ - virtio_queue_host_notifier_read(notifier); - event_notifier_cleanup(notifier); -} - /* * This function switches ioeventfd on/off in the device. * The caller must set or clear the handlers for the EventNotifier. @@ -292,13 +283,19 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus,= int n, bool assign) r =3D k->ioeventfd_assign(proxy, notifier, n, true); if (r < 0) { error_report("%s: unable to assign ioeventfd: %d", __func__, r= ); - virtio_bus_cleanup_event_notifier(notifier); + goto cleanup_event_notifier; } + return 0; } else { - notifier->cleanup =3D virtio_bus_cleanup_event_notifier; k->ioeventfd_assign(proxy, notifier, n, false); } =20 +cleanup_event_notifier: + /* Test and clear notifier after disabling event, + * in case poll callback didn't have time to run. + */ + virtio_queue_host_notifier_read(notifier); + event_notifier_cleanup(notifier); return r; } =20 --=20 2.14.3