GQI chains a frame larger than one Rx buffer into a multi-segment mbuf
whether or not the application enabled RTE_ETH_RX_OFFLOAD_SCATTER, so
an application that did not ask for scatter can still receive chained
mbufs once the MTU exceeds the Rx buffer.
Refuse such a configuration on GQI. Rx queue setup fails when the
current MTU plus the Ethernet header and the GVE_RX_PAD bytes ahead of
the frame does not fit in the queue's Rx buffer, and an MTU change
fails on the same test against each configured Rx queue. The buffer
length comes from one helper shared with queue setup, so the check
matches the size the device is given. DQO is unchanged.
Fixes: 496d4d2c8b54 ("net/gve: support jumbo frame for GQI")
Cc: [email protected]
Suggested-by: Stephen Hemminger <[email protected]>
Signed-off-by: Ryan Wolfe <[email protected]>
---
drivers/net/gve/gve_ethdev.c | 18 ++++++++++++++++++
drivers/net/gve/gve_ethdev.h | 9 +++++++++
drivers/net/gve/gve_rx.c | 31 +++++++++++++++++++++++++------
3 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index 92a5a7679f..e47ec0c55b 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -1031,6 +1031,24 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
return -EBUSY;
}
+ /* GQI chains a frame larger than one Rx buffer into a multi-segment
+ * mbuf. No Rx offload is per-queue here, so check the port offloads.
+ */
+ if (gve_is_gqi(priv) &&
+ !(dev->data->dev_conf.rxmode.offloads &
RTE_ETH_RX_OFFLOAD_SCATTER)) {
+ for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) {
+ struct gve_rx_queue *rxq = dev->data->rx_queues[i];
+
+ if (rxq != NULL &&
+ gve_rx_gqi_needs_scatter(mtu, rxq->rx_buf_len)) {
+ PMD_DRV_LOG(ERR,
+ "MTU %u needs Rx scatter with %u
byte Rx buffers",
+ mtu, rxq->rx_buf_len);
+ return -EINVAL;
+ }
+ }
+ }
+
err = process_priv->ctrl_ops->set_mtu(priv, mtu);
if (err) {
PMD_DRV_LOG(ERR, "Failed to set mtu as %u err = %d", mtu, err);
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index 19eac9ec0b..f4b72a9159 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -454,6 +454,15 @@ gve_is_gqi(struct gve_priv *priv)
priv->queue_format == GVE_GQI_QPL_FORMAT;
}
+/* GQI places GVE_RX_PAD bytes ahead of the frame in its first Rx buffer
+ * and chains the rest of a larger frame into further buffers.
+ */
+static inline bool
+gve_rx_gqi_needs_scatter(uint16_t mtu, uint16_t rx_buf_len)
+{
+ return (uint32_t)mtu + RTE_ETHER_HDR_LEN + GVE_RX_PAD > rx_buf_len;
+}
+
static inline bool
gve_get_admin_queue_ok(struct gve_priv *priv)
{
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 09f9d8d480..4a455b3067 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -297,6 +297,16 @@ gve_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
dev->data->rx_queues[qid] = NULL;
}
+static uint16_t
+gve_rx_buf_len_gqi(struct rte_mempool *pool)
+{
+ uint32_t mbuf_len =
+ rte_pktmbuf_data_room_size(pool) - RTE_PKTMBUF_HEADROOM;
+
+ return RTE_MIN((uint16_t)GVE_RX_MAX_BUF_SIZE_GQI,
+ RTE_ALIGN_FLOOR(mbuf_len, GVE_RX_BUF_ALIGN_GQI));
+}
+
int
gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
uint16_t nb_desc, unsigned int socket_id,
@@ -306,7 +316,8 @@ 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;
+ uint16_t rx_buf_len;
+ uint64_t offloads;
int err = 0;
/* Ring size is required to be a power of two. */
@@ -316,6 +327,18 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_id,
return -EINVAL;
}
+ /* A frame larger than one Rx buffer is chained into a multi-segment
+ * mbuf, which the application must have asked for.
+ */
+ offloads = dev->data->dev_conf.rxmode.offloads | conf->offloads;
+ rx_buf_len = gve_rx_buf_len_gqi(pool);
+ if (!(offloads & RTE_ETH_RX_OFFLOAD_SCATTER) &&
+ gve_rx_gqi_needs_scatter(dev->data->mtu, rx_buf_len)) {
+ PMD_DRV_LOG(ERR, "MTU %u needs Rx scatter with %u byte Rx
buffers",
+ dev->data->mtu, rx_buf_len);
+ return -EINVAL;
+ }
+
/* Free memory if needed. */
if (dev->data->rx_queues[queue_id]) {
gve_rx_queue_release(dev, queue_id);
@@ -351,11 +374,7 @@ gve_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_id,
rxq->hw = hw;
rxq->ntfy_addr =
&hw->db_bar[rte_be_to_cpu_32(hw->irq_dbs[rxq->ntfy_id].id)];
- 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));
+ rxq->rx_buf_len = rx_buf_len;
/* Allocate software ring */
rxq->sw_ring = rte_zmalloc_socket("gve rx sw ring", sizeof(struct
rte_mbuf *) * nb_desc,
--
2.56.0.218.g1ec904b173-goog
