[dpdk-stable] patch 'vhost: fix passing destroyed device to destroy callback' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Wed May 8 12:15:00 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.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 05/13/19. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9fc9960f7c61561c44c51cc8f6cf596f1a3f85f2

Thanks.

Kevin Traynor

---
>From 9fc9960f7c61561c44c51cc8f6cf596f1a3f85f2 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets at samsung.com>
Date: Fri, 12 Apr 2019 11:32:28 +0300
Subject: [PATCH] vhost: fix passing destroyed device to destroy callback

[ upstream commit 2344395df2e944683df87b1a47f8b64eea050d2b ]

Application should be able to obtain information like 'ifname' from
the 'vid' passed to 'destroy_connection' callback. Currently, all the
API calls with passed 'vid' fails with 'device not found'.

Fixes: efba12a78ddf ("vhost: add user callbacks for socket open/close")

Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 lib/librte_vhost/socket.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 4007d9d56..097995166 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -298,11 +298,17 @@ vhost_user_read_cb(int connfd, void *dat, int *remove)
 	ret = vhost_user_msg_handler(conn->vid, connfd);
 	if (ret < 0) {
+		struct virtio_net *dev = get_device(conn->vid);
+
 		close(connfd);
 		*remove = 1;
+
+		if (dev)
+			vhost_destroy_device_notify(dev);
+
+		if (vsocket->notify_ops->destroy_connection)
+			vsocket->notify_ops->destroy_connection(conn->vid);
+
 		vhost_destroy_device(conn->vid);
 
-		if (vsocket->notify_ops->destroy_connection)
-			vsocket->notify_ops->destroy_connection(conn->vid);
-
 		pthread_mutex_lock(&vsocket->conn_mutex);
 		TAILQ_REMOVE(&vsocket->conn_list, conn, next);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:06.759190028 +0100
+++ 0018-vhost-fix-passing-destroyed-device-to-destroy-callba.patch	2019-05-08 11:05:05.794933494 +0100
@@ -1 +1 @@
-From 2344395df2e944683df87b1a47f8b64eea050d2b Mon Sep 17 00:00:00 2001
+From 9fc9960f7c61561c44c51cc8f6cf596f1a3f85f2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2344395df2e944683df87b1a47f8b64eea050d2b ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index c7a77a5d5..274988c4d 100644
+index 4007d9d56..097995166 100644


More information about the stable mailing list