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 E3ACFA04B1 for ; Mon, 23 Nov 2020 18:13:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DABE2C8E4; Mon, 23 Nov 2020 18:13:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 16028C914 for ; Mon, 23 Nov 2020 18:13:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151604; 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=o3JccDyUt77tzXjx01OaKg49ClPLMpsmOU1oFnu5JfQ=; b=L8cjJNRmxcvkoD1TiDVFNvvsc4CTNHtjFNm06JBCIoDcUNkm9Qz8XeXcqq3vM4ci4fIDBR UokFH/X74K99pT6uXjPNnRdiyxwe8yqZrsRlkPxcAoblh0ZA2sV4INgIfKOloGl4M11KaA ODvv28XEz1oatR4/Ep7/MFNE+J+akrU= 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-219-Qz3m66mkP8eyjXvqAb70RA-1; Mon, 23 Nov 2020 12:13:20 -0500 X-MC-Unique: Qz3m66mkP8eyjXvqAb70RA-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A2B91868410 for ; Mon, 23 Nov 2020 17:13:19 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8969B60C04; Mon, 23 Nov 2020 17:13:18 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Date: Mon, 23 Nov 2020 17:12:12 +0000 Message-Id: <20201123171222.79398-20-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'examples/l2fwd-crypto: fix build with pkg-config' has been queued to LTS release 18.11.11 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.11 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/27/20. 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/1ceffb2318882648926fd29fa9023da6d3a71186 Thanks. Kevin. --- >From 1ceffb2318882648926fd29fa9023da6d3a71186 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Sat, 14 Nov 2020 10:05:26 +0100 Subject: [PATCH] examples/l2fwd-crypto: fix build with pkg-config [ upstream commit bcd3004381b09adaa1ab7ceb9c0592e640fb210c ] Two issues fixed here. First add the experimental flag. Then fix a link issue with the crypto scheduler driver: /usr/bin/ld: /tmp/cchr7aHA.o: in function `main': main.c:(.text.startup+0x1673): undefined reference to `rte_cryptodev_scheduler_workers_get' collect2: error: ld returned 1 exit status Fixes: e3bcb99a5e13 ("examples/l2fwd-crypto: limit number of sessions") Fixes: 261bbff75e34 ("examples: use separate crypto session mempools") Signed-off-by: David Marchand --- examples/l2fwd-crypto/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index 08881ff183..4c085ab221 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -25,4 +25,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk) +CFLAGS += -DALLOW_EXPERIMENTAL_API +CONFIG_DEFINES = $(shell $(CC) $(CFLAGS) -dM -E - < /dev/null) +ifneq ($(findstring RTE_CRYPTO_SCHEDULER,$(CONFIG_DEFINES)),) +LDFLAGS_SHARED += -lrte_crypto_scheduler +endif + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.465625868 +0000 +++ 0020-examples-l2fwd-crypto-fix-build-with-pkg-config.patch 2020-11-23 17:10:14.001061594 +0000 @@ -1 +1 @@ -From bcd3004381b09adaa1ab7ceb9c0592e640fb210c Mon Sep 17 00:00:00 2001 +From 1ceffb2318882648926fd29fa9023da6d3a71186 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bcd3004381b09adaa1ab7ceb9c0592e640fb210c ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 4953ee2b95..7731eccd03 100644 +index 08881ff183..4c085ab221 100644 @@ -28,2 +29,2 @@ -@@ -27,4 +27,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) - LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) +@@ -25,4 +25,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) + LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)