config/arm: add core and NUMA counts to cross files

Add support for setting core count and numa nodes in cross files. The
values specified in cross files will override the default values.
Also add missing default values to Arm config.

Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
Tested-by: Jerin Jacob <jerinj@marvell.com>
Tested-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Tested-by: Vimal Chungath <vcchunga@amazon.com>
Tested-by: Dharmik Thakkar <dharmik.thakkar@arm.com>

diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc
index 143a3c9f87d9b5c894e56a90f0e82238b11fc034..2ecc4604c0b595d2ea136ad8fac4d7ca139c9989 100644 (file)
--- a/config/arm/arm64_armada_linux_gcc
+++ b/config/arm/arm64_armada_linux_gcc
@@ -16,3 +16,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x56'
 part_number = '0xd08'
+max_lcores = 16
+max_numa_nodes = 1

diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
index 0099f5ca235e590c409b8b8b34f4878804426578..5451a01da1a912e0c7e8f7c9c4f363e1668ddf88 100644 (file)
--- a/config/arm/arm64_armv8_linux_gcc
+++ b/config/arm/arm64_armv8_linux_gcc
@@ -16,3 +16,5 @@ endian = 'little'
 # Generate binaries that are portable across all Armv8 machines
 implementer_id = 'generic'
 part_number = 'generic'
+max_lcores = 256
+max_numa_nodes = 4

diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc
index b79389d858248751de52480e541f0d02241abfac..4f56790c5ae64d3bd307db5d652a9f626bae2948 100644 (file)
--- a/config/arm/arm64_bluefield_linux_gcc
+++ b/config/arm/arm64_bluefield_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x41'
 part_number = '0xd08'
+max_lcores = 16
+max_numa_nodes = 1

diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc
index c3c8a1ef6c0e25bd374c611453abbbb928f3d5fb..8641fee63cd5ea1503d7563569f0763f5b22113e 100644 (file)
--- a/config/arm/arm64_dpaa_linux_gcc
+++ b/config/arm/arm64_dpaa_linux_gcc
@@ -16,3 +16,5 @@ endian = 'little'
 [properties]
 implementer_id = 'dpaa'
 part_number = '0xd08'
+max_lcores = 16
+max_numa_nodes = 1

diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc
index c675954fc9e937d1345004bbe855dc04cd4715fc..7cbb055106121e746347078fd519c9934b4a541f 100644 (file)
--- a/config/arm/arm64_emag_linux_gcc
+++ b/config/arm/arm64_emag_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x50'
 part_number = '0x0'
+max_lcores = 32
+max_numa_nodes = 1

diff --git a/config/arm/arm64_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc
index 022e0630396b33796467d13a1b5d5ed8cecd8343..d0bfec87d6028de4150dd5251dc223c4e0baf87c 100644 (file)
--- a/config/arm/arm64_graviton2_linux_gcc
+++ b/config/arm/arm64_graviton2_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementor_id = '0x41'
 implementor_pn = '0xd0c'
+max_lcores = 64
+max_numa_nodes = 1

diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc
index 6fb3f02ea20fb31905dd8ff99c4aed937777baca..138ae08c3c7a886ffc4b73332323217d0ea15f6b 100644 (file)
--- a/config/arm/arm64_n1sdp_linux_gcc
+++ b/config/arm/arm64_n1sdp_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x41'
 part_number = '0xd0c'
+max_lcores = 4
+max_numa_nodes = 1

diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc
index 3de5a6eb1b0ec9bb2d70eedc2c3be1151cd6ac79..d249ccf9130ead77f3d08c9de43d122a5efa636b 100644 (file)
--- a/config/arm/arm64_n2_linux_gcc
+++ b/config/arm/arm64_n2_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x41'
 part_number = '0xd49'
+max_lcores = 64
+max_numa_nodes = 1

diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc
index ac1042806212e6ab106617ecef971fb75288314e..26cf471adb4529920a3f39dec3dfdc2f343b0b15 100644 (file)
--- a/config/arm/arm64_octeontx2_linux_gcc
+++ b/config/arm/arm64_octeontx2_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x43'
 part_number = '0xb2'
+max_lcores = 36
+max_numa_nodes = 1

diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc
index b79389d858248751de52480e541f0d02241abfac..4f56790c5ae64d3bd307db5d652a9f626bae2948 100644 (file)
--- a/config/arm/arm64_stingray_linux_gcc
+++ b/config/arm/arm64_stingray_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x41'
 part_number = '0xd08'
