From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 708191B488 for ; Thu, 22 Nov 2018 17:52:57 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DBF07300156B for ; Thu, 22 Nov 2018 16:52:56 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 486FB60E3F; Thu, 22 Nov 2018 16:52:52 +0000 (UTC) From: Kevin Traynor To: Timothy Redaelli Cc: Maxime Coquelin , dpdk stable Date: Thu, 22 Nov 2018 16:49:39 +0000 Message-Id: <20181122164957.13003-47-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 22 Nov 2018 16:52:56 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost/crypto: fix shared lib build without cryptodev' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Thu, 22 Nov 2018 16:52:57 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/28/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From cf7826b1c256b267c68ceb74acc2453d4f8a6dfe Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 16 Oct 2018 22:47:16 +0200 Subject: [PATCH] vhost/crypto: fix shared lib build without cryptodev [ upstream commit 1726e9994c77cddd40a2982a1a01ceaf18a83403 ] Currently it's not possible to build DPDK as shared library with cryptodev disabled since vhost is trying to link with rte_crypto, but rte_crypto and rte_hash are only needed when you build vhost_crypto and so only when cryptodev is enabled. This patch fix this by linking rte_vhost with rte_crypto and rte_hash only when cryptodev is enabled. Fixes: b4ca81298613 ("vhost/crypto: fix build without cryptodev") Fixes: 939066d96563 ("vhost/crypto: add public function implementation") Signed-off-by: Timothy Redaelli Reviewed-by: Maxime Coquelin --- lib/librte_vhost/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile index 531cf4832..5dd318987 100644 --- a/lib/librte_vhost/Makefile +++ b/lib/librte_vhost/Makefile @@ -20,6 +20,5 @@ ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) LDLIBS += -lnuma endif -LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net \ - -lrte_cryptodev -lrte_hash +LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net # all source are stored in SRCS-y @@ -32,4 +31,5 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h # only compile vhost crypto when cryptodev is enabled ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y) +LDLIBS += -lrte_cryptodev -lrte_hash SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto.c SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost_crypto.h -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:33.491978670 +0000 +++ 0047-vhost-crypto-fix-shared-lib-build-without-cryptodev.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,8 +1,10 @@ -From 1726e9994c77cddd40a2982a1a01ceaf18a83403 Mon Sep 17 00:00:00 2001 +From cf7826b1c256b267c68ceb74acc2453d4f8a6dfe Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 16 Oct 2018 22:47:16 +0200 Subject: [PATCH] vhost/crypto: fix shared lib build without cryptodev +[ upstream commit 1726e9994c77cddd40a2982a1a01ceaf18a83403 ] + Currently it's not possible to build DPDK as shared library with cryptodev disabled since vhost is trying to link with rte_crypto, but rte_crypto and rte_hash are only needed when you build vhost_crypto @@ -13,7 +15,6 @@ Fixes: b4ca81298613 ("vhost/crypto: fix build without cryptodev") Fixes: 939066d96563 ("vhost/crypto: add public function implementation") -Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Reviewed-by: Maxime Coquelin