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 A1A01A0561 for ; Thu, 4 Mar 2021 21:33:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7103422A2D5; Thu, 4 Mar 2021 21:33:33 +0100 (CET) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by mails.dpdk.org (Postfix) with ESMTP id 93A5240147 for ; Thu, 4 Mar 2021 21:33:31 +0100 (CET) Received: by mail-qk1-f172.google.com with SMTP id 130so14649454qkh.11 for ; Thu, 04 Mar 2021 12:33:31 -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=HZgcT0RypAkTBKk2dEI0odsRmmoAEKRjq5UGrRdfe+E=; b=IeTFEkItMjgIKmPP1uKEm5bIciGtzVRo9aea8+Y4fHmSM3jXfPH+L6/3/arDMntB9o 8PwC4BgZi28LGWYqRQYQ+CdqK2Jt5GZjNjCCHBnyGvQwaonqDv3GDtN2znPhhysRkIFY e+qoccECouNKmvj+C6SkxXvGRvu1+nXkRmD0nmMJyPAI0L7lMkkktHLCPYaEE8PrdfJH KriLls0NFY3EFxWM5SZgyjVWfGkXT6rCNAbrv6qvw3FruTMkzcrMqN0JN9YcLtvM3XKH 6oW47dlB7qZL2Nvvj+9QOfDC7g5B+FS0zObHb8ztDzvWcaCB+gg4Af0H8lWxOOMTcaYx +5eQ== 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=HZgcT0RypAkTBKk2dEI0odsRmmoAEKRjq5UGrRdfe+E=; b=E36BW+RKuQEEOnlc7BxB2LOqfAfo/94OGUqyBKqO2dJBYuMz4EXxDimI75cTo7o4M7 8DMudKbpJoh2Q3bgQkOasaQPHW3szcECObkPv0sAwHQZ2/gbg66DD+yR1JitBHyWeRUl jCPVkQAkbIRj9H6UVQOGH+GaE19wqm1tMSlT/L4VFC9kqyKxaX64HQ4rI0KrPZypJLcI 3Pep6eo/DxnuB4X/qZWqBnUjWJAvjF3RGDxMI2ZhySD48t7fvGEPvhqFscqzyBuPtHg5 +TanqttQzZi0t+34y5sOGOJ+BwW0WP5yhcaV91MJkpqKnsQMRNp0HydeMHTS8MbGT4gy 2/yg== X-Gm-Message-State: AOAM530srF81YhfMgHozEHX3hlBXeRRfktVmrQktrD7uqrdTqdzuK14f 2ND2rcptAEJz+pFQ+HRcSI8PZA== X-Google-Smtp-Source: ABdhPJz0jBTn2ccMOjxXlhHLjGeoYb9uBqWktaQHptKLZu+pd9oJ5yyX5ISVpb3dG5r98YvMTKMq3g== X-Received: by 2002:a37:584:: with SMTP id 126mr5607811qkf.274.1614890011116; Thu, 04 Mar 2021 12:33:31 -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 b65sm250710qkd.120.2021.03.04.12.33.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 12:33:30 -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: Thu, 4 Mar 2021 15:33:18 -0500 Message-Id: <20210304203321.6154-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210304203321.6154-1-ed.czeck@atomicrules.com> References: <20210304165637.24658-1-ed.czeck@atomicrules.com> <20210304203321.6154-1-ed.czeck@atomicrules.com> Subject: [dpdk-stable] [PATCH v2 2/5] 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