From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C4581A04B5; Fri, 2 Oct 2020 15:40:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0FAC81D5CF; Fri, 2 Oct 2020 15:40:15 +0200 (CEST) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 585021C1E7 for ; Fri, 2 Oct 2020 15:40:13 +0200 (CEST) Received: by mail-pj1-f68.google.com with SMTP id q4so831665pjh.5 for ; Fri, 02 Oct 2020 06:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:mime-version; bh=yFxEwUyrk7G1F0nstgbHcrjb7O8a1fyvA0Q+NCvvGRo=; b=e7TyJ258FMx0kwe5q+sF2e9YjzHag48uWSmmEOgdO01AG4nVtVuh2apsHWzuafM+Nv HUKolEVfDnAuNLsueIJbm3K6MEx/Bai6iPJF0LM5XZJ7482CSIQQ10snJcUJVdflXn/T 3loyqv6pA1To9g+dWpfUE5rMFN9kHCXRd5F5E= 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:mime-version; bh=yFxEwUyrk7G1F0nstgbHcrjb7O8a1fyvA0Q+NCvvGRo=; b=RMJ+tpFi87pRhpjQqNUiXjWx72azqoF0mdu6EHF8ZirQWhNB8PWCJn0GBDVrRPQyIW u27FC+31izpdkF2BTyBHYHv6ENHrb6vpr3+oQyYfjBnlbfUH5KGYWz6LCpogKYLA47rJ dGNfEmJpSusIVtRHqnBJKaaXBaPk0kQKkCPCMfDTW2dpR4PR8l8HAH6FKoCEAs23/CJF wZ/C6Wz5zw0uAInFzOgJZ12JSBTtKtgn/HNLaFDOVJslVthGAU0jA58iPD6Q4j9G8oGL uNL3jQD3kd01XCqA0/CUJ0dT1tbSXmwJ4B0t4LvU/e+TgUePHKfSUaBwHQTrl/6D2Hcv V8Gg== X-Gm-Message-State: AOAM533ZEsNp4YLCz5elZDa7yLFypiiabXFoLV8iAiwohCmVoAG8h5+C NwqQGQQsomV7l7lJ/FzS0olU8A== X-Google-Smtp-Source: ABdhPJy1Vd/gZb/wvTAJa+gZ8XseGRyZ/AZpg7l9r4JNpgrnNXgdYQz1qgmUrIUqkF8HvIK8803xmA== X-Received: by 2002:a17:90a:ea96:: with SMTP id h22mr2170521pjz.203.1601646011254; Fri, 02 Oct 2020 06:40:11 -0700 (PDT) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id f18sm2151893pfe.153.2020.10.02.06.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 06:40:10 -0700 (PDT) From: Lance Richardson To: Ajit Khaparde , Somnath Kotur Cc: dev@dpdk.org Date: Fri, 2 Oct 2020 09:40:02 -0400 Message-Id: <20201002134002.83845-1-lance.richardson@broadcom.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: [dpdk-dev] [PATCH v2] net/bnxt: support fast mbuf free 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" Add support for DEV_TX_OFFLOAD_MBUF_FAST_FREE to bnxt vector mode transmit. This offload may be enabled only when multi-segment transmit is not needed, all transmitted mbufs for a given queue will be allocated from the same pool, and all transmitted mbufs will have a reference count of 1. Since this offload is only supported in vector mode at this time, support in the features list is indicated as "partial". Signed-off-by: Lance Richardson --- - v2: Fixed mangling of advertised tx offload capabilities. doc/guides/nics/features/bnxt.ini | 1 + drivers/net/bnxt/bnxt_ethdev.c | 11 +++++++---- drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 28 ++++++++++++++++++++++++++- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 28 ++++++++++++++++++++++++++- drivers/net/bnxt/bnxt_txq.c | 2 ++ drivers/net/bnxt/bnxt_txq.h | 1 + 6 files changed, 65 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/features/bnxt.ini b/doc/guides/nics/features/bnxt.ini index f1f300c8b..7cb873dd0 100644 --- a/doc/guides/nics/features/bnxt.ini +++ b/doc/guides/nics/features/bnxt.ini @@ -8,6 +8,7 @@ Speed capabilities = Y Link status = Y Link status event = Y Rx interrupt = Y +Fast mbuf free = P Queue start/stop = Y Burst mode info = Y MTU update = Y diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 624cb2031..c2a9f80e2 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -920,7 +920,9 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, dev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT; if (bp->flags & BNXT_FLAG_PTP_SUPPORTED) dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TIMESTAMP; - dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT; + dev_info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; + dev_info->tx_offload_capa = BNXT_DEV_TX_OFFLOAD_SUPPORT | + dev_info->tx_queue_offload_capa; dev_info->flow_type_rss_offloads = BNXT_ETH_RSS_SUPPORT; dev_info->speed_capa = bnxt_get_speed_capabilities(bp); @@ -1191,6 +1193,7 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev) { #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) #ifndef RTE_LIBRTE_IEEE1588 + uint64_t offloads = eth_dev->data->dev_conf.txmode.offloads; struct bnxt *bp = eth_dev->data->dev_private; /* @@ -1198,7 +1201,7 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev) * or tx offloads. */ if (!eth_dev->data->scattered_rx && - !eth_dev->data->dev_conf.txmode.offloads && + !(offloads & ~DEV_TX_OFFLOAD_MBUF_FAST_FREE) && !BNXT_TRUFLOW_EN(bp)) { PMD_DRV_LOG(INFO, "Using vector mode transmit for port %d\n", eth_dev->data->port_id); @@ -1210,7 +1213,7 @@ bnxt_transmit_function(__rte_unused struct rte_eth_dev *eth_dev) "Port %d scatter: %d tx offload: %" PRIX64 "\n", eth_dev->data->port_id, eth_dev->data->scattered_rx, - eth_dev->data->dev_conf.txmode.offloads); + offloads); #endif #endif return bnxt_xmit_pkts; @@ -2685,7 +2688,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->conf.tx_free_thresh = txq->tx_free_thresh; qinfo->conf.tx_rs_thresh = 0; qinfo->conf.tx_deferred_start = txq->tx_deferred_start; - qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads; + qinfo->conf.offloads = txq->offloads; } static const struct { diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c index 299b6b86d..a70055fce 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c @@ -338,6 +338,29 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, return nb_rx_pkts; } +static void +bnxt_tx_cmp_vec_fast(struct bnxt_tx_queue *txq, int nr_pkts) +{ + struct bnxt_tx_ring_info *txr = txq->tx_ring; + struct rte_mbuf **free = txq->free; + uint16_t cons = txr->tx_cons; + unsigned int blk = 0; + uint32_t ring_mask = txr->tx_ring_struct->ring_mask; + + while (nr_pkts--) { + struct bnxt_sw_tx_bd *tx_buf; + + tx_buf = &txr->tx_buf_ring[cons]; + cons = (cons + 1) & ring_mask; + free[blk++] = tx_buf->mbuf; + tx_buf->mbuf = NULL; + } + if (blk) + rte_mempool_put_bulk(free[0]->pool, (void **)free, blk); + + txr->tx_cons = cons; +} + static void bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts) { @@ -399,7 +422,10 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) cpr->valid = !!(raw_cons & cp_ring_struct->ring_size); if (nb_tx_pkts) { - bnxt_tx_cmp_vec(txq, nb_tx_pkts); + if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) + bnxt_tx_cmp_vec_fast(txq, nb_tx_pkts); + else + bnxt_tx_cmp_vec(txq, nb_tx_pkts); cpr->cp_raw_cons = raw_cons; bnxt_db_cq(cpr); } diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index 271e7908e..6d1f163f7 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -309,6 +309,29 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, return nb_rx_pkts; } +static void +bnxt_tx_cmp_vec_fast(struct bnxt_tx_queue *txq, int nr_pkts) +{ + struct bnxt_tx_ring_info *txr = txq->tx_ring; + struct rte_mbuf **free = txq->free; + uint16_t cons = txr->tx_cons; + unsigned int blk = 0; + uint32_t ring_mask = txr->tx_ring_struct->ring_mask; + + while (nr_pkts--) { + struct bnxt_sw_tx_bd *tx_buf; + + tx_buf = &txr->tx_buf_ring[cons]; + cons = (cons + 1) & ring_mask; + free[blk++] = tx_buf->mbuf; + tx_buf->mbuf = NULL; + } + if (blk) + rte_mempool_put_bulk(free[0]->pool, (void **)free, blk); + + txr->tx_cons = cons; +} + static void bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts) { @@ -371,7 +394,10 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) cpr->valid = !!(raw_cons & cp_ring_struct->ring_size); if (nb_tx_pkts) { - bnxt_tx_cmp_vec(txq, nb_tx_pkts); + if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) + bnxt_tx_cmp_vec_fast(txq, nb_tx_pkts); + else + bnxt_tx_cmp_vec(txq, nb_tx_pkts); cpr->cp_raw_cons = raw_cons; bnxt_db_cq(cpr); } diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c index bdc7ffaaa..c8d75ac95 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -131,6 +131,8 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, txq->nb_tx_desc = nb_desc; txq->tx_free_thresh = RTE_MIN(rte_align32pow2(nb_desc) / 4, RTE_BNXT_MAX_TX_BURST); + txq->offloads = eth_dev->data->dev_conf.txmode.offloads | + tx_conf->offloads; txq->tx_deferred_start = tx_conf->tx_deferred_start; diff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h index 9f849fc71..8033e241e 100644 --- a/drivers/net/bnxt/bnxt_txq.h +++ b/drivers/net/bnxt/bnxt_txq.h @@ -39,6 +39,7 @@ struct bnxt_tx_queue { struct bnxt_cp_ring_info *cp_ring; const struct rte_memzone *mz; struct rte_mbuf **free; + uint64_t offloads; }; void bnxt_free_txq_stats(struct bnxt_tx_queue *txq); -- 2.25.1