From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 64C2CA0032; Fri, 29 Oct 2021 11:49:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3CBF410E1; Fri, 29 Oct 2021 11:49:41 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 3F771410E1 for ; Fri, 29 Oct 2021 11:49:41 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id m22so15396461wrb.0 for ; Fri, 29 Oct 2021 02:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0H0m5aLzTw6SMtett8l0m2P5H+Vu+awHskCAHcb7GDU=; b=f36RnnDXOEB3Z5OUo2Q7GyYwKwvsE906jhsh8rQsi+Gi9HoAzrSBvZhEj7J+2IAzwI n1hiTunY/Jw14bWSZeNkUFNhh3AKZFPb2W7ZS3Tbdtz9xLadXEOYL61IzLjHLMYs6+J/ v2vc0By2swS9yLNJ8iG7CKH4UmuUpxSWN16/iT7I4idwu3rtZquPqGbvjWzX/EU5mIGo 34M4LQC8T5R6AMwFZO8tU9BOVIhjEKkL0xkRtburAhKNE8ABlNgl+KCtnPrDypkmYH1R gv2K42VAqiaoVENGZ7LvVsciJChvsAngrkTOx+L9NfK6a6nkGeHZLCtNxSTKZHM0QeHE ztNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0H0m5aLzTw6SMtett8l0m2P5H+Vu+awHskCAHcb7GDU=; b=RXsIbyUi0DcXYGxRymww4gH16DYGYEazMxEdm8DTSntaKiP/Bq0cIqTAP9V4Rbyr9q huHT8/GG1hSCulkiwgZkHktfbrgy4a3bMJx2dCwqw/0nLu4L2jUE6mg0P8ImBO7709UC bzikiqGprz6xdjHClE7t+a8Fcw7D34kPRFbw1l7u2VCDcRwqqoGjJ1M+xbxRrMQgTP3I KmJc/xPo/BPAD8RJuR6dbrK5qTg4R5onzVH2AgrHbgriiHko/nLRI0XXASDsI+GTfYTs 5OcnhSz3b3JPyK8qFMSVvrIEnMfSfAeu1kLgsqZYPxBEc41GbL8AeXrqOH/do5+U79lO KCFw== X-Gm-Message-State: AOAM533alFbyuftwMzpkx0diKYjkwJveJpRXGD8mt2gIY6I6NnevwhDb 4uqSPf3mHPOL3cPaqGrxzP1hysfyfPLqcA== X-Google-Smtp-Source: ABdhPJw0/zPnYHoQnwPY9/WxmO3ZVkeuz3iV4z1N4xTLQyT7kUno6E/R0LkdBrQMdCf6YKGJgCoO1g== X-Received: by 2002:a5d:660e:: with SMTP id n14mr13136925wru.388.1635500980912; Fri, 29 Oct 2021 02:49:40 -0700 (PDT) Received: from gojira.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id w10sm5290012wrq.88.2021.10.29.02.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 02:49:40 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Cc: Anatoly Burakov , Ilyes Ben Hamouda , stable@dpdk.org Date: Fri, 29 Oct 2021 11:49:29 +0200 Message-Id: <20211029094929.29864-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] eal: fix mem alloc from control thread if socket 0 is unused X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ilyes Ben Hamouda When using rte_malloc() from a control thread, the used heap is the one from numa socket 0, which may not have available memory. Fix this by selecting the first socket which has available memory. Note: malloc_get_numa_socket() is only used from one .c file, so move it there, and remove the inline keyword. Fixes: b94580d6887e ("malloc: avoid unknown socket id") Cc: stable@dpdk.org Signed-off-by: Ilyes Ben Hamouda Signed-off-by: Olivier Matz --- lib/eal/common/malloc_heap.c | 20 ++++++++++++++++++++ lib/eal/common/malloc_heap.h | 11 ----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c index ee400f38ec..6eff9a2284 100644 --- a/lib/eal/common/malloc_heap.c +++ b/lib/eal/common/malloc_heap.c @@ -694,6 +694,26 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size, return ret; } +static unsigned int +malloc_get_numa_socket(void) +{ + const struct internal_config *conf = eal_get_internal_configuration(); + unsigned int socket_id = rte_socket_id(); + unsigned int idx; + + if (socket_id != (unsigned int)SOCKET_ID_ANY) + return socket_id; + + /* for control threads, return first socket where memory is available */ + for (idx = 0; idx < rte_socket_count(); idx++) { + socket_id = rte_socket_id_by_idx(idx); + if (conf->socket_mem[socket_id] != 0) + return socket_id; + } + + return rte_socket_id_by_idx(0); +} + void * malloc_heap_alloc(const char *type, size_t size, int socket_arg, unsigned int flags, size_t align, size_t bound, bool contig) diff --git a/lib/eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h index 3a6ec6ecf0..3a29d024b4 100644 --- a/lib/eal/common/malloc_heap.h +++ b/lib/eal/common/malloc_heap.h @@ -33,17 +33,6 @@ struct malloc_heap { char name[RTE_HEAP_NAME_MAX_LEN]; } __rte_cache_aligned; -static inline unsigned -malloc_get_numa_socket(void) -{ - unsigned socket_id = rte_socket_id(); - - if (socket_id == (unsigned)SOCKET_ID_ANY) - return 0; - - return socket_id; -} - void * malloc_heap_alloc(const char *type, size_t size, int socket, unsigned int flags, size_t align, size_t bound, bool contig); -- 2.30.2