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 819B1A052A; Tue, 26 Jan 2021 19:33:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97C48140F62; Tue, 26 Jan 2021 19:33:03 +0100 (CET) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by mails.dpdk.org (Postfix) with ESMTP id 89B53140F4B for ; Tue, 26 Jan 2021 19:32:59 +0100 (CET) Received: by mail-lj1-f177.google.com with SMTP id a25so19696983ljn.0 for ; Tue, 26 Jan 2021 10:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1qN6fNNWj09UtYtiff0PLCi5B5S6zrA6/F/OsStTVgg=; b=GHz8VniXDoXtZL0Mt6PFs8rzO00QK0yPEk7qqQrppuU34MklxqQpMfNMqAOdoUv8kH dOQ43ltt/zhyHQL3AUXLJYyGyxS1JOzDpQK8IU0QNEwvyg+BfGHUJxMRs+7M7qEGHdy6 Lrz9dRJTFIlAoQVuKAZd/fLNKctEGf8X++gAbcrwwBnUHU/+T3RY70pRte9A6dCP4cM9 njzpaBGFm/FP46sd1FKRcwNIweMIPK/GO6cqgjJrYMpJh8IvnpydHD9/wUf9zOcgfuFS h+fkDSR2Rf4QkzKP3rq4YO4vfnqCVlf2H+CZVuU37qUeFHxWm/2m79Uw8/02LVQmcW+J jiyQ== 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:mime-version:content-transfer-encoding; bh=1qN6fNNWj09UtYtiff0PLCi5B5S6zrA6/F/OsStTVgg=; b=F/TXrX1+La1htEoP3IsLlhYef855DAXWRAKYEgAW7dYeeQBMtkwi8JO/zxAn5dP5S6 ltewFqczNsRttaCd0UDBoTjY02FndvUXEkQhfPneYjKmqMJvOxVOjSh6+xCyXJ+jCBWN zacQceM5tHsLHT9lvAUWPh/LPbQJvXCyMK6hGeyXFVw7SWMlKewBWDHYtXM51y/VRNkS HavE1wrIE/a9QuGajGUSxas9urx18K2jim/fAUUC041g2tswW2M2iVK8OMILeGm+Ex5l xT2aA7KSYliy5XpK04/mQtwY38kOqlX3+mihMkXR+rb6Tv+uCjhcWGxS47FBv49uetwS dfjQ== X-Gm-Message-State: AOAM530dCpZahOFO7+53+gELv4KQg5KycOcw1UzlWpU2X97dYH/D2oVc FH1PtIBCtIeqfby10Ym98sGn2VBmW27cMRrB X-Google-Smtp-Source: ABdhPJw3NrNLCr/hVHjLfRuMenHBtma61n5oGoAoXgV2zEkmGc4ukNpu+t/QbRSSmXGEYFoqq2AGRA== X-Received: by 2002:a2e:6c02:: with SMTP id h2mr3630213ljc.277.1611685978918; Tue, 26 Jan 2021 10:32:58 -0800 (PST) Received: from mkPC.int.semihalf.com (193-106-246-138.noc.fibertech.net.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id s3sm3351036ljo.41.2021.01.26.10.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 10:32:58 -0800 (PST) From: Michal Krawczyk To: dev@dpdk.org Cc: gtzalik@amazon.com, igorch@amazon.com, mw@semihalf.com, Michal Krawczyk Date: Tue, 26 Jan 2021 19:32:25 +0100 Message-Id: <20210126183226.2420903-5-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210126183226.2420903-1-mk@semihalf.com> References: <20210126183226.2420903-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 4/5] net/ena: fix Tx sq free space assessment 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 Sender: "dev" From: Igor Chauskin Before starting transmission of Tx burst, the driver checked the available space in the sq and limited the number of packets for transmission accordingly. The calculation was incorrect for fragmented packets and potentially had significantly limited the length of Tx bursts. This patch removes the assessment and pushes packets to the sq as long as the burst is not exhausted and space is available in the sq. Correct evaluation of the required space isn't possible before the burst because it depends on the number of segments of each packet. This patch adds per-packet space evaluation for each packet before attempting to process it. In case there is not enough queue space, the burst will just stop without error. Signed-off-by: Igor Chauskin Reviewed-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 9ee9de6eb9..4083568d5d 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -2359,8 +2359,8 @@ static void ena_update_hints(struct ena_adapter *adapter, } } -static int ena_check_and_linearize_mbuf(struct ena_ring *tx_ring, - struct rte_mbuf *mbuf) +static int ena_check_space_and_linearize_mbuf(struct ena_ring *tx_ring, + struct rte_mbuf *mbuf) { struct ena_com_dev *ena_dev; int num_segments, header_len, rc; @@ -2370,13 +2370,21 @@ static int ena_check_and_linearize_mbuf(struct ena_ring *tx_ring, header_len = mbuf->data_len; if (likely(num_segments < tx_ring->sgl_size)) - return 0; + goto checkspace; if (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV && (num_segments == tx_ring->sgl_size) && (header_len < tx_ring->tx_max_header_size)) - return 0; + goto checkspace; + /* Checking for space for 2 additional metadata descriptors due to + * possible header split and metadata descriptor. Linearization will + * be needed so we reduce the segments number from num_segments to 1 + */ + if (!ena_com_sq_have_enough_space(tx_ring->ena_com_io_sq, 3)) { + PMD_DRV_LOG(DEBUG, "Not enough space in the tx queue\n"); + return ENA_COM_NO_MEM; + } ++tx_ring->tx_stats.linearize; rc = rte_pktmbuf_linearize(mbuf); if (unlikely(rc)) { @@ -2386,7 +2394,19 @@ static int ena_check_and_linearize_mbuf(struct ena_ring *tx_ring, return rc; } - return rc; + return 0; + +checkspace: + /* Checking for space for 2 additional metadata descriptors due to + * possible header split and metadata descriptor + */ + if (!ena_com_sq_have_enough_space(tx_ring->ena_com_io_sq, + num_segments + 2)) { + PMD_DRV_LOG(DEBUG, "Not enough space in the tx queue\n"); + return ENA_COM_NO_MEM; + } + + return 0; } static void ena_tx_map_mbuf(struct ena_ring *tx_ring, @@ -2473,7 +2493,7 @@ static int ena_xmit_mbuf(struct ena_ring *tx_ring, struct rte_mbuf *mbuf) int nb_hw_desc; int rc; - rc = ena_check_and_linearize_mbuf(tx_ring, mbuf); + rc = ena_check_space_and_linearize_mbuf(tx_ring, mbuf); if (unlikely(rc)) return rc; @@ -2580,9 +2600,6 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, return 0; } - nb_pkts = RTE_MIN(ena_com_free_q_entries(tx_ring->ena_com_io_sq), - nb_pkts); - for (sent_idx = 0; sent_idx < nb_pkts; sent_idx++) { if (ena_xmit_mbuf(tx_ring, tx_pkts[sent_idx])) break; -- 2.25.1