patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Thomas Monjalon <thomas@monjalon.net>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'drivers/net: fix exposing internal headers' has been queued to LTS release 18.11.10
Date: Thu, 20 Aug 2020 16:33:37 +0100
Message-ID: <20200820153341.171927-32-ktraynor@redhat.com> (raw)
In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com>

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 <ferruh.yigit@intel.com>
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 <ferruh.yigit@intel.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
 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 <rte_ethdev_driver.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
 
 /*
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 <rte_ethdev_driver.h>
-
 /**
  * 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 <rte_ethdev_driver.h>
+#include <rte_compat.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
 
 /**
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 <rte_ethdev_driver.h>
+#include <rte_compat.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
 
 /**
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 <rte_ethdev_driver.h>
-+#include <rte_compat.h>
- 
- /**
+ 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)


  parent reply	other threads:[~2020-08-20 15:35 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: allow getting info for unknown device' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: fill NUMA socket ID in info' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: export dump function in map file' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'cfgfile: fix stack buffer underflow' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'test/crypto: fix asymmetric session mempool creation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'common/cpt: fix encryption offset' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix core mapping reset' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe: report 10Mbps link speed for x553' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/iavf: fix uninitialized variable' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: remove dead code' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/i40e: fix getting EEPROM information' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: use clock time in throughput calculation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: fix burst percentage " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix log type for some error messages' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix C++ linkage' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix unneeded replacement of TCP checksum 0' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix checksum on big endian CPUs' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'eal: fix parentheses in alignment macros' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'vhost: fix virtio ready flag check' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'bus/fslmc: fix getting FD error' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/dpaa: fix FD offset data type' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix socket ID check' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/netvsc: fix underflow when Rx external mbuf' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix data room size verification in Rx queue setup' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' " Kevin Traynor
2020-08-20 15:33 ` Kevin Traynor [this message]
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix LACP negotiation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bnxt: remove unused enum declaration' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix parsing of TDES vectors' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200820153341.171927-32-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=ferruh.yigit@intel.com \
    --cc=stable@dpdk.org \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git