From patchwork Tue Feb 22 18:11:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 108009 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 81B97A034E; Tue, 22 Feb 2022 19:12:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 592ED41145; Tue, 22 Feb 2022 19:12:13 +0100 (CET) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mails.dpdk.org (Postfix) with ESMTP id 91DA64113C for ; Tue, 22 Feb 2022 19:12:10 +0100 (CET) Received: by mail-ej1-f43.google.com with SMTP id p9so45455638ejd.6 for ; Tue, 22 Feb 2022 10:12:10 -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=bQ7QIk60YocF7MUXrF0scolw6A4Mcpl0quApXme1KiQ=; b=PL80c/fjsplHcCj7iV1vLBHSxxVzKlk+Isp+IfhzC2chokb0u3zCgdYdxorm3cGhS2 xPI7yZywJ0FaWxI4qfi/MqPM1jMzrsHfLYSTosYt9nZzRFKhUO4DGGhMW8+UbMOmHFHm ka2Jc2fE3SRZ26hCHG+dGl8x9RxlaqHSvI/KXovaeFz6HlvIt5rDQEtYYBpcHbJG3ZDk 4Onip22czW9bsOKJp8b3zP9Z6mAD6izmMc3KTllSDRJgaMOaLx6r/u0qZJslSmBOvh+f piX2ZD8BQ+YyGFVupcLBMa8TpL2X4JTGk+deBng39a64Qxajs609eelEsdg1ZLzrquxP SEgw== 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=bQ7QIk60YocF7MUXrF0scolw6A4Mcpl0quApXme1KiQ=; b=tXwBDIvlzLeaG9Ucbs5pI3JWK/upxt19rTO39k3JJ9PXXNliCnTpib1k+GttjPI0ab HNt8Aet8i74LeEN2T1Ta3WQrxTaQRRgHgaKMrTzyMLFwWUSjlqsaqvpAQRhu+tj3uIku st9tKCgOATU7KQ4XgxiCUJNgU7vuR0CUFg4POlZTFVShPCP4GUdBPM8BmbccYbS7U4Qs IV88pHBHVaoBAB5ZPa3o1piKJyp/yxbNwAw20rRIHUByokNLG9hACrP193+/rGQ8AeKd BhKgrKtC/jz2v0codHPAEPvCVvAVEhBxe2yJdHENEI2PpfJFNukSSt2hvUWI9gE+opry 5GIA== X-Gm-Message-State: AOAM532o29zmeeYblBb43S6ytAkW+r2ygfiuLZm9bv3TFZ8BasoXCTkJ /fLBF0D/MNnSXd3lBbudcBBJSMgL5NoOKw== X-Google-Smtp-Source: ABdhPJzSgJlt73vxtJL9ik+RzLLNZpsVEKUXaQY/e+qGvb5ywuVSo9qs1cddWMHXwNWGLeesp1W0YQ== X-Received: by 2002:a17:906:86cc:b0:6ce:698a:bc7 with SMTP id j12-20020a17090686cc00b006ce698a0bc7mr19852343ejy.709.1645553529966; Tue, 22 Feb 2022 10:12:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 10:12:09 -0800 (PST) From: Michal Krawczyk To: dev@dpdk.org Cc: shaibran@amazon.com, upstream@semihalf.com, Michal Krawczyk , Artur Rojek , Dawid Gorecki , Igor Chauskin Subject: [PATCH v2 01/21] net/ena: remove linearization function Date: Tue, 22 Feb 2022 19:11:26 +0100 Message-Id: <20220222181146.28882-2-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 The linearization of the mbuf isn't common practice for the PMD, as it can expose it's capabilities to the upper layer using rte_eth_dev_info_get(). Moreover, the rte_eth_tx_prepare() function should also verify if the number of segments inside the mbuf isn't too high. Because of those 2 circumstances, it may be safer to avoid modifying mbuf on PMD's Tx side and remove linearization at all. Instead, add verification of the number of segments to the eth_ena_prep_pkts(). Signed-off-by: Michal Krawczyk Reviewed-by: Artur Rojek Reviewed-by: Dawid Gorecki Reviewed-by: Igor Chauskin Reviewed-by: Shai Brandes --- drivers/net/ena/ena_ethdev.c | 74 +++++++++--------------------------- drivers/net/ena/ena_ethdev.h | 2 - 2 files changed, 19 insertions(+), 57 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index db2b5ec8e7..deaee30664 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -93,8 +93,6 @@ static const struct ena_stats ena_stats_tx_strings[] = { ENA_STAT_TX_ENTRY(cnt), ENA_STAT_TX_ENTRY(bytes), ENA_STAT_TX_ENTRY(prepare_ctx_err), - ENA_STAT_TX_ENTRY(linearize), - ENA_STAT_TX_ENTRY(linearize_failed), ENA_STAT_TX_ENTRY(tx_poll), ENA_STAT_TX_ENTRY(doorbells), ENA_STAT_TX_ENTRY(bad_req_id), @@ -2408,6 +2406,17 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, return i; } + if (unlikely(m->nb_segs >= tx_ring->sgl_size && + !(tx_ring->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV && + m->nb_segs == tx_ring->sgl_size && + m->data_len < tx_ring->tx_max_header_size))) { + PMD_TX_LOG(DEBUG, + "mbuf[%" PRIu32 "] has too many segments: %" PRIu16 "\n", + i, m->nb_segs); + rte_errno = EINVAL; + return i; + } + #ifdef RTE_LIBRTE_ETHDEV_DEBUG /* Check if requested offload is also enabled for the queue */ if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM && @@ -2554,56 +2563,6 @@ static void ena_update_hints(struct ena_adapter *adapter, } } -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; - - ena_dev = &tx_ring->adapter->ena_dev; - num_segments = mbuf->nb_segs; - header_len = mbuf->data_len; - - if (likely(num_segments < tx_ring->sgl_size)) - 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)) - 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_TX_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)) { - PMD_TX_LOG(WARNING, "Mbuf linearize failed\n"); - rte_atomic64_inc(&tx_ring->adapter->drv_stats->ierrors); - ++tx_ring->tx_stats.linearize_failed; - 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_TX_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, struct ena_tx_buffer *tx_info, struct rte_mbuf *mbuf, @@ -2688,9 +2647,14 @@ static int ena_xmit_mbuf(struct ena_ring *tx_ring, struct rte_mbuf *mbuf) int nb_hw_desc; int rc; - rc = ena_check_space_and_linearize_mbuf(tx_ring, mbuf); - if (unlikely(rc)) - return rc; + /* 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, + mbuf->nb_segs + 2)) { + PMD_DRV_LOG(DEBUG, "Not enough space in the tx queue\n"); + return ENA_COM_NO_MEM; + } next_to_use = tx_ring->next_to_use; diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h index f99e4f3984..f47ba3fb02 100644 --- a/drivers/net/ena/ena_ethdev.h +++ b/drivers/net/ena/ena_ethdev.h @@ -103,8 +103,6 @@ struct ena_stats_tx { u64 cnt; u64 bytes; u64 prepare_ctx_err; - u64 linearize; - u64 linearize_failed; u64 tx_poll; u64 doorbells; u64 bad_req_id;