eal: remove dead code on NUMA node detection
Checks
Commit Message
RTE_EAL_ALLOW_INV_SOCKET_ID had been introduced and documented as used
with xen dom0 support (dropped for some time now).
Closely looking at this, the code was changed later and ensures that the
socket id is in the [0..RTE_MAX_NUMA_NODES] range anyway.
Let's drop this dead code and the build option with it.
Fixes: 94ef2964148a ("eal/linux: fix numa node detection")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
config/common_base | 1 -
config/meson.build | 1 -
lib/librte_eal/common/eal_common_lcore.c | 9 ---------
3 files changed, 11 deletions(-)
Comments
On Tue, 22 Oct 2019 21:34:17 +0200
David Marchand <david.marchand@redhat.com> wrote:
> RTE_EAL_ALLOW_INV_SOCKET_ID had been introduced and documented as used
> with xen dom0 support (dropped for some time now).
>
> Closely looking at this, the code was changed later and ensures that the
> socket id is in the [0..RTE_MAX_NUMA_NODES] range anyway.
>
> Let's drop this dead code and the build option with it.
>
> Fixes: 94ef2964148a ("eal/linux: fix numa node detection")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
On 22-Oct-19 8:34 PM, David Marchand wrote:
> RTE_EAL_ALLOW_INV_SOCKET_ID had been introduced and documented as used
> with xen dom0 support (dropped for some time now).
>
> Closely looking at this, the code was changed later and ensures that the
> socket id is in the [0..RTE_MAX_NUMA_NODES] range anyway.
>
> Let's drop this dead code and the build option with it.
>
> Fixes: 94ef2964148a ("eal/linux: fix numa node detection")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
On Wed, Oct 23, 2019 at 7:49 PM Burakov, Anatoly
<anatoly.burakov@intel.com> wrote:
>
> On 22-Oct-19 8:34 PM, David Marchand wrote:
> > RTE_EAL_ALLOW_INV_SOCKET_ID had been introduced and documented as used
> > with xen dom0 support (dropped for some time now).
> >
> > Closely looking at this, the code was changed later and ensures that the
> > socket id is in the [0..RTE_MAX_NUMA_NODES] range anyway.
> >
> > Let's drop this dead code and the build option with it.
> >
> > Fixes: 94ef2964148a ("eal/linux: fix numa node detection")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>>
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Applied.
@@ -102,7 +102,6 @@ CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO
CONFIG_RTE_LOG_HISTORY=256
CONFIG_RTE_BACKTRACE=y
CONFIG_RTE_LIBEAL_USE_HPET=n
-CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n
CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
CONFIG_RTE_EAL_IGB_UIO=n
CONFIG_RTE_EAL_VFIO=n
@@ -162,7 +162,6 @@ dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
-dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id'))
# values which have defaults which may be overridden
dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
@@ -89,15 +89,6 @@ rte_eal_cpu_init(void)
/* find socket first */
socket_id = eal_cpu_socket_id(lcore_id);
- if (socket_id >= RTE_MAX_NUMA_NODES) {
-#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID
- socket_id = 0;
-#else
- RTE_LOG(ERR, EAL, "Socket ID (%u) is greater than RTE_MAX_NUMA_NODES (%d)\n",
- socket_id, RTE_MAX_NUMA_NODES);
- return -1;
-#endif
- }
lcore_to_socket_id[lcore_id] = socket_id;
/* in 1:1 mapping, record related cpu detected state */