Skip to contentSkip to conversation

some bbdev cleanups

PATCH Applied Bruce Richardson 3 participants 8 messages Oct 4, 2019 – Oct 9, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover some bbdev cleanups

As pointed out in the discussion of the patchset for building shared and static libraries separately [1], the test_bbdev_perf.c file explicitly disables some code for shared library builds. This is due to functions not being properly exported from one of the baseband drivers.

While fixing this and looking to remove the #ifdef for shared libraries, it was discovered that the per-driver macro used in that file was incorrect for use in the meson build due to inconsistencies of naming between the two builds.

Therefore, this set adjusts the macros and names of the drivers so that they are consistent across drivers, and between both meson and make. Thereafter the missing function for the fpga_lte_fec driver is exported and the #ifdef removed from the code.

After these patches are replied, the only instance of the RTE_BUILD_SHARED_LIB macro used in .c/.h file is in rte_compat.h for function versioning support.

[1] http://patches.dpdk.org/project/dpdk/list/?series=6596

Bruce Richardson (5):
drivers/baseband: align meson defines with make baseband/fpga_lte_fec: align naming to other bbdevs drivers/baseband: remove override of driver names baseband/fpga_lte_fec: add public API to map file app/test-bbdev: enable fpga_lte_fec support in shared builds

 app/test-bbdev/Makefile                                   | 3 +++
 app/test-bbdev/meson.build                                | 6 +++---
 app/test-bbdev/test_bbdev_perf.c                          | 8 +++-----
 config/common_base                                        | 2 +-
 doc/guides/bbdevs/fpga_lte_fec.rst                        | 2 +-
 drivers/baseband/Makefile                                 | 2 +-
 drivers/baseband/fpga_lte_fec/Makefile                    | 6 +++---
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.h              | 1 +
 drivers/baseband/fpga_lte_fec/meson.build                 | 1 -
 .../fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map   | 4 ++++
 drivers/baseband/meson.build                              | 4 ++--
 drivers/baseband/null/meson.build                         | 1 -
 drivers/baseband/turbo_sw/meson.build                     | 1 -
 mk/rte.app.mk                                             | 2 +-
 14 files changed, 23 insertions(+), 20 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/5 drivers/baseband: align meson defines with make

For baseband drivers, the macros used to indicate the presence of a particular driver were subtly different from that used in make. The make values hand "PMD" before the individual driver name, while in meson it came afterwards. Update meson to put the "PMD" part first.

---
 drivers/baseband/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/baseband/meson.build +1 -1
index 391bd511b..03604400e 100644
@@ -3,5 +3,5 @@
 
 drivers = ['null', 'turbo_sw', 'fpga_lte_fec']
 
-config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
+config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'
 driver_name_fmt = 'rte_pmd_@0@'
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/5 baseband/fpga_lte_fec: align naming to other bbdevs

In reply to Bruce Richardson

The fpga_lte_fec is the only bbdev driver that does not use bbdev in the name, so modify it to keep consistency with the other bbdev drivers. This will then allow later simplification due to all drivers using the same basic naming format.

---
 app/test-bbdev/meson.build             | 6 +++---
 app/test-bbdev/test_bbdev_perf.c       | 6 +++---
 config/common_base                     | 2 +-
 doc/guides/bbdevs/fpga_lte_fec.rst     | 2 +-
 drivers/baseband/Makefile              | 2 +-
 drivers/baseband/fpga_lte_fec/Makefile | 6 +++---
 mk/rte.app.mk                          | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
app/test-bbdev/meson.build +3 -3
index d3f2b7701..4f53a2ed8 100644
@@ -7,6 +7,6 @@ sources = files('main.c',
 		'test_bbdev_vector.c')
 allow_experimental_apis = true
 deps += ['bbdev', 'bus_vdev']
-if dpdk_conf.has('RTE_LIBRTE_PMD_FPGA_LTE_FEC')
-	deps += ['bbdev_fpga_lte_fec']
-endif
\ No newline at end of file
+if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC')
+	deps += ['pmd_bbdev_fpga_lte_fec']
+endif
app/test-bbdev/test_bbdev_perf.c +3 -3
index 7ab61eff8..fb9045fc5 100644
@@ -18,7 +18,7 @@
 #include <rte_hexdump.h>
 #include <rte_interrupts.h>
 
