From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BCD9042ECF for ; Thu, 20 Jul 2023 17:26:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B8AD440685; Thu, 20 Jul 2023 17:26:49 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 40E93400D6 for ; Thu, 20 Jul 2023 17:26:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866807; 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=8STJp8yvn8R8rkKxkA+37cAX+yfWFjftDHfMIZj45BQ=; b=f+xPTJYjpgFcdCUFwUTK4neJuoYyVt7HA8/Yz+Oq7CiUURh2dZIEla8cgq1ZOA+ScsKnmr BX2E7ZmmzTVnY6+Rjr0XS3VlwSNJJNGU6/kXyBTtjY1Bgh5uDUTh6PsSC40zaLQKWNJBRf PwMk7s3H518WbaKvhVZisQIP7fB5oyI= 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-652--UfhYP_VOWyBQBnlMWL3fg-1; Thu, 20 Jul 2023 11:22:23 -0400 X-MC-Unique: -UfhYP_VOWyBQBnlMWL3fg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2E4B185AD31; Thu, 20 Jul 2023 15:21:27 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id A12114CD0E3; Thu, 20 Jul 2023 15:21:19 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Eelco Chaudron , Chenbo Xia , dpdk stable Subject: patch 'vhost: fix invalid call FD handling' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:07 +0100 Message-ID: <20230720151942.262154-56-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/11a426ee6b59cc2a6ea4e32739636bbe13230af1 Thanks. Kevin --- >From 11a426ee6b59cc2a6ea4e32739636bbe13230af1 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 1 Jun 2023 09:40:08 +0200 Subject: [PATCH] vhost: fix invalid call FD handling [ upstream commit 0445f81883a3aa727ac7f8531beee2c225d3001a ] This patch fixes cases where IRQ injection is tried while the call FD is not valid, which should not happen. Fixes: b1cce26af1dc ("vhost: add notification for packed ring") Fixes: e37ff954405a ("vhost: support virtqueue interrupt/notification suppression") Signed-off-by: Maxime Coquelin Signed-off-by: Eelco Chaudron Reviewed-by: Chenbo Xia --- lib/vhost/vhost.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 4d0adb81b5..b9c387882c 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -787,7 +787,7 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq) old, new); - if ((vhost_need_event(vhost_used_event(vq), new, old) && - (vq->callfd >= 0)) || - unlikely(!signalled_used_valid)) { + if ((vhost_need_event(vhost_used_event(vq), new, old) || + unlikely(!signalled_used_valid)) && + vq->callfd >= 0) { eventfd_write(vq->callfd, (eventfd_t) 1); if (dev->notify_ops->guest_notified) @@ -852,5 +852,5 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq) kick = true; kick: - if (kick) { + if (kick && vq->callfd >= 0) { eventfd_write(vq->callfd, (eventfd_t)1); if (dev->notify_ops->guest_notified) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:01.860146920 +0100 +++ 0056-vhost-fix-invalid-call-FD-handling.patch 2023-07-20 16:17:54.772750961 +0100 @@ -1 +1 @@ -From 0445f81883a3aa727ac7f8531beee2c225d3001a Mon Sep 17 00:00:00 2001 +From 11a426ee6b59cc2a6ea4e32739636bbe13230af1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0445f81883a3aa727ac7f8531beee2c225d3001a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 8554ab4002..40863f7bfd 100644 +index 4d0adb81b5..b9c387882c 100644 @@ -24,2 +25,2 @@ -@@ -903,7 +903,7 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq) - __func__, vhost_used_event(vq), old, new); +@@ -787,7 +787,7 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq) + old, new); @@ -34,2 +35,2 @@ - if (dev->flags & VIRTIO_DEV_STATS_ENABLED) -@@ -972,5 +972,5 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq) + if (dev->notify_ops->guest_notified) +@@ -852,5 +852,5 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq) @@ -41 +42 @@ - if (dev->flags & VIRTIO_DEV_STATS_ENABLED) + if (dev->notify_ops->guest_notified)