From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA54A337100 for ; Wed, 22 Oct 2025 18:23:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761157405; cv=none; b=VKbSUYwK1yIPJuYwig+P0trlzbCYqaEnDD4jEY8pfMlm5SVtHh019iYSXKRNKThBEI7Na7DdMmF57/EBeTR18QRH8lDMPN/BT73vID9mCVlPXFS32ypNW6HJIhn/vBepCrnk9Psh84QprYSjCU5033T43okcyH6Kxwvv+skjVds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761157405; c=relaxed/simple; bh=Mtn2S0bnI8t9f5MzmCAQjaNwa/k1YvIYY2gLwi4xrFM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZO7bBSzSFvNmR8KEc2szWU1tL/0K8FsCxQPdY8VjazrCgCA+cNLllZ0viY12VUCcT5xrpUFDlFy8GwyCyvcpf3ztJsYr1t5ykPxNCp+9Yo/ox1cy0P+32NdXeCd8sSTnWnvCBjnTvpIPd7wj4u2N3piec9YYgi1B4E9XuD8sTlA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ZR8HU3s5; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZR8HU3s5" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3324538ceb0so12231979a91.1 for ; Wed, 22 Oct 2025 11:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761157403; x=1761762203; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BSjvwoj3QY8YDFwz6g2xMO+Jxrb6UQbJ+DExnyviC1c=; b=ZR8HU3s5HSykCA8r1kKXxukBUG5NEIuQWaHSUbOqhBRO8GtrSppkAKAK6fIVJKj24v SguBa+QP4fus1J4yAzBjk7ggJBCbDPqMNIUK8i4QwP2+hJautN0gaBXIRuqed7I1CqW8 EdyAthZkOiQidk92mVGlUusT+l5D1iBZf6IoI3I+GBEFlOE2FLyzr5Fy3vLvserZqQbl xuGPdPasoF3kHd14XYNVRT+dwgHUzc6EswyOQ7jONZs3c7dynthRlnsEuZ1JZJfSQcT1 Dpe5Zkyd9Z6/WvcIRf/l7cb0TuPpwM6oqI9H8bgPACsdFFU4hrnOpQoChOZyPIabg5XW g+QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761157403; x=1761762203; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BSjvwoj3QY8YDFwz6g2xMO+Jxrb6UQbJ+DExnyviC1c=; b=vsETB+/FWA5e6gVx7c4x2Xyo7kNLuhPCGcbj6hncg+JbjwFf++hzeY13HHBWfUFN44 5IrRCqsTRhuk6xSZdygqIYMP2CEY3ySnVBivobGuUbCsG2SgXn+bsuvCMwTF6+n1usw+ A89lkI1yG28JRwNV5yzRnNkO1FUkBhaB9K2P51H7zynh0J++hQnIu78WT4xKy6VTPW+t Bd/wjHbT1XfAFgP11jg6j2LaQDjTrCdH5FakJZ3u3QdYenQbp/er2gi+Z0igveUC77yL G7hm7tbWqJAky0u6jwjnP3enaBQ3z3hQaOSuBeFmk996xlcoVPhwgQaY8MokvpieFeOD kJlA== X-Forwarded-Encrypted: i=1; AJvYcCU/y847fGxEzpbccfCnLycBHNXWzx75TmGlOXHszM/tgA6Twlmy/u8eedIATeh+OH1IPkINNe91jSR0jsc=@vger.kernel.org X-Gm-Message-State: AOJu0YxgPFSOdk/35NNl/74BMJjzJR0z9oFDSwioAyrtRcvDrQFJZNJO mis/BAMnVyEWPgdGAqq34CpWJdrDpGf7oxEqlIpcUF8QoC7tJiAZESbfmbiyXKcVoI1xuB8/WPD pGoNKECkXjTRw9w== X-Google-Smtp-Source: AGHT+IFSGiEBHzmUJ9Zm6BjG0EdjwrD2yFch0TYJtxCLqhBdri6M5unSRtixX3MkKfUYqoMBDsSlJFJSIffG9g== X-Received: from pjbkr5.prod.google.com ([2002:a17:90b:4905:b0:33e:384c:7327]) (user=joshwash job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:ec8b:b0:32e:9a24:2df9 with SMTP id 98e67ed59e1d1-33bcf86c09emr25106830a91.14.1761157403088; Wed, 22 Oct 2025 11:23:23 -0700 (PDT) Date: Wed, 22 Oct 2025 11:22:23 -0700 In-Reply-To: <20251022182301.1005777-1-joshwash@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251022182301.1005777-1-joshwash@google.com> X-Mailer: git-send-email 2.51.1.814.gb8fa24458f-goog Message-ID: <20251022182301.1005777-2-joshwash@google.com> Subject: [PATCH net-next 1/3] gve: Decouple header split from RX buffer length From: Joshua Washington To: netdev@vger.kernel.org Cc: Ankit Garg , Harshitha Ramamurthy , Jordan Rhee , Willem de Bruijn , Joshua Washington , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Praveen Kaligineedi , Ziwei Xiao , open list Content-Type: text/plain; charset="UTF-8" From: Ankit Garg Previously, enabling header split via `gve_set_hsplit_config` also implicitly changed the RX buffer length to 4K (if supported by the device). This coupled two settings that should be orthogonal; this patch removes that side effect. After this change, `gve_set_hsplit_config` only toggles the header split configuration. The RX buffer length is no longer affected and must be configured independently. Signed-off-by: Ankit Garg Reviewed-by: Harshitha Ramamurthy Reviewed-by: Jordan Rhee Reviewed-by: Willem de Bruijn Signed-off-by: Joshua Washington --- drivers/net/ethernet/google/gve/gve.h | 3 --- drivers/net/ethernet/google/gve/gve_ethtool.c | 2 -- drivers/net/ethernet/google/gve/gve_main.c | 10 ---------- 3 files changed, 15 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index cf95ec25b11a..c237d00c5ab3 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -59,8 +59,6 @@ #define GVE_DEFAULT_RX_BUFFER_SIZE 2048 -#define GVE_MAX_RX_BUFFER_SIZE 4096 - #define GVE_XDP_RX_BUFFER_SIZE_DQO 4096 #define GVE_DEFAULT_RX_BUFFER_OFFSET 2048 @@ -1249,7 +1247,6 @@ void gve_rx_free_rings_gqi(struct gve_priv *priv, struct gve_rx_alloc_rings_cfg *cfg); void gve_rx_start_ring_gqi(struct gve_priv *priv, int idx); void gve_rx_stop_ring_gqi(struct gve_priv *priv, int idx); -u16 gve_get_pkt_buf_size(const struct gve_priv *priv, bool enable_hplit); bool gve_header_split_supported(const struct gve_priv *priv); int gve_set_hsplit_config(struct gve_priv *priv, u8 tcp_data_split, struct gve_rx_alloc_rings_cfg *rx_alloc_cfg); diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c index b030a84b678c..db6fc855a511 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -606,8 +606,6 @@ static int gve_set_ringparam(struct net_device *netdev, } else { /* Set ring params for the next up */ priv->header_split_enabled = rx_alloc_cfg.enable_header_split; - priv->rx_cfg.packet_buffer_size = - rx_alloc_cfg.packet_buffer_size; priv->tx_desc_cnt = tx_alloc_cfg.ring_size; priv->rx_desc_cnt = rx_alloc_cfg.ring_size; } diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 29845e8f3c0d..8d825218965a 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2041,14 +2041,6 @@ static void gve_tx_timeout(struct net_device *dev, unsigned int txqueue) priv->tx_timeo_cnt++; } -u16 gve_get_pkt_buf_size(const struct gve_priv *priv, bool enable_hsplit) -{ - if (enable_hsplit && priv->max_rx_buffer_size >= GVE_MAX_RX_BUFFER_SIZE) - return GVE_MAX_RX_BUFFER_SIZE; - else - return GVE_DEFAULT_RX_BUFFER_SIZE; -} - /* Header split is only supported on DQ RDA queue format. If XDP is enabled, * header split is not allowed. */ @@ -2080,8 +2072,6 @@ int gve_set_hsplit_config(struct gve_priv *priv, u8 tcp_data_split, return 0; rx_alloc_cfg->enable_header_split = enable_hdr_split; - rx_alloc_cfg->packet_buffer_size = - gve_get_pkt_buf_size(priv, enable_hdr_split); return 0; } -- 2.51.1.814.gb8fa24458f-goog