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 C2D53A0546 for ; Fri, 30 Apr 2021 14:58:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 421B441348; Fri, 30 Apr 2021 14:58:12 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 3699641317 for ; Fri, 30 Apr 2021 14:58:05 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id l14so638182wrx.5 for ; Fri, 30 Apr 2021 05:58:05 -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=OVjiNi3rEM6c2TPW5cj3QlpdyHt7FsIV4QxsJDBzno0=; b=0TUoNidlVRqY0Vme3a38SEKQU/hWDF1m/JNOUB9PTF53D8DvzwsJYMdstIaHQJmcpv evYM0CTcLy/Qoe1KHrzV5bTrql1Z4AsMzo9XybsXdsgxYyhqWkkcpRM1irq1KzcQoIq5 jVrXl4JNYiX8i5mpe/ITnaCa4eAtxapESlQ5RWmW9NT3puIr4LeRto/TKStH9DcPyaNa PI/z51rNETI8lk3VnJ7h2Az1V1CaH3yB9mmeNb8LwErNfkrLZ3aHQQaATxM6fAu99WyW 9lQTaCE4qkgQ/jF04OtlReN87B+EkJn3tATBwSdtt95f26ejjg4oUAvM+viiMhlHA8Gr Gw7g== 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=OVjiNi3rEM6c2TPW5cj3QlpdyHt7FsIV4QxsJDBzno0=; b=DtBxntk/J/cXyhvtNZgJcwf5B657RYrHtEtRyyXx6Ytu+mc/g+fTHXZXbXx7/siIxM 4OPBhKAK+K5lGxhxtkOtscba+eNJ6ep0V5Wo2/21qIcpuMWfMSKMBI/TfquwOQwFEZul swsPudRAGh3AJ0qCwKyG8z7V0jIL2UphzO1YKeQT0ak12x8FGmBEYPWs0taU/lGLgcA3 Z+rRhbC0dY5L6be+sIsYUIbnS91R+ZEM4uh8ag8pLdLYMuPerEgL7cFFi64xmyQInS3W CU+l/u/3fbv4ThkLj3fucW67I9+ZJrqka7M1/KBxvQXxDl6DOTw9K3+TF0qu+hJ01Sbr jzwg== X-Gm-Message-State: AOAM532ly9SPgPkz+s3PXFh5E4bERvor4aoYNGkE33eudavA1k+FFT8h DgPkNEm7lqWY5svOHixeJYJ6EQ== X-Google-Smtp-Source: ABdhPJwTvv4bF0IbSwlB2h31vQKhNKrwrvtpNLxoeqd06bowXQHGVabaiiQ6O+WL2/8yC2z9iYIQBw== X-Received: by 2002:a5d:6d48:: with SMTP id k8mr6520866wri.93.1619787485057; Fri, 30 Apr 2021 05:58:05 -0700 (PDT) Received: from DESKTOP-U5LNN3J.localdomain (89-79-189-199.dynamic.chello.pl. [89.79.189.199]) by smtp.gmail.com with ESMTPSA id l13sm13476245wmj.3.2021.04.30.05.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 05:58:04 -0700 (PDT) From: Michal Krawczyk To: dev@dpdk.org Cc: ndagan@amazom.com, gtzalik@amazon.com, igorch@amazon.com, mw@semihalf.com, Stanislaw Kardach , stable@dpdk.org, Michal Krawczyk , Shay Agroskin Date: Fri, 30 Apr 2021 14:57:24 +0200 Message-Id: <20210430125725.28796-22-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210430125725.28796-1-mk@semihalf.com> References: <20210430125725.28796-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 21/22] net/ena: report default ring size X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Stanislaw Kardach Remove invalid ring size alignment logic and add default rx and tx port ring sizes to the device info spec. The logic in lines 1297 and 1371 is invalid. The RTE_ETH_DEV_FALLBACK_RX_RINGSIZE (and the TX counterpart) is a value that rte_eth_rx_queue_setup() will set if dev_info.default_rxportconf.ring_size is 0 and user provided 0 in nb_rx_desc argument. However the current code treats it as a hint for the PMD to change the ring size to internal defaults. Additionally since the ENA_DEFAULT_RING_SIZE is defined, report it in the device capabilities so that both rte_ethdev code and the user can utilize it for device configuration. Fixes: ea93d37eb49d ("net/ena: add HW queues depth setup") Cc: stable@dpdk.org Signed-off-by: Stanislaw Kardach Reviewed-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Shay Agroskin --- drivers/net/ena/ena_ethdev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 73e99e956a..c5d8e7d43e 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1294,9 +1294,6 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } - if (nb_desc == RTE_ETH_DEV_FALLBACK_TX_RINGSIZE) - nb_desc = adapter->max_tx_ring_size; - txq->port_id = dev->data->port_id; txq->next_to_clean = 0; txq->next_to_use = 0; @@ -1368,9 +1365,6 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev, return ENA_COM_FAULT; } - if (nb_desc == RTE_ETH_DEV_FALLBACK_RX_RINGSIZE) - nb_desc = adapter->max_rx_ring_size; - if (!rte_is_power_of_2(nb_desc)) { PMD_DRV_LOG(ERR, "Unsupported size of RX queue: %d is not a power of 2.\n", @@ -2130,6 +2124,9 @@ static int ena_infos_get(struct rte_eth_dev *dev, dev_info->tx_desc_lim.nb_mtu_seg_max = RTE_MIN(ENA_PKT_MAX_BUFS, adapter->max_tx_sgl_size); + dev_info->default_rxportconf.ring_size = ENA_DEFAULT_RING_SIZE; + dev_info->default_txportconf.ring_size = ENA_DEFAULT_RING_SIZE; + return 0; } -- 2.25.1