Re: [dpdk-dev] [PATCH] remove unneeded eal header inclusion

Mon, 12 Aug 2019 02:39:43 -0700 

On 12-Aug-19 7:53 AM, David Marchand wrote:

Restrict this header inclusion to its real users.

Fixes: 028669bc9f0d ("eal: hide shared memory config")

Signed-off-by: David Marchand <david.march...@redhat.com>
---
  app/test/test_external_mem.c                  | 1 -
  app/test/test_malloc.c                        | 1 -
  app/test/test_memory.c                        | 1 -
  app/test/test_memzone.c                       | 1 -
  app/test/test_tailq.c                         | 1 -
  drivers/bus/fslmc/fslmc_bus.c                 | 1 -
  drivers/bus/pci/bsd/pci.c                     | 1 -
  drivers/bus/pci/linux/pci.c                   | 1 -
  drivers/bus/pci/linux/pci_uio.c               | 1 -
  drivers/bus/pci/linux/pci_vfio.c              | 1 -
  drivers/bus/vmbus/linux/vmbus_uio.c           | 1 -
  drivers/event/opdl/opdl_ring.c                | 1 -
  drivers/net/mlx4/mlx4_mr.c                    | 1 +
  drivers/net/mlx4/mlx4_mr.h                    | 1 -
  drivers/net/mlx5/mlx5.c                       | 1 -
  drivers/net/mlx5/mlx5_mr.c                    | 1 +
  drivers/net/mlx5/mlx5_mr.h                    | 1 -
  drivers/net/virtio/virtio_user/vhost_kernel.c | 1 -
  drivers/net/virtio/virtio_user/vhost_user.c   | 1 -
  drivers/raw/ifpga/ifpga_rawdev.c              | 1 -
  lib/librte_acl/rte_acl.c                      | 1 +
  lib/librte_acl/rte_acl_osdep.h                | 1 -
  lib/librte_eal/common/eal_common_memalloc.c   | 1 -
  lib/librte_eal/common/eal_common_memzone.c    | 1 -
  lib/librte_eal/common/eal_memalloc.h          | 1 -
  lib/librte_eal/common/eal_memcfg.h            | 1 -
  lib/librte_eal/common/malloc_elem.h           | 2 --
  lib/librte_eal/freebsd/eal/eal.c              | 1 -
  lib/librte_eal/freebsd/eal/eal_memory.c       | 1 -
  lib/librte_eal/linux/eal/eal.c                | 1 -
  lib/librte_eal/linux/eal/eal_memalloc.c       | 1 -
  lib/librte_eal/linux/eal/eal_memory.c         | 1 -
  lib/librte_rcu/rte_rcu_qsbr.c                 | 1 -
  33 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/app/test/test_external_mem.c b/app/test/test_external_mem.c
index 97bde1c..7eb81f6 100644
--- a/app/test/test_external_mem.c
+++ b/app/test/test_external_mem.c
@@ -13,7 +13,6 @@
  #include <rte_common.h>
  #include <rte_debug.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_errno.h>
  #include <rte_malloc.h>
  #include <rte_ring.h>
diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 7243e83..a16e28c 100644
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -12,7 +12,6 @@
#include <rte_common.h> 
  #include <rte_memory.h>
-#include <rte_eal_memconfig.h>
  #include <rte_per_lcore.h>
  #include <rte_launch.h>
  #include <rte_eal.h>
diff --git a/app/test/test_memory.c b/app/test/test_memory.c
index 3da803e..7d5ae99 100644
--- a/app/test/test_memory.c
+++ b/app/test/test_memory.c
@@ -6,7 +6,6 @@
  #include <stdint.h>
#include <rte_eal.h> 
-#include <rte_eal_memconfig.h>
  #include <rte_memory.h>
  #include <rte_common.h>
  #include <rte_memzone.h>
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 7501b63..7edfd06 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -13,7 +13,6 @@
  #include <rte_memory.h>
  #include <rte_memzone.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_common.h>
  #include <rte_string_fns.h>
  #include <rte_errno.h>
diff --git a/app/test/test_tailq.c b/app/test/test_tailq.c
index 7c9b69f..9520219 100644
--- a/app/test/test_tailq.c
+++ b/app/test/test_tailq.c
@@ -10,7 +10,6 @@
  #include <sys/queue.h>
