From nobody Mon Feb 9 08:29:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661279669; cv=none; d=zohomail.com; s=zohoarc; b=GmI7gJC151rjKTU6LOpPwhJtGXken+E5Dj/8F/VkB0yibYaup/L6jUrjCyZ/Cu4803xhStiEZPIMXFDYFqjHhMJ87Ge/pNI8X/RKt4aEPGcXx5509flqBKZ/6Q8JFgwi1NkLpV/uI2oeaTrA0Yd1u5Pg03XN/agoOLjSEtOY/EU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661279669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3LXszn1oKHYse3sdyaKlGcH7svqT1e7hqhc+UjpoJZs=; b=GaSo8dWXorXXjo2yot59xri017JOJRJixK1UUA/DjkMlbDeHphJE5Mwmp/h1Jc+PKOB3YOSGQ7kJuremU8pWSZKB7R0VKlz5Y5cD5Md/5HnAFH9Es3fsPC7Q0u6bln1xNLz1r+J3Ef/102g//6SiYwj5zOXW0cAf55A+Oe5OTLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661279669075100.81111326284429; Tue, 23 Aug 2022 11:34:29 -0700 (PDT) Received: from localhost ([::1]:36224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQYjK-0000Eq-CB for importer@patchew.org; Tue, 23 Aug 2022 14:34:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQYW3-0005Jt-KJ for qemu-devel@nongnu.org; Tue, 23 Aug 2022 14:20:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQYVs-000337-CV for qemu-devel@nongnu.org; Tue, 23 Aug 2022 14:20:36 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-275-uSNUMetrMA-a7ghFVHwF7Q-1; Tue, 23 Aug 2022 14:20:25 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0B6B804191; Tue, 23 Aug 2022 18:20:24 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.195.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BEDC40D2830; Tue, 23 Aug 2022 18:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661278827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3LXszn1oKHYse3sdyaKlGcH7svqT1e7hqhc+UjpoJZs=; b=NqgBZpVtMDurul+tiMbBBjBoIadCHiTzNfQcOFwaP7EVRG78mEhvH0q9jpC/N8BtJ0VDXO Aoh1rgyf3CqY2qbXqfozW8aymgbr815dgrV4uwozFy8cBLAV1Ic2PXYOlEqBIh2/L/7rfw G6NVA5cF5Tv7YBie/O598j5bHCoB+3w= X-MC-Unique: uSNUMetrMA-a7ghFVHwF7Q-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Jason Wang , Paolo Bonzini , "Michael S. Tsirkin" , Peter Xu , Cindy Lu , Laurent Vivier , Lei Yang , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v2 6/7] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd Date: Tue, 23 Aug 2022 20:20:07 +0200 Message-Id: <20220823182008.97141-7-eperezma@redhat.com> In-Reply-To: <20220823182008.97141-1-eperezma@redhat.com> References: <20220823182008.97141-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661279670788100001 We can unbind twice a file descriptor if we call twice vhost_svq_set_svq_kick_fd because of this. Since it comes from vhost and not from SVQ, that file descriptor could be a different thing that guest's vhost notifier. Likewise, it can happens the same if a guest start and stop the device multiple times. Reported-by: Lei Yang Fixes: dff4426fa6 ("vhost: Add Shadow VirtQueue kick forwarding capabilitie= s") Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- hw/virtio/vhost-shadow-virtqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index e4956728dd..82a784d250 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -602,13 +602,13 @@ void vhost_svq_set_svq_kick_fd(VhostShadowVirtqueue *= svq, int svq_kick_fd) event_notifier_set_handler(svq_kick, NULL); } =20 + event_notifier_init_fd(svq_kick, svq_kick_fd); /* * event_notifier_set_handler already checks for guest's notifications= if * they arrive at the new file descriptor in the switch, so there is no * need to explicitly check for them. */ if (poll_start) { - event_notifier_init_fd(svq_kick, svq_kick_fd); event_notifier_set(svq_kick); event_notifier_set_handler(svq_kick, vhost_handle_guest_kick_notif= ier); } @@ -655,7 +655,7 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIOD= evice *vdev, */ void vhost_svq_stop(VhostShadowVirtqueue *svq) { - event_notifier_set_handler(&svq->svq_kick, NULL); + vhost_svq_set_svq_kick_fd(svq, VHOST_FILE_UNBIND); g_autofree VirtQueueElement *next_avail_elem =3D NULL; =20 if (!svq->vq) { --=20 2.31.1