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 CF42AA0566 for ; Mon, 8 Mar 2021 23:29:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBC0D22A503; Mon, 8 Mar 2021 23:29:37 +0100 (CET) Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by mails.dpdk.org (Postfix) with ESMTP id E069022A4EA for ; Mon, 8 Mar 2021 23:29:35 +0100 (CET) Received: by mail-qv1-f44.google.com with SMTP id d9so5469157qvo.3 for ; Mon, 08 Mar 2021 14:29:35 -0800 (PST) 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=JZcyAN7TUDcAIWlgS9/v2P+aRp6UbfLidKHB1736o4kIbhW42qhCSW2NWzA6VGLioI 0PkE3Y3YuB9d5DpfdFrpp0mPcNwOWr7/lSsFelq/rw2iC+4TaDGw7WU3kcRdRYRyWfhk Xsx3FiPju5x7cCyZRZfH7kB0g497/DvXIY5ji4KONY+ShGBaRO/pl+XcwasD3PD5Qv+/ RmlEsSMNcKc98qcS8E2k9UBpbTlptnvvgAuObtRawo5Wi4O6fP3scA2WibZBiYsUd4EC jfJflGI3jbk1sHspINCN7LPbJC6LaaXQruFSRCL26xJ/U5GjynWB/lFkPdQO4vKW341E 7XjQ== 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=tFT2+U7LohJZYh1l+ofMPvCZ/5l2192iglW+UP8+WSNiObqYB7i4weLBwqZhnFyimp 37jyu25A3Q0zF69neO6gUf8gpGlQF/MAR6ev9KEIRVnAS+Sp4UD8iBcFc2D7MVMek0F4 tau0osAMjFRaBygyPz6/xKyjwL1b5Kvic/v88NW3aOn49s82waOd3YjGYiMwBb0gLTdE AZyObRB79Cd1O7J06lJTOg6N66Uqpb8ZzNnkmpuBfIFreV1Tu96C1d2yAKkyd3LBqH6t kEpYSpNmb9RP3ahIHEiIQI0tj/kY+Gk9uVBicnujybhXq9Ypf7hMqij5IOObDnEStMSB 6cWA== X-Gm-Message-State: AOAM530QfUXTDOHMAZWO6VnJ/Ri/YtbnLgmRi5D+x8l2OzvBxoOpxT6v b9aq9u18SPHEb4H1RrmAplE8jA== X-Google-Smtp-Source: ABdhPJw5/8JMqhpIbGBaMbgfhooZV/xbJH93B7uHB2BGtTkMH1vJBxRf6LnxMzplOniUsmUJTwS3+g== X-Received: by 2002:ad4:5aa3:: with SMTP id u3mr9048092qvg.0.1615242575388; Mon, 08 Mar 2021 14:29:35 -0800 (PST) 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 z188sm8892774qkb.40.2021.03.08.14.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 14:29:34 -0800 (PST) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@intel.com Cc: shepard.siegel@atomicrules.com, john.miller@atomicrules.com, stable@dpdk.org Date: Mon, 8 Mar 2021 17:29:18 -0500 Message-Id: <20210308222922.30667-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308222922.30667-1-ed.czeck@atomicrules.com> References: <20210304165637.24658-1-ed.czeck@atomicrules.com> <20210308222922.30667-1-ed.czeck@atomicrules.com> Subject: [dpdk-stable] [PATCH v3 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