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 E9DC0A04AF for ; Thu, 20 Aug 2020 17:35:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D3C6F1C0C6; Thu, 20 Aug 2020 17:35:03 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 7711A1E2B for ; Thu, 20 Aug 2020 17:35:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937701; 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=DM1BKH/Qh2EuuvCqna0gkGqzRWGlZh75Wz5xMkpYUYI=; b=aWdcZ8OJM+HlkARAFM8oN1UBDwQYgrVZFZlF19VjrDXvNvZsvenQ9kmRl9mRKzStukf6oz QOS9pfPg0PAx8+LVZUk4WyQNyvwjNB++qKnKARD3ZwTfcaPstx7fwqSX5awGlAvGgZp1yv t78pBflDF15AwqMvARV+66qO7guNESM= 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-510-9qj3Csc6MaSNLzfz2YvJWQ-1; Thu, 20 Aug 2020 11:34:57 -0400 X-MC-Unique: 9qj3Csc6MaSNLzfz2YvJWQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C379C425D5; Thu, 20 Aug 2020 15:34:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 760C410027A6; Thu, 20 Aug 2020 15:34:55 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Thomas Monjalon , dpdk stable Date: Thu, 20 Aug 2020 16:33:37 +0100 Message-Id: <20200820153341.171927-32-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'drivers/net: fix exposing internal headers' has been queued to LTS release 18.11.10 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/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/eed7f1e8986dd632eeb0eda6deafd1dba7edbf84 Thanks. Kevin. --- >From eed7f1e8986dd632eeb0eda6deafd1dba7edbf84 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 10 Jul 2020 22:43:41 +0100 Subject: [PATCH] drivers/net: fix exposing internal headers [ upstream commit 61ede39537f45e561dc80eaa23621ce3d2cf9e73 ] Using '__rte_internal' tag in 'rte_ethdev_driver.h' causing build error for applications and examples. Because they don't define 'ALLOW_INTERNAL_API' flag and '__rte_internal' causes the error. This patch is preparation for future '__rte_internal' usage. At first place, applications/examples should not include 'rte_ethdev_driver.h', this is happening because of PMD public header files include 'rte_ethdev_driver.h' by mistake. Updated PMD public header files to not include internal header files. But for unit test application, 'app/test', enable accessing internal APIs, since some unit tests need them. Fixes: ffc905f3b856 ("ethdev: separate driver APIs") Fixes: ec0dec44ecb9 ("net/atlantic: enable MACsec configuration") Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- drivers/net/bnxt/rte_pmd_bnxt.h | 3 ++- drivers/net/dpaa/rte_pmd_dpaa.h | 2 -- drivers/net/i40e/rte_pmd_i40e.h | 4 +++- drivers/net/ixgbe/rte_pmd_ixgbe.h | 4 +++- test/test/meson.build | 3 +++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/rte_pmd_bnxt.h b/drivers/net/bnxt/rte_pmd_bnxt.h index 68fbe34d69..3206be75ff 100644 --- a/drivers/net/bnxt/rte_pmd_bnxt.h +++ b/drivers/net/bnxt/rte_pmd_bnxt.h @@ -7,5 +7,6 @@ #define _PMD_BNXT_H_ -#include +#include +#include /* diff --git a/drivers/net/dpaa/rte_pmd_dpaa.h b/drivers/net/dpaa/rte_pmd_dpaa.h index 37eea9b032..8d244bb491 100644 --- a/drivers/net/dpaa/rte_pmd_dpaa.h +++ b/drivers/net/dpaa/rte_pmd_dpaa.h @@ -16,6 +16,4 @@ */ -#include - /** * Enable/Disable TX loopback diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h index a1313146b6..1ef1624236 100644 --- a/drivers/net/i40e/rte_pmd_i40e.h +++ b/drivers/net/i40e/rte_pmd_i40e.h @@ -15,5 +15,7 @@ */ -#include +#include +#include +#include /** diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/ixgbe/rte_pmd_ixgbe.h index 72a941f9dc..1eee5733a5 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.h +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.h @@ -12,5 +12,7 @@ #define _PMD_IXGBE_H_ -#include +#include +#include +#include /** diff --git a/test/test/meson.build b/test/test/meson.build index 09b51a7ca6..4ce4fb94b1 100644 --- a/test/test/meson.build +++ b/test/test/meson.build @@ -262,4 +262,7 @@ endif cflags += '-D_GNU_SOURCE' +# Enable using internal APIs in unit tests +cflags += ['-DALLOW_INTERNAL_API'] + test_dep_objs = [] compress_test_dep = dependency('zlib', required: false) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.957494631 +0100 +++ 0032-drivers-net-fix-exposing-internal-headers.patch 2020-08-20 16:26:15.828324360 +0100 @@ -1 +1 @@ -From 61ede39537f45e561dc80eaa23621ce3d2cf9e73 Mon Sep 17 00:00:00 2001 +From eed7f1e8986dd632eeb0eda6deafd1dba7edbf84 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61ede39537f45e561dc80eaa23621ce3d2cf9e73 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -27,31 +28,7 @@ - app/test/meson.build | 3 +++ - drivers/net/atlantic/rte_pmd_atlantic.h | 2 +- - drivers/net/bnxt/rte_pmd_bnxt.h | 3 ++- - drivers/net/dpaa/rte_pmd_dpaa.h | 2 -- - drivers/net/i40e/rte_pmd_i40e.h | 4 +++- - drivers/net/ixgbe/rte_pmd_ixgbe.h | 4 +++- - 6 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/app/test/meson.build b/app/test/meson.build -index e0d33ea5ef..786a213972 100644 ---- a/app/test/meson.build -+++ b/app/test/meson.build -@@ -397,4 +397,7 @@ cflags += '-D_GNU_SOURCE' - cflags += '-fno-strict-aliasing' - -+# Enable using internal APIs in unit tests -+cflags += ['-DALLOW_INTERNAL_API'] -+ - test_dep_objs = [] - if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') -diff --git a/drivers/net/atlantic/rte_pmd_atlantic.h b/drivers/net/atlantic/rte_pmd_atlantic.h -index c0208569b6..0100fc16e5 100644 ---- a/drivers/net/atlantic/rte_pmd_atlantic.h -+++ b/drivers/net/atlantic/rte_pmd_atlantic.h -@@ -12,5 +12,5 @@ - #define _PMD_ATLANTIC_H_ - --#include -+#include - - /** + drivers/net/bnxt/rte_pmd_bnxt.h | 3 ++- + drivers/net/dpaa/rte_pmd_dpaa.h | 2 -- + drivers/net/i40e/rte_pmd_i40e.h | 4 +++- + drivers/net/ixgbe/rte_pmd_ixgbe.h | 4 +++- + test/test/meson.build | 3 +++ + 5 files changed, 11 insertions(+), 5 deletions(-) + @@ -59 +36 @@ -index 2e893cc7bf..81d0d0e032 100644 +index 68fbe34d69..3206be75ff 100644 @@ -82 +59 @@ -index 0f6715efc8..fc3560c28c 100644 +index a1313146b6..1ef1624236 100644 @@ -95 +72 @@ -index 8b6bb99a58..90fc8160b1 100644 +index 72a941f9dc..1eee5733a5 100644 @@ -106,0 +84,12 @@ +diff --git a/test/test/meson.build b/test/test/meson.build +index 09b51a7ca6..4ce4fb94b1 100644 +--- a/test/test/meson.build ++++ b/test/test/meson.build +@@ -262,4 +262,7 @@ endif + cflags += '-D_GNU_SOURCE' + ++# Enable using internal APIs in unit tests ++cflags += ['-DALLOW_INTERNAL_API'] ++ + test_dep_objs = [] + compress_test_dep = dependency('zlib', required: false)