From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 61789A04B5 for ; Tue, 3 Dec 2019 19:27:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 589262B8D; Tue, 3 Dec 2019 19:27:40 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 828B32B8D for ; Tue, 3 Dec 2019 19:27:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397657; 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=qyxQfx1nwPDgosTDMZXfBUovqEPtt3TLGAm2fz0uKx4=; b=aE3A4sqEvVkJUn9JqobLE7opBp9AkipagHQBOQxrhBw8eKbLgU/5X4KQhPIcsAioLQ/iKC 52OvhhmXVZ23fNDa/B+xDMXHJD9pPgbt1V6yh1OyRtTTSs8pM/4rOezIGNAs5OYqiexc6j 2mVhonlGLaS+1dHc2mv+SsF62ZKGv0A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-WnitEAkxNzmFGx3-6hocpw-1; Tue, 03 Dec 2019 13:27:34 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B951800D4E; Tue, 3 Dec 2019 18:27:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AA3F5C3FA; Tue, 3 Dec 2019 18:27:30 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Tue, 3 Dec 2019 18:26:12 +0000 Message-Id: <20191203182714.17297-3-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: WnitEAkxNzmFGx3-6hocpw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'vhost: fix slave request fd leak' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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 rebasi= ng (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/314b42e9b909906402= 5962aa6f5f66b1ca0bef5c Thanks. Kevin. --- >From 314b42e9b9099064025962aa6f5f66b1ca0bef5c Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Thu, 5 Sep 2019 19:01:25 +0800 Subject: [PATCH] vhost: fix slave request fd leak [ upstream commit 761d57651c51365354cefb624883fccf62aee67d ] We need to close the old slave request fd if any first before taking the new one. Fixes: 275c3f944730 ("vhost: support slave requests channel") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 530823ecd..f0ad550c6 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1673,4 +1673,7 @@ vhost_user_set_req_fd(struct virtio_net **pdev, struc= t VhostUserMsg *msg, =09} =20 +=09if (dev->slave_req_fd >=3D 0) +=09=09close(dev->slave_req_fd); + =09dev->slave_req_fd =3D fd; =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:51.969461151 +0000 +++ 0003-vhost-fix-slave-request-fd-leak.patch=092019-12-03 17:29:51.676751= 494 +0000 @@ -1 +1 @@ -From 761d57651c51365354cefb624883fccf62aee67d Mon Sep 17 00:00:00 2001 +From 314b42e9b9099064025962aa6f5f66b1ca0bef5c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 761d57651c51365354cefb624883fccf62aee67d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0b72648a5..f46843610 100644 +index 530823ecd..f0ad550c6 100644 @@ -22 +23 @@ -@@ -1565,4 +1565,7 @@ vhost_user_set_req_fd(struct virtio_net **pdev, stru= ct VhostUserMsg *msg, +@@ -1673,4 +1673,7 @@ vhost_user_set_req_fd(struct virtio_net **pdev, stru= ct VhostUserMsg *msg,