-#ifdef RTE_LIBRTE_PMD_FPGA_LTE_FEC
+#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
 #include <fpga_lte_fec.h>
 #endif
 
@@ -30,7 +30,7 @@
 #define MAX_QUEUES RTE_MAX_LCORE
 #define TEST_REPETITIONS 1000
 
-#ifdef RTE_LIBRTE_PMD_FPGA_LTE_FEC
+#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
 #define FPGA_PF_DRIVER_NAME ("intel_fpga_lte_fec_pf")
 #define FPGA_VF_DRIVER_NAME ("intel_fpga_lte_fec_vf")
 #define VF_UL_QUEUE_VALUE 4
@@ -520,7 +520,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
  * if '-i' flag is set and using fpga device
  */
 #ifndef RTE_BUILD_SHARED_LIB
-#ifdef RTE_LIBRTE_PMD_FPGA_LTE_FEC
+#ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
 	if ((get_init_device() == true) &&
 		(!strcmp(info->drv.driver_name, FPGA_PF_DRIVER_NAME))) {
 		struct fpga_lte_fec_conf conf;
config/common_base +1 -1
index 8ef75c203..c102699dd 100644
@@ -556,7 +556,7 @@ CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW=y
 #
 # Compile PMD for Intel FPGA LTE FEC bbdev device
 #
-CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC=y
+CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC=y
 
 #
 # Compile generic crypto device library
doc/guides/bbdevs/fpga_lte_fec.rst +1 -1
index 4a3061a90..206b6f4f9 100644
@@ -52,7 +52,7 @@ Installation
 
 Section 3 of the DPDK manual provides instuctions on installing and compiling DPDK. The
 default set of bbdev compile flags may be found in config/common_base, where for example
-the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC``, is already
+the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already
 set. It is assumed DPDK has been compiled using for instance:
 
 .. code-block:: console
drivers/baseband/Makefile +1 -1
index ceffc7d49..91048beca 100644
@@ -10,7 +10,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null
 DEPDIRS-null = $(core-libs)
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw
 DEPDIRS-turbo_sw = $(core-libs)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC) += fpga_lte_fec
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec
 DEPDIRS-fpga_lte_fec = $(core-libs)
 
 include $(RTE_SDK)/mk/rte.subdir.mk
drivers/baseband/fpga_lte_fec/Makefile +3 -3
index a38a396ae..2369bd27f 100644
@@ -4,7 +4,7 @@
 include $(RTE_SDK)/mk/rte.vars.mk
 
 # library name
-LIB = librte_pmd_fpga_lte_fec.a
+LIB = librte_pmd_bbdev_fpga_lte_fec.a
 
 # build flags
 CFLAGS += -DALLOW_EXPERIMENTAL_API
@@ -21,9 +21,9 @@ EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map
 LIBABIVER := 1
 
 # library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC) += fpga_lte_fec.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c
 
 # export include files
-SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC)-include += fpga_lte_fec.h
+SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h
 
 include $(RTE_SDK)/mk/rte.lib.mk
mk/rte.app.mk +1 -1
index ba5c39e01..1806abaf7 100644
@@ -226,7 +226,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD)     += -lrte_pmd_netvsc
 
 ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL)     += -lrte_pmd_bbdev_null
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FPGA_LTE_FEC) += -lrte_pmd_fpga_lte_fec
+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec
 
 # TURBO SOFTWARE PMD is dependent on the FLEXRAN library
 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw
Signature · 1 line
2.21.0
#3 lore raw

PATCH 3/5 drivers/baseband: remove override of driver names

In reply to Bruce Richardson

Now that all driver names follow a consistent pattern, remove the override of the name in each driver which adds the prefix. Instead we can just add the prefix at a higher level.

---
 drivers/baseband/fpga_lte_fec/meson.build | 1 -
 drivers/baseband/meson.build              | 4 ++--
 drivers/baseband/null/meson.build         | 1 -
 drivers/baseband/turbo_sw/meson.build     | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)
