rename PMDs map files to match library name and add Meson files
Subsystems (4)
cover rename PMDs map files to match library name and add Meson files
A few PMDs have a mismatch between the library filenames and the directory and maps names, so adding support for Meson is awkward or, if it already exists, the shared/static library filenames are different. Rename the map files of the following PMDs to match the libraries:
- net/liquidio
- net/thunderx
- net/sfc
- net/vmxnet3
- event/opdl
- event/octeonx
- compress/octeonx
The octeonx event PMD is the most troubling of all, as all other event PMDs have an _event suffix. So I had to rework a bit the overaching Meson file for the drivers/event directory to accomodate it, to avoid having to change the library filename which would break user apps.
Finally, Meson support is added (and build-tested only, but it looks fine) for:
- net/tap
- net/vdev_netvsc
- net/avf
- net/qede
- net/vmxnet3
- crypto/scheduler
- baseband/null
- event/opdl
Luca Boccassi (15):
build: add Meson file for TAP PMD
build: add Meson file for vdev_netvsc PMD
build: add Meson file for crypto scheduler PMD
build: add Meson files for avf PMD
build: add Meson files for qede PMD
build: add Meson file for bbdev_null PMD net/liquidio: rename version map after library file name event/opdl: rename map file to match library name
build: add Meson file for opdl_event PMD net/thunderx: rename version map after library file name net/sfc: rename version map after library file name event/octeontx: rename version map after library file name compress/octeontx: rename version map after library file name net/vmxnet3: rename version map after library file name
build: add Meson file for vmxnet3_uio PMD
config/rte_config.h | 3 +
drivers/baseband/meson.build | 7 +++
drivers/baseband/null/meson.build | 7 +++
drivers/compress/octeontx/Makefile | 2 +-
drivers/compress/octeontx/meson.build | 2 +-
...n.map => rte_pmd_octeontx_zip_version.map} | 0
drivers/crypto/meson.build | 2 +-
drivers/crypto/scheduler/meson.build | 19 +++++++
drivers/event/dpaa/meson.build | 1 +
drivers/event/dpaa2/meson.build | 1 +
drivers/event/meson.build | 4 +-
drivers/event/octeontx/Makefile | 2 +-
drivers/event/octeontx/meson.build | 1 +
...map => rte_pmd_octeontx_ssovf_version.map} | 0
drivers/event/opdl/Makefile | 2 +-
drivers/event/opdl/meson.build | 12 ++++
...ion.map => rte_pmd_opdl_event_version.map} | 0
drivers/event/skeleton/meson.build | 1 +
drivers/event/sw/meson.build | 1 +
drivers/meson.build | 1 +
drivers/net/avf/base/meson.build | 20 +++++++
drivers/net/avf/meson.build | 15 +++++
drivers/net/liquidio/Makefile | 2 +-
drivers/net/liquidio/meson.build | 1 +
...io_version.map => rte_pmd_lio_version.map} | 0
drivers/net/meson.build | 9 ++-
drivers/net/qede/base/meson.build | 57 +++++++++++++++++++
drivers/net/qede/meson.build | 14 +++++
drivers/net/sfc/Makefile | 2 +-
drivers/net/sfc/meson.build | 2 +
...ersion.map => rte_pmd_sfc_efx_version.map} | 0
drivers/net/tap/meson.build | 41 +++++++++++++
drivers/net/thunderx/Makefile | 2 +-
drivers/net/thunderx/meson.build | 1 +
...map => rte_pmd_thunderx_nicvf_version.map} | 0
drivers/net/vdev_netvsc/meson.build | 19 +++++++
drivers/net/vmxnet3/Makefile | 2 +-
drivers/net/vmxnet3/meson.build | 19 +++++++
...on.map => rte_pmd_vmxnet3_uio_version.map} | 0
39 files changed, 261 insertions(+), 13 deletions(-)
create mode 100644 drivers/baseband/meson.build
create mode 100644 drivers/baseband/null/meson.build
rename drivers/compress/octeontx/{rte_pmd_octeontx_compress_version.map => rte_pmd_octeontx_zip_version.map} (100%)
create mode 100644 drivers/crypto/scheduler/meson.build
rename drivers/event/octeontx/{rte_pmd_octeontx_event_version.map => rte_pmd_octeontx_ssovf_version.map} (100%)
create mode 100644 drivers/event/opdl/meson.build
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%)
create mode 100644 drivers/net/avf/base/meson.build
create mode 100644 drivers/net/avf/meson.build
rename drivers/net/liquidio/{rte_pmd_liquidio_version.map => rte_pmd_lio_version.map} (100%)
create mode 100644 drivers/net/qede/base/meson.build
create mode 100644 drivers/net/qede/meson.build
rename drivers/net/sfc/{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} (100%)
create mode 100644 drivers/net/tap/meson.build
rename drivers/net/thunderx/{rte_pmd_thunderx_version.map => rte_pmd_thunderx_nicvf_version.map} (100%)
create mode 100644 drivers/net/vdev_netvsc/meson.build
create mode 100644 drivers/net/vmxnet3/meson.build
rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} (100%)Signature · 1 line
2.18.0
PATCH 1/15 build: add Meson file for tap PMD
Use same autoconf generation mechanism as the MLX4/5 PMDs
--- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build
drivers/net/meson.build +1 -0
@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio']
drivers/net/tap/meson.build new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH 2/15 build: add Meson file for vdev_netvsc PMD
In reply to Luca Boccassi--- drivers/net/meson.build | 1 + drivers/net/vdev_netvsc/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/net/vdev_netvsc/meson.build
drivers/net/meson.build +1 -0
@@ -29,6 +29,7 @@ drivers = ['af_packet', 'szedata2', 'tap', 'thunderx', + 'vdev_netvsc', 'vhost', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
drivers/net/vdev_netvsc/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files('vdev_netvsc.c') + +allow_experimental_apis = true + +cflags_options = [ + '-Wall', + '-Wextra', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' +] +foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif +endforeach
Signature · 1 line
2.18.0
PATCH 3/15 build: add Meson file for crypto scheduler PMD
In reply to Luca Boccassi--- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build
drivers/crypto/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/crypto/scheduler/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +)
Signature · 1 line
2.18.0
PATCH 4/15 build: add Meson files for avf PMD
In reply to Luca Boccassi--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 36 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build
drivers/net/avf/base/meson.build new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/avf/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) +if arch_subdir == 'x86' + sources += files('avf_rxtx_vec_sse.c') +endif
drivers/net/meson.build +1 -0
@@ -3,6 +3,7 @@ drivers = ['af_packet', 'ark', + 'avf', 'avp', 'axgbe', 'bonding', 'bnx2x',
Signature · 1 line
2.18.0
PATCH 5/15 build: add Meson files for qede PMD
In reply to Luca Boccassi--- config/rte_config.h | 3 ++ drivers/net/meson.build | 2 +- drivers/net/qede/base/meson.build | 57 +++++++++++++++++++++++++++++++ drivers/net/qede/meson.build | 14 ++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 drivers/net/qede/base/meson.build create mode 100644 drivers/net/qede/meson.build
config/rte_config.h +3 -0
@@ -116,4 +116,7 @@#define RTE_PMD_RING_MAX_RX_RINGS 16#define RTE_PMD_RING_MAX_TX_RINGS 16 +/* QEDE PMD defines */ +#define RTE_LIBRTE_QEDE_FW "" +#endif /* _RTE_CONFIG_H_ */
drivers/net/meson.build +1 -1
@@ -24,7 +24,7 @@ drivers = ['af_packet', 'mvpp2', 'netvsc', 'nfp', - 'null', 'octeontx', 'pcap', 'ring', + 'null', 'octeontx', 'pcap', 'qede', 'ring', 'sfc', 'softnic', 'szedata2',
drivers/net/qede/base/meson.build new file +57 -0
57 lines not on this page · raw message
drivers/net/qede/meson.build new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c', + 'qede_main.c', + 'qede_rxtx.c', +) + +#deps += ['ethdev']
Signature · 1 line
2.18.0
Re: [PATCH 05/15] build: add Meson files for qede PMD
Quoted 9 lines
-----Original Message-----
From: Luca Boccassi <[email protected]>
Sent: Tuesday, September 11, 2018 1:34 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Mody, Rasesh <[email protected]>; Patil, Harish <[email protected]>; Shaikh, Shahed <[email protected]>; [email protected]; Thotton, Shijith <[email protected]>; Srinivasan, Srisivasubramanian
Quoted 8 lines
<[email protected]>; [email protected]; [email protected]; Jacob, Jerin <[email protected]>; Czekaj, Maciej <[email protected]>; [email protected]; [email protected]; Gupta, Ashish <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 05/15] build: add Meson files for qede PMD
.
.
drivers/net/qede/meson.build line 9
Quoted 6 lines
drivers/net/qede/meson.build new file +6
-0+subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c',
Heads up -
We have submitted a patch series in which qede_fdir.c gets renamed to qede_filter.c.
Series has not be accepted yet, so you may have to change this if our patch series gets applied before this one.
Quoted 7 lines
drivers/net/qede/meson.build new file +5
-1+ 'qede_main.c', + 'qede_rxtx.c', +) + +#deps += ['ethdev'] --2.18.0
PATCH 6/15 build: add Meson file for bbdev_null PMD
In reply to Luca Boccassi--- drivers/baseband/meson.build | 7 +++++++ drivers/baseband/null/meson.build | 7 +++++++ drivers/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 drivers/baseband/meson.build create mode 100644 drivers/baseband/null/meson.build
drivers/baseband/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +drivers = ['null'] + +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +driver_name_fmt = 'rte_pmd_@0@'
drivers/baseband/null/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# 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/meson.build +1 -0
@@ -9,6 +9,7 @@ driver_classes = ['common', 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args
Signature · 1 line
2.18.0
PATCH 7/15 net/liquidio: rename version map after library file name
In reply to Luca BoccassiThe library is called librte_pmd_lio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same
---
drivers/net/liquidio/Makefile | 2 +-
drivers/net/liquidio/meson.build | 1 +
.../{rte_pmd_liquidio_version.map => rte_pmd_lio_version.map} | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename drivers/net/liquidio/{rte_pmd_liquidio_version.map => rte_pmd_lio_version.map} (100%)drivers/net/liquidio/Makefile +1 -1
@@ -15,7 +15,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci -EXPORT_MAP := rte_pmd_liquidio_version.map +EXPORT_MAP := rte_pmd_lio_version.map LIBABIVER := 1
drivers/net/liquidio/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +name = 'lio' sources = files('base/lio_23xx_vf.c', 'base/lio_mbox.c', 'lio_ethdev.c',
drivers/net/liquidio/rte_pmd_lio_version.map renamed from drivers/net/liquidio/rte_pmd_liquidio_version.map +0 -0
Signature · 1 line
2.18.0
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 8 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>
Rather than doing this renaming, can we instead add a symlink in the install phase to map the old name to the new one? I'd like to see the consistency of directory name, map filename and driver name enforced strictly in the build system. Having exceptions is a pain.
/Bruce
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 10 lines · Bruce Richardson
Quoted 9 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and set
the name in the meson file so that the built library names with meson
and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")
Quoted 8 lines
Quoted 1 line
Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in the install phase to map the old name to the new one? I'd like to see the consistency of directory name, map filename and driver name enforced strictly in the build system. Having exceptions is a pain.
/Bruce
We could, but the pain gets shifted on packagers then - what about renaming the directory entirely to net/lio?
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 18 lines · Luca Boccassi
Quoted 17 lines · Bruce Richardson
Quoted 10 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and set
the name in the meson file so that the built library names with meson
and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in the install phase to map the old name to the new one? I'd like to see the consistency of directory name, map filename and driver name enforced strictly in the build system. Having exceptions is a pain.
Quoted 5 lines
Quoted 1 line
/Bruce
We could, but the pain gets shifted on packagers then - what about renaming the directory entirely to net/lio?
It is still an issue with packagers if the symlinks are created as part of the install step of DPDK itself (which is what I was intending)? I was thinking of adding a new post-install script for the backward compatible renames.
As for renaming the directory, I don't mind, but I'll let the driver maintainers comment on their thoughts on it.
/Bruce
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 29 lines · Bruce Richardson
Quoted 22 lines · Luca Boccassi
Quoted 21 lines · Bruce Richardson
Quoted 11 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and
set
the name in the meson file so that the built library names with meson
and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in the
install phase to map the old name to the new one? I'd like to see the
consistency of directory name, map filename and driver name enforced
strictly in the build system. Having exceptions is a pain.Quoted 5 lines
Quoted 1 line
/Bruce
We could, but the pain gets shifted on packagers then - what about renaming the directory entirely to net/lio?
Quoted 7 lines
It is still an issue with packagers if the symlinks are created as part of
the install step of DPDK itself (which is what I was intending)? I was
thinking of adding a new post-install script for the backward compatible
renames.
At least for Debian/Ubuntu, if I tell the tools that package libfoo1 needs to have libfoo.so.1.2.3, that's what it will do, without following symlinks. So a broken link will be installed in the system, unless I start tracking what symlinks are there and adding them manually to the package they belong to.
There's also the fact that by policy the library package names should match the file name of the library and its ABI revision, so libfoo.so.1.2.3 should be in libfoo1 pkg vy policy - if they mismatch, some linters tools are going to yell at me at the very least.
Quoted 4 lines
As for renaming the directory, I don't mind, but I'll let the driver maintainers comment on their thoughts on it.
/Bruce
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
In reply to Luca BoccassiQuoted 18 lines · Luca Boccassi
Quoted 17 lines · Bruce Richardson
Quoted 10 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and set
the name in the meson file so that the built library names with meson
and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in the install phase to map the old name to the new one? I'd like to see the consistency of directory name, map filename and driver name enforced strictly in the build system. Having exceptions is a pain.
Quoted 4 lines
Quoted 1 line
/Bruce
We could, but the pain gets shifted on packagers then - what about renaming the directory entirely to net/lio?
For packagers, what sort of ABI compatibility guarantees do you try and keep between releases. Is this something that just needs a one-release ABI announcement, as with other ABI changes?
/Bruce
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 28 lines · Bruce Richardson
Quoted 22 lines · Luca Boccassi
Quoted 21 lines · Bruce Richardson
Quoted 11 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and
set
the name in the meson file so that the built library names with meson
and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in the
install phase to map the old name to the new one? I'd like to see the
consistency of directory name, map filename and driver name enforced
strictly in the build system. Having exceptions is a pain.Quoted 4 lines
Quoted 1 line
/Bruce
We could, but the pain gets shifted on packagers then - what about renaming the directory entirely to net/lio?
Quoted 7 lines
For packagers, what sort of ABI compatibility guarantees do you try and
keep between releases. Is this something that just needs a one- release ABI
announcement, as with other ABI changes?/Bruce
Currently in Debian/Ubuntu we are using the ABI override (because of the sticky ABI breakage issue) so the filenames and package names are different on every release anyway.
So in theory we could change the name of the libs and packages, but what I'm mostly worried about is keeping consistency and some level of compatibility between old and new build systems, isn't that an issue?
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 37 lines · Luca Boccassi
Quoted 28 lines · Bruce Richardson
Quoted 22 lines · Luca Boccassi
Quoted 21 lines · Bruce Richardson
Quoted 11 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file and
set
the name in the meson file so that the built library names with meson
and legacy makefiles are the sameFixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in the
install phase to map the old name to the new one? I'd like to see the
consistency of directory name, map filename and driver name enforced
strictly in the build system. Having exceptions is a pain.Quoted 4 lines
Quoted 1 line
/Bruce
We could, but the pain gets shifted on packagers then - what about renaming the directory entirely to net/lio?
Quoted 7 lines
For packagers, what sort of ABI compatibility guarantees do you try and
keep between releases. Is this something that just needs a one- release ABI
announcement, as with other ABI changes?/Bruce
Quoted 8 lines
Currently in Debian/Ubuntu we are using the ABI override (because of the sticky ABI breakage issue) so the filenames and package names are different on every release anyway.
So in theory we could change the name of the libs and packages, but what I'm mostly worried about is keeping consistency and some level of compatibility between old and new build systems, isn't that an issue?
It's a good question, and I suspect everyone will have their own opinion.
Personally, I take the view that moving build system involves quite a number of changes anyway, so we should take the opportunity to clean up a few other things at the same time. This is why I'm so keep on trying to keep everything consistent as far as possible throughout the system and not put in special cases. For many of these a) if we put in lots of name overrides now we'll probably never get rid of them, and b) it's more likely that future drivers will adopt the same technique to have different naming of drivers and directories.
However, if keeping sonames consistent is a major concern, then perhaps we should look to rename some directories, like you suggested before.
/Bruce
Re: [PATCH 07/15] net/liquidio: rename version map after library file name
Quoted 75 lines · Bruce Richardson
Quoted 50 lines · Luca Boccassi
Quoted 34 lines · Bruce Richardson
Quoted 27 lines · Luca Boccassi
Quoted 26 lines · Bruce Richardson
Quoted 9 lines · Luca Boccassi
The library is called
librte_pmd_lio, so rename the map file
and
set
the name in the meson file so that the built library names with
meson
and legacy makefiles are the sameQuoted 4 lines
Fixes bad475c03fee ("net/liquidio: add to meson build")Signed-off-by Luca Boccassi <[email protected]>Rather than doing this renaming, can we instead add a symlink in
the
install phase to map the old name to the new one? I'd like to see
the
consistency of directory name, map filename and driver name enforced
strictly in the build system. Having exceptions is a pain.Quoted 5 lines
Quoted 1 line
/Bruce
We could, but the pain gets shifted on packagers then - what about
renaming the directory entirely to net/lio?Quoted 8 lines
For packagers, what sort of ABI compatibility guarantees do you try
and
keep between releases. Is this something that just needs a one- release ABI
announcement, as with other ABI changes?/Bruce
Currently in Debian/Ubuntu we are using the ABI override (because of
the sticky ABI breakage issue) so the filenames and package names are
different on every release anyway.Quoted 6 lines
So in theory we could change the name of the libs and packages, but what I'm mostly worried about is keeping consistency and some level of
compatibility between old and new build systems, isn't that an issue?It's a good question, and I suspect everyone will have their own opinion.
Personally, I take the view that moving build system involves quite a number of changes anyway, so we should take the opportunity to clean up a
few other things at the same time. This is why I'm so keep on trying to
keep everything consistent as far as possible throughout the system and not
put in special cases. For many of these a) if we put in lots of name overrides now we'll probably never get rid of them, and b) it's more likely
that future drivers will adopt the same technique to have different naming
of drivers and directories.
Quoted 5 lines
However, if keeping sonames consistent is a major concern, then perhaps we
should look to rename some directories, like you suggested before./Bruce
Actually I tend to agree, it would be better to make the libraries consistent, so I'm fine with having to deal with it once in packaging. I'll send a v2 without most of the renames.
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH 8/15 event/opdl: rename map file to match library name
In reply to Luca BoccassiSo that it can be used from Meson as well
---
drivers/event/opdl/Makefile | 2 +-
...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%)drivers/event/opdl/Makefile +1 -1
@@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_evdev_opdl_version.map +EXPORT_MAP := rte_pmd_opdl_event_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
drivers/event/opdl/rte_pmd_opdl_event_version.map renamed from drivers/event/opdl/rte_pmd_evdev_opdl_version.map +0 -0
Signature · 1 line
2.18.0
PATCH 9/15 build: add Meson file for opdl_event PMD
In reply to Luca Boccassi--- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build
drivers/event/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event'
drivers/event/opdl/meson.build new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev']
Signature · 1 line
2.18.0
PATCH 10/15 net/thunderx: rename version map after library file name
In reply to Luca BoccassiThe library is called librte_pmd_thunderx_nicvf, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same
---
drivers/net/thunderx/Makefile | 2 +-
drivers/net/thunderx/meson.build | 1 +
..._thunderx_version.map => rte_pmd_thunderx_nicvf_version.map} | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename drivers/net/thunderx/{rte_pmd_thunderx_version.map => rte_pmd_thunderx_nicvf_version.map} (100%)drivers/net/thunderx/Makefile +1 -1
@@ -16,7 +16,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci -EXPORT_MAP := rte_pmd_thunderx_version.map +EXPORT_MAP := rte_pmd_thunderx_nicvf_version.map LIBABIVER := 1
drivers/net/thunderx/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +name = 'thunderx_nicvf' subdir('base') objs = [base_objs]
drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map renamed from drivers/net/thunderx/rte_pmd_thunderx_version.map +0 -0
Signature · 1 line
2.18.0
Re: [PATCH 10/15] net/thunderx: rename version map after library file name
Quoted 9 lines · Luca Boccassi
The library is called
librte_pmd_thunderx_nicvf, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the sameFixes 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")Signed-off-by Luca Boccassi <[email protected]>---
Again, I'd prefer we use a symlink if we need to enforce backward compatibility. I also think we should then use the deprecation procedure to remove those symlinks in a later version.
/Bruce
PATCH 11/15 net/sfc: rename version map after library file name
In reply to Luca BoccassiThe library is called librte_pmd_sfc_efx, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same
---
drivers/net/sfc/Makefile | 2 +-
drivers/net/sfc/meson.build | 2 ++
.../{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} | 0
3 files changed, 3 insertions(+), 1 deletion(-)
rename drivers/net/sfc/{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} (100%)drivers/net/sfc/Makefile +1 -1
@@ -60,7 +60,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*. $(foreach obj, $(BASE_DRIVER_OBJS), \ $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) -EXPORT_MAP := rte_pmd_sfc_version.map +EXPORT_MAP := rte_pmd_sfc_efx_version.map LIBABIVER := 1
drivers/net/sfc/meson.build +2 -0
@@ -6,6 +6,8 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. +name = 'sfc_efx' + if arch_subdir != 'x86' or cc.sizeof('void *') == 4 build = false endif
drivers/net/sfc/rte_pmd_sfc_efx_version.map renamed from drivers/net/sfc/rte_pmd_sfc_version.map +0 -0
Signature · 1 line
2.18.0
PATCH 12/15 event/octeontx: rename version map after library file name
In reply to Luca BoccassiThe library is called librte_pmd_octeonx_ssovf, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same.
Also refactor how the event PMDs library names are built in Meson to allow for this discrepancy in the octeonx driver (all other PMDs are called FOO_event, while this is called octeonx_ssovf)
---
drivers/event/dpaa/meson.build | 1 +
drivers/event/dpaa2/meson.build | 1 +
drivers/event/meson.build | 2 +-
drivers/event/octeontx/Makefile | 2 +-
drivers/event/octeontx/meson.build | 1 +
...ntx_event_version.map => rte_pmd_octeontx_ssovf_version.map} | 0
drivers/event/opdl/meson.build | 1 +
drivers/event/skeleton/meson.build | 1 +
drivers/event/sw/meson.build | 1 +
9 files changed, 8 insertions(+), 2 deletions(-)
rename drivers/event/octeontx/{rte_pmd_octeontx_event_version.map => rte_pmd_octeontx_ssovf_version.map} (100%)drivers/event/dpaa/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +name = 'dpaa_event' if host_machine.system() != 'linux' build = false endif
drivers/event/dpaa2/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +name = 'dpaa2_event' if host_machine.system() != 'linux' build = false endif
drivers/event/meson.build +1 -1
@@ -4,4 +4,4 @@ drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' -driver_name_fmt = 'rte_pmd_@0@_event' +driver_name_fmt = 'rte_pmd_@0@'
drivers/event/octeontx/Makefile +1 -1
@@ -19,7 +19,7 @@ LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs LDLIBS += -lrte_bus_vdev -EXPORT_MAP := rte_pmd_octeontx_event_version.map +EXPORT_MAP := rte_pmd_octeontx_ssovf_version.map LIBABIVER := 1
drivers/event/octeontx/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +name = 'octeontx_ssovf' sources = files('ssovf_worker.c', 'ssovf_evdev.c', 'ssovf_evdev_selftest.c',
drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map renamed from drivers/event/octeontx/rte_pmd_octeontx_event_version.map +0 -0
drivers/event/opdl/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi <[email protected]> +name = 'opdl_event' sources = files( 'opdl_evdev.c', 'opdl_evdev_init.c',
drivers/event/skeleton/meson.build +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +name = 'skeleton_event' sources = files('skeleton_eventdev.c') deps += ['bus_pci', 'bus_vdev']
drivers/event/sw/meson.build +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +name = 'sw_event' allow_experimental_apis = true sources = files('sw_evdev_scheduler.c', 'sw_evdev_selftest.c',
Signature · 1 line
2.18.0
PATCH 13/15 compress/octeontx: rename version map after library file name
In reply to Luca BoccassiThe library is called librte_pmd_octeonx_compress, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same
---
drivers/compress/octeontx/Makefile | 2 +-
drivers/compress/octeontx/meson.build | 2 +-
...tx_compress_version.map => rte_pmd_octeontx_zip_version.map} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/compress/octeontx/{rte_pmd_octeontx_compress_version.map => rte_pmd_octeontx_zip_version.map} (100%)drivers/compress/octeontx/Makefile +1 -1
@@ -25,6 +25,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c # versioning export map -EXPORT_MAP := rte_pmd_octeontx_compress_version.map +EXPORT_MAP := rte_pmd_octeontx_zip_version.map include $(RTE_SDK)/mk/rte.lib.mk
drivers/compress/octeontx/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc -name = 'octeontx_compress' +name = 'octeontx_zip' sources = files('otx_zip.c', 'otx_zip_pmd.c') allow_experimental_apis = true includes += include_directories('include')
drivers/compress/octeontx/rte_pmd_octeontx_zip_version.map renamed from drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map +0 -0
Signature · 1 line
2.18.0
PATCH 14/15 net/vmxnet3: rename version map after library file name
In reply to Luca BoccassiThe library is called librte_pmd_vmxnet3_uio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same
---
drivers/net/vmxnet3/Makefile | 2 +-
..._pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} (100%)drivers/net/vmxnet3/Makefile +1 -1
@@ -43,7 +43,7 @@ LDLIBS += -lrte_bus_pci VPATH += $(SRCDIR)/base -EXPORT_MAP := rte_pmd_vmxnet3_version.map +EXPORT_MAP := rte_pmd_vmxnet3_uio_version.map LIBABIVER := 1
drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map renamed from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map +0 -0
Signature · 1 line
2.18.0
Re: [PATCH 14/15] net/vmxnet3: rename version map after library file name
-----Original Message-----
From: Luca Boccassi <[email protected]>
Date: Monday, September 10, 2018 at 1:05 PM
To: "[email protected]" <[email protected]>
Cc: "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>, Yong Wang <[email protected]>, "[email protected]" <[email protected]>, "[email protected]" <[email protected]>
Subject: [PATCH 14/15] net/vmxnet3: rename version map after library file name
The library is called librte_pmd_vmxnet3_uio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same
---
Not directly related to this change but I have some question on the uio naming. The original motivation is from the following commit:
commit 1daf0aae7fd6b3bc38952e9817a1653c1258be66
Author: Thomas Monjalon <[email protected]> Date: Fri Mar 21 13:52:17 2014 +0100
vmxnet3: rename library
In order to distinguish clearly this implementation from the extension vmxnet3-usermap, it is renamed to reflect its usage of uio framework.
However, this version of vmxnet3 can also be bound to vfio-pci driver. I think having the uio naming in that case will be misleading.
drivers/net/vmxnet3/Makefile | 2 +-
..._pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} (100%)
diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile
index f1141da674..9848cd224f 100644
--- a/drivers/net/vmxnet3/Makefile
+++ b/drivers/net/vmxnet3/Makefile
@@ -43,7 +43,7 @@ LDLIBS += -lrte_bus_pci
VPATH += $(SRCDIR)/base
-EXPORT_MAP := rte_pmd_vmxnet3_version.map
+EXPORT_MAP := rte_pmd_vmxnet3_uio_version.map
LIBABIVER := 1
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map
similarity index 100%
rename from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
rename to drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map
--
2.18.0Re: [PATCH 14/15] net/vmxnet3: rename version map after library file name
13/09/2018 23:44, Yong Wang:
Quoted 16 lines
From: Luca Boccassi <[email protected]>
The library is calledlibrte_pmd_vmxnet3_uio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the sameSigned-off-by Luca Boccassi <[email protected]>---
Not directly related to this change but I have some question on the uio naming. The original motivation is from the following commit:
commit
1daf0aae7fd6b3bc38952e9817a1653c1258be66Author: Thomas Monjalon <[email protected]> Date: Fri Mar 21 13:52:17 2014 +0100vmxnet3: rename library
Quoted 7 lines
In order to distinguish clearly this implementation from the extension vmxnet3-usermap, it is renamed to reflect its usage of uio framework.
Signed-off-by Thomas Monjalon <[email protected]>Acked-by Thomas Graf <[email protected]>However, this version of vmxnet3 can also be bound to vfio-pci driver. I think having the uio naming in that case will be misleading.
Yes, i agree.
vmxnet3-usermap is not maintained anymore, so we can remove the uio suffix.
PATCH 15/15 build: add Meson file for vmxnet3_uio PMD
In reply to Luca Boccassi--- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build
drivers/net/meson.build +3 -1
@@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus
drivers/net/vmxnet3/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +name = 'vmxnet3_uio' +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', + '-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags + if cc.has_argument(flag) + cflags += flag + endif +endforeach
Signature · 1 line
2.18.0
PATCH v2 1/9 build: add Meson file for TAP PMD
In reply to Luca BoccassiUse same autoconf generation mechanism as the MLX4/5 PMDs
--- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build
drivers/net/meson.build +1 -0
@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio']
drivers/net/tap/meson.build new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v2 2/9 build: add Meson file for vdev_netvsc PMD
--- drivers/net/meson.build | 1 + drivers/net/vdev_netvsc/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/net/vdev_netvsc/meson.build
drivers/net/meson.build +1 -0
@@ -29,6 +29,7 @@ drivers = ['af_packet', 'szedata2', 'tap', 'thunderx', + 'vdev_netvsc', 'vhost', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
drivers/net/vdev_netvsc/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files('vdev_netvsc.c') + +allow_experimental_apis = true + +cflags_options = [ + '-Wall', + '-Wextra', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' +] +foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif +endforeach
Signature · 1 line
2.18.0
PATCH v2 3/9 build: add Meson file for crypto scheduler PMD
In reply to Luca Boccassi--- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build
drivers/crypto/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/crypto/scheduler/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +)
Signature · 1 line
2.18.0
PATCH v2 4/9 build: add Meson files for avf PMD
In reply to Luca Boccassi--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 36 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build
drivers/net/avf/base/meson.build new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/avf/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) +if arch_subdir == 'x86' + sources += files('avf_rxtx_vec_sse.c') +endif
drivers/net/meson.build +1 -0
@@ -3,6 +3,7 @@ drivers = ['af_packet', 'ark', + 'avf', 'avp', 'axgbe', 'bonding', 'bnx2x',
Signature · 1 line
2.18.0
Re: [PATCH v2 4/9] build: add Meson files for avf PMD
Quoted 9 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 36 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build
After applying this patch, I get lots of unused variable warnings. Gcc 6.3 on debian, you'll be glad to know.
/Bruce
Re: [PATCH v2 4/9] build: add Meson files for avf PMD
Quoted 11 lines · Bruce Richardson
Quoted 9 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 +3 files changed, 36 insertions(+)create mode 100644
drivers/net/avf/base/meson.buildcreate mode 100644drivers/net/avf/meson.build
Quoted 5 lines
After applying this patch, I get lots of unused variable warnings. Gcc 6.3
on debian, you'll be glad to know./Bruce
Yep got the same, but I'll leave that for the AVF maintainers to have fun with :-)
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [PATCH v2 4/9] build: add Meson files for avf PMD
Quoted 12 lines · Luca Boccassi
Quoted 11 lines · Bruce Richardson
Quoted 9 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 +3 files changed, 36 insertions(+)create mode 100644
drivers/net/avf/base/meson.buildcreate mode 100644drivers/net/avf/meson.build
Quoted 9 lines
Quoted 5 lines
After applying this patch, I get lots of unused variable warnings. Gcc 6.3
on debian, you'll be glad to know./Bruce
Yep got the same, but I'll leave that for the AVF maintainers to have fun with :-)
Ok, I've sent a patch to remove the unused stuff.
http://patches.dpdk.org/patch/44694/
I think this file still needs "cflags += '-Wno-strict-aliasing'" to make it work though, since those errors are tougher to remove. There also needs to be an "INC_VECTOR" define inside the x86-specific block, as is done for the IXGBE and I40E drivers.
/Bruce
PATCH v2 5/9 build: add Meson files for qede PMD
In reply to Luca Boccassi--- config/rte_config.h | 3 ++ drivers/net/meson.build | 2 +- drivers/net/qede/base/meson.build | 57 +++++++++++++++++++++++++++++++ drivers/net/qede/meson.build | 12 +++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 drivers/net/qede/base/meson.build create mode 100644 drivers/net/qede/meson.build
config/rte_config.h +3 -0
@@ -116,4 +116,7 @@#define RTE_PMD_RING_MAX_RX_RINGS 16#define RTE_PMD_RING_MAX_TX_RINGS 16 +/* QEDE PMD defines */ +#define RTE_LIBRTE_QEDE_FW "" +#endif /* _RTE_CONFIG_H_ */
drivers/net/meson.build +1 -1
@@ -24,7 +24,7 @@ drivers = ['af_packet', 'mvpp2', 'netvsc', 'nfp', - 'null', 'octeontx', 'pcap', 'ring', + 'null', 'octeontx', 'pcap', 'qede', 'ring', 'sfc', 'softnic', 'szedata2',
drivers/net/qede/base/meson.build new file +57 -0
57 lines not on this page · raw message
drivers/net/qede/meson.build new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c', + 'qede_main.c', + 'qede_rxtx.c', +)
Signature · 1 line
2.18.0
PATCH v2 6/9 build: add Meson file for bbdev_null PMD
In reply to Luca Boccassi--- drivers/baseband/meson.build | 7 +++++++ drivers/baseband/null/meson.build | 7 +++++++ drivers/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 drivers/baseband/meson.build create mode 100644 drivers/baseband/null/meson.build
drivers/baseband/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +drivers = ['null'] + +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +driver_name_fmt = 'rte_pmd_@0@'
drivers/baseband/null/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# 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/meson.build +1 -0
@@ -9,6 +9,7 @@ driver_classes = ['common', 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args
Signature · 1 line
2.18.0
PATCH v2 7/9 event/opdl: rename map file to match library name
In reply to Luca BoccassiSo that it can be used from Meson as well
---
drivers/event/opdl/Makefile | 2 +-
...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%)drivers/event/opdl/Makefile +1 -1
@@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_evdev_opdl_version.map +EXPORT_MAP := rte_pmd_opdl_event_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
drivers/event/opdl/rte_pmd_opdl_event_version.map renamed from drivers/event/opdl/rte_pmd_evdev_opdl_version.map +0 -0
Signature · 1 line
2.18.0
PATCH v2 8/9 build: add Meson file for opdl_event PMD
In reply to Luca Boccassi--- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build
drivers/event/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event'
drivers/event/opdl/meson.build new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev']
Signature · 1 line
2.18.0
PATCH v2 9/9 build: add Meson file for vmxnet3_uio PMD
In reply to Luca Boccassi--- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build
drivers/net/meson.build +3 -1
@@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus
drivers/net/vmxnet3/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', + '-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags + if cc.has_argument(flag) + cflags += flag + endif +endforeach
Signature · 1 line
2.18.0
Re: [PATCH v2 1/9] build: add Meson file for TAP PMD
In reply to Luca BoccassiQuoted 59 lines · Luca Boccassi
Use same autoconf generation mechanism as the MLX4/5 PMDs
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.builddrivers/net/meson.build +1
-0@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio']drivers/net/tap/meson.build new file +31
-0@@ -0,0 +1,41 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 Luca Boccassi <[email protected]> + +sources = files( + 'rte_eth_tap.c', + 'tap_bpf_api.c', + 'tap_flow.c', + 'tap_intr.c', + 'tap_netlink.c', + 'tap_tcmsgs.c', +) + +deps = ['bus_vdev', 'gso', 'hash'] + +cflags += '-DTAP_MAX_QUEUES=16' + +# To maintain the compatibility with the make build system +# tap_autoconf.h file is still generated. +# input array for meson symbol search: +# [ "MACRO to define if found", "header for the search", +# "enum/define", "symbol to search" ] +# +args = [ + [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_UNSPEC' ], + [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_KEY_VLAN_PRIO' ], + [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_UNSPEC' ], + [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_FD' ],
drivers/net/tap/meson.build line 41
Quoted 10 lines
drivers/net/tap/meson.build new file +10
-0+ [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_UNSPEC' ], + [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_FD' ], +] +config = configuration_data() +foreach arg:args + config.set(arg[0], cc.has_header_symbol(arg[1], arg[3])) +endforeach +configure_file(output : 'tap_autoconf.h', configuration : config)
Minor nit, arg 2 is unused, and this could be dropped, as is done in the latest version of the mlnx meson build files.
/Bruce
Re: [PATCH v2 1/9] build: add Meson file for TAP PMD
Quoted 77 lines · Bruce Richardson
Quoted 70 lines · Luca Boccassi
Use same autoconf generation mechanism as the MLX4/5 PMDs
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/meson.build | 1 +
drivers/net/tap/meson.build | 41
+++++++++++++++++++++++++++++++++++++2 files changed, 42 insertions(+)create mode 100644
drivers/net/tap/meson.builddrivers/net/meson.build +1
-0@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost','virtio']
drivers/net/tap/meson.build new file +41
-0@@ -0,0 +1,41 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 Luca Boccassi <[email protected]> + +sources = files( + 'rte_eth_tap.c', + 'tap_bpf_api.c', + 'tap_flow.c', + 'tap_intr.c', + 'tap_netlink.c', + 'tap_tcmsgs.c', +) + +deps = ['bus_vdev', 'gso', 'hash'] + +cflags += '-DTAP_MAX_QUEUES=16' + +# To maintain the compatibility with the make build system +# tap_autoconf.h file is still generated. +# input array for meson symbol search: +# [ "MACRO to define if found", "header for the search", +# "enum/define", "symbol to search" ] +# +args = [ + [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_UNSPEC' ], + [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_KEY_VLAN_PRIO' ], + [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_UNSPEC' ], + [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_FD' ], + [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_UNSPEC' ], + [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_FD' ], +] +config = configuration_data() +foreach arg:args + config.set(arg[0], cc.has_header_symbol(arg[1], arg[3])) +endforeach +configure_file(output : 'tap_autoconf.h', configuration : config)Quoted 1 line
--
Minor nit, arg 2 is unused, and this could be dropped, as is done in the
latest version of the mlnx meson build files.
Quoted 1 line
/Bruce
Ok, will fix in v3
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v3 1/9 build: add Meson file for TAP PMD
In reply to Luca BoccassiUse same autoconf generation mechanism as the MLX4/5 PMDs
--- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build
drivers/net/meson.build +1 -0
@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio']
drivers/net/tap/meson.build new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v3 2/9 build: add Meson file for vdev_netvsc PMD
--- drivers/net/meson.build | 1 + drivers/net/vdev_netvsc/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/net/vdev_netvsc/meson.build
drivers/net/meson.build +1 -0
@@ -29,6 +29,7 @@ drivers = ['af_packet', 'szedata2', 'tap', 'thunderx', + 'vdev_netvsc', 'vhost', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
drivers/net/vdev_netvsc/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files('vdev_netvsc.c') + +allow_experimental_apis = true + +cflags_options = [ + '-Wall', + '-Wextra', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' +] +foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif +endforeach
Signature · 1 line
2.18.0
PATCH v3 3/9 build: add Meson file for crypto scheduler PMD
In reply to Luca Boccassi--- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build
drivers/crypto/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/crypto/scheduler/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +)
Signature · 1 line
2.18.0
PATCH v3 4/9 build: add Meson files for avf PMD
In reply to Luca Boccassi--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 36 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build
drivers/net/avf/base/meson.build new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/avf/meson.build new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) +if arch_subdir == 'x86' + sources += files('avf_rxtx_vec_sse.c') +endif
drivers/net/meson.build +1 -0
@@ -3,6 +3,7 @@ drivers = ['af_packet', 'ark', + 'avf', 'avp', 'axgbe', 'bonding', 'bnx2x',
Signature · 1 line
2.18.0
Re: [PATCH v3 4/9] build: add Meson files for avf PMD
Quoted 46 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 36 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.builddrivers/net/avf/base/meson.build new file +20
-0@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()drivers/net/avf/meson.build new file +5
-0@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs]
drivers/net/avf/meson.build line 15
Quoted 10 lines
drivers/net/avf/meson.build new file +10
-0+ +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) +if arch_subdir == 'x86' + sources += files('avf_rxtx_vec_sse.c') +endif
Missed this set had been sent, so please see comment on V2 re. needed warning-disable flag, and need for VECTOR define flag for x86.
/Bruce
Re: [PATCH v3 4/9] build: add Meson files for avf PMD
Quoted 63 lines · Bruce Richardson
Quoted 48 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 +3 files changed, 36 insertions(+)create mode 100644
drivers/net/avf/base/meson.buildcreate mode 100644drivers/net/avf/meson.builddrivers/net/avf/base/meson.build new file +20
-0@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()drivers/net/avf/meson.build new file +5
-0@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs]drivers/net/avf/meson.build line 15
Quoted 10 lines
drivers/net/avf/meson.build new file +10
-0+ +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) +if arch_subdir == 'x86' + sources += files('avf_rxtx_vec_sse.c') +endifMissed this set had been sent, so please see comment on V2 re. needed warning-disable flag, and need for VECTOR define flag for x86.
Quoted 1 line
/Bruce
Ok, thanks, done in v4
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v3 5/9 build: add Meson files for qede PMD
In reply to Luca Boccassi--- config/rte_config.h | 3 ++ drivers/net/meson.build | 2 +- drivers/net/qede/base/meson.build | 57 +++++++++++++++++++++++++++++++ drivers/net/qede/meson.build | 12 +++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 drivers/net/qede/base/meson.build create mode 100644 drivers/net/qede/meson.build
config/rte_config.h +3 -0
@@ -116,4 +116,7 @@#define RTE_PMD_RING_MAX_RX_RINGS 16#define RTE_PMD_RING_MAX_TX_RINGS 16 +/* QEDE PMD defines */ +#define RTE_LIBRTE_QEDE_FW "" +#endif /* _RTE_CONFIG_H_ */
drivers/net/meson.build +1 -1
@@ -24,7 +24,7 @@ drivers = ['af_packet', 'mvpp2', 'netvsc', 'nfp', - 'null', 'octeontx', 'pcap', 'ring', + 'null', 'octeontx', 'pcap', 'qede', 'ring', 'sfc', 'softnic', 'szedata2',
drivers/net/qede/base/meson.build new file +57 -0
57 lines not on this page · raw message
drivers/net/qede/meson.build new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c', + 'qede_main.c', + 'qede_rxtx.c', +)
Signature · 1 line
2.18.0
PATCH v3 6/9 build: add Meson file for bbdev_null PMD
In reply to Luca Boccassi--- drivers/baseband/meson.build | 7 +++++++ drivers/baseband/null/meson.build | 7 +++++++ drivers/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 drivers/baseband/meson.build create mode 100644 drivers/baseband/null/meson.build
drivers/baseband/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +drivers = ['null'] + +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +driver_name_fmt = 'rte_pmd_@0@'
drivers/baseband/null/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# 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/meson.build +1 -0
@@ -9,6 +9,7 @@ driver_classes = ['common', 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args
Signature · 1 line
2.18.0
PATCH v3 7/9 event/opdl: rename map file to match library name
In reply to Luca BoccassiSo that it can be used from Meson as well
---
drivers/event/opdl/Makefile | 2 +-
...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%)drivers/event/opdl/Makefile +1 -1
@@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_evdev_opdl_version.map +EXPORT_MAP := rte_pmd_opdl_event_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
drivers/event/opdl/rte_pmd_opdl_event_version.map renamed from drivers/event/opdl/rte_pmd_evdev_opdl_version.map +0 -0
Signature · 1 line
2.18.0
PATCH v3 8/9 build: add Meson file for opdl_event PMD
In reply to Luca Boccassi--- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build
drivers/event/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event'
drivers/event/opdl/meson.build new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev']
Signature · 1 line
2.18.0
PATCH v3 9/9 build: add Meson file for vmxnet3_uio PMD
In reply to Luca Boccassi--- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build
drivers/net/meson.build +3 -1
@@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus
drivers/net/vmxnet3/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', + '-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags + if cc.has_argument(flag) + cflags += flag + endif +endforeach
Signature · 1 line
2.18.0
PATCH v4 1/9 build: add Meson file for TAP PMD
In reply to Luca BoccassiUse same autoconf generation mechanism as the MLX4/5 PMDs
--- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build
drivers/net/meson.build +1 -0
@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio']
drivers/net/tap/meson.build new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v4 2/9 build: add Meson file for vdev_netvsc PMD
--- drivers/net/meson.build | 1 + drivers/net/vdev_netvsc/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/net/vdev_netvsc/meson.build
drivers/net/meson.build +1 -0
@@ -29,6 +29,7 @@ drivers = ['af_packet', 'szedata2', 'tap', 'thunderx', + 'vdev_netvsc', 'vhost', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
drivers/net/vdev_netvsc/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files('vdev_netvsc.c') + +allow_experimental_apis = true + +cflags_options = [ + '-Wall', + '-Wextra', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' +] +foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif +endforeach
Signature · 1 line
2.18.0
PATCH v4 3/9 build: add Meson file for crypto scheduler PMD
In reply to Luca Boccassi--- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build
drivers/crypto/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/crypto/scheduler/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +)
Signature · 1 line
2.18.0
PATCH v4 4/9 build: add Meson files for avf PMD
In reply to Luca Boccassi--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build
drivers/net/avf/base/meson.build new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/avf/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +cflags += ['-Wno-strict-aliasing'] + +subdir('base') +objs = [base_objs] + +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) + +if arch_subdir == 'x86' + dpdk_conf.set('RTE_LIBRTE_AVF_INC_VECTOR', 1) + sources += files('avf_rxtx_vec_sse.c') +endif
drivers/net/meson.build +1 -0
@@ -3,6 +3,7 @@ drivers = ['af_packet', 'ark', + 'avf', 'avp', 'axgbe', 'bonding', 'bnx2x',
Signature · 1 line
2.18.0
PATCH v4 5/9 build: add Meson files for qede PMD
In reply to Luca Boccassi--- config/rte_config.h | 3 ++ drivers/net/meson.build | 2 +- drivers/net/qede/base/meson.build | 57 +++++++++++++++++++++++++++++++ drivers/net/qede/meson.build | 12 +++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 drivers/net/qede/base/meson.build create mode 100644 drivers/net/qede/meson.build
config/rte_config.h +3 -0
@@ -116,4 +116,7 @@#define RTE_PMD_RING_MAX_RX_RINGS 16#define RTE_PMD_RING_MAX_TX_RINGS 16 +/* QEDE PMD defines */ +#define RTE_LIBRTE_QEDE_FW "" +#endif /* _RTE_CONFIG_H_ */
drivers/net/meson.build +1 -1
@@ -24,7 +24,7 @@ drivers = ['af_packet', 'mvpp2', 'netvsc', 'nfp', - 'null', 'octeontx', 'pcap', 'ring', + 'null', 'octeontx', 'pcap', 'qede', 'ring', 'sfc', 'softnic', 'szedata2',
drivers/net/qede/base/meson.build new file +57 -0
57 lines not on this page · raw message
drivers/net/qede/meson.build new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c', + 'qede_main.c', + 'qede_rxtx.c', +)
Signature · 1 line
2.18.0
PATCH v4 6/9 build: add Meson file for bbdev_null PMD
In reply to Luca Boccassi--- drivers/baseband/meson.build | 7 +++++++ drivers/baseband/null/meson.build | 7 +++++++ drivers/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 drivers/baseband/meson.build create mode 100644 drivers/baseband/null/meson.build
drivers/baseband/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +drivers = ['null'] + +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +driver_name_fmt = 'rte_pmd_@0@'
drivers/baseband/null/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# 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/meson.build +1 -0
@@ -9,6 +9,7 @@ driver_classes = ['common', 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args
Signature · 1 line
2.18.0
PATCH v4 7/9 event/opdl: rename map file to match library name
In reply to Luca BoccassiSo that it can be used from Meson as well
---
drivers/event/opdl/Makefile | 2 +-
...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%)drivers/event/opdl/Makefile +1 -1
@@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_evdev_opdl_version.map +EXPORT_MAP := rte_pmd_opdl_event_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
drivers/event/opdl/rte_pmd_opdl_event_version.map renamed from drivers/event/opdl/rte_pmd_evdev_opdl_version.map +0 -0
Signature · 1 line
2.18.0
PATCH v4 8/9 build: add Meson file for opdl_event PMD
In reply to Luca Boccassi--- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build
drivers/event/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event'
drivers/event/opdl/meson.build new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev']
Signature · 1 line
2.18.0
PATCH v4 9/9 build: add Meson file for vmxnet3_uio PMD
In reply to Luca Boccassi--- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build
drivers/net/meson.build +3 -1
@@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus
drivers/net/vmxnet3/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', + '-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags + if cc.has_argument(flag) + cflags += flag + endif +endforeach
Signature · 1 line
2.18.0
Re: [PATCH v4 9/9] build: add Meson file for vmxnet3_uio PMD
drivers/net/meson.build
Quoted 9 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/meson.build | 4 +++-drivers/net/vmxnet3/meson.build| 18 ++++++++++++++++++2 files changed, 21 insertions(+), 1 deletion(-)create mode 100644
drivers/net/vmxnet3/meson.builddrivers/net/meson.build +0
-0
On request I've sent a v5 adding a note in the commit message that the filename of the library will be different from the one generated by the makefiles, as it doesn't have the _uio suffix, following the suggestion to avoid renames.
The following PMDs already have meson files which build a library file with a different name from the makefiles:
net/liquidio
net/thurnderx
net/sfc
event/octeontx
compress/octeontx
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [PATCH v4 9/9] build: add Meson file for vmxnet3_uio PMD
Quoted 16 lines · Luca Boccassi
drivers/net/meson.build
Quoted 9 lines · Luca Boccassi
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/meson.build | 4 +++-drivers/net/vmxnet3/meson.build| 18 ++++++++++++++++++2 files changed, 21 insertions(+), 1 deletion(-)create mode 100644
drivers/net/vmxnet3/meson.builddrivers/net/meson.build +0
-0On request I've sent a v5 adding a note in the commit message that the filename of the library will be different from the one generated by the makefiles, as it doesn't have the
_uiosuffix, following the suggestion to avoid renames.
Quoted 9 lines
The following PMDs already have meson files which build a library file with a different name from the makefiles:
net/liquidio
net/thurnderx
net/sfc
event/octeontx
compress/octeontx
We should really start pointing people to use the pkg-config files to pull in libraries, and with a properly installed DPDK using "ninja install", all .so drivers should be automatically found on the PMD_PATH. Therefore, the number of cases where built-in DPDK drivers are being explicitly loaded individually using "-d <drivername>" should be very, very few.
Regards,
/Bruce
PATCH v5 1/9 build: add Meson file for TAP PMD
In reply to Luca BoccassiUse same autoconf generation mechanism as the MLX4/5 PMDs
--- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build
drivers/net/meson.build +1 -0
@@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio']
drivers/net/tap/meson.build new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v5 2/9 build: add Meson file for vdev_netvsc PMD
--- drivers/net/meson.build | 1 + drivers/net/vdev_netvsc/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/net/vdev_netvsc/meson.build
drivers/net/meson.build +1 -0
@@ -29,6 +29,7 @@ drivers = ['af_packet', 'szedata2', 'tap', 'thunderx', + 'vdev_netvsc', 'vhost', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
drivers/net/vdev_netvsc/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files('vdev_netvsc.c') + +allow_experimental_apis = true + +cflags_options = [ + '-Wall', + '-Wextra', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' +] +foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif +endforeach
Signature · 1 line
2.18.0
PATCH v5 3/9 build: add Meson file for crypto scheduler PMD
In reply to Luca Boccassi--- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build
drivers/crypto/meson.build +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/crypto/scheduler/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +)
Signature · 1 line
2.18.0
PATCH v5 4/9 build: add Meson files for avf PMD
In reply to Luca Boccassi--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build
drivers/net/avf/base/meson.build new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects()
drivers/net/avf/meson.build new file +19 -0
@@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +cflags += ['-Wno-strict-aliasing'] + +subdir('base') +objs = [base_objs] + +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) + +if arch_subdir == 'x86' + dpdk_conf.set('RTE_LIBRTE_AVF_INC_VECTOR', 1) + sources += files('avf_rxtx_vec_sse.c') +endif
drivers/net/meson.build +1 -0
@@ -3,6 +3,7 @@ drivers = ['af_packet', 'ark', + 'avf', 'avp', 'axgbe', 'bonding', 'bnx2x',
Signature · 1 line
2.18.0
Re: [PATCH v5 4/9] build: add Meson files for avf PMD
18/09/2018 16:58, Luca Boccassi:
Quoted 6 lines
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+)
I cannot merge this patch because of compilation issues in the avf driver itself.
I will merge others and keep this one for later.
Re: [PATCH v5 4/9] build: add Meson files for avf PMD
Quoted 8 lines · Thomas Monjalon
18/09/2018 16:58, Luca Boccassi:
Quoted 6 lines
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+)
Quoted 5 lines
I cannot merge this patch because of compilation issues in the avf driver itself.
I will merge others and keep this one for later.
Those should be fixed by patches: http://patches.dpdk.org/project/dpdk/list/?series=1372
Re: [PATCH v5 4/9] build: add Meson files for avf PMD
19/09/2018 10:31, Bruce Richardson:
Quoted 9 lines · Thomas Monjalon
Quoted 8 lines
18/09/2018 16:58, Luca Boccassi:
Quoted 6 lines
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+)
Quoted 6 lines
Quoted 5 lines
I cannot merge this patch because of compilation issues in the avf driver itself.
I will merge others and keep this one for later.
Those should be fixed by patches: http://patches.dpdk.org/project/dpdk/list/?series=1372
Yes, waiting for them to be merged in next-net-intel and next-net.
Re: [PATCH v5 4/9] build: add Meson files for avf PMD
Quoted 10 lines · Thomas Monjalon
19/09/2018 10:31, Bruce Richardson:
Quoted 9 lines · Thomas Monjalon
Quoted 8 lines
18/09/2018 16:58, Luca Boccassi:
Quoted 6 lines
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+)
Quoted 9 lines
Quoted 6 lines
Quoted 5 lines
I cannot merge this patch because of compilation issues in the avf driver itself.
I will merge others and keep this one for later.
Those should be fixed by patches: http://patches.dpdk.org/project/dpdk/list/?series=1372
Yes, waiting for them to be merged in next-net-intel and next-net.
To ease tracking, I'll do a v4 of the above set and include this patch in that as a third patch. That way, we'll avoid synchronisation between the trees.
/Bruce
Re: [PATCH v5 4/9] build: add Meson files for avf PMD
Quoted 18 lines · Bruce Richardson
Quoted 17 lines · Thomas Monjalon
19/09/2018 10:31, Bruce Richardson:
Quoted 15 lines · Thomas Monjalon
Quoted 8 lines
18/09/2018 16:58, Luca Boccassi:
Quoted 6 lines
Signed-off-by Luca Boccassi <[email protected]>--- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 40 insertions(+)Quoted 5 lines
I cannot merge this patch because of compilation issues in the avf driver itself.
I will merge others and keep this one for later.
Those should be fixed by patches: http://patches.dpdk.org/project/dpdk/list/?series=1372
Quoted 7 lines
Quoted 2 lines
Yes, waiting for them to be merged in next-net-intel and next-net.
To ease tracking, I'll do a v4 of the above set and include this patch in that as a third patch. That way, we'll avoid synchronisation between the trees.
/Bruce
Now superceded by: http://patches.dpdk.org/patch/44908/ from set:
http://patches.dpdk.org/project/dpdk/list/?series=1386
/Bruce
Re: [PATCH v5 4/9] build: add Meson files for avf PMD
Quoted 32 lines · Bruce Richardson
Quoted 31 lines · Bruce Richardson
Quoted 14 lines · Thomas Monjalon
19/09/2018 10:31, Bruce Richardson:
Quoted 13 lines
Quoted 11 lines · Thomas Monjalon
18/09/2018 16:58, Luca Boccassi:
Quoted 6 lines
Signed-off-by Luca Boccassi <[email protected]>---
drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 19 +++++++++++++++++++ drivers/net/meson.build | 1 +3 files changed, 40 insertions(+)I cannot merge this patch because of compilation issues in the avf driver itself.
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
I will merge others and keep this one for later.
Those should be fixed by patches: http://patches.dpdk.org/proje
ct/dpdk/list/?series=1372Yes, waiting for them to be merged in next-net-intel and next- net.
To ease tracking, I'll do a v4 of the above set and include this patch in
that as a third patch. That way, we'll avoid synchronisation between the
trees.
Quoted 6 lines
Quoted 1 line
/Bruce
Now superceded by: http://patches.dpdk.org/patch/44908/ from set:
http://patches.dpdk.org/project/dpdk/list/?series=1386/Bruce
Great, thanks
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v5 5/9 build: add Meson files for qede PMD
In reply to Luca Boccassi--- config/rte_config.h | 3 ++ drivers/net/meson.build | 2 +- drivers/net/qede/base/meson.build | 57 +++++++++++++++++++++++++++++++ drivers/net/qede/meson.build | 12 +++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 drivers/net/qede/base/meson.build create mode 100644 drivers/net/qede/meson.build
config/rte_config.h +3 -0
@@ -116,4 +116,7 @@#define RTE_PMD_RING_MAX_RX_RINGS 16#define RTE_PMD_RING_MAX_TX_RINGS 16 +/* QEDE PMD defines */ +#define RTE_LIBRTE_QEDE_FW "" +#endif /* _RTE_CONFIG_H_ */
drivers/net/meson.build +1 -1
@@ -24,7 +24,7 @@ drivers = ['af_packet', 'mvpp2', 'netvsc', 'nfp', - 'null', 'octeontx', 'pcap', 'ring', + 'null', 'octeontx', 'pcap', 'qede', 'ring', 'sfc', 'softnic', 'szedata2',
drivers/net/qede/base/meson.build new file +57 -0
57 lines not on this page · raw message
drivers/net/qede/meson.build new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c', + 'qede_main.c', + 'qede_rxtx.c', +)
Signature · 1 line
2.18.0
PATCH v5 6/9 build: add Meson file for bbdev_null PMD
In reply to Luca Boccassi--- drivers/baseband/meson.build | 7 +++++++ drivers/baseband/null/meson.build | 7 +++++++ drivers/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 drivers/baseband/meson.build create mode 100644 drivers/baseband/null/meson.build
drivers/baseband/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +drivers = ['null'] + +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +driver_name_fmt = 'rte_pmd_@0@'
drivers/baseband/null/meson.build new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# 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/meson.build +1 -0
@@ -9,6 +9,7 @@ driver_classes = ['common', 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args
Signature · 1 line
2.18.0
PATCH v5 7/9 event/opdl: rename map file to match library name
In reply to Luca BoccassiSo that it can be used from Meson as well
---
drivers/event/opdl/Makefile | 2 +-
...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%)drivers/event/opdl/Makefile +1 -1
@@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_evdev_opdl_version.map +EXPORT_MAP := rte_pmd_opdl_event_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
drivers/event/opdl/rte_pmd_opdl_event_version.map renamed from drivers/event/opdl/rte_pmd_evdev_opdl_version.map +0 -0
Signature · 1 line
2.18.0
PATCH v5 8/9 build: add Meson file for opdl_event PMD
In reply to Luca Boccassi--- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build
drivers/event/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event'
drivers/event/opdl/meson.build new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev']
Signature · 1 line
2.18.0
PATCH v5 9/9 build: add Meson file for vmxnet3_uio PMD
In reply to Luca BoccassiNote that the library built by meson will not have the _uio suffix:
librte_pmd_vmxnet3.so - as it follows the directory name, while the legacy makefile rename it to librte_pmd_vmxnet3_uio.so.
--- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build
drivers/net/meson.build +3 -1
@@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus
drivers/net/vmxnet3/meson.build new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi <[email protected]> + +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', + '-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags + if cc.has_argument(flag) + cflags += flag + endif +endforeach
Signature · 1 line
2.18.0
Re: [PATCH v5 1/9] build: add Meson file for TAP PMD
In reply to Luca Boccassi18/09/2018 16:58, Luca Boccassi:
Quoted 3 lines
Use same autoconf generation mechanism as the MLX4/5 PMDs
Signed-off-by Luca Boccassi <[email protected]>
Series applied, except patch 4 for avf, thanks.