From patchwork Mon Oct 8 21:16:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 46298 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 8AC655B2C; Mon, 8 Oct 2018 23:17:05 +0200 (CEST) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by dpdk.org (Postfix) with ESMTP id 1E68156A3 for ; Mon, 8 Oct 2018 23:17:04 +0200 (CEST) Received: by mail-qt1-f195.google.com with SMTP id e22-v6so15476737qto.6 for ; Mon, 08 Oct 2018 14:17:04 -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; bh=yNiZejSGepLIRKE/Ome0luF8jHE5aDwh6wmIlpq6SiY=; b=c3/x0ncu6OnlEnvjUXrVony3ycB9uN6uWWDYrPmwg5PQ1tF9n17Vg4sez5JHQbJUqR 1FlOxmHq5kPLieMsyGR5TZa13DfjrWPoj3ekEg1Uru5lRwqZ9FOSVP3BiZO6LTOzRJkk nsTM5YCDteZYDWVNURwMrmPz2rRG02K75rSYzwEVrdfzjQGjp7to++f0b4KPsCwTqiEQ 3c0dhFFG5NGdbq7K0n1uBHqGCdyk/ephXrZzWGV56ZRq9TBaso5GTROA+Szeky+d0tnk 38IoLmzIRYu9QHeRYDDtUitv/q+CUEWB7mavTef3xaIsUVhQOINNII5+1AqtwUzmlewN baOQ== 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; bh=yNiZejSGepLIRKE/Ome0luF8jHE5aDwh6wmIlpq6SiY=; b=GloXeAd1KosqxVXQbP3v2jZ7/QY+by/wx3PI2EG1275bDYLjBb5e/FKxp+26tGCDAs Iguw9Zl/PP7mWZCOa52ECtt87Mn6bgL9f6p5m9458mtn1HN6nsKtQIeCDSoyQ2pG7eY7 UlTqMjSIF3l2yBGvavGfJUu1rrkaFXcW3svNnjqSkzXPLMCBmgeAD0+Y6T+zcTmip6Iu 1CaEkdyH8XDOF8jlKJrxn7qGzbb+k+bGkAlZ662GAggXA5VDo2e7vX2fdYDTch4VOqrc ZjEXLxOXkNVjrebyaYHG8Ioa0pCXqnYQcBC3H2hgs0vIdmxrkxX18jDz9oiWNKPGO+G7 IjAg== X-Gm-Message-State: ABuFfogtxAtHIJ876koMxHkPJNrVDxOjqhdd83UHy0aYXfk1a73aq+Vs nD2jyaOl142hRsLXZ3bv1uS5LUFLmsk= X-Google-Smtp-Source: ACcGV61dEHOurIaxCpnj2VfFimUHZTpRrup+uKTa1ad7Hncb+uJMvS5Mbys5tkKH/+uw/Cmw3Zwfqw== X-Received: by 2002:a0c:9923:: with SMTP id h32-v6mr20600792qvd.81.1539033423032; Mon, 08 Oct 2018 14:17:03 -0700 (PDT) Received: from z170.home (pool-173-48-117-246.bstnma.fios.verizon.net. [173.48.117.246]) by smtp.gmail.com with ESMTPSA id y28-v6sm2699953qtj.9.2018.10.08.14.17.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Oct 2018 14:17:02 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: john.miller@atomicrules.com, shepard.siegel@atomicrules.com, ferruh.yigit@intel.com, Ed Czeck Date: Mon, 8 Oct 2018 17:16:48 -0400 Message-Id: <1539033410-21422-1-git-send-email-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH 1/3] net/ark: add recovery code for lack of mbufs during runtime 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" Fail with rte_exit() when the lack of mbufs is not recoverable. Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev_rx.c | 52 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 16f0d11..77149f6 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -25,6 +25,9 @@ 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 { @@ -196,20 +199,25 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, /* populate mbuf reserve */ status = eth_ark_rx_seed_mbufs(queue); + if (queue->seed_index != nb_desc) { + PMD_DRV_LOG(ERR, "ARK: Failed to allocate %u mbufs for RX queue %d\n", + nb_desc, qidx); + status = -1; + } /* MPU Setup */ if (status == 0) status = eth_ark_rx_hw_setup(dev, queue, qidx, queue_idx); if (unlikely(status != 0)) { - struct rte_mbuf *mbuf; + struct rte_mbuf **mbuf; PMD_DRV_LOG(ERR, "Failed to initialize RX queue %d %s\n", qidx, __func__); /* Free the mbufs allocated */ - for (i = 0, mbuf = queue->reserve_q[0]; - i < nb_desc; ++i, mbuf++) { - rte_pktmbuf_free(mbuf); + for (i = 0, mbuf = queue->reserve_q; + i < queue->seed_index; ++i, mbuf++) { + rte_pktmbuf_free(*mbuf); } rte_free(queue->reserve_q); rte_free(queue->paddress_q); @@ -446,8 +454,13 @@ eth_ark_rx_seed_mbufs(struct ark_rx_queue *queue) struct rte_mbuf **mbufs = &queue->reserve_q[seed_m]; int status = rte_pktmbuf_alloc_bulk(queue->mb_pool, mbufs, nb); - if (unlikely(status != 0)) - return -1; + 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; + } + } if (ARK_RX_DEBUG) { /* DEBUG */ while (count != nb) { @@ -495,6 +508,33 @@ 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) { + PMD_DRV_LOG(ERR, + "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); + if (queue->seed_index - queue->cons_index < 64) { + rte_exit(EXIT_FAILURE, + "ARK: No mbufs in pool; do you have a leak?\n"); + } + } + return status; +} + void eth_ark_rx_dump_queue(struct rte_eth_dev *dev, uint16_t queue_id, const char *msg)