From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 59487A0096 for ; Wed, 8 May 2019 12:16:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4FF752862; Wed, 8 May 2019 12:16:23 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3DA812862 for ; Wed, 8 May 2019 12:16:22 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A54256698A; Wed, 8 May 2019 10:16:21 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5B1D1A267; Wed, 8 May 2019 10:16:20 +0000 (UTC) From: Kevin Traynor To: Ilya Maximets Cc: Tiwei Bie , dpdk stable Date: Wed, 8 May 2019 11:15:00 +0100 Message-Id: <20190508101534.8984-18-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 08 May 2019 10:16:21 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost: fix passing destroyed device to destroy callback' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" 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 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 Reviewed-by: Tiwei Bie --- 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@dpdk.org @@ -20 +21 @@ -index c7a77a5d5..274988c4d 100644 +index 4007d9d56..097995166 100644