From 7f7ac7dcd4cdf3e3834b7f81efadb8c9b6a080e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juraj=20Linke=C5=A1?= Date: Tue, 23 Mar 2021 10:06:50 +0100 Subject: [PATCH] Infra: fix NUMA count in Arm DPDK build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The default NUMA value for Taishan build is insufficient and results in failed test runs. Fix by increasing the amount to what's on the device. Change-Id: Ia7c761e81ee9063d7129472d9caa8cebbbb7e1cf Signed-off-by: Juraj Linkeš --- resources/libraries/bash/function/dpdk.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/libraries/bash/function/dpdk.sh b/resources/libraries/bash/function/dpdk.sh index 0b148aa83d..1da9aeead2 100644 --- a/resources/libraries/bash/function/dpdk.sh +++ b/resources/libraries/bash/function/dpdk.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -87,9 +87,12 @@ function dpdk_compile () { pushd "${DPDK_DIR}" || die "Pushd failed" # Patch ARM. - sed_cmd="s/'RTE_MAX_LCORE', [0-9]*/'RTE_MAX_LCORE', $(nproc --all)/" sed_file="config/arm/meson.build" - sed -i "${sed_cmd}" "${sed_file}" || die "Patch failed" + sed_cmd="s/'RTE_MAX_LCORE', [0-9]*/'RTE_MAX_LCORE', $(nproc --all)/" + sed -i "${sed_cmd}" "${sed_file}" || die "RTE_MAX_LCORE Patch failed" + sed_cmd="s/'RTE_MAX_NUMA_NODES', [0-9]*/'RTE_MAX_NUMA_NODES', " + "$(echo /sys/devices/system/node/node* | wc -w)/" + sed -i "${sed_cmd}" "${sed_file}" || die "RTE_MAX_NUMA_NODES Patch failed" # Patch L3FWD. sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128/#define RTE_TEST_RX_DESC_DEFAULT 1024/g" -- 2.16.6