#include <rte_eal.h> 
-#include <rte_eal_memconfig.h>
  #include <rte_string_fns.h>
  #include <rte_tailq.h>
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c 
index a2f4825..e7d240f 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -10,7 +10,6 @@
#include <rte_log.h> 
  #include <rte_bus.h>
-#include <rte_eal_memconfig.h>
  #include <rte_malloc.h>
  #include <rte_devargs.h>
  #include <rte_memcpy.h>
diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c
index 8f07ed9..7777179 100644
--- a/drivers/bus/pci/bsd/pci.c
+++ b/drivers/bus/pci/bsd/pci.c
@@ -33,7 +33,6 @@
  #include <rte_launch.h>
  #include <rte_memory.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_per_lcore.h>
  #include <rte_lcore.h>
  #include <rte_malloc.h>
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 43debaa..1ac2bff 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -9,7 +9,6 @@
  #include <rte_bus.h>
  #include <rte_pci.h>
  #include <rte_bus_pci.h>
-#include <rte_eal_memconfig.h>
  #include <rte_malloc.h>
  #include <rte_devargs.h>
  #include <rte_memcpy.h>
diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c
index f240fe4..e031361 100644
--- a/drivers/bus/pci/linux/pci_uio.c
+++ b/drivers/bus/pci/linux/pci_uio.c
@@ -20,7 +20,6 @@
  #include <rte_log.h>
  #include <rte_pci.h>
  #include <rte_bus_pci.h>
-#include <rte_eal_memconfig.h>
  #include <rte_common.h>
  #include <rte_malloc.h>
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c 
index 1ceb1c0..faf2990 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -14,7 +14,6 @@
  #include <rte_log.h>
  #include <rte_pci.h>
  #include <rte_bus_pci.h>
-#include <rte_eal_memconfig.h>
  #include <rte_malloc.h>
  #include <rte_vfio.h>
  #include <rte_eal.h>
diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c 
b/drivers/bus/vmbus/linux/vmbus_uio.c
index be6b677..10e50c9 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -14,7 +14,6 @@
  #include <rte_log.h>
  #include <rte_bus.h>
  #include <rte_memory.h>
-#include <rte_eal_memconfig.h>
  #include <rte_common.h>
  #include <rte_malloc.h>
  #include <rte_bus_vmbus.h>
diff --git a/drivers/event/opdl/opdl_ring.c b/drivers/event/opdl/opdl_ring.c
index e8b29e2..06fb5b3 100644
--- a/drivers/event/opdl/opdl_ring.c
+++ b/drivers/event/opdl/opdl_ring.c
@@ -16,7 +16,6 @@
  #include <rte_memcpy.h>
  #include <rte_memory.h>
  #include <rte_memzone.h>
-#include <rte_eal_memconfig.h>
#include "opdl_ring.h" 
  #include "opdl_log.h"
diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index 80827ce..470cee0 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -26,6 +26,7 @@
#include <rte_branch_prediction.h> 
  #include <rte_common.h>
+#include <rte_eal_memconfig.h>
  #include <rte_errno.h>
  #include <rte_malloc.h>
  #include <rte_memory.h>
diff --git a/drivers/net/mlx4/mlx4_mr.h b/drivers/net/mlx4/mlx4_mr.h
index 9d125e2..af5251a 100644
--- a/drivers/net/mlx4/mlx4_mr.h
+++ b/drivers/net/mlx4/mlx4_mr.h
@@ -19,7 +19,6 @@
  #pragma GCC diagnostic error "-Wpedantic"
  #endif
-#include <rte_eal_memconfig.h> 
  #include <rte_ethdev.h>
  #include <rte_rwlock.h>
  #include <rte_bitmap.h>
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 962c0d5..d4757cf 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -32,7 +32,6 @@
  #include <rte_bus_pci.h>
  #include <rte_common.h>
  #include <rte_config.h>
-#include <rte_eal_memconfig.h>
  #include <rte_kvargs.h>
  #include <rte_rwlock.h>
  #include <rte_spinlock.h>
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 872d059..0d549b6 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -11,6 +11,7 @@
  #pragma GCC diagnostic error "-Wpedantic"
  #endif
