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 7587EA04DB for ; Tue, 17 Nov 2020 12:16:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 691E0567C; Tue, 17 Nov 2020 12:16:24 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id 7193E567C for ; Tue, 17 Nov 2020 12:16:23 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id p22so2852978wmg.3 for ; Tue, 17 Nov 2020 03:16:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y39ocBpyA28VUpoE9h7OZAL3U2PoOaqTrJbv88vLDQk=; b=DeMm6AFq7g+iDQJZRNdgPgmnCUG2nMO4Zt140MPM31vpuucmpZiG8ZWqyDq92CxKt0 bySZsKGs0ZRZkABU2m9iChwu3KNguhGi37NZ2rlLG4wzLoL1fOowBda/w1+Ri9ZwfY3u V3ULB6oORsrNb/Medw20PzXWySgqFvDRWb1EYl4z00747C+32xtDrbzlASbOtSTeKrTZ fgqezNIRV/jGtOwbS2a9z/UQTlurRHueKZqacDNjn/Wyzxt7OyiGhqUC3UHIlYXD4GOB z2J8FnwlK8hChvwRDsr6/YYPwrejyYQ6IE9GtSxXDTXeStW+Wd8fFnrBnuV7ZLzZSSox iPNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y39ocBpyA28VUpoE9h7OZAL3U2PoOaqTrJbv88vLDQk=; b=jPKdahKL5iv1/naiufu8G52hLTFPt63+K1EhaUjwF3Bm+K4vMu9IA8zB4eZEIAUASk 8Yy1jGSDVnbVgyC2EjmirqyAIwJ2EY5aU1TWRFp9/L9UJ33Rc6no5ohuW5SR71QxE9iX JgE+bUAQBiWqeVBnqEI4kzHpC2bRA93i8OX42PdHWL6CaizrG24MSBr5A8H62GEj9qPh XqW98xVjGSVBem7ZAuj0Vi6ZFv4+yBHGvzufcyFp39eZ0fbHXeWS4usv8d93Sa7PmpYe WttH//2m2lsQ1LNUPmxY/f9L9X+DmalHTXRtubP3k8POMBvqR84C4qaLYV9QTFmZFkL6 W8rQ== X-Gm-Message-State: AOAM5305bQldjwFJXDf6ssnnqIuJ3t88zeFSj647w5ckudZ+f/9dNbYY 8BOCdFYHncyozGo5PqYoFts= X-Google-Smtp-Source: ABdhPJwhfO7cGFRZMHnLlSdw/B6a5ClWB7POgIzXG6CdGxU1TR7fXzwmsQtnjo92qNc0z26AKvhXnw== X-Received: by 2002:a7b:c1ce:: with SMTP id a14mr3870202wmj.126.1605611782100; Tue, 17 Nov 2020 03:16:22 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m22sm28398111wrb.97.2020.11.17.03.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:16:21 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: dpdk stable Date: Tue, 17 Nov 2020 11:14:12 +0000 Message-Id: <20201117111416.1961049-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/l2fwd-crypto: fix build with pkg-config' has been queued to stable release 19.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 stable release 19.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 11/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/763e52f711e57a227f90f4c9ff15ff5a149fbdcf Thanks. Luca Boccassi --- >From 763e52f711e57a227f90f4c9ff15ff5a149fbdcf 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 cdbb91a1e6..cafe778fc6 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -24,6 +24,12 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) LDFLAGS_STATIC = $(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.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:14.579518452 +0000 +++ 0038-examples-l2fwd-crypto-fix-build-with-pkg-config.patch 2020-11-17 11:13:12.953117254 +0000 @@ -1 +1 @@ -From bcd3004381b09adaa1ab7ceb9c0592e640fb210c Mon Sep 17 00:00:00 2001 +From 763e52f711e57a227f90f4c9ff15ff5a149fbdcf 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 cdbb91a1e6..cafe778fc6 100644 @@ -28 +29 @@ -@@ -26,6 +26,12 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +@@ -24,6 +24,12 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)