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 39DC746211 for ; Thu, 13 Feb 2025 11:02:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 315D042EF4; Thu, 13 Feb 2025 11:02:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BA08B40287 for ; Thu, 13 Feb 2025 11:01:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440918; 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=GAgjdrx32GEdqcW3U4YeiCYZA5fKwkTR/ysXO80PIwU=; b=UNr3UrpO/35v1ahblwwRY4FhpfJVapXi1n7Nht/cVO5og3DG+eGofKHm3H2zKrOwBC9MVq 08jnkVr5mc0s2r0knLFq2x7wXXVpSJ2ZVZA6vx31yACW9iver9eOSLJXsSf9e1dLYRqsg3 dTEky3oT2/aI//HFirDdkk94tX5zP7E= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-357-E5REzGHtNrCTKsGhTMxzHg-1; Thu, 13 Feb 2025 05:01:56 -0500 X-MC-Unique: E5REzGHtNrCTKsGhTMxzHg-1 X-Mimecast-MFC-AGG-ID: E5REzGHtNrCTKsGhTMxzHg Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F23719560BC for ; Thu, 13 Feb 2025 10:01:56 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2D5381800360; Thu, 13 Feb 2025 10:01:53 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: Maxime Coquelin , dpdk stable Subject: patch 'vhost: add null callback checks' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:25 +0000 Message-ID: <20250213095933.362078-58-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6QuK86Lgjud9VKJrtUnrzLstPIrjhGNE0-39xtbkQeI_1739440916 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. 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/1298fbb1c0621b305e34868e9e11ba65b644a8c0 Thanks. Kevin --- >From 1298fbb1c0621b305e34868e9e11ba65b644a8c0 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Fri, 24 Jan 2025 14:14:07 +0000 Subject: [PATCH] vhost: add null callback checks [ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ] rte_vhost_driver_callback_register() does not specify any mandatory callbacks in struct rte_vhost_device_ops. Add some missing NULL checks before calling rte_vhost_device_ops callbacks. Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") Signed-off-by: Kevin Traynor Reviewed-by: Maxime Coquelin --- lib/vhost/vduse.c | 3 ++- lib/vhost/vhost.c | 5 +++-- lib/vhost/vhost_user.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index 8ba58555f9..be548f051e 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -319,5 +319,6 @@ vduse_device_start(struct virtio_net *dev, bool reconnect) dev->flags |= VIRTIO_DEV_READY; - if (dev->notify_ops->new_device(dev->vid) == 0) + if (!dev->notify_ops->new_device || + dev->notify_ops->new_device(dev->vid) == 0) dev->flags |= VIRTIO_DEV_RUNNING; diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 5a50a06f8d..c41c29ca57 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -752,8 +752,9 @@ vhost_destroy_device_notify(struct virtio_net *dev) if (dev->flags & VIRTIO_DEV_RUNNING) { vdpa_dev = dev->vdpa_dev; - if (vdpa_dev) + if (vdpa_dev && vdpa_dev->ops->dev_close) vdpa_dev->ops->dev_close(dev->vid); dev->flags &= ~VIRTIO_DEV_RUNNING; - dev->notify_ops->destroy_device(dev->vid); + if (dev->notify_ops->destroy_device) + dev->notify_ops->destroy_device(dev->vid); } } diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 52d8078d7c..26dc0bde97 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -3302,5 +3302,6 @@ unlock: if (!(dev->flags & VIRTIO_DEV_RUNNING)) { - if (dev->notify_ops->new_device(dev->vid) == 0) + if (!dev->notify_ops->new_device || + dev->notify_ops->new_device(dev->vid) == 0) dev->flags |= VIRTIO_DEV_RUNNING; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:40.717225740 +0000 +++ 0058-vhost-add-null-callback-checks.patch 2025-02-12 17:29:34.379946103 +0000 @@ -1 +1 @@ -From 66be1a05a480a0484b02c1a0194126763f4dbb99 Mon Sep 17 00:00:00 2001 +From 1298fbb1c0621b305e34868e9e11ba65b644a8c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -36 +37 @@ -index 2f34d3500e..f01ae6130e 100644 +index 5a50a06f8d..c41c29ca57 100644