+#include <rte_eal_memconfig.h> 
  #include <rte_mempool.h>
  #include <rte_malloc.h>
  #include <rte_rwlock.h>
diff --git a/drivers/net/mlx5/mlx5_mr.h b/drivers/net/mlx5/mlx5_mr.h
index 89e89b7..48264c8 100644
--- a/drivers/net/mlx5/mlx5_mr.h
+++ b/drivers/net/mlx5/mlx5_mr.h
@@ -21,7 +21,6 @@
  #pragma GCC diagnostic error "-Wpedantic"
  #endif
-#include <rte_eal_memconfig.h> 
  #include <rte_ethdev.h>
  #include <rte_rwlock.h>
  #include <rte_bitmap.h>
diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c 
b/drivers/net/virtio/virtio_user/vhost_kernel.c
index 6b19180..5c81e8d 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
@@ -8,7 +8,6 @@
  #include <unistd.h>
#include <rte_memory.h> 
-#include <rte_eal_memconfig.h>
#include "vhost.h" 
  #include "virtio_user_dev.h"
diff --git a/drivers/net/virtio/virtio_user/vhost_user.c 
b/drivers/net/virtio/virtio_user/vhost_user.c
index 4b74bd2..a4b5c25 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -13,7 +13,6 @@
#include <rte_string_fns.h> 
  #include <rte_fbarray.h>
-#include <rte_eal_memconfig.h>
#include "vhost.h" 
  #include "virtio_user_dev.h"
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index fef89e6..1825143 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -10,7 +10,6 @@
  #include <fcntl.h>
  #include <rte_log.h>
  #include <rte_bus.h>
-#include <rte_eal_memconfig.h>
  #include <rte_malloc.h>
  #include <rte_devargs.h>
  #include <rte_memcpy.h>
diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c
index bd7247c..777ec4d 100644
--- a/lib/librte_acl/rte_acl.c
+++ b/lib/librte_acl/rte_acl.c
@@ -2,6 +2,7 @@
   * Copyright(c) 2010-2014 Intel Corporation
   */
+#include <rte_eal_memconfig.h> 
  #include <rte_string_fns.h>
  #include <rte_acl.h>
  #include <rte_tailq.h>
diff --git a/lib/librte_acl/rte_acl_osdep.h b/lib/librte_acl/rte_acl_osdep.h
index 68c1696..b2c262d 100644
--- a/lib/librte_acl/rte_acl_osdep.h
+++ b/lib/librte_acl/rte_acl_osdep.h
@@ -39,7 +39,6 @@
  #include <rte_branch_prediction.h>
  #include <rte_malloc.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_per_lcore.h>
  #include <rte_errno.h>
  #include <rte_string_fns.h>
diff --git a/lib/librte_eal/common/eal_common_memalloc.c 
b/lib/librte_eal/common/eal_common_memalloc.c
index 3712719..55189d0 100644
--- a/lib/librte_eal/common/eal_common_memalloc.c
+++ b/lib/librte_eal/common/eal_common_memalloc.c
@@ -9,7 +9,6 @@
  #include <rte_fbarray.h>
  #include <rte_memzone.h>
  #include <rte_memory.h>
-#include <rte_eal_memconfig.h>
  #include <rte_string_fns.h>
  #include <rte_rwlock.h>
diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c 
index ef6c909..99b8d65 100644
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -15,7 +15,6 @@
  #include <rte_memory.h>
  #include <rte_memzone.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_per_lcore.h>
  #include <rte_errno.h>
  #include <rte_string_fns.h>
diff --git a/lib/librte_eal/common/eal_memalloc.h 
b/lib/librte_eal/common/eal_memalloc.h
index b96c9c5..e953cd8 100644
--- a/lib/librte_eal/common/eal_memalloc.h
+++ b/lib/librte_eal/common/eal_memalloc.h
@@ -8,7 +8,6 @@
  #include <stdbool.h>
