From patchwork Fri Mar 27 10:18:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 67291 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31F04A0589; Fri, 27 Mar 2020 11:32:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6509E1C199; Fri, 27 Mar 2020 11:29:43 +0100 (CET) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 325511C119 for ; Fri, 27 Mar 2020 11:29:33 +0100 (CET) Received: by mail-lj1-f194.google.com with SMTP id 19so9610373ljj.7 for ; Fri, 27 Mar 2020 03:29:33 -0700 (PDT) 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=Nlxn0UL9TpQdzDv83NkI185u8GUv4l17wupW0ANAp2A=; b=Es6Qx7laEJywNyrsGyupxt0L1YzT6xlD04pqcliFXBT/eSUOTsW1swISMqrY9fKU65 iHwFpNs8HDCTe/Q7JRYan36K8Fgtc7Z4SeYYsMRAJODVFANYZPSLsZzR3xP3KNpsQ+uE w9CDuQZzFI3pU6QJRKe74t7l5HQF6/alm+4MG0GgnPJoPFtUYnAE+YMZdwdI9KDvGxd9 3KFDJ9SFkQJJWJQd3oFGUrsN4w2uD93ah75VFjiz7Mr+Q7YE+DNYnte1rI5DBC8KCOjx dU5Oy91i5n/Av/1+cHNzKD7Phic00fMz/ghja/hmV9IMcmCl8I1MKiO6qyL2fdM0qQMA rXJw== 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=Nlxn0UL9TpQdzDv83NkI185u8GUv4l17wupW0ANAp2A=; b=GAEXNXZVowweCTvMGWx7gVXMQWrD1KQCZL90AKJnHeWQ6o8BpdxwUMqSY7yt9xNz7b MmDifu+tB+i9eduqjkGKNjrBVCpB4jbCPTSRk0rBSKxz9XGaI8J0PLmp3DX3kVT/FL/p YoLetNcOYi/19LTt/YzJ34tjgzIvpVx7qHjmRAp1ywCpWKqGnaI2oqbtDyc8Y4oxORgs TYalLaoWKZEmM1g8PZieiTPQDgIgicaUFUJe4rnGzQ75pBZ+640UzvlxiAmhEuvlzXWn 8SMverMZEHGH9QtYq1rzDfEHvpNY1OQMZUZKdyBILcfJijakt8u4PhsqUxZYiHeoT52t Ogcw== X-Gm-Message-State: AGi0PuYPZJGLIO6d0I/uiQ0sB+D+9gkzW0N4RTL0GANx2mAQhbGdyqB3 TfUwGLAKd7XshZdU/aFEQQfHjG+3o/aB5A== X-Google-Smtp-Source: APiQypI5LQ3BRtU4Fm3ufFNdbfTLNArBDHszS1oYxsafWeGHXe8yYtPqYK32yXepmWUlUVmmdEsiqQ== X-Received: by 2002:a2e:9097:: with SMTP id l23mr5016089ljg.173.1585304972529; Fri, 27 Mar 2020 03:29:32 -0700 (PDT) Received: from localhost.localdomain (193-106-246-138.noc.fibertech.net.pl. [193.106.246.138]) by smtp.gmail.com with ESMTPSA id i11sm2789587lfo.84.2020.03.27.03.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 03:29:31 -0700 (PDT) From: Michal Krawczyk To: dev@dpdk.org Cc: mw@semihalf.com, mba@semihalf.com, gtzalik@amazon.com, evgenys@amazon.com, igorch@amazon.com, Michal Krawczyk Date: Fri, 27 Mar 2020 11:18:11 +0100 Message-Id: <20200327101823.12646-18-mk@semihalf.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327101823.12646-1-mk@semihalf.com> References: <20200327101823.12646-1-mk@semihalf.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 17/29] net/ena: add support for large LLQ headers 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" If the device supports larger LLQ (Low Latency Queue) headers, the user can activate them by enabling CONFIG_RTE_LIBRTE_ENA_LARGE_LLQ_HEADERS flag in the configuration file. If the device isn't supporting this feature, the default value will be used. Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- config/common_base | 1 + doc/guides/nics/ena.rst | 5 +++++ drivers/net/ena/ena_ethdev.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/config/common_base b/config/common_base index c31175f9d6..31f508b3cc 100644 --- a/config/common_base +++ b/config/common_base @@ -266,6 +266,7 @@ CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n +CONFIG_RTE_LIBRTE_ENA_LARGE_LLQ_HEADERS=n # # Compile burst-oriented Cisco ENIC PMD driver diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst index bbf27f235a..a953068cac 100644 --- a/doc/guides/nics/ena.rst +++ b/doc/guides/nics/ena.rst @@ -95,6 +95,11 @@ Configuration information * **CONFIG_RTE_LIBRTE_ENA_COM_DEBUG** (default n): Enables or disables debug logging of low level tx/rx logic in ena_com(base) within the ENA PMD driver. + * **CONFIG_RTE_LIBRTE_ENA_LARGE_LLQ_HEADERS** (default n): Enables or + disables usage of large LLQ headers. This option will have effect only if + the device also supports large LLQ headers. Otherwise, the default value + will be used. + **ENA Configuration Parameters** * **Number of Queues** diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index e1d1a9a7b6..b8bf31be7c 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -894,6 +894,19 @@ ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx) max_rx_queue_size = rte_align32prevpow2(max_rx_queue_size); max_tx_queue_size = rte_align32prevpow2(max_tx_queue_size); +#ifdef RTE_LIBRTE_ENA_LARGE_LLQ_HEADERS + if ((llq->entry_size_ctrl_supported & ENA_ADMIN_LIST_ENTRY_SIZE_256B) && + (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)) { + max_tx_queue_size /= 2; + PMD_INIT_LOG(INFO, + "Forcing large headers and decreasing maximum TX queue size to %d\n", + max_tx_queue_size); + } else { + PMD_INIT_LOG(ERR, + "Forcing large headers failed: LLQ is disabled or device does not support large headers\n"); + } +#endif + if (unlikely(max_rx_queue_size == 0 || max_tx_queue_size == 0)) { PMD_INIT_LOG(ERR, "Invalid queue size"); return -EFAULT; @@ -1595,14 +1608,28 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, } static inline void -set_default_llq_configurations(struct ena_llq_configurations *llq_config) +set_default_llq_configurations(struct ena_llq_configurations *llq_config, + struct ena_admin_feature_llq_desc *llq) { llq_config->llq_header_location = ENA_ADMIN_INLINE_HEADER; - llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B; llq_config->llq_stride_ctrl = ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY; llq_config->llq_num_decs_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2; +#ifdef RTE_LIBRTE_ENA_LARGE_LLQ_HEADERS + if ((llq->entry_size_ctrl_supported & ENA_ADMIN_LIST_ENTRY_SIZE_256B)) { + llq_config->llq_ring_entry_size = + ENA_ADMIN_LIST_ENTRY_SIZE_256B; + llq_config->llq_ring_entry_size_value = 256; + } else { + llq_config->llq_ring_entry_size = + ENA_ADMIN_LIST_ENTRY_SIZE_128B; + llq_config->llq_ring_entry_size_value = 128; + } +#else + llq_config->llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B; llq_config->llq_ring_entry_size_value = 128; + RTE_SET_USED(llq); +#endif } static int @@ -1749,7 +1776,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) } adapter->wd_state = wd_state; - set_default_llq_configurations(&llq_config); + set_default_llq_configurations(&llq_config, &get_feat_ctx.llq); rc = ena_set_queues_placement_policy(adapter, ena_dev, &get_feat_ctx.llq, &llq_config); if (unlikely(rc)) {