drivers/baseband/fpga_lte_fec/meson.build +0 -1
index bf44e6bba..c4d3a489a 100644
@@ -2,6 +2,5 @@
 # Copyright(c) 2019 Intel Corporation
 
 deps += ['bbdev', 'bus_vdev', 'ring', 'pci', 'bus_pci']
-name = 'bbdev_fpga_lte_fec'
 allow_experimental_apis = true
 sources = files('fpga_lte_fec.c')
drivers/baseband/meson.build +2 -2
index 03604400e..be7677f87 100644
@@ -3,5 +3,5 @@
 
 drivers = ['null', 'turbo_sw', 'fpga_lte_fec']
 
-config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'
-driver_name_fmt = 'rte_pmd_@0@'
+config_flag_fmt = 'RTE_LIBRTE_PMD_BBDEV_@0@'
+driver_name_fmt = 'rte_pmd_bbdev_@0@'
drivers/baseband/null/meson.build +0 -1
index 64c29d860..e491c7da4 100644
@@ -2,6 +2,5 @@
 # Copyright(c) 2018 Luca Boccassi <[email protected]>
 
 deps += ['bbdev', 'bus_vdev', 'ring']
-name = 'bbdev_null'
 allow_experimental_apis = true
 sources = files('bbdev_null.c')
drivers/baseband/turbo_sw/meson.build +0 -1
index 1a1f7c9a9..21c3cf819 100644
@@ -36,6 +36,5 @@ if dpdk_conf.has('RTE_BBDEV_SDK_AVX512')
 endif
 
 deps += ['bbdev', 'bus_vdev', 'ring']
-name = 'bbdev_turbo_sw'
 allow_experimental_apis = true
 sources = files('bbdev_turbo_software.c')
Signature · 1 line
2.21.0
#4 lore raw

PATCH 4/5 baseband/fpga_lte_fec: add public API to map file

In reply to Bruce Richardson

To allow shared library builds of e.g. test-bbdev app, we need to export the configure function. Since this needs to be exported as experimental by default, we update the header file to add the experimental tag there too.

---
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.h                  | 1 +
 .../fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map       | 4 ++++
 2 files changed, 5 insertions(+)
drivers/baseband/fpga_lte_fec/fpga_lte_fec.h +1 -0
index 9ae8b1226..b2e423c87 100644
@@ -62,6 +62,7 @@ struct fpga_lte_fec_conf {
  * @return
  *   Zero on success, negative value on failure.
  */
+__rte_experimental
 int
 fpga_lte_fec_configure(const char *dev_name,
 		const struct fpga_lte_fec_conf *conf);
drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map +4 -0
index e92327075..7e26c8553 100644
@@ -1,3 +1,7 @@
 DPDK_19.08 {
     local: *;
 };
+EXPERIMENTAL {
+    global:
+    fpga_lte_fec_configure;
+};
Signature · 1 line
2.21.0
#5 lore raw

PATCH 5/5 app/test-bbdev: enable fpga_lte_fec support in shared builds

In reply to Bruce Richardson

Now that the necessary function is exported from the fpga_lte_fec driver, we can enable the code paths using it in shared-library builds.

---
 app/test-bbdev/Makefile          | 3 +++
 app/test-bbdev/test_bbdev_perf.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
app/test-bbdev/Makefile +3 -0
index 6da0c8e0c..c53982ffc 100644
@@ -21,5 +21,8 @@ SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c
 SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c
 
 LDLIBS += -lm
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y)
+LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec
+endif
 
 include $(RTE_SDK)/mk/rte.app.mk
app/test-bbdev/test_bbdev_perf.c +0 -2
index fb9045fc5..d8db58ea0 100644
@@ -519,7 +519,6 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
 /* Configure fpga lte fec with PF & VF values
  * if '-i' flag is set and using fpga device
  */