+max_lcores = 16
+max_numa_nodes = 1

diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc
index dd257745ede530e1cb84b9b1f5d4ef7bfac486ea..c06dcdc2b307a2277ce82e3c7f6ec104f305a363 100644 (file)
--- a/config/arm/arm64_thunderx2_linux_gcc
+++ b/config/arm/arm64_thunderx2_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x43'
 part_number = '0xaf'
+max_lcores = 256
+max_numa_nodes = 2

diff --git a/config/arm/arm64_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc
index 7589662626bb4cbcf5f6ecff2c88a4389934bcce..3ba1528e48d14c9f81bc924d8aa818890a1af0d5 100644 (file)
--- a/config/arm/arm64_thunderxt88_linux_gcc
+++ b/config/arm/arm64_thunderxt88_linux_gcc
@@ -15,3 +15,5 @@ endian = 'little'
 [properties]
 implementer_id = '0x43'
 part_number = '0xa1'
+max_lcores = 96
+max_numa_nodes = 1

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 9c33490e8488dece617835de965c5eed21c906b4..d397471ebeb72e1ed217c569e38377506af7d1e9 100644 (file)
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -36,7 +36,8 @@ implementer_generic = {
        'flags': [
                ['RTE_MACHINE', '"armv8a"'],
                ['RTE_USE_C11_MEM_MODEL', true],
-               ['RTE_MAX_LCORE', 256]
+               ['RTE_MAX_LCORE', 256],
+               ['RTE_MAX_NUMA_NODES', 4]
        ],
        'part_number_config': {
                'generic': {'machine_args': ['-march=armv8-a+crc',
@@ -61,8 +62,7 @@ part_number_config_arm = {
                        ['RTE_EAL_NUMA_AWARE_HUGEPAGES', false],
                        ['RTE_LIBRTE_VHOST_NUMA', false],
                        ['RTE_MAX_MEM_MB', 1048576],
-                       ['RTE_MAX_LCORE', 80],
-                       ['RTE_MAX_NUMA_NODES', 1]
+                       ['RTE_MAX_LCORE', 80]
                ]
        },
        '0xd49': {
@@ -82,7 +82,8 @@ implementer_arm = {
                ['RTE_MACHINE', '"armv8a"'],
                ['RTE_USE_C11_MEM_MODEL', true],
                ['RTE_CACHE_LINE_SIZE', 64],
-               ['RTE_MAX_LCORE', 16]
+               ['RTE_MAX_LCORE', 16],
+               ['RTE_MAX_NUMA_NODES', 1]
        ],
        'part_number_config': part_number_config_arm
 }
@@ -119,8 +120,7 @@ implementer_cavium = {
                                ['RTE_ARM_FEATURE_ATOMICS', true],
                                ['RTE_USE_C11_MEM_MODEL', true],
                                ['RTE_CACHE_LINE_SIZE', 64],
-                               ['RTE_MAX_LCORE', 256],
-                               ['RTE_MAX_NUMA_NODES', 2]
+                               ['RTE_MAX_LCORE', 256]
                        ]
                },
                '0xb2': {

diff --git a/config/meson.build b/config/meson.build
index a3154e29c3cc66698660db607c61c01ab40c619e..19c743091300a1e4899d930aa16b0476564c285e 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -253,6 +253,21 @@ compile_time_cpuflags = []
 subdir(arch_subdir)
 dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 
+# apply cross-specific options
+if meson.is_cross_build()
+       # configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
+       cross_max_lcores = meson.get_cross_property('max_lcores', 0)
+       if cross_max_lcores != 0
+               message('Setting RTE_MAX_LCORE from cross file')
+               dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
+       endif
+       cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
+       if cross_max_numa_nodes != 0
+               message('Setting RTE_MAX_NUMA_NODES from cross file')
+               dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
+       endif
+endif
+
 # set the install path for the drivers
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 

diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
index 6a883b03026f61856d8868b3cf8a8c5b64d144f5..4e65b271c02a89ec8f037689c60a12630cd2279c 100644 (file)
--- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
@@ -134,3 +134,12 @@ you may use various combinations of implementer/part number::
 
    Supported part_numbers for 0x50:
       '0x0':     emag
+
+Other cross file options
+------------------------
+
+There are other options you may specify in a cross file to tailor the build::
+
+   Supported extra configuration
+      max_numa_nodes = n  # will set RTE_MAX_NUMA_NODES
+      max_lcores = n      # will set RTE_MAX_LCORE