From patchwork Tue Feb 22 18:11:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 108021 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 609A7A034E; Tue, 22 Feb 2022 19:13:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E09141203; Tue, 22 Feb 2022 19:12:32 +0100 (CET) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mails.dpdk.org (Postfix) with ESMTP id 5E389411DB for ; Tue, 22 Feb 2022 19:12:31 +0100 (CET) Received: by mail-ej1-f54.google.com with SMTP id d10so45435279eje.10 for ; Tue, 22 Feb 2022 10:12:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mDhQnzFWHG4t0egd6mvppeslz6lKUKkj8/9ZbLux+YI=; b=KyMHbrZaQrg+XKMlrnGbM33TWVxzBqkar0NsAkmLX7/l0RH/2dcKx8+g2/5mzF8IWy pS4rUdjWiACdfcScr6lExK2WElxlwrlWqMYPrZ4RL+T7fmJGKcs0mmK1QoffsZBhI0hr vxnTQh7rDJDjQzs31csis0zp7t4MjDniw1ZL0KIkB73Q7oJ3KMVLdL5+D+PB/qLijsv2 9ayXsK0bRgPc1dItfIXX34Fgfbr2Ezq748deY0ZCbUYKs1iaHlCh3Jwlxoj9zbDkgxVR cqSFQekGdXztw6f233u6ie5A70fdYk0y2u84o4dlVCKxLq0iJ11U9YmVTBUln75T3RvR RzWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mDhQnzFWHG4t0egd6mvppeslz6lKUKkj8/9ZbLux+YI=; b=4Sj6R5GkeDk/Yh0oExKaNTbbd1wUWIEMcAm4PFCkFmkoM8ThAG/+I8Mrh70weqhURk 6xdonq+/5o2HUWCAAxntuB4IBl57c1p2OuAhrViCCpDlmH1x8GUgNvSDrKAthGSRrmTH +D6jCnct7n3Y4EjqLc8v1qQI1wf8I3hqCIvQGCJc11qSwE9fPc+MU8S+siULW6fMh+2I RRcuXFPu3IkyZEAVLe1QpiaPmBcaVDhgcnBXd2IfDPd0JvNxbB56OBTTEuVK48kZ3ZSO IGGODs8x4qVXLcqmcdsO37+t1hGZtbEaOCuGUyrAhSE1p94ZcJImq8grWKmEis8pV5cx egKA== X-Gm-Message-State: AOAM533npfY6FiggY+FqJyjBRThliEqsK5pDIhGOmQzYM6sClLxE9upi /BXAkTzn8DnFlBfYC47qugQhBWU3F7XYlQ== X-Google-Smtp-Source: ABdhPJzwQNxGIJ4uJlaJCcA5FNBly8OAvzQdKE6gMukRBgmtdvzFc7SPVr3dmoP36Pb/U4NnwjKfdg== X-Received: by 2002:a17:906:cc8d:b0:6c9:6df1:7c55 with SMTP id oq13-20020a170906cc8d00b006c96df17c55mr20050979ejb.317.1645553550760; Tue, 22 Feb 2022 10:12:30 -0800 (PST) Received: from DESKTOP-U5LNN3J.localdomain (89-79-181-52.dynamic.chello.pl. [89.79.181.52]) by smtp.gmail.com with ESMTPSA id y21sm10610153eda.38.2022.02.22.10.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 10:12:30 -0800 (PST) From: Michal Krawczyk To: dev@dpdk.org Cc: shaibran@amazon.com, upstream@semihalf.com, Dawid Gorecki , Michal Krawczyk Subject: [PATCH v2 13/21] net/ena: expose Tx cleanup function Date: Tue, 22 Feb 2022 19:11:38 +0100 Message-Id: <20220222181146.28882-14-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220222181146.28882-1-mk@semihalf.com> References: <20220222160634.24489-1-mk@semihalf.com> <20220222181146.28882-1-mk@semihalf.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Dawid Gorecki ENA driver did not allow applications to call tx_cleanup. Freeing Tx mbufs was always done by the driver and it was not possible to manually request the driver to free mbufs. Modify ena_tx_cleanup function to accept maximum number of packets to free and return number of packets that was freed. Signed-off-by: Dawid Gorecki Reviewed-by: Michal Krawczyk Reviewed-by: Shai Brandes --- doc/guides/nics/features/ena.ini | 1 + doc/guides/rel_notes/release_22_03.rst | 1 + drivers/net/ena/ena_ethdev.c | 27 ++++++++++++++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/doc/guides/nics/features/ena.ini b/doc/guides/nics/features/ena.ini index 55690aaf5a..59c1ae85fa 100644 --- a/doc/guides/nics/features/ena.ini +++ b/doc/guides/nics/features/ena.ini @@ -7,6 +7,7 @@ Link status = Y Link status event = Y Rx interrupt = Y +Free Tx mbuf on demand = Y MTU update = Y Scattered Rx = Y TSO = Y diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index 92f36fa8ab..91324dae18 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -114,6 +114,7 @@ New Features * Added support for the link status configuration. * Added optimized memcpy support for the ARM platforms. * Added ENA admin queue support for the MP applications. + * Added free Tx mbuf on demand feature support. * **Updated Cisco enic driver.** diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 8f30718f2c..eecdd447dd 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -170,7 +170,7 @@ static void ena_tx_map_mbuf(struct ena_ring *tx_ring, void **push_header, uint16_t *header_len); static int ena_xmit_mbuf(struct ena_ring *tx_ring, struct rte_mbuf *mbuf); -static void ena_tx_cleanup(struct ena_ring *tx_ring); +static int ena_tx_cleanup(void *txp, uint32_t free_pkt_cnt); static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); static uint16_t eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -276,6 +276,7 @@ static const struct eth_dev_ops ena_dev_ops = { .rx_queue_intr_disable = ena_rx_queue_intr_disable, .rss_hash_update = ena_rss_hash_update, .rss_hash_conf_get = ena_rss_hash_conf_get, + .tx_done_cleanup = ena_tx_cleanup, }; /********************************************************************* @@ -2990,16 +2991,22 @@ static int ena_xmit_mbuf(struct ena_ring *tx_ring, struct rte_mbuf *mbuf) return 0; } -static void ena_tx_cleanup(struct ena_ring *tx_ring) +static int ena_tx_cleanup(void *txp, uint32_t free_pkt_cnt) { + struct ena_ring *tx_ring = (struct ena_ring *)txp; unsigned int total_tx_descs = 0; + unsigned int total_tx_pkts = 0; uint16_t cleanup_budget; uint16_t next_to_clean = tx_ring->next_to_clean; - /* Attempt to release all Tx descriptors (ring_size - 1 -> size_mask) */ - cleanup_budget = tx_ring->size_mask; + /* + * If free_pkt_cnt is equal to 0, it means that the user requested + * full cleanup, so attempt to release all Tx descriptors + * (ring_size - 1 -> size_mask) + */ + cleanup_budget = (free_pkt_cnt == 0) ? tx_ring->size_mask : free_pkt_cnt; - while (likely(total_tx_descs < cleanup_budget)) { + while (likely(total_tx_pkts < cleanup_budget)) { struct rte_mbuf *mbuf; struct ena_tx_buffer *tx_info; uint16_t req_id; @@ -3021,6 +3028,7 @@ static void ena_tx_cleanup(struct ena_ring *tx_ring) tx_ring->empty_tx_reqs[next_to_clean] = req_id; total_tx_descs += tx_info->tx_descs; + total_tx_pkts++; /* Put back descriptor to the ring for reuse */ next_to_clean = ENA_IDX_NEXT_MASKED(next_to_clean, @@ -3034,8 +3042,11 @@ static void ena_tx_cleanup(struct ena_ring *tx_ring) ena_com_update_dev_comp_head(tx_ring->ena_com_io_cq); } - /* Notify completion handler that the cleanup was just called */ - tx_ring->last_cleanup_ticks = rte_get_timer_cycles(); + /* Notify completion handler that full cleanup was performed */ + if (free_pkt_cnt == 0 || total_tx_pkts < cleanup_budget) + tx_ring->last_cleanup_ticks = rte_get_timer_cycles(); + + return total_tx_pkts; } static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -3056,7 +3067,7 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, available_desc = ena_com_free_q_entries(tx_ring->ena_com_io_sq); if (available_desc < tx_ring->tx_free_thresh) - ena_tx_cleanup(tx_ring); + ena_tx_cleanup((void *)tx_ring, 0); for (sent_idx = 0; sent_idx < nb_pkts; sent_idx++) { if (ena_xmit_mbuf(tx_ring, tx_pkts[sent_idx]))