* [PATCH 01/10] build: add generic support for base code in drivers
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 02/10] common/sfc_efx: use common base code build handling Bruce Richardson
` (9 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson
Add support to the drivers meson.build file for base code files with
extra cflags for compilation. This should remove the need for custom
logic in each driver.
In future, we may want to move the base code handling down the file a
little in order to get lock checking. However, this lock checking is not
done currently on base code builds, so not all drivers can safely pass
these checks. Therefore, we handle the base code files before we add on
the extra lock annotation flags.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/meson.build | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/meson.build b/drivers/meson.build
index c15319dc24..b2d2537dc8 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -145,7 +145,13 @@ foreach subpath:subdirs
pkgconfig_extra_libs = []
testpmd_sources = []
require_iova_in_mbuf = true
+ # for handling base code files which may need extra cflags
+ base_sources = []
+ base_cflags = []
+ if fs.is_dir(drv_path / 'base')
+ includes += include_directories(drv_path / 'base')
+ endif
if name.contains('/')
name = name.split('/')[1]
endif
@@ -216,6 +222,20 @@ foreach subpath:subdirs
continue
endif
+ # not all drivers base code is lock annotation safe, so do base code builds before
+ # adding on the lock annotation flags. NOTE: If no custom cflags, the lock annotation
+ # checks will be done though.
+ if base_cflags != []
+ base_lib = static_library(lib_name + '_base_lib',
+ base_sources,
+ dependencies: static_deps,
+ include_directories: includes,
+ c_args: cflags + base_cflags)
+ objs += base_lib.extract_objects(base_sources)
+ else
+ sources += base_sources
+ endif
+
enabled_drivers += name
lib_name = '_'.join(['rte', class, name])
cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=' + '.'.join([log_prefix, name])
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 02/10] common/sfc_efx: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
2025-03-31 16:09 ` [PATCH 01/10] build: add generic support for base code in drivers Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-04-01 7:10 ` Andrew Rybchenko
2025-03-31 16:09 ` [PATCH 03/10] net/hinic: " Bruce Richardson
` (8 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Andrew Rybchenko
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/common/sfc_efx/base/meson.build | 18 +++---------------
drivers/common/sfc_efx/meson.build | 3 ---
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build
index c8deb4555e..58bb5f7b4a 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -5,7 +5,7 @@
# This software was jointly developed between OKTET Labs (under contract
# for Solarflare) and Solarflare Communications, Inc.
-sources = [
+base_sources = files(
'efx_bootcfg.c',
'efx_crc32.c',
'efx_ev.c',
@@ -64,7 +64,7 @@ sources = [
'rhead_tunnel.c',
'rhead_tx.c',
'rhead_virtio.c',
-]
+)
if is_ms_compiler
extra_flags = [
@@ -80,20 +80,8 @@ else
]
endif
-c_args = cflags
foreach flag: extra_flags
if cc.has_argument(flag)
- c_args += flag
+ base_cflags += flag
endif
endforeach
-
-if build
- base_lib = static_library('sfc_base', sources,
- include_directories: includes,
- dependencies: static_rte_eal,
- c_args: c_args)
-
- base_objs = base_lib.extract_all_objects(recursive: true)
-else
- base_objs = []
-endif
diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 0cf0a23bf8..d8cb6d7b96 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -35,12 +35,9 @@ foreach flag: extra_flags
endforeach
subdir('base')
-objs = [base_objs]
deps += ['bus_pci']
sources = files(
'sfc_efx.c',
'sfc_efx_mcdi.c',
)
-
-includes += include_directories('base')
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 03/10] net/hinic: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
2025-03-31 16:09 ` [PATCH 01/10] build: add generic support for base code in drivers Bruce Richardson
2025-03-31 16:09 ` [PATCH 02/10] common/sfc_efx: use common base code build handling Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 04/10] net/intel: " Bruce Richardson
` (7 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Ziyang Xuan, Xiaoyun Wang
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
Minor note: while working on this driver, I noticed that the
dependencies of it, and the overall C flags, not the base code C flags,
are set in the "base/meson.build" file. Most drivers in DPDK have those
set in the top-level driver file, and only to have the base-code
specific changes in the base directory.
---
drivers/net/hinic/base/meson.build | 16 +++++-----------
drivers/net/hinic/meson.build | 1 -
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/net/hinic/base/meson.build b/drivers/net/hinic/base/meson.build
index 3aa53df881..9028acdf4d 100644
--- a/drivers/net/hinic/base/meson.build
+++ b/drivers/net/hinic/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Huawei Technologies Co., Ltd
-sources = [
+base_sources = files(
'hinic_pmd_api_cmd.c',
'hinic_pmd_cfg.c',
'hinic_pmd_cmdq.c',
@@ -13,7 +13,7 @@ sources = [
'hinic_pmd_nicio.c',
'hinic_pmd_wq.c',
'hinic_pmd_mbox.c',
-]
+)
extra_flags = []
# The driver runs only on arch64 machine, remove 32bit warnings
@@ -22,16 +22,10 @@ if not dpdk_conf.get('RTE_ARCH_64')
endif
foreach flag: extra_flags
- if cc.has_argument(flag)
- cflags += flag
- endif
+ if cc.has_argument(flag)
+ cflags += flag
+ endif
endforeach
deps += ['hash']
-c_args = cflags
-
-base_lib = static_library('hinic_base', sources,
- dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
- c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index 8242e0052e..36cc9431a6 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -8,7 +8,6 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
sources = files(
'hinic_pmd_ethdev.c',
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 04/10] net/intel: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (2 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 03/10] net/hinic: " Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-04-02 13:05 ` David Marchand
2025-03-31 16:09 ` [PATCH 05/10] net/ngbe: " Bruce Richardson
` (6 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, Ian Stokes, Vladimir Medvedkin,
Anatoly Burakov, Jingjing Wu, Praveen Shetty
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the drivers.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/e1000/meson.build | 3 ---
drivers/net/intel/fm10k/meson.build | 3 ---
drivers/net/intel/i40e/meson.build | 2 --
drivers/net/intel/iavf/meson.build | 1 -
drivers/net/intel/ice/base/meson.build | 22 +++++++---------------
drivers/net/intel/ice/meson.build | 2 --
drivers/net/intel/idpf/meson.build | 1 -
drivers/net/intel/ixgbe/meson.build | 3 ---
8 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/drivers/net/intel/e1000/meson.build b/drivers/net/intel/e1000/meson.build
index b52a843228..924fe4ecae 100644
--- a/drivers/net/intel/e1000/meson.build
+++ b/drivers/net/intel/e1000/meson.build
@@ -3,7 +3,6 @@
subdir('base')
-sources += base_sources
sources += files(
'e1000_logs.c',
'em_ethdev.c',
@@ -24,5 +23,3 @@ if not is_windows
'igc_txrx.c',
)
endif
-
-includes += include_directories('base')
diff --git a/drivers/net/intel/fm10k/meson.build b/drivers/net/intel/fm10k/meson.build
index e08a00cb49..fac4750f8d 100644
--- a/drivers/net/intel/fm10k/meson.build
+++ b/drivers/net/intel/fm10k/meson.build
@@ -9,7 +9,6 @@ endif
subdir('base')
-sources += base_sources
sources += files(
'fm10k_ethdev.c',
'fm10k_rxtx.c',
@@ -17,5 +16,3 @@ sources += files(
if arch_subdir == 'x86'
sources += files('fm10k_rxtx_vec.c')
endif
-
-includes += include_directories('base')
diff --git a/drivers/net/intel/i40e/meson.build b/drivers/net/intel/i40e/meson.build
index 720706ff1e..49e7f899e6 100644
--- a/drivers/net/intel/i40e/meson.build
+++ b/drivers/net/intel/i40e/meson.build
@@ -19,7 +19,6 @@ endif
subdir('base')
-sources += base_sources
sources += files(
'i40e_ethdev.c',
'i40e_rxtx.c',
@@ -36,7 +35,6 @@ sources += files(
testpmd_sources = files('i40e_testpmd.c')
deps += ['hash']
-includes += include_directories('base')
if arch_subdir == 'x86'
sources += files('i40e_rxtx_vec_sse.c')
diff --git a/drivers/net/intel/iavf/meson.build b/drivers/net/intel/iavf/meson.build
index 7e03881529..3b1da8a796 100644
--- a/drivers/net/intel/iavf/meson.build
+++ b/drivers/net/intel/iavf/meson.build
@@ -24,7 +24,6 @@ sources = files(
'iavf_ipsec_crypto.c',
'iavf_fsub.c',
)
-includes += include_directories('base')
if arch_subdir == 'x86'
sources += files('iavf_rxtx_vec_sse.c')
diff --git a/drivers/net/intel/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build
index e7ba9c34bc..f453005a1d 100644
--- a/drivers/net/intel/ice/base/meson.build
+++ b/drivers/net/intel/ice/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018-2021 Intel Corporation
-sources = [
+base_sources = files(
'ice_controlq.c',
'ice_common.c',
'ice_sched.c',
@@ -29,7 +29,7 @@ sources = [
'ice_ddp.c',
'ice_fwlog.c',
'ice_vf_mbx.c',
-]
+)
if is_ms_compiler
error_cflags = [
@@ -41,22 +41,14 @@ else
'-Wno-unused-but-set-variable',
'-Wno-unused-parameter',
]
+ # Bugzilla ID: 678
+ #if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
+ # error_cflags += ['-Wno-array-bounds']
+ #endif
endif
-# Bugzilla ID: 678
-if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
- error_cflags += ['-Wno-array-bounds']
-endif
-
-c_args = cflags
-
foreach flag: error_cflags
if cc.has_argument(flag)
- c_args += flag
+ base_cflags += flag
endif
endforeach
-
-base_lib = static_library('ice_base', sources,
- dependencies: static_rte_eal,
- c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/intel/ice/meson.build b/drivers/net/intel/ice/meson.build
index 70ec746e50..8a20d0f297 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -2,7 +2,6 @@
# Copyright(c) 2018 Intel Corporation
subdir('base')
-objs = [base_objs]
sources = files(
'ice_acl_filter.c',
@@ -19,7 +18,6 @@ sources = files(
testpmd_sources = files('ice_testpmd.c')
deps += ['hash', 'net']
-includes += include_directories('base')
if dpdk_conf.has('RTE_NET_IAVF')
deps += 'net_iavf'
diff --git a/drivers/net/intel/idpf/meson.build b/drivers/net/intel/idpf/meson.build
index 44e59c6910..a805d02ea2 100644
--- a/drivers/net/intel/idpf/meson.build
+++ b/drivers/net/intel/idpf/meson.build
@@ -11,7 +11,6 @@ subdir('base')
includes += include_directories('../iavf/base')
-sources += base_sources
sources += files(
'idpf_common_device.c',
'idpf_common_rxtx.c',
diff --git a/drivers/net/intel/ixgbe/meson.build b/drivers/net/intel/ixgbe/meson.build
index 23f5a6cb3e..d1122bb9cd 100644
--- a/drivers/net/intel/ixgbe/meson.build
+++ b/drivers/net/intel/ixgbe/meson.build
@@ -5,7 +5,6 @@ cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
subdir('base')
-sources += base_sources
sources += files(
'ixgbe_82599_bypass.c',
'ixgbe_bypass.c',
@@ -32,6 +31,4 @@ elif arch_subdir == 'arm'
sources += files('ixgbe_recycle_mbufs_vec_common.c')
endif
-includes += include_directories('base')
-
headers = files('rte_pmd_ixgbe.h')
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 04/10] net/intel: use common base code build handling
2025-03-31 16:09 ` [PATCH 04/10] net/intel: " Bruce Richardson
@ 2025-04-02 13:05 ` David Marchand
2025-04-02 13:42 ` Bruce Richardson
0 siblings, 1 reply; 17+ messages in thread
From: David Marchand @ 2025-04-02 13:05 UTC (permalink / raw)
To: Bruce Richardson
Cc: dev, Ian Stokes, Vladimir Medvedkin, Anatoly Burakov,
Jingjing Wu, Praveen Shetty
On Mon, Mar 31, 2025 at 6:10 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
> diff --git a/drivers/net/intel/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build
> index e7ba9c34bc..f453005a1d 100644
> --- a/drivers/net/intel/ice/base/meson.build
> +++ b/drivers/net/intel/ice/base/meson.build
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2018-2021 Intel Corporation
>
> -sources = [
> +base_sources = files(
> 'ice_controlq.c',
> 'ice_common.c',
> 'ice_sched.c',
> @@ -29,7 +29,7 @@ sources = [
> 'ice_ddp.c',
> 'ice_fwlog.c',
> 'ice_vf_mbx.c',
> -]
> +)
>
> if is_ms_compiler
> error_cflags = [
> @@ -41,22 +41,14 @@ else
> '-Wno-unused-but-set-variable',
> '-Wno-unused-parameter',
> ]
> + # Bugzilla ID: 678
> + #if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
> + # error_cflags += ['-Wno-array-bounds']
> + #endif
Why keep it commented?
> endif
>
> -# Bugzilla ID: 678
> -if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
> - error_cflags += ['-Wno-array-bounds']
> -endif
> -
> -c_args = cflags
> -
--
David Marchand
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 04/10] net/intel: use common base code build handling
2025-04-02 13:05 ` David Marchand
@ 2025-04-02 13:42 ` Bruce Richardson
0 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-04-02 13:42 UTC (permalink / raw)
To: David Marchand
Cc: dev, Ian Stokes, Vladimir Medvedkin, Anatoly Burakov,
Jingjing Wu, Praveen Shetty
On Wed, Apr 02, 2025 at 03:05:07PM +0200, David Marchand wrote:
> On Mon, Mar 31, 2025 at 6:10 PM Bruce Richardson
> <bruce.richardson@intel.com> wrote:
> > diff --git a/drivers/net/intel/ice/base/meson.build b/drivers/net/intel/ice/base/meson.build
> > index e7ba9c34bc..f453005a1d 100644
> > --- a/drivers/net/intel/ice/base/meson.build
> > +++ b/drivers/net/intel/ice/base/meson.build
> > @@ -1,7 +1,7 @@
> > # SPDX-License-Identifier: BSD-3-Clause
> > # Copyright(c) 2018-2021 Intel Corporation
> >
> > -sources = [
> > +base_sources = files(
> > 'ice_controlq.c',
> > 'ice_common.c',
> > 'ice_sched.c',
> > @@ -29,7 +29,7 @@ sources = [
> > 'ice_ddp.c',
> > 'ice_fwlog.c',
> > 'ice_vf_mbx.c',
> > -]
> > +)
> >
> > if is_ms_compiler
> > error_cflags = [
> > @@ -41,22 +41,14 @@ else
> > '-Wno-unused-but-set-variable',
> > '-Wno-unused-parameter',
> > ]
> > + # Bugzilla ID: 678
> > + #if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
> > + # error_cflags += ['-Wno-array-bounds']
> > + #endif
>
> Why keep it commented?
>
>
This was an accidental change added in. In my testing with gcc 14, I
discovered that the warning flag was not necessary. However, I assume it is
still necessary for GCC 11 as originally added. I have not tested with a
range of GCC versions to be sure. Therefore, I'll just drop this diff in
next patch revision.
/Bruce
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 05/10] net/ngbe: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (3 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 04/10] net/intel: " Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 06/10] net/octeontx: " Bruce Richardson
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Jiawen Wu
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/ngbe/base/meson.build | 12 ++----------
drivers/net/ngbe/meson.build | 3 ---
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ngbe/base/meson.build b/drivers/net/ngbe/base/meson.build
index 86e78d4024..6932f648af 100644
--- a/drivers/net/ngbe/base/meson.build
+++ b/drivers/net/ngbe/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018-2021 Beijing WangXun Technology Co., Ltd.
-sources = [
+base_sources = files(
'ngbe_eeprom.c',
'ngbe_hw.c',
'ngbe_mbx.c',
@@ -11,14 +11,6 @@ sources = [
'ngbe_phy_mvl.c',
'ngbe_phy_yt.c',
'ngbe_vf.c',
-]
-
-error_cflags = []
+)
cflags += no_wvla_cflag
-c_args = cflags
-
-base_lib = static_library('ngbe_base', sources,
- dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci],
- c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/ngbe/meson.build b/drivers/net/ngbe/meson.build
index f4f8f7ee79..319eb23c35 100644
--- a/drivers/net/ngbe/meson.build
+++ b/drivers/net/ngbe/meson.build
@@ -8,7 +8,6 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
sources = files(
'ngbe_ethdev.c',
@@ -25,5 +24,3 @@ if arch_subdir == 'x86'
elif arch_subdir == 'arm'
sources += files('ngbe_rxtx_vec_neon.c')
endif
-
-includes += include_directories('base')
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 06/10] net/octeontx: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (4 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 05/10] net/ngbe: " Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 07/10] net/qede: " Bruce Richardson
` (4 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Harman Kalra
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/octeontx/base/meson.build | 19 +------------------
drivers/net/octeontx/meson.build | 3 ---
2 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index 8e5e8c1b55..244466bd36 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -1,25 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
-sources = [
+base_sources = files(
'octeontx_pkovf.c',
'octeontx_pkivf.c',
'octeontx_bgx.c',
-]
-
-depends = ['ethdev', 'mempool_octeontx']
-static_objs = []
-foreach d: depends
- if not is_variable('shared_rte_' + d)
- subdir_done()
- endif
- static_objs += get_variable('static_rte_' + d)
-endforeach
-
-c_args = cflags
-base_lib = static_library('octeontx_base', sources,
- c_args: c_args,
- dependencies: static_objs,
)
-
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 541d2d9d0b..fc8a5a73f2 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -8,7 +8,6 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
endif
subdir('base')
-objs = [base_objs]
sources = files(
'octeontx_ethdev.c',
@@ -18,6 +17,4 @@ sources = files(
deps += ['mempool_octeontx', 'eventdev']
-includes += include_directories('base')
-
cflags += no_wvla_cflag
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 07/10] net/qede: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (5 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 06/10] net/octeontx: " Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 08/10] net/thunderx: " Bruce Richardson
` (3 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Devendra Singh Rawat, Alok Prasad
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/qede/base/meson.build | 17 +++++------------
drivers/net/qede/meson.build | 1 -
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/net/qede/base/meson.build b/drivers/net/qede/base/meson.build
index 66251360bf..a6dad3ec7b 100644
--- a/drivers/net/qede/base/meson.build
+++ b/drivers/net/qede/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
-sources = [
+base_sources = files(
'bcm_osal.c',
'ecore_cxt.c',
'ecore_dcbx.c',
@@ -16,8 +16,7 @@ sources = [
'ecore_spq.c',
'ecore_sriov.c',
'ecore_vf.c',
-]
-
+)
if is_ms_compiler
error_cflags = [
@@ -51,14 +50,8 @@ else
]
endif
-c_args = cflags
foreach flag: error_cflags
- if cc.has_argument(flag)
- c_args += flag
- endif
+ if cc.has_argument(flag)
+ base_cflags += flag
+ endif
endforeach
-
-base_lib = static_library('qede_base', sources,
- dependencies: [static_rte_net, static_rte_bus_pci],
- c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 3783e24db7..e1b21d6ff5 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -8,7 +8,6 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
sources = files(
'qede_debug.c',
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 08/10] net/thunderx: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (6 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 07/10] net/qede: " Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:09 ` [PATCH 09/10] net/txgbe: " Bruce Richardson
` (2 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Jerin Jacob, Maciej Czekaj
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/thunderx/base/meson.build | 10 +---------
drivers/net/thunderx/meson.build | 3 ---
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
index cec45d0ae1..abf0b64e79 100644
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -1,16 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
-sources = [
+base_sources = files(
'nicvf_hw.c',
'nicvf_mbox.c',
'nicvf_bsvf.c',
-]
-
-c_args = cflags
-base_lib = static_library('nicvf_base', sources,
- c_args: c_args,
- dependencies: static_rte_ethdev
)
-
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index da665bd76f..03262af8ca 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -8,7 +8,6 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
endif
subdir('base')
-objs = [base_objs]
sources = files(
'nicvf_ethdev.c',
@@ -23,5 +22,3 @@ endif
if cc.has_argument('-Wno-maybe-uninitialized')
cflags += '-Wno-maybe-uninitialized'
endif
-
-includes += include_directories('base')
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 09/10] net/txgbe: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (7 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 08/10] net/thunderx: " Bruce Richardson
@ 2025-03-31 16:09 ` Bruce Richardson
2025-03-31 16:10 ` [PATCH 10/10] raw/ifpga: " Bruce Richardson
2025-04-02 13:08 ` [PATCH 00/10] centralise base code handling for drivers David Marchand
10 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:09 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Jiawen Wu, Jian Wang
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/txgbe/base/meson.build | 18 ++----------------
drivers/net/txgbe/meson.build | 3 ---
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build
index 4cf90a394a..0bb0782c92 100644
--- a/drivers/net/txgbe/base/meson.build
+++ b/drivers/net/txgbe/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
-sources = [
+base_sources = files(
'txgbe_dcb_hw.c',
'txgbe_dcb.c',
'txgbe_eeprom.c',
@@ -10,18 +10,4 @@ sources = [
'txgbe_mng.c',
'txgbe_phy.c',
'txgbe_vf.c',
-]
-
-error_cflags = []
-
-c_args = cflags
-foreach flag: error_cflags
- if cc.has_argument(flag)
- c_args += flag
- endif
-endforeach
-
-base_lib = static_library('txgbe_base', sources,
- dependencies: [static_rte_eal, static_rte_net, static_rte_bus_pci],
- c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
+)
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index d9ca3743e2..4dbbf597bb 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -8,7 +8,6 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
sources = files(
'txgbe_ethdev.c',
@@ -32,6 +31,4 @@ elif arch_subdir == 'arm'
sources += files('txgbe_rxtx_vec_neon.c')
endif
-includes += include_directories('base')
-
install_headers('rte_pmd_txgbe.h')
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 10/10] raw/ifpga: use common base code build handling
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (8 preceding siblings ...)
2025-03-31 16:09 ` [PATCH 09/10] net/txgbe: " Bruce Richardson
@ 2025-03-31 16:10 ` Bruce Richardson
2025-04-01 0:27 ` Xu, Rosen
2025-04-02 13:08 ` [PATCH 00/10] centralise base code handling for drivers David Marchand
10 siblings, 1 reply; 17+ messages in thread
From: Bruce Richardson @ 2025-03-31 16:10 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Rosen Xu
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
While making changes similar to that in other drivers, also move content
around dependencies from the base/meson.build file to the main
driver meson.build file, so that the base code file only contains the
list of base code files.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/raw/ifpga/base/meson.build | 21 ++-------------------
drivers/raw/ifpga/meson.build | 15 ++++++++++++---
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index 2de8e7ea22..efebff94e9 100644
--- a/drivers/raw/ifpga/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
-sources = [
+base_sources = files(
'ifpga_api.c',
'ifpga_enumerate.c',
'ifpga_feature_dev.c',
@@ -23,21 +23,4 @@ sources = [
'opae_i2c.c',
'opae_at24_eeprom.c',
'opae_eth_group.c',
-]
-
-rtdep = dependency('librt', required: false)
-if not rtdep.found()
- rtdep = cc.find_library('rt', required: false)
-endif
-if not rtdep.found()
- build = false
- reason = 'missing dependency, "librt"'
- subdir_done()
-endif
-
-ext_deps += rtdep
-
-base_lib = static_library('ifpga_rawdev_base', sources,
- dependencies: static_rte_eal,
- c_args: cflags)
-base_objs = base_lib.extract_all_objects(recursive: true)
+)
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 444799cfb2..4295ec04bd 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -7,8 +7,19 @@ if not has_libfdt
subdir_done()
endif
+rtdep = dependency('librt', required: false)
+if not rtdep.found()
+ rtdep = cc.find_library('rt', required: false)
+endif
+if not rtdep.found()
+ build = false
+ reason = 'missing dependency, "librt"'
+ subdir_done()
+endif
+
+ext_deps += rtdep
+
subdir('base')
-objs = [base_objs]
deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
@@ -17,6 +28,4 @@ sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c',
'afu_pmd_n3000.c', 'afu_pmd_he_lpbk.c', 'afu_pmd_he_mem.c',
'afu_pmd_he_hssi.c')
-includes += include_directories('base')
-
headers = files('rte_pmd_ifpga.h')
--
2.45.2
^ permalink raw reply [flat|nested] 17+ messages in thread* RE: [PATCH 10/10] raw/ifpga: use common base code build handling
2025-03-31 16:10 ` [PATCH 10/10] raw/ifpga: " Bruce Richardson
@ 2025-04-01 0:27 ` Xu, Rosen
0 siblings, 0 replies; 17+ messages in thread
From: Xu, Rosen @ 2025-04-01 0:27 UTC (permalink / raw)
To: Bruce Richardson, dev
Hi,
> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Tuesday, April 1, 2025 12:10 AM
> To: dev@dpdk.org
> Cc: Bruce Richardson <bruce.richardson@intel.com>; Xu, Rosen
> <rosen.xu@altera.com>
> Subject: [PATCH 10/10] raw/ifpga: use common base code build handling
>
> [You don't often get email from bruce.richardson@intel.com. Learn why this
> is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> Use the base code build handling logic in the drivers/meson.build file, rather
> than re-implementing it in the driver itself.
>
> While making changes similar to that in other drivers, also move content
> around dependencies from the base/meson.build file to the main driver
> meson.build file, so that the base code file only contains the list of base code
> files.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> drivers/raw/ifpga/base/meson.build | 21 ++-------------------
> drivers/raw/ifpga/meson.build | 15 ++++++++++++---
> 2 files changed, 14 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/raw/ifpga/base/meson.build
> b/drivers/raw/ifpga/base/meson.build
> index 2de8e7ea22..efebff94e9 100644
> --- a/drivers/raw/ifpga/base/meson.build
> +++ b/drivers/raw/ifpga/base/meson.build
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel
> Corporation
>
> -sources = [
> +base_sources = files(
> 'ifpga_api.c',
> 'ifpga_enumerate.c',
> 'ifpga_feature_dev.c',
> @@ -23,21 +23,4 @@ sources = [
> 'opae_i2c.c',
> 'opae_at24_eeprom.c',
> 'opae_eth_group.c',
> -]
> -
> -rtdep = dependency('librt', required: false) -if not rtdep.found()
> - rtdep = cc.find_library('rt', required: false)
> -endif
> -if not rtdep.found()
> - build = false
> - reason = 'missing dependency, "librt"'
> - subdir_done()
> -endif
> -
> -ext_deps += rtdep
> -
> -base_lib = static_library('ifpga_rawdev_base', sources,
> - dependencies: static_rte_eal,
> - c_args: cflags)
> -base_objs = base_lib.extract_all_objects(recursive: true)
> +)
> diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
> index 444799cfb2..4295ec04bd 100644
> --- a/drivers/raw/ifpga/meson.build
> +++ b/drivers/raw/ifpga/meson.build
> @@ -7,8 +7,19 @@ if not has_libfdt
> subdir_done()
> endif
>
> +rtdep = dependency('librt', required: false) if not rtdep.found()
> + rtdep = cc.find_library('rt', required: false) endif if not
> +rtdep.found()
> + build = false
> + reason = 'missing dependency, "librt"'
> + subdir_done()
> +endif
> +
> +ext_deps += rtdep
> +
> subdir('base')
> -objs = [base_objs]
>
> deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
> 'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke'] @@ -17,6 +28,4 @@
> sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c',
> 'afu_pmd_n3000.c', 'afu_pmd_he_lpbk.c', 'afu_pmd_he_mem.c',
> 'afu_pmd_he_hssi.c')
>
> -includes += include_directories('base')
> -
> headers = files('rte_pmd_ifpga.h')
> --
> 2.45.2
Acked-by: Rosen Xu <rosen.xu@altera.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 00/10] centralise base code handling for drivers
2025-03-31 16:09 [PATCH 00/10] centralise base code handling for drivers Bruce Richardson
` (9 preceding siblings ...)
2025-03-31 16:10 ` [PATCH 10/10] raw/ifpga: " Bruce Richardson
@ 2025-04-02 13:08 ` David Marchand
2025-04-02 13:44 ` Bruce Richardson
10 siblings, 1 reply; 17+ messages in thread
From: David Marchand @ 2025-04-02 13:08 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, Thomas Monjalon, Stephen Hemminger
On Mon, Mar 31, 2025 at 6:10 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> Many DPDK drivers use the same pattern for base code handling, having
> a meson.build file in the base code directory which optionally defines
> some custom cflags for the base code build, then builds the code as a
> static library and extracts the objects from it. (The reason behind this
> is that, in meson, cflags apply per-object, so we need to have a
> separate build object for the base code to use custom flags)
>
> This patchset deduplicates this logic by putting it into the
> drivers/meson.build file, and allowing individual drivers to then just
> specify values for "base_sources" and "base_cflags".
In general, this series lgtm.
> Depends-on: Series-34946 ("net/intel: clean up base code build")
This dependency is a bit problematic, as this series is already merged
in next-net-intel.
There will be some merge conflict to resolve.
Instead, it would have been better if next-net-intel relied on this new series.
After this series, the only remaining special case is for SVE stuff in
net/hns3 and we would have all source compiling handled by
drivers/meson.build.
Do you plan to clean it too?
--
David Marchand
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 00/10] centralise base code handling for drivers
2025-04-02 13:08 ` [PATCH 00/10] centralise base code handling for drivers David Marchand
@ 2025-04-02 13:44 ` Bruce Richardson
0 siblings, 0 replies; 17+ messages in thread
From: Bruce Richardson @ 2025-04-02 13:44 UTC (permalink / raw)
To: David Marchand; +Cc: dev, Thomas Monjalon, Stephen Hemminger
On Wed, Apr 02, 2025 at 03:08:45PM +0200, David Marchand wrote:
> On Mon, Mar 31, 2025 at 6:10 PM Bruce Richardson
> <bruce.richardson@intel.com> wrote:
> >
> > Many DPDK drivers use the same pattern for base code handling, having
> > a meson.build file in the base code directory which optionally defines
> > some custom cflags for the base code build, then builds the code as a
> > static library and extracts the objects from it. (The reason behind this
> > is that, in meson, cflags apply per-object, so we need to have a
> > separate build object for the base code to use custom flags)
> >
> > This patchset deduplicates this logic by putting it into the
> > drivers/meson.build file, and allowing individual drivers to then just
> > specify values for "base_sources" and "base_cflags".
>
> In general, this series lgtm.
>
> > Depends-on: Series-34946 ("net/intel: clean up base code build")
>
> This dependency is a bit problematic, as this series is already merged
> in next-net-intel.
> There will be some merge conflict to resolve.
> Instead, it would have been better if next-net-intel relied on this new series.
>
Maybe so, however, this was the order in which the work was done, and when
doing the next-net work I wasn't sure I'd be doing this set in this
release!
>
> After this series, the only remaining special case is for SVE stuff in
> net/hns3 and we would have all source compiling handled by
> drivers/meson.build.
> Do you plan to clean it too?
>
I wasn't aware of it, but I can take a look, hopefully soon.
/Bruce
^ permalink raw reply [flat|nested] 17+ messages in thread