From patchwork Tue Jun 4 10:42:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 54352 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F3A31BC06; Tue, 4 Jun 2019 12:42:43 +0200 (CEST) Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by dpdk.org (Postfix) with ESMTP id A4BF61BB0C for ; Tue, 4 Jun 2019 12:42:42 +0200 (CEST) Received: by mail-lj1-f193.google.com with SMTP id h11so19218105ljb.2 for ; Tue, 04 Jun 2019 03:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OtO4oXWxKPuDu+lPLCHUhNrCkeY/M7Nym1bI8ccl0+c=; b=rOCTQv8RW2Kzvvqm7Ix92Ah1BSv8zvfK5vkEdHy6EojJKKj7kxAvl4qRjbDC22ixGJ cJADFPBLn0XulXj4j1t4vWLWc0HJ7TJ1ZpigBUlGqnU1NGbgZNfyftEiNeQUeVIlTVog dLOdjz87wFLmTLkLH3lqps+1xCafoO5dHp6YPKT2LzlBynSEii9AFin11hCFB7GTBgw/ 5891rCQWKMuJxzHL1NT4Nv/eCTdtbXZFw01uySE+Li4npUIB6h6+2/kVChSL3NIlmxO5 JhukG7Jua5F8CpOm5irLWlfMiY13I4p21evinF0T84FcMW7fETb1bTVjrly5NJdA/Gpc e8Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OtO4oXWxKPuDu+lPLCHUhNrCkeY/M7Nym1bI8ccl0+c=; b=Mpjr5hF0nDa4nYOA/alcvYaIbHGDu7iGaQX2/ilP6HC06pLJZ/UXfyTPOebUBYu6U0 4cbrivbbTdH4xBLIutsRP+LiFuOXLRPHfkuEZBVl47JZbVc+7M+W9D3TFv8dLDcFT9r3 3CzcWGiD/F89L2L8XI/8UUlDHc6NSZdeZw6ujWp8bmdvtUFOSI/I70Arf2IeEB3rh3im ONgwk1RrFSZDAveMwK8QfudBDiCg6wAk8+iUHmHfA68aUcCfHkmMvbfcjSsRndD8kyIU Wn4kXqFRy/JYD9grkFTk965eq32Ke3qt+cFiizp88nHrhzq3jV7zVMyeW8Otxo6xAEaX KeyA== X-Gm-Message-State: APjAAAVgfYRLKHv0dDzPIOpR0I5ue0ijh0ZtbZiSyRf26kHCnH4Lkqg+ Ft5ZKwea6R8TrAkgaPgKdaTBTBuEq6Q= X-Google-Smtp-Source: APXvYqwftBPZOy1dtJ0261nbKqYx4VVJ34jrOkHHy9UVeTDByPSe+YuW1Qf/6rvoI+bBll3jZ8Vaqg== X-Received: by 2002:a2e:56dd:: with SMTP id k90mr3880657lje.204.1559644961973; Tue, 04 Jun 2019 03:42:41 -0700 (PDT) Received: from localhost.localdomain ([185.157.12.197]) by smtp.gmail.com with ESMTPSA id q8sm57646lfa.89.2019.06.04.03.42.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Jun 2019 03:42:41 -0700 (PDT) From: Michal Krawczyk To: dev@dpdk.org Cc: mw@semihalf.com, gtzalik@amazon.com, evgenys@amazon.com, matua@amazon.com, igorch@amazon.com, anatoly.burakov@intel.com, Michal Krawczyk , stable@dpdk.org Date: Tue, 4 Jun 2019 12:42:35 +0200 Message-Id: <1559644955-29088-1-git-send-email-mk@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1559644299-28575-1-git-send-email-mk@semihalf.com> References: <1559644299-28575-1-git-send-email-mk@semihalf.com> Subject: [dpdk-dev] [PATCH v2] net/ena: fix assigning NUMA node to IO queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Previous solution was using memzones in invalid way in hope to assign IO queue to the appropriate NUMA zone. The right way is to use socket_id from the rx/tx queue setup function and then pass it to the IO queue. Fixes: 3d3edc265fc8 ("net/ena: make coherent memory allocation NUMA-aware") Cc: stable@dpdk.org Signed-off-by: Michal Krawczyk Reviewed-by: David Marchand --- v2: * Remove gerrit change id * Add dpdk-stable to cc drivers/net/ena/ena_ethdev.c | 24 +++++------------------- drivers/net/ena/ena_ethdev.h | 2 ++ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index b6651fc..e9ccb04 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -272,22 +272,6 @@ static const struct eth_dev_ops ena_dev_ops = { .reta_query = ena_rss_reta_query, }; -#define NUMA_NO_NODE SOCKET_ID_ANY - -static inline int ena_cpu_to_node(int cpu) -{ - struct rte_config *config = rte_eal_get_configuration(); - struct rte_fbarray *arr = &config->mem_config->memzones; - const struct rte_memzone *mz; - - if (unlikely(cpu >= RTE_MAX_MEMZONE)) - return NUMA_NO_NODE; - - mz = rte_fbarray_get(arr, cpu); - - return mz->socket_id; -} - static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf, struct ena_com_rx_ctx *ena_rx_ctx) { @@ -1126,7 +1110,7 @@ static int ena_create_io_queue(struct ena_ring *ring) } ctx.qid = ena_qid; ctx.msix_vector = -1; /* interrupts not used */ - ctx.numa_node = ena_cpu_to_node(ring->id); + ctx.numa_node = ring->numa_socket_id; rc = ena_com_create_io_queue(ena_dev, &ctx); if (rc) { @@ -1224,7 +1208,7 @@ static int ena_queue_start(struct ena_ring *ring) static int ena_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - __rte_unused unsigned int socket_id, + unsigned int socket_id, const struct rte_eth_txconf *tx_conf) { struct ena_ring *txq = NULL; @@ -1262,6 +1246,7 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev, txq->next_to_clean = 0; txq->next_to_use = 0; txq->ring_size = nb_desc; + txq->numa_socket_id = socket_id; txq->tx_buffer_info = rte_zmalloc("txq->tx_buffer_info", sizeof(struct ena_tx_buffer) * @@ -1309,7 +1294,7 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev, static int ena_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - __rte_unused unsigned int socket_id, + unsigned int socket_id, __rte_unused const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { @@ -1347,6 +1332,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev, rxq->next_to_clean = 0; rxq->next_to_use = 0; rxq->ring_size = nb_desc; + rxq->numa_socket_id = socket_id; rxq->mb_pool = mp; rxq->rx_buffer_info = rte_zmalloc("rxq->buffer_info", diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h index dcc8690..9067e90 100644 --- a/drivers/net/ena/ena_ethdev.h +++ b/drivers/net/ena/ena_ethdev.h @@ -143,6 +143,8 @@ struct ena_ring { struct ena_stats_rx rx_stats; struct ena_stats_tx tx_stats; }; + + unsigned int numa_socket_id; } __rte_cache_aligned; enum ena_adapter_state {