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 649804337B; Mon, 20 Nov 2023 09:04:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBC5142DB6; Mon, 20 Nov 2023 09:04:36 +0100 (CET) Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by mails.dpdk.org (Postfix) with ESMTP id C639540266 for ; Mon, 20 Nov 2023 09:04:35 +0100 (CET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5c934524a61so24689237b3.2 for ; Mon, 20 Nov 2023 00:04:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700467474; x=1701072274; darn=dpdk.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=aAMrhxSwHa7Y9RHwq2pItKAc2y6rFU//TBoeo2yUXr4=; b=mpuLkmGTEDXnJl0f2vYvvGIF499HaKKckrAvYmd5ejzTTEb1Wsd+HpMDA89pUoEXgM ko8OhJkdeaaWDnTu1VcVaVRTvJgpy0zpzA5Nh+GyrSF/+1+rwtBzra+atf6IepwrkgX2 +CPzTltF7KyJcYH0JuRugeh/m0r3QNwPBdSjZ9GH3wF2YKxN7c2E/T2x2io10ItBoNFp cvzvOvP3ag/shrtkVNKPusb86uVaH9Rw+aOd6cpqyoRn/opSYRZhtYtBj7aQAFFtv62C pkAuvzPXDE15tH5+OXdj/VYfRlqp4cARB9T/4F8Q9bgEH0uK8B4bD9ihI4ZcI452Iz9z 241g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700467474; x=1701072274; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aAMrhxSwHa7Y9RHwq2pItKAc2y6rFU//TBoeo2yUXr4=; b=LhQ0Y3OYewZ83QUfqsTuwUlpB3ypBIroykwhXmowTt0B6lylEMwNIKy1DJ4B9i63qK 1dO6oLyClXKjpbM08TkrWzdk5G58vPDjT65zDxYGFIIKvDln2aT2Knfiu33HEmvCyrBy 8GhrzqmYHq/4m23pkldU13awGppmYOEUB5iywMKDTxf6SE8eMIkIa3bsQnjCsSURE6R+ b7lvzLuiXOIPln1GrJyJnPfDdW04Wge7bRGpretP5+K+u722W+TMAB2CbICX+yglabvI is0JzgrqHpCBg4CoCxb2YQ0SHc2LTsFHI+BTumyX0H10gHGAV8InRDl/WJq4ZBDxd9hI qhCA== X-Gm-Message-State: AOJu0YzJnOpdVNpB5lB/WLVxcG4RNTW9ka9mc95/jdTudZrgyEEv4RDU oYhIQp3lW5sfbmtd/ZKBuh9OS2FCBHF1 X-Google-Smtp-Source: AGHT+IGO07I1cevyW0iJ+m3CdirQaHTzh59/qhyzaa0VHq50Up6gN03w8TlSkZy4RRJNGa6Gk7Rk2zY4onEu X-Received: from wrushilg.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:2168]) (user=rushilg job=sendgmr) by 2002:a05:690c:2a46:b0:5ca:92ac:cd27 with SMTP id ej6-20020a05690c2a4600b005ca92accd27mr33900ywb.2.1700467474716; Mon, 20 Nov 2023 00:04:34 -0800 (PST) Date: Mon, 20 Nov 2023 08:04:30 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231120080430.1446500-1-rushilg@google.com> Subject: [PATCH] net/gve: add support for 4K ring size only for DQO From: Rushil Gupta To: junfeng.guo@intel.com, jeroendb@google.com, joshwash@google.com, ferruh.yigit@amd.com Cc: dev@dpdk.org, Rushil Gupta Content-Type: text/plain; charset="UTF-8" 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 Bump up the dpdk dqo driver ring size to 4096. The queue size is controlled by queue_setup method. Signed-off-by: Rushil Gupta Reviewed-by: Joshua Washington --- drivers/net/gve/base/gve_adminq.c | 8 ++++---- drivers/net/gve/gve_ethdev.c | 4 ++-- drivers/net/gve/gve_ethdev.h | 1 + drivers/net/gve/gve_rx_dqo.c | 6 ------ drivers/net/gve/gve_tx_dqo.c | 6 ------ 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c index 41202725e6..343bd13d67 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -516,11 +516,11 @@ static int gve_adminq_create_tx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_tx_queue.queue_page_list_id = cpu_to_be32(qpl_id); } else { cmd.create_tx_queue.tx_ring_size = - cpu_to_be16(priv->tx_desc_cnt); + cpu_to_be16(txq->nb_tx_desc); cmd.create_tx_queue.tx_comp_ring_addr = cpu_to_be64(txq->compl_ring_phys_addr); cmd.create_tx_queue.tx_comp_ring_size = - cpu_to_be16(priv->tx_compq_size * DQO_TX_MULTIPLIER); + cpu_to_be16(txq->sw_size); } return gve_adminq_issue_cmd(priv, &cmd); @@ -566,7 +566,7 @@ static int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_rx_queue.packet_buffer_size = cpu_to_be16(rxq->rx_buf_len); } else { cmd.create_rx_queue.rx_ring_size = - cpu_to_be16(priv->rx_desc_cnt); + cpu_to_be16(rxq->nb_rx_desc); cmd.create_rx_queue.rx_desc_ring_addr = cpu_to_be64(rxq->compl_ring_phys_addr); cmd.create_rx_queue.rx_data_ring_addr = @@ -574,7 +574,7 @@ static int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_rx_queue.packet_buffer_size = cpu_to_be16(rxq->rx_buf_len); cmd.create_rx_queue.rx_buff_ring_size = - cpu_to_be16(priv->rx_bufq_size); + cpu_to_be16(rxq->nb_rx_desc); cmd.create_rx_queue.enable_rsc = !!(priv->enable_rsc); } diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index 001cae2b98..ecd37ff37f 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -333,14 +333,14 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->default_rxportconf.ring_size = priv->rx_desc_cnt; dev_info->rx_desc_lim = (struct rte_eth_desc_lim) { - .nb_max = priv->rx_desc_cnt, + .nb_max = gve_is_gqi(priv) ? priv->rx_desc_cnt : GVE_MAX_QUEUE_SIZE_DQO, .nb_min = priv->rx_desc_cnt, .nb_align = 1, }; dev_info->default_txportconf.ring_size = priv->tx_desc_cnt; dev_info->tx_desc_lim = (struct rte_eth_desc_lim) { - .nb_max = priv->tx_desc_cnt, + .nb_max = gve_is_gqi(priv) ? priv->tx_desc_cnt : GVE_MAX_QUEUE_SIZE_DQO, .nb_min = priv->tx_desc_cnt, .nb_align = 1, }; diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 37f2b60845..58d8943e71 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -23,6 +23,7 @@ #define GVE_RX_BUF_ALIGN_DQO 128 #define GVE_RX_MIN_BUF_SIZE_DQO 1024 #define GVE_RX_MAX_BUF_SIZE_DQO ((16 * 1024) - GVE_RX_BUF_ALIGN_DQO) +#define GVE_MAX_QUEUE_SIZE_DQO 4096 #define GVE_RX_BUF_ALIGN_GQI 2048 #define GVE_RX_MIN_BUF_SIZE_GQI 2048 diff --git a/drivers/net/gve/gve_rx_dqo.c b/drivers/net/gve/gve_rx_dqo.c index 422784e7e0..7c7a8c48d0 100644 --- a/drivers/net/gve/gve_rx_dqo.c +++ b/drivers/net/gve/gve_rx_dqo.c @@ -223,12 +223,6 @@ gve_rx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint32_t mbuf_len; int err = 0; - if (nb_desc != hw->rx_desc_cnt) { - PMD_DRV_LOG(WARNING, "gve doesn't support nb_desc config, use hw nb_desc %u.", - hw->rx_desc_cnt); - } - nb_desc = hw->rx_desc_cnt; - /* Free memory if needed */ if (dev->data->rx_queues[queue_id]) { gve_rx_queue_release_dqo(dev, queue_id); diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c index e0d144835b..16101de84f 100644 --- a/drivers/net/gve/gve_tx_dqo.c +++ b/drivers/net/gve/gve_tx_dqo.c @@ -268,12 +268,6 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t sw_size; int err = 0; - if (nb_desc != hw->tx_desc_cnt) { - PMD_DRV_LOG(WARNING, "gve doesn't support nb_desc config, use hw nb_desc %u.", - hw->tx_desc_cnt); - } - nb_desc = hw->tx_desc_cnt; - /* Free memory if needed. */ if (dev->data->tx_queues[queue_id]) { gve_tx_queue_release_dqo(dev, queue_id); -- 2.43.0.rc1.413.gea7ed67945-goog