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 E57ED436D5 for ; Tue, 12 Dec 2023 21:07:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C36D142E63; Tue, 12 Dec 2023 21:07:05 +0100 (CET) Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by mails.dpdk.org (Postfix) with ESMTP id 1663742E59 for ; Tue, 12 Dec 2023 21:07:04 +0100 (CET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-db402e6f61dso6560733276.3 for ; Tue, 12 Dec 2023 12:07:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702411623; x=1703016423; darn=dpdk.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=QcJntaVvMgL6ncJDZmUipUEJYjljAyHz3BbEZdYrLpI=; b=Fl01L3Oa2yjYYeSZ8ZMoBHWwYsNqt+1/hRbj8WYmi9Vfg9Sn3vJCRYaMZV7q0+HHZV S7KpDTVmx+Fsu+3n/lwB7d840Pw/jDoMaQ+26R+t9Fv+zqqz10XqJcT1m++RydjRuXgG R2kUxrvgjILB2BbrzC6AUPTUiPfDhfKr2dCkao+4JP78C9f08uNnnX1prtV+ew7cjQ+m cU1THTtb5l3NrTC9lGHeJGd+1ihzmgPJVGQks00hbVOTly1cSUlM5HFLWZc6TLrz8KBX 7uFPXqHEaP8L6bIhyQ1lvDigySv0jmhGnEWLaOiu335C1JcCEBgQLrRfP0xM8B18Vu8f mVYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702411623; x=1703016423; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QcJntaVvMgL6ncJDZmUipUEJYjljAyHz3BbEZdYrLpI=; b=pn7F1mZuivcFUo+vdPHC+aGsGzMj6PALWLqxIoDaSVtt8AVOr6qjU2nLVMF/04wGzr uOw5hHm1f6qbTnS/dJ85sPoYMG7ic3npgER0YR1vmPORtVzmidg7ay1I3D8Mj9V3JTPW gYvF/S2y4VB+oX48QTLx47okAYgyD55yOLGg80QJI7MbnsDVxthAL05KowFxuSU3NF75 OrSUGdUQDkMJSFblv9kTFJlahGZpvMF5khHeZ7newpYnt5/UQTE+nEzgeW5tJ0VUe0Ag F3MGToX1j3sJVnLzC4bZ1yNvnGBIScA0fSEwQsZhNqXytQSivOpHk5Wy+ayw5ITP0QCt XzCw== X-Gm-Message-State: AOJu0Ywtyv7ZTDfbdMgfgLDaujriqWmXtF0uSvrZyfCF9S64sOrku1ep iCZ5I8nG59dBYpgAJQXEsJyeN77Wj6jVBw== X-Google-Smtp-Source: AGHT+IH3FSncI2/PBk/hZEnByZK85XCf4sf4eEWgApCo0qTcJfyeqpHJgKLnN+1ZVbWw3+9Z3vs3qi/2TDI4TA== X-Received: from joshwash.sea.corp.google.com ([2620:15c:11c:202:3424:c5f9:2c52:e888]) (user=joshwash job=sendgmr) by 2002:a25:e20c:0:b0:db5:47c1:e82d with SMTP id h12-20020a25e20c000000b00db547c1e82dmr44891ybe.6.1702411623255; Tue, 12 Dec 2023 12:07:03 -0800 (PST) Date: Tue, 12 Dec 2023 12:06:47 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231212200647.320716-1-joshwash@google.com> Subject: [PATCH 22.11] net/gve: fix RX buffer size alignment From: Joshua Washington To: Junfeng Guo , Xiaoyun Li , Rushil Gupta , Joshua Washington , Jeroen de Borst Cc: stable@dpdk.org, Xueming Li Content-Type: text/plain; charset="UTF-8" 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 The GVE driver has RX buffer size alignment requirements which will not always be respected when a user specifies an mbuf size. Assuming that an mbuf size is greater than the DPDK recommended default (2048 + 128), if the buffer size is not properly aligned with what the device expects, the device will silently fail to create any transmit or receive queues. Because no queues are created, there is no network traffic for the DPDK program, and errors like the following are returned when attempting to destroy queues: gve_adminq_parse_err(): AQ command failed with status -11 gve_stop_tx_queues(): failed to destroy txqs gve_adminq_parse_err(): AQ command failed with status -11 gve_stop_rx_queues(): failed to destroy rxqs This change aims to remedy this by restricting the RX receive buffer sizes to valid sizes for the GQ queue format, including both alignment and minimum and maximum supported buffer sizes. Fixes: 4bec2d0b5572 ("net/gve: support queue operations") Fixes: 1dc00f4fc74b ("net/gve: add Rx queue setup for DQO") Cc: junfeng.guo@intel.com Cc: stable@dpdk.org Signed-off-by: Joshua Washington Reviewed-by: Rushil Gupta --- drivers/net/gve/gve_ethdev.c | 2 +- drivers/net/gve/gve_ethdev.h | 4 +++- drivers/net/gve/gve_rx.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index 7872b4e476..0796d37760 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -275,7 +275,7 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->max_mac_addrs = 1; dev_info->max_rx_queues = priv->max_nb_rxq; dev_info->max_tx_queues = priv->max_nb_txq; - dev_info->min_rx_bufsize = GVE_MIN_BUF_SIZE; + dev_info->min_rx_bufsize = GVE_RX_MIN_BUF_SIZE_GQI; dev_info->max_rx_pktlen = priv->max_mtu + RTE_ETHER_HDR_LEN; dev_info->max_mtu = priv->max_mtu; dev_info->min_mtu = RTE_ETHER_MIN_MTU; diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 4123685b34..b7702a1249 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -28,7 +28,9 @@ #define GVE_DEFAULT_TX_FREE_THRESH 256 #define GVE_TX_MAX_FREE_SZ 512 -#define GVE_MIN_BUF_SIZE 1024 +#define GVE_RX_BUF_ALIGN_GQI 2048 +#define GVE_RX_MIN_BUF_SIZE_GQI 2048 +#define GVE_RX_MAX_BUF_SIZE_GQI 4096 /* A list of pages registered with the device during setup and used by a queue * as buffers diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c index 518c9d109c..50f9f5c370 100644 --- a/drivers/net/gve/gve_rx.c +++ b/drivers/net/gve/gve_rx.c @@ -222,6 +222,7 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, const struct rte_memzone *mz; struct gve_rx_queue *rxq; uint16_t free_thresh; + uint32_t mbuf_len; int err = 0; if (nb_desc != hw->rx_desc_cnt) { @@ -265,7 +266,11 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, rxq->hw = hw; rxq->ntfy_addr = &hw->db_bar2[rte_be_to_cpu_32(hw->irq_dbs[rxq->ntfy_id].id)]; - rxq->rx_buf_len = rte_pktmbuf_data_room_size(rxq->mpool) - RTE_PKTMBUF_HEADROOM; + mbuf_len = + rte_pktmbuf_data_room_size(rxq->mpool) - RTE_PKTMBUF_HEADROOM; + rxq->rx_buf_len = + RTE_MIN((uint16_t)GVE_RX_MAX_BUF_SIZE_GQI, + RTE_ALIGN_FLOOR(mbuf_len, GVE_RX_BUF_ALIGN_GQI)); /* Allocate software ring */ rxq->sw_ring = rte_zmalloc_socket("gve rx sw ring", sizeof(struct rte_mbuf *) * nb_desc, -- 2.43.0.472.g3155946c3a-goog