#include <rte_memory.h> 
-#include <rte_eal_memconfig.h>
/* 
   * Allocate segment of specified page size.
diff --git a/lib/librte_eal/common/eal_memcfg.h 
b/lib/librte_eal/common/eal_memcfg.h
index 359beb2..aea9a352 100644
--- a/lib/librte_eal/common/eal_memcfg.h
+++ b/lib/librte_eal/common/eal_memcfg.h
@@ -6,7 +6,6 @@
  #define EAL_MEMCFG_H
#include <rte_config.h> 
-#include <rte_eal_memconfig.h>
  #include <rte_malloc_heap.h>
  #include <rte_memory.h>
  #include <rte_memzone.h>
diff --git a/lib/librte_eal/common/malloc_elem.h 
b/lib/librte_eal/common/malloc_elem.h
index 207767c..a1e5f7f 100644
--- a/lib/librte_eal/common/malloc_elem.h
+++ b/lib/librte_eal/common/malloc_elem.h
@@ -7,8 +7,6 @@
#include <stdbool.h> -#include <rte_eal_memconfig.h> 
-
  #define MIN_DATA_SIZE (RTE_CACHE_LINE_SIZE)
/* dummy definition of struct so we can use pointers to it in malloc_elem struct */ 
diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
index d53f0fe..270ce54 100644
--- a/lib/librte_eal/freebsd/eal/eal.c
+++ b/lib/librte_eal/freebsd/eal/eal.c
@@ -26,7 +26,6 @@
  #include <rte_memory.h>
  #include <rte_launch.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_errno.h>
  #include <rte_per_lcore.h>
  #include <rte_lcore.h>
diff --git a/lib/librte_eal/freebsd/eal/eal_memory.c 
b/lib/librte_eal/freebsd/eal/eal_memory.c
index 9b9a057..cd31827 100644
--- a/lib/librte_eal/freebsd/eal/eal_memory.c
+++ b/lib/librte_eal/freebsd/eal/eal_memory.c
@@ -11,7 +11,6 @@
  #include <fcntl.h>
#include <rte_eal.h> 
-#include <rte_eal_memconfig.h>
  #include <rte_errno.h>
  #include <rte_log.h>
  #include <rte_string_fns.h>
diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
index 946222c..c6ad231 100644
--- a/lib/librte_eal/linux/eal/eal.c
+++ b/lib/librte_eal/linux/eal/eal.c
@@ -32,7 +32,6 @@
  #include <rte_memory.h>
  #include <rte_launch.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_errno.h>
  #include <rte_per_lcore.h>
  #include <rte_lcore.h>
diff --git a/lib/librte_eal/linux/eal/eal_memalloc.c 
b/lib/librte_eal/linux/eal/eal_memalloc.c
index 1f6a7c1..af6d0d0 100644
--- a/lib/librte_eal/linux/eal/eal_memalloc.c
+++ b/lib/librte_eal/linux/eal/eal_memalloc.c
@@ -35,7 +35,6 @@
#include <rte_common.h> 
  #include <rte_log.h>
-#include <rte_eal_memconfig.h>
  #include <rte_eal.h>
  #include <rte_errno.h>
  #include <rte_memory.h>
diff --git a/lib/librte_eal/linux/eal/eal_memory.c 
b/lib/librte_eal/linux/eal/eal_memory.c
index 1c089a1..8f62c34 100644
--- a/lib/librte_eal/linux/eal/eal_memory.c
+++ b/lib/librte_eal/linux/eal/eal_memory.c
@@ -38,7 +38,6 @@
  #include <rte_memory.h>
  #include <rte_launch.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_per_lcore.h>
  #include <rte_lcore.h>
  #include <rte_common.h>
diff --git a/lib/librte_rcu/rte_rcu_qsbr.c b/lib/librte_rcu/rte_rcu_qsbr.c
index ce7f93d..a6b66ac 100644
--- a/lib/librte_rcu/rte_rcu_qsbr.c
+++ b/lib/librte_rcu/rte_rcu_qsbr.c
@@ -14,7 +14,6 @@
  #include <rte_memory.h>
  #include <rte_malloc.h>
  #include <rte_eal.h>
-#include <rte_eal_memconfig.h>
  #include <rte_atomic.h>
  #include <rte_per_lcore.h>
  #include <rte_lcore.h>
This header is no longer needed as mem config is not exposed anymore. I did a cursory check of not removing rte_eal_memconfig.h where functions from there are still used, and didn't find any extraneous removals. 

Acked-by: Anatoly Burakov <anatoly.bura...@intel.com>

--
Thanks,
Anatoly

Reply via email to