gve: Check valid ts bit on RX descriptor before hw timestamping

The device returns a valid bit in the LSB of the low timestamp byte in
the completion descriptor that the driver should check before
setting the SKB's hardware timestamp. If the timestamp is not valid, do not
hardware timestamp the SKB.

Cc: stable@vger.kernel.org
Fixes: b2c7aeb49056 ("gve: Implement ndo_hwtstamp_get/set for RX timestamping")
Reviewed-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Tim Hostetler <thostet@google.com>
Signed-off-by: Harshitha Ramamurthy <hramamurthy@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20251014004740.2775957-1-hramamurthy@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h
index bceaf9b05cb422413d2f4eda03e60a147989d30c..4cc6dcbfd367b81da5b2c41b160b75d52ef49f0f 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve.h
+++ b/drivers/net/ethernet/google/gve/gve.h
@@ -100,6 +100,8 @@
  */
 #define GVE_DQO_QPL_ONDEMAND_ALLOC_THRESHOLD 96
 
+#define GVE_DQO_RX_HWTSTAMP_VALID 0x1
+
 /* Each slot in the desc ring has a 1:1 mapping to a slot in the data ring */
 struct gve_rx_desc_queue {
        struct gve_rx_desc *desc_ring; /* the descriptor ring */

diff --git a/drivers/net/ethernet/google/gve/gve_desc_dqo.h b/drivers/net/ethernet/google/gve/gve_desc_dqo.h
index d17da841b5a03182732e9e64c74a4e8b9b1984bf..f7786b03c7444753fb8b71c7aaf5ed37719caa1f 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_desc_dqo.h
+++ b/drivers/net/ethernet/google/gve/gve_desc_dqo.h
@@ -236,7 +236,8 @@ struct gve_rx_compl_desc_dqo {
 
        u8 status_error1;
 
-       __le16 reserved5;
+       u8 reserved5;
+       u8 ts_sub_nsecs_low;
        __le16 buf_id; /* Buffer ID which was sent on the buffer queue. */
 
        union {

diff --git a/drivers/net/ethernet/google/gve/gve_rx_dqo.c b/drivers/net/ethernet/google/gve/gve_rx_dqo.c
index 55393b784317ffada646dc25e20157ae542fe38d..1aff3bbb8cfcfb4812360c06b2177daf5b89ad83 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_rx_dqo.c
+++ b/drivers/net/ethernet/google/gve/gve_rx_dqo.c
@@ -456,14 +456,20 @@ static void gve_rx_skb_hash(struct sk_buff *skb,
  * Note that this means if the time delta between packet reception and the last
  * clock read is greater than ~2 seconds, this will provide invalid results.
  */
-static void gve_rx_skb_hwtstamp(struct gve_rx_ring *rx, u32 hwts)
+static void gve_rx_skb_hwtstamp(struct gve_rx_ring *rx,
+                               const struct gve_rx_compl_desc_dqo *desc)
 {
        u64 last_read = READ_ONCE(rx->gve->last_sync_nic_counter);
        struct sk_buff *skb = rx->ctx.skb_head;
-       u32 low = (u32)last_read;
-       s32 diff = hwts - low;
-
-       skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(last_read + diff);
+       u32 ts, low;
+       s32 diff;
+
+       if (desc->ts_sub_nsecs_low & GVE_DQO_RX_HWTSTAMP_VALID) {
+               ts = le32_to_cpu(desc->ts);
+               low = (u32)last_read;
+               diff = ts - low;
+               skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(last_read + diff);
+       }
 }
 
 static void gve_rx_free_skb(struct napi_struct *napi, struct gve_rx_ring *rx)
@@ -944,7 +950,7 @@ static int gve_rx_complete_skb(struct gve_rx_ring *rx, struct napi_struct *napi,
                gve_rx_skb_csum(rx->ctx.skb_head, desc, ptype);
 
        if (rx->gve->ts_config.rx_filter == HWTSTAMP_FILTER_ALL)
-               gve_rx_skb_hwtstamp(rx, le32_to_cpu(desc->ts));
+               gve_rx_skb_hwtstamp(rx, desc);
 
        /* RSC packets must set gso_size otherwise the TCP stack will complain
         * that packets are larger than MTU.