-#ifndef RTE_BUILD_SHARED_LIB
 #ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
 	if ((get_init_device() == true) &&
 		(!strcmp(info->drv.driver_name, FPGA_PF_DRIVER_NAME))) {
@@ -563,7 +562,6 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
 				"Failed to configure 4G FPGA PF for bbdev %s",
 				info->dev_name);
 	}
-#endif
 #endif
 	nb_queues = RTE_MIN(rte_lcore_count(), info->drv.max_num_queues);
 	nb_queues = RTE_MIN(nb_queues, (unsigned int) MAX_QUEUES);
Signature · 1 line
2.21.0
Acked-by on v1 5/5
#6 lore raw

Re: [dpdk-dev] [PATCH 5/5] app/test-bbdev: enable fpga_lte_fec support in shared builds

Quoted 47 lines

-----Original Message-----
From: Richardson, Bruce
Sent: Friday, October 4, 2019 10:19 AM
To: [email protected]; Chautru, Nicolas <[email protected]>
Cc: Akhil Goyal <[email protected]>; Andrzej Ostruszka <[email protected]>; Richardson, Bruce <[email protected]>
Subject: [PATCH 5/5] app/test-bbdev: enable fpga_lte_fec support in shared builds

Now that the necessary function is exported from the fpga_lte_fec driver, we can enable the code paths using it in shared-library builds.

---
 app/test-bbdev/Makefile          | 3 +++
 app/test-bbdev/test_bbdev_perf.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
app/test-bbdev/Makefile +3 -0
@@ -21,5 +21,8 @@ SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c
 SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c
 
 LDLIBS += -lm
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y)
+LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec
+endif
 
 include $(RTE_SDK)/mk/rte.app.mk
app/test-bbdev/test_bbdev_perf.c +0 -1
index fb9045fc5..d8db58ea0 100644
@@ -519,7 +519,6 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
 /* Configure fpga lte fec with PF & VF values
  * if '-i' flag is set and using fpga device
  */
-#ifndef RTE_BUILD_SHARED_LIB
 #ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
 	if ((get_init_device() == true) &&
 		(!strcmp(info->drv.driver_name, FPGA_PF_DRIVER_NAME))) { @@ -563,7 +562,6 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
app/test-bbdev/test_bbdev_perf.c +0 -2
 				"Failed to configure 4G FPGA PF for bbdev %s",
 				info->dev_name);
 	}
-#endif
 #endif
 	nb_queues = RTE_MIN(rte_lcore_count(), info->drv.max_num_queues);
 	nb_queues = RTE_MIN(nb_queues, (unsigned int) MAX_QUEUES);
--
Quoted 2 lines

2.21.0

Thanks Bruce, I did review the serie and it is better and cleaner this way.
This is a non backward compatible change due to the rename of driver library but worth the update notably given more similar drivers being upstreamed next quarter.

Applied
#7 lore raw
In reply to Bruce Richardson
Quoted 23 lines

Bruce Richardson (5):
drivers/baseband: align meson defines with make baseband/fpga_lte_fec: align naming to other bbdevs drivers/baseband: remove override of driver names baseband/fpga_lte_fec: add public API to map file app/test-bbdev: enable fpga_lte_fec support in shared builds

 app/test-bbdev/Makefile                                   | 3 +++
 app/test-bbdev/meson.build                                | 6 +++---
 app/test-bbdev/test_bbdev_perf.c                          | 8 +++-----
 config/common_base                                        | 2 +-
 doc/guides/bbdevs/fpga_lte_fec.rst                        | 2 +-
 drivers/baseband/Makefile                                 | 2 +-
 drivers/baseband/fpga_lte_fec/Makefile                    | 6 +++---
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.h              | 1 +
 drivers/baseband/fpga_lte_fec/meson.build                 | 1 -
 .../fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map   | 4 ++++
 drivers/baseband/meson.build                              | 4 ++--
 drivers/baseband/null/meson.build                         | 1 -
 drivers/baseband/turbo_sw/meson.build                     | 1 -
 mk/rte.app.mk                                             | 2 +-
 14 files changed, 23 insertions(+), 20 deletions(-)
Quoted 2 lines

--
2.21.0

Applied to dpdk-next-crypto

Thanks.