From nobody Wed Dec 17 10:46:35 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 7C7505CDF1 for ; Fri, 21 Mar 2025 00:29:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742516963; cv=none; b=hPxhph5uqG6syIwEkn7UfiSjx9Q0rBsjiaQBC+t+U8YnDlk7qECbxkWEGp4FLYvUbCbBze5nfLrjWHpXgFhKv56BaVu82qS4QHirdR8/lYQ/MoYIbKzCbPnrf73lXeDfnc/v8Z6RNRvfK/Gm9p7+Sdntubc8VI1+z9ji9SPNHOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742516963; c=relaxed/simple; bh=Jbm7GYaJXcjd03+tuScQgxz8fqw00dOQwC1LuGpDchY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LDN7P+9KlYSRqsWd1CIRMmBtpgs2RnSUI2OQZeoU/TD5oWY8eXtPfFX/xJr8rIKFNquWQCJMfAbIz45h6eelXMr3M+fkKaxdAgLz2sv9pXbs4uD+anHHSRXo9nxxBC8bcIBmLrkFMqz7FC56VBDKy7vs1wHx8XfCHI7BFO3ppF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=geEeMLjT; arc=none smtp.client-ip=209.85.216.74 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--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="geEeMLjT" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff6aaa18e8so2029667a91.1 for ; Thu, 20 Mar 2025 17:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742516962; x=1743121762; 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=KoTBbWww7JEQC+F5jRMP+bnOpvYvD/+5OAlhy1ULkuk=; b=geEeMLjTSdLTdOKmTL2VSJ6nhZu2vOQdxNxwK934MjNLfhmNL72gdx0YamiIFAduVu 0/jNV6T/6traltcsEO2ihRo5TNMFXhvbLNyOWlxE7dS93JntCDH07lCjSgiNMaigo0p7 GrXvXcgv65+UarRPSEFu7kN5H2j0klMDkJTNcLsGN5iEh2Vtpdk3aujHYZmXheHFsrzb 0td9JZ/4zrBvkSGlTB+/W4MzNkO9iS2y7PkPoIoNUSzI7uxlSGcB/bzpLgyiHDNtdc/J NxhgBprpAaDXhbH16oSqzLhcyqQ2cHsJTh9amDiRbGPxFZtkwWtPa6fXolrt9b66kzQD sDOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742516962; x=1743121762; 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=KoTBbWww7JEQC+F5jRMP+bnOpvYvD/+5OAlhy1ULkuk=; b=lKNhqwMV0AHL7YYES3srAxjvxtO7EqlrqxwCH9qsa8o4Teqc6QOno1pIPyccoubSB1 5oM9FTj5AE05JAX5Vfli8Qj9PSOImN8w7cHvA5BdSV2Mx/1DAOliRU/7Ai42hB08Q5vH 5x6vxoSOpq5VUTi0ETaWv0WVP1eRo9r9zjpzzXhgf+tlt9E/jMZY/EZPELgeifBhn9ut kkUQmBMP7jmFtRzXB6t2hU+i7J/S0ZSLrdECrwtgZZ3+YOjiKU+K9hGFxIol6D23HxWx Yn0XvzpdWm+PQSmkFDbT21iXq0SgwmHaaZuBp+sQG5mbsUp1IebiPWq+XQOfju1G/02h qsUg== X-Forwarded-Encrypted: i=1; AJvYcCV2oyES56NzBp8uTEVFHx4xud6LmCRJ23mlsYtGAJu/nyID5XfqgD7aJRYNVORX9ciqXQP3XDCYbFYCXJE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywl6Uf6GSgJ4thnlUDalr9NO9sy6d/arIuRbLT33dO1SlfbsSRA gzigUUwoP+XYiHs+cd+2YTST9ZF8DHPvS4qj9V2p39vxXiq+99YVEL9Zl43+ZeM3k1s4NkJw5Fz MpquMpj+gY36+alm0Mz8h2w== X-Google-Smtp-Source: AGHT+IF/RKffTkar3eNChq0M93Wm9yCSbeUCKsyAMrO6ynd5mACmphLhb4ZEULjZm1n+Oj8W1m67dSwK7GHZr2a5Lg== X-Received: from pgbdo13.prod.google.com ([2002:a05:6a02:e8d:b0:af2:8474:f67e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2448:b0:1f5:8179:4f42 with SMTP id adf61e73a8af0-1fe42f090fdmr2537813637.6.1742516961712; Thu, 20 Mar 2025 17:29:21 -0700 (PDT) Date: Fri, 21 Mar 2025 00:29:05 +0000 In-Reply-To: <20250321002910.1343422-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250321002910.1343422-1-hramamurthy@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250321002910.1343422-2-hramamurthy@google.com> Subject: [PATCH net-next 1/6] gve: remove xdp_xsk_done and xdp_xsk_wakeup statistics From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: jeroendb@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, pkaligineedi@google.com, willemb@google.com, ziweixiao@google.com, joshwash@google.com, horms@kernel.org, shailend@google.com, bcf@google.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington These statistics pollute the hotpath and do not have any real-world use or meaning. Reviewed-by: Willem de Bruijn Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 2 -- drivers/net/ethernet/google/gve/gve_ethtool.c | 8 +++----- drivers/net/ethernet/google/gve/gve_tx.c | 8 ++------ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 483c43bab3a9..2064e592dfdd 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -613,8 +613,6 @@ struct gve_tx_ring { dma_addr_t complq_bus_dqo; /* dma address of the dqo.compl_ring */ struct u64_stats_sync statss; /* sync stats for 32bit archs */ struct xsk_buff_pool *xsk_pool; - u32 xdp_xsk_wakeup; - u32 xdp_xsk_done; u64 xdp_xsk_sent; u64 xdp_xmit; u64 xdp_xmit_errors; diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/et= hernet/google/gve/gve_ethtool.c index a572f1e05934..bc59b5b4235a 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -63,8 +63,8 @@ static const char gve_gstrings_rx_stats[][ETH_GSTRING_LEN= ] =3D { static const char gve_gstrings_tx_stats[][ETH_GSTRING_LEN] =3D { "tx_posted_desc[%u]", "tx_completed_desc[%u]", "tx_consumed_desc[%u]", "t= x_bytes[%u]", "tx_wake[%u]", "tx_stop[%u]", "tx_event_counter[%u]", - "tx_dma_mapping_error[%u]", "tx_xsk_wakeup[%u]", - "tx_xsk_done[%u]", "tx_xsk_sent[%u]", "tx_xdp_xmit[%u]", "tx_xdp_xmit_err= ors[%u]" + "tx_dma_mapping_error[%u]", + "tx_xsk_sent[%u]", "tx_xdp_xmit[%u]", "tx_xdp_xmit_errors[%u]" }; =20 static const char gve_gstrings_adminq_stats[][ETH_GSTRING_LEN] =3D { @@ -417,9 +417,7 @@ gve_get_ethtool_stats(struct net_device *netdev, data[i++] =3D value; } } - /* XDP xsk counters */ - data[i++] =3D tx->xdp_xsk_wakeup; - data[i++] =3D tx->xdp_xsk_done; + /* XDP counters */ do { start =3D u64_stats_fetch_begin(&priv->tx[ring].statss); data[i] =3D tx->xdp_xsk_sent; diff --git a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/etherne= t/google/gve/gve_tx.c index 4350ebd9c2bd..c8c067e18059 100644 --- a/drivers/net/ethernet/google/gve/gve_tx.c +++ b/drivers/net/ethernet/google/gve/gve_tx.c @@ -959,14 +959,10 @@ static int gve_xsk_tx(struct gve_priv *priv, struct g= ve_tx_ring *tx, =20 spin_lock(&tx->xdp_lock); while (sent < budget) { - if (!gve_can_tx(tx, GVE_TX_START_THRESH)) + if (!gve_can_tx(tx, GVE_TX_START_THRESH) || + !xsk_tx_peek_desc(tx->xsk_pool, &desc)) goto out; =20 - if (!xsk_tx_peek_desc(tx->xsk_pool, &desc)) { - tx->xdp_xsk_done =3D tx->xdp_xsk_wakeup; - goto out; - } - data =3D xsk_buff_raw_get_data(tx->xsk_pool, desc.addr); nsegs =3D gve_tx_fill_xdp(priv, tx, data, desc.len, NULL, true); tx->req +=3D nsegs; --=20 2.49.0.rc1.451.g8f38331e32-goog