From patchwork Mon Oct 15 12:52:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 46831 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 DF28623D; Mon, 15 Oct 2018 14:53:05 +0200 (CEST) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by dpdk.org (Postfix) with ESMTP id B1324239 for ; Mon, 15 Oct 2018 14:53:04 +0200 (CEST) Received: by mail-qt1-f196.google.com with SMTP id d14-v6so21239531qto.4 for ; Mon, 15 Oct 2018 05:53: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:in-reply-to:references; bh=FLcY0dCvnd+dwMjm95tR+YMFgk5PUYxKfotG23gqcP0=; b=pUkr2vMLWKYi26JiaibSnaXnOMQ8UkSK5jm4J+7Mjzj+yT2Osq6Q42WyNHeGZYetFq y968yo+Og6+lfiqGkWVzEpULjJ0fTo/qmhUpt8JXHvpv6wDH7+f1yGFWEcLKF3Of2O3T azgiQUr5A9CBKTa53iwT2i0PJS/j0J6riwo89R2EAiLx5Hh69HWpV4XDFNUeJAALatB6 /ynhvN9hqt7U3eUxjTHbkU0Y3EPNabNeMHy29m4YgBrLNUnzET7/fmIHOPkt+i5pxk5v FuZ/ss78xHPDu47mvKDk8k+gkq72oWGC2ynZgPOsR04q/XfOaEWxd1NPq6QDomCMvcrx n8dg== 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=FLcY0dCvnd+dwMjm95tR+YMFgk5PUYxKfotG23gqcP0=; b=XLfu8rFy4Vq0ZhGvy8r0K3bd06G/svqq30xegTjep2ETHgtycyStnDToTqv6M4Wdfd jenVO77N669Lt2XOTRNjMvnLCWKmbjjnRfpOyTa0vcDVeXzI5cJ/Jbko9cT+sP81Gbpi fD789QAmMOZYP8FAop4I3FtFeOCkBFyGjYjlj1xZDE9PjMoNSgnX6s5gqzMqFnqunKiE jabhbItfnQFDqgrFX/596tdE/i0CQ4nnHkkDbG3HmJwlwL+4MWM3pQGuAHVnj6Ka0NX/ a1vxRvpXuoa+kwxsXQCoVK7Lktx3W6cETq7AiDSW6kFMTauQCux01I+y+SPs1rokm88k H1Gg== X-Gm-Message-State: ABuFfohWJfUrC505QbNey+vI9n3z1NhFgUlr/VmGOQzAdOzwE4Q7EvZR OH8PySHKzBnviBY7AcHb9ZuUupkEGLtKjA== X-Google-Smtp-Source: ACcGV61wPXywTh7zUGnzy7iOCA66CKShraaBgFZOcZrsSCendUWrjzP9JJEzMSO4F/yBjWQ/ZQVyqg== X-Received: by 2002:ac8:60d0:: with SMTP id i16-v6mr15543196qtm.249.1539607983517; Mon, 15 Oct 2018 05:53: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 e2-v6sm4982180qkm.55.2018.10.15.05.53.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 05:53: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, 15 Oct 2018 08:52:41 -0400 Message-Id: <1539607961-20851-1-git-send-email-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539033410-21422-1-git-send-email-ed.czeck@atomicrules.com> References: <1539033410-21422-1-git-send-email-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v2 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" Attempt to allocate smaller chunk of mbufs when larger amount is not available. Report error when small chunk not available. Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev_rx.c | 48 +++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 16f0d11..5751585 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,29 @@ 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); + } + return status; +} + void eth_ark_rx_dump_queue(struct rte_eth_dev *dev, uint16_t queue_id, const char *msg) From patchwork Mon Oct 15 12:53:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 46832 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 D0D492BDB; Mon, 15 Oct 2018 14:53:18 +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 E3FA2B62 for ; Mon, 15 Oct 2018 14:53:17 +0200 (CEST) Received: by mail-qt1-f195.google.com with SMTP id q41-v6so21221766qtq.10 for ; Mon, 15 Oct 2018 05:53:17 -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=YAa7+1Z7VNNhlD8Up+EbL/C85iXFWpRQhfbRh9L8R9M=; b=YbzaAUQlF9+wSUlwXa5xIIari6bFalOgPpuBhmlNHuEf5sG+ivFvSFLfPUYVNnXhyY ELiTcz5Tg+K2eXwsIIdITm3CNh57o6TFj+ZWng1DNYuMhPmRiyKlgAR4oiyvtws8Xsz3 v+pBYDHxbSkcYrZkT04f5m+6b9Fa8qkOUPWlnMATwf8QeoRdL1d1g2XtxTC7oQrsLHxV 50b97Owo3AVrZlxtnbiaHncMTPClQIl8gxRKDC/pSuDgY+qtP7Hj9WoRbL3xMajTfTvP ULS6IqwrYvlNu0MELKKlsNkIbUM0lSQZWzlTVhW0xVuFWpY7F9m3P5/YgtInO6otg0cS 6e4A== 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=YAa7+1Z7VNNhlD8Up+EbL/C85iXFWpRQhfbRh9L8R9M=; b=td7IoK4dpZx5oDjL1DE7YGz2U5FoO5vjsGL5J9b6MkzEcHh+YoI/0YT8JRq4r+M5wG 9qsENcfPuQ5rScf1XDQaEqmS3BT36gQTI95Ff2kvmIvmON97wlpgnnCucU7IEJRXT91W BpbPlf7HQ1OQhmVmOeg/4ol99EXmdEw2UxtpvoZcW2RJNctezrFkgrNuB6lY3MaABBIT CY97yUYdRv7r2KpGS3Tiy3bul/Ugz/NWGhcZEbpeUTppdtG7OE448WdbW3kycx5lGLOS d+T/z6pLRtLgvmKotku52Z6N9xygpT1WWwg9ZCqpJG9aV1S5PWao1yHdQwk5fw74p1L3 C6fQ== X-Gm-Message-State: ABuFfoiPykM8jZJiVBiUQ40SvLl1NflucDHg5p4cTpb/79GVCYWNHFjT t/BZz1v4p5gpUiI5AAnhL02qOTAPq7mKog== X-Google-Smtp-Source: ACcGV60V+lQv43a0WVA8D/2muM/9yoP+QiwkcMjOA5tOj0Gy/1gywRB8662UUa4gIjc/pvrR0T+F0A== X-Received: by 2002:ac8:17f9:: with SMTP id r54-v6mr15763817qtk.206.1539607997033; Mon, 15 Oct 2018 05:53:17 -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 h66-v6sm5550677qkc.53.2018.10.15.05.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 05:53:16 -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, 15 Oct 2018 08:53:11 -0400 Message-Id: <1539607991-21308-1-git-send-email-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539033410-21422-2-git-send-email-ed.czeck@atomicrules.com> References: <1539033410-21422-2-git-send-email-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v2 2/3] net/ark: remove useless hardware notifications 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" Only send notification to mpu when crossing 64 index boundary. Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ethdev_rx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 5751585..300029d 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -53,7 +53,7 @@ struct ark_rx_queue { /* The queue Index is used within the dpdk device structures */ uint16_t queue_index; - uint32_t pad1; + uint32_t last_cons; /* separate cache line */ /* second cache line - fields only used in slow path */ @@ -105,7 +105,10 @@ 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); - ark_mpu_set_producer(queue->mpu, queue->seed_index); + if (((cons_index - queue->last_cons) >= 64U)) { + queue->last_cons = cons_index; + ark_mpu_set_producer(queue->mpu, queue->seed_index); + } } /* ************************************************************************* */ From patchwork Mon Oct 15 12:53:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 46833 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 E3A4D493D; Mon, 15 Oct 2018 14:53:36 +0200 (CEST) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by dpdk.org (Postfix) with ESMTP id 4BADB2F4F for ; Mon, 15 Oct 2018 14:53:35 +0200 (CEST) Received: by mail-qk1-f195.google.com with SMTP id a85-v6so11712116qkg.3 for ; Mon, 15 Oct 2018 05:53:35 -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=J8SoMSPgpfVAu7FfQXRLzQljh8wVo3bMGFqcFvH76XM=; b=ofIUtkKwvLtpYQvl0J3zLjuMdEsAq7vyW0PFJoHe/HtSei85KEMgLsve+ZLQGJ9I1W P3N2asQ/NdhJ74wlae6iS0GRqIe25YAooiccYB1udAgNJ3Qeuv/tcZlRZ15IdTWWBtIP fa1JEVYySnuWt0ZPiUCSz5h73VTdUHXP+vB5abl46toaQf+r6TFy6+aXisUhfbFQVGgi JOVOSJ9L7TNwr+/sUMHq0bDtNKuJN4I6RLRpMYqvczfdtnCxtBeeMD5vBUvPDg/NB536 LLYWY3hEi8m2K9dF2T1rzc+5ESzwwS9cNNySQ8jfpGmPwjpWtmzU9YDtwXrOZ2U80lMi 1DeA== 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=J8SoMSPgpfVAu7FfQXRLzQljh8wVo3bMGFqcFvH76XM=; b=OPYsGC7cbaar81Pqh2R/+1PqSfMnNTmHCsjISZnoD6BIg3uasrs/G2d4bF1PdobuHV C4Twt3gh9xq0eZCOhbJxCfJhbnBd+MwwUoqHtqeuJULwmmeK6lJ84aexrRR9d+WVm2JJ hvT4Jb03prGX7digq9L/zE7xRpIqsfKJrLhgTkgB+2W0mpFbytEg7ZJA1Fxh3xWa8Sd2 9QQq2YxiBlgeCU0xVLsW9MRWzcyTc/DIkvTXLu+qV+cU1bl53jAbH18WdjRU8ORGTV0l HYN/CajPBv0wK7DCjeOuKYUFJRY+lJFeBJlzWPhCxCdS5UrXX2CShXmP5DUa2F1qpP9M 6S9g== X-Gm-Message-State: ABuFfog+k0gwgu0Om3iHGd4T4iL0D0n7GC2NawX6QvVqEDwFzQ1FUSat jI5cpd25vEaxen9ch3WJbORv+prmD3ywZQ== X-Google-Smtp-Source: ACcGV61ZMOmj8h5NjqkFc0eme/Hm3VZzIbNpaqJPukALIjwmCrWrOHh2kqgexBJsshScaXXaOS9Udw== X-Received: by 2002:a37:d909:: with SMTP id u9-v6mr16004391qki.140.1539608014402; Mon, 15 Oct 2018 05:53:34 -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 s28-v6sm6694244qtc.92.2018.10.15.05.53.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 05:53:33 -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, 15 Oct 2018 08:53:26 -0400 Message-Id: <1539608006-21758-1-git-send-email-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539033410-21422-3-git-send-email-ed.czeck@atomicrules.com> References: <1539033410-21422-3-git-send-email-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v2 3/3] net/ark: support for updated hardware and Tx meta data 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" Support for version 2 of DDM hardware and user tx meta data. Verify version during initialization. Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ddm.c | 12 ++++++++++-- drivers/net/ark/ark_ddm.h | 7 +++++-- drivers/net/ark/ark_ethdev.c | 3 +++ drivers/net/ark/ark_ethdev_tx.c | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c index eea388a..57026f8 100644 --- a/drivers/net/ark/ark_ddm.c +++ b/drivers/net/ark/ark_ddm.c @@ -11,14 +11,22 @@ int ark_ddm_verify(struct ark_ddm_t *ddm) { + uint32_t hw_const; if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) { PMD_DRV_LOG(ERR, "ARK: DDM structure looks incorrect %d vs %zd\n", ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t)); return -1; } - if (ddm->cfg.const0 != ARK_DDM_CONST) { - PMD_DRV_LOG(ERR, "ARK: DDM module not found as expected 0x%08x\n", + hw_const = ddm->cfg.const0; + if (hw_const == ARK_DDM_CONST1) { + PMD_DRV_LOG(ERR, + "ARK: DDM module is version 1, " + "PMD expects version 2\n"); + return -1; + } else if (hw_const != ARK_DDM_CONST2) { + PMD_DRV_LOG(ERR, + "ARK: DDM module not found as expected 0x%08x\n", ddm->cfg.const0); return -1; } diff --git a/drivers/net/ark/ark_ddm.h b/drivers/net/ark/ark_ddm.h index b37d1e0..5456b4b 100644 --- a/drivers/net/ark/ark_ddm.h +++ b/drivers/net/ark/ark_ddm.h @@ -19,7 +19,7 @@ /* struct defining Tx meta data -- fixed in FPGA -- 16 bytes */ struct ark_tx_meta { uint64_t physaddr; - uint32_t delta_ns; + uint32_t user1; uint16_t data_len; /* of this MBUF */ #define ARK_DDM_EOP 0x01 #define ARK_DDM_SOP 0x02 @@ -34,7 +34,10 @@ struct ark_tx_meta { * structs will never be instantiated in ram memory */ #define ARK_DDM_CFG 0x0000 -#define ARK_DDM_CONST 0xfacecafe +/* Set unique HW ID for hardware version */ +#define ARK_DDM_CONST2 (0x324d4444) +#define ARK_DDM_CONST1 (0xfacecafe) + struct ark_ddm_cfg_t { uint32_t r0; volatile uint32_t tlp_stats_clear; diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 552ca01..c26f076 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -313,6 +313,9 @@ eth_ark_dev_init(struct rte_eth_dev *dev) /* We are a single function multi-port device. */ ret = ark_config_device(dev); + if (ret) + return -1; + dev->dev_ops = &ark_eth_dev_ops; dev->data->mac_addrs = rte_zmalloc("ark", ETHER_ADDR_LEN, 0); diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 57188c2..94da5f9 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -65,7 +65,7 @@ eth_ark_tx_meta_from_mbuf(struct ark_tx_meta *meta, uint8_t flags) { meta->physaddr = rte_mbuf_data_iova(mbuf); - meta->delta_ns = 0; + meta->user1 = (uint32_t)mbuf->udata64; meta->data_len = rte_pktmbuf_data_len(mbuf); meta->flags = flags; }