From mboxrd@z Thu Jan 1 00:00:00 1970 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 0D5C139C000 for ; Mon, 20 Apr 2026 17:18:42 +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=1776705524; cv=none; b=tYT4jCAifJTSebB/3LwSjDuqBYOJlrBuXDlQlCgb26MRdQoUR7QREARXys893H7SiyCq24itVmnNlYopjeAoEHybh4ijPmfVNNDhcmDTRoUNXtMrxc0b2Kgr/trHESVPZhWH/mPpuO7qFeU5AJupWS/FoqzqCC0XWWeCjaRlgr4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776705524; c=relaxed/simple; bh=u0UVsOozKt4Tg7IC9nw6qxk0e3pyOwuHpeuJX0VNCQM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JgMo2ELMj81mMdnTsgKGXkrtqboZM7ZgiLkD4s6Cl8Wl96gaQRn9p/AhD6XqBdCSaLrtWeQkqbiIqMrTBbtQxG3cFN8MJt+UncziMDsi6yIuE8MSjDwwFbGWz6D1i2NvOXlokpQwmAbDPeeiNKxW0oy/Ftd86vUVMBNIr07McPo= 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=g9yY9vVr; 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="g9yY9vVr" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-35d9e67f6dcso6671098a91.1 for ; Mon, 20 Apr 2026 10:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776705522; x=1777310322; 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=+0Cj3kzc2z6biU160rJ3owwxifAK2ueeF94SXw4tnzM=; b=g9yY9vVrV0M1Wqmco3v5QErLyz7rFhkGkkhHRjh92Wv+qrmwK11DeEDZEhS2lYcTQo FQeS/EtL1F76QEGPYRhwQ1oXq/O5s85WBK+8fbeZyaV+5NOCF0nzY8vOsR0ModEvdKEW 9ePHghw/11Skrr+Dvn65b2cA5d9fEdnA2m6eZxant40htr9N8P7Urh2TJ2QjHvYeMKs0 H+jQIV1BvuGokCRLsz+dRBQfR6ZWbm3rVJqxub3LmbggsLn7UIDvJo8Tw1ah4ztRWv+I wxnPxUNyG8lApBUOR9zheV+ROP5ASwtM4/xByuyYAZgCy5ljB2XYBJznWa3+Pr1Fla6c KLWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776705522; x=1777310322; 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=+0Cj3kzc2z6biU160rJ3owwxifAK2ueeF94SXw4tnzM=; b=jz0reNfCC+cD/LyZwxhOBC2KsmFRCOVFtccoi9OCbb2NdqLBXBACxO8Qw5AzeNovM+ p5QLhVlJLf8ZdjpptxFxe1ukFFqH9FkfVz4YegHK2RxgyEGWK9B9dclFC1N2QeYUU9eO uq3qN1TfPVLQJ4hs8Yongz/nDTagiuwYzBanK8Ybo+mcab40KFiH8fcap4ZiQRgy0eAL XFgCcaFx5vhT2BUXm45jVe1OxtJ2JipaVOh4tgqTX8sMcF0jvkKnO8RIjkJKI0SQrGtr qufhZMW6o2HTzao42MrMV1Dmaa5/3nrOi2nTLAFyZk68EHVx5yIZmSxzdm2PKvHGH6P7 Gh8A== X-Forwarded-Encrypted: i=1; AFNElJ+wJGYgRJ/ZWJWQqCJNMycxxJmOrMTJnuSaCfI9d8wHGKazIAoDfc6C+tflNAJyGr7S8OpCnfCwp9olH1w=@vger.kernel.org X-Gm-Message-State: AOJu0YxDS9xUocPmClWGbI1TJ2pZ+xEJM+tXaltD1FPH6TYUyqvMcpJ2 qmu/s2aRK0NhAPTDN93IBlc2kJiuLRmMQXSTVYAnLz87FvC1W2mgDVapFqniUqdA5Ej80/RssNi 6K/ZtiKNXSY+hJ3hu1UiujHLVwA== X-Received: from pjtl11.prod.google.com ([2002:a17:90a:c58b:b0:35d:a8d7:ccda]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4e85:b0:35f:b5df:450 with SMTP id 98e67ed59e1d1-3614048a226mr15714612a91.19.1776705522232; Mon, 20 Apr 2026 10:18:42 -0700 (PDT) Date: Mon, 20 Apr 2026 17:18:34 +0000 In-Reply-To: <20260420171837.455487-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: <20260420171837.455487-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.rc1.555.g9c883467ad-goog Message-ID: <20260420171837.455487-2-hramamurthy@google.com> Subject: [PATCH net 1/4] gve: Add NULL pointer checks for per-queue statistics From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, willemb@google.com, maolson@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, jacob.e.keller@intel.com, pkaligineedi@google.com, shailend@google.com, jordanrhee@google.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org, Debarghya Kundu , Pin-yen Lin Content-Type: text/plain; charset="UTF-8" From: Debarghya Kundu gve_get_[tx/rx]_queue_stats references the [tx/rx] null rings when the link is down. Add NULL pointer checks to guard this. This was discovered by drivers/net/stats.py selftest. Cc: stable@vger.kernel.org Fixes: 2e5e0932dff5 ("gve: add support for basic queue stats") Signed-off-by: Debarghya Kundu Signed-off-by: Pin-yen Lin Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 0ee864b0afe0..675382e9756c 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2705,9 +2705,13 @@ static void gve_get_rx_queue_stats(struct net_device *dev, int idx, struct netdev_queue_stats_rx *rx_stats) { struct gve_priv *priv = netdev_priv(dev); - struct gve_rx_ring *rx = &priv->rx[idx]; + struct gve_rx_ring *rx; unsigned int start; + if (!priv->rx) + return; + rx = &priv->rx[idx]; + do { start = u64_stats_fetch_begin(&rx->statss); rx_stats->packets = rx->rpackets; @@ -2721,9 +2725,13 @@ static void gve_get_tx_queue_stats(struct net_device *dev, int idx, struct netdev_queue_stats_tx *tx_stats) { struct gve_priv *priv = netdev_priv(dev); - struct gve_tx_ring *tx = &priv->tx[idx]; + struct gve_tx_ring *tx; unsigned int start; + if (!priv->tx) + return; + tx = &priv->tx[idx]; + do { start = u64_stats_fetch_begin(&tx->statss); tx_stats->packets = tx->pkt_done; -- 2.54.0.rc0.605.g598a273b03-goog