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 BE771A0562 for ; Thu, 18 Mar 2021 18:37:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B1055140EA3; Thu, 18 Mar 2021 18:37:15 +0100 (CET) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by mails.dpdk.org (Postfix) with ESMTP id 9FB564067C for ; Thu, 18 Mar 2021 18:37:13 +0100 (CET) Received: by mail-qk1-f182.google.com with SMTP id l4so2814242qkl.0 for ; Thu, 18 Mar 2021 10:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xJZ+Xd5FQHgOjjbnjut3Da7ZflfSGJ/M0eR6q2Y/uqE=; b=gG+sQcS1dev98Rg8Qj9RPOpwPenO2yjAY/wnh+bygqJFMoSWRUPZtEd6NRMXZ7GoCt 6dbNorkb0FPxBRFr14PTOrw+d6Q40AG+A1Gqn+7AKqYznkGlP7oku/s2AjKW0ovdYSGG +TlBH6lVBj3QtKWb51avONhYOfKLjXCd3AFfUzixu4XgDBlmqjTvT3yK32z5YtEHTwfr RZoZEY9vHvp7mAs5wQ3QPU/f/kpSlP0ZEpHDEtWlXXUpgZZwEbWXFn8y2RNachUUI2Jf oLxVvZ2/I4z4R/pVy3cvV5dSTVICXuTcZf3l5gff532szsynQbQ+uHj6LIjIa0dVXYYJ uXKQ== 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=xJZ+Xd5FQHgOjjbnjut3Da7ZflfSGJ/M0eR6q2Y/uqE=; b=ha1INUam5wQ704Axxy7WY4XBQf5hwEYpMJhU9AC5Rf7XApBNhU5AillO4Z1iYQVLbv fp1pcPlvM7yb/YW0msG2PwTthl+NSf1Bi4h++otvyL+fMt0uzebSo4qPudthTvB7oYYE NEBqKd+BKSD9DfXwudCFOPUoEXuC2InJnbMP3hr82U6tOy6/jF8+r91w3u+zWimMg+SH KaIE09qiRrqfAZwXeFj6LKz2YDdvfKIygx50Ozp8N0HvyhDgV/mh64/8zltuH2lzgsS2 TasE2dZoWE7Lf8e7/p97PXZCa0jVtEAV/dAkj/oo3/+iGfjdn1YoqKh2nRvMdRYF2bmp RLag== X-Gm-Message-State: AOAM5338ceGZDSjo3ckQ0UUGv6GS7LWwK2dx5BEActPZ45BddP4MqdE9 X76a1RGez1kDBNCaMJeYZ4+ZC+ivk0PgzA== X-Google-Smtp-Source: ABdhPJwfKfnpEQiALIBCfcxW8BAl9IGeEnvN54zYj7mLAYmkIUCAecJJ9wuVt1GQmTqPmzwRD0kY5Q== X-Received: by 2002:a37:9dc9:: with SMTP id g192mr5276177qke.258.1616089033106; Thu, 18 Mar 2021 10:37:13 -0700 (PDT) Received: from z390.czeck.local (pool-72-74-133-40.bstnma.fios.verizon.net. [72.74.133.40]) by smtp.gmail.com with ESMTPSA id j1sm1931741qti.55.2021.03.18.10.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 10:37:12 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@intel.com, bruce.richardson@intel.com Cc: shepard.siegel@atomicrules.com, john.miller@atomicrules.com, stable@dpdk.org Date: Thu, 18 Mar 2021 13:36:56 -0400 Message-Id: <20210318173700.15102-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210318173700.15102-1-ed.czeck@atomicrules.com> References: <20210304165637.24658-1-ed.czeck@atomicrules.com> <20210318173700.15102-1-ed.czeck@atomicrules.com> Subject: [dpdk-stable] [PATCH v5 2/6] net/ark: refactor Rx buffer recovery X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Allocate mbufs for Rx path in bulk of at least 64 buffers to improve performance. Allow recovery even without a Rx operation to support lack of buffers in pool. Fixes: be410a861598 ("net/ark: add recovery for lack of mbufs") Cc: stable@dpdk.org Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev_rx.c | 49 ++++++++------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index d29d3db78..8e55b851a 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -26,9 +26,6 @@ static uint32_t eth_ark_rx_jumbo(struct ark_rx_queue *queue, struct rte_mbuf *mbuf0, uint32_t cons_index); static inline int eth_ark_rx_seed_mbufs(struct ark_rx_queue *queue); -static int eth_ark_rx_seed_recovery(struct ark_rx_queue *queue, - uint32_t *pnb, - struct rte_mbuf **mbufs); /* ************************************************************************* */ struct ark_rx_queue { @@ -54,7 +51,7 @@ struct ark_rx_queue { /* The queue Index is used within the dpdk device structures */ uint16_t queue_index; - uint32_t last_cons; + uint32_t unused; /* separate cache line */ /* second cache line - fields only used in slow path */ @@ -105,9 +102,8 @@ static inline void eth_ark_rx_update_cons_index(struct ark_rx_queue *queue, uint32_t cons_index) { queue->cons_index = cons_index; - eth_ark_rx_seed_mbufs(queue); - if (((cons_index - queue->last_cons) >= 64U)) { - queue->last_cons = cons_index; + if ((cons_index + queue->queue_size - queue->seed_index) >= 64U) { + eth_ark_rx_seed_mbufs(queue); ark_mpu_set_producer(queue->mpu, queue->seed_index); } } @@ -321,9 +317,7 @@ eth_ark_recv_pkts(void *rx_queue, break; } - if (unlikely(nb != 0)) - /* report next free to FPGA */ - eth_ark_rx_update_cons_index(queue, cons_index); + eth_ark_rx_update_cons_index(queue, cons_index); return nb; } @@ -458,11 +452,13 @@ eth_ark_rx_seed_mbufs(struct ark_rx_queue *queue) int status = rte_pktmbuf_alloc_bulk(queue->mb_pool, mbufs, nb); if (unlikely(status != 0)) { - /* Try to recover from lack of mbufs in pool */ - status = eth_ark_rx_seed_recovery(queue, &nb, mbufs); - if (unlikely(status != 0)) { - return -1; - } + ARK_PMD_LOG(NOTICE, + "Could not allocate %u mbufs from pool" + " for RX queue %u;" + " %u free buffers remaining in queue\n", + nb, queue->queue_index, + queue->seed_index - queue->cons_index); + return -1; } if (ARK_DEBUG_CORE) { /* DEBUG */ @@ -511,29 +507,6 @@ eth_ark_rx_seed_mbufs(struct ark_rx_queue *queue) return 0; } -int -eth_ark_rx_seed_recovery(struct ark_rx_queue *queue, - uint32_t *pnb, - struct rte_mbuf **mbufs) -{ - int status = -1; - - /* Ignore small allocation failures */ - if (*pnb <= 64) - return -1; - - *pnb = 64U; - status = rte_pktmbuf_alloc_bulk(queue->mb_pool, mbufs, *pnb); - if (status != 0) { - ARK_PMD_LOG(NOTICE, - "ARK: Could not allocate %u mbufs from pool for RX queue %u;" - " %u free buffers remaining in queue\n", - *pnb, queue->queue_index, - queue->seed_index - queue->cons_index); - } - return status; -} - void eth_ark_rx_dump_queue(struct rte_eth_dev *dev, uint16_t queue_id, const char *msg) -- 2.17.1