From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65C0FCD98D2 for ; Wed, 17 Jun 2026 00:07:47 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B22E40DD2; Wed, 17 Jun 2026 02:07:27 +0200 (CEST) Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by mails.dpdk.org (Postfix) with ESMTP id D67A240A84 for ; Wed, 17 Jun 2026 02:07:22 +0200 (CEST) Received: by mail-qk1-f202.google.com with SMTP id af79cd13be357-91579011fd1so764302085a.1 for ; Tue, 16 Jun 2026 17:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781654842; x=1782259642; darn=dpdk.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=AlfjLX4bfd9CKa1yQYM7nKoR8F0en8bk01lhKQ1A78s=; b=uJXC5xywDXMaAk6MHBXEiYtlHe/1+Na5Rh0+I21jjWy8F4g10q0a5Ym+ACk6bdUblR qlColEkp4G5Fu6NHZXOGK6fqxPoef8jpin1ce4pVx9svhFiDdYtQ99fAHTWMUVXeCD9r Q6YOYZ+iZbdyLA5MBtbNu96NdiOxTAipPCGytqWdhjuhWylphCZqqtQAtIBREwyhQnJR PxqgJj9bQdgTFBg0G7MzIDW62Sz/WOTYnck8vFCXX9ApqJCFfimoTeZn/WoosX9jZ7sY R9FQiW9tBppkmZNghRHLnj/3g+O2uiaFHWieCpOdtWnRFVizYWkmZpvnkBFwSGWRrhbv u1FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781654842; x=1782259642; 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=AlfjLX4bfd9CKa1yQYM7nKoR8F0en8bk01lhKQ1A78s=; b=rVR993N5J75IDCBv7YDn+/Vc2e8pHesglG2I6KBUWFu9PemBuoJJn+B1aifZS4xJsS +nDJC+Cw5GvV7tHSxS9B/4AjDK2+yRaHLlR21y1ziXWZwJzZe7w/y4iavlnR1fQ1MvkE RTrd1m9ZxDNlUv7Zvs8hnurVwd4j/n6W6LgkDtnYwCncdTT7Iui+gnYFnU5IUPJwuSA3 LBa9ljvQZpAxE6XE2pTcUBZSY720jIh+ur+etkQoZA4Z7XVu5oY2Pw3DtOHKkZMQD7Gu kWX5nRnn8x/SebOdQOuJi4SwAr6Sc0AN7lbkcUjIvbAjIClroFohMiD4dNxNJCmvXk9B d0eA== X-Gm-Message-State: AOJu0YxSyX50OuEd+DykP2T3NydnTLwirrVzauAgWJ/KCbiDlWmNd89j SGJabFbKdWlVMh3yeYZfWtsqY757oHvMZa4OErYxu9eU2Fyc97Cir3vZRn4u5H9MWcU/cRO2nG8 9BcPU4Q== X-Received: from qknsn22.prod.google.com ([2002:a05:620a:9496:b0:915:7fe4:76cb]) (user=blasko job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:2626:b0:914:c226:ecce with SMTP id af79cd13be357-91d8856da59mr332973985a.9.1781654841833; Tue, 16 Jun 2026 17:07:21 -0700 (PDT) Date: Wed, 17 Jun 2026 00:07:09 +0000 In-Reply-To: <20260617000712.2195506-1-blasko@google.com> Mime-Version: 1.0 References: <20260613042300.3760470-1-blasko@google.com> <20260617000712.2195506-1-blasko@google.com> X-Mailer: git-send-email 2.54.0.1189.g8c84645362-goog Message-ID: <20260617000712.2195506-6-blasko@google.com> Subject: [PATCH v5 5/6] net/gve: support read clock ethdev op From: Mark Blasko To: stephen@networkplumber.org Cc: dev@dpdk.org, joshwash@google.com, jtranoleary@google.com, blasko@google.com Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Implement the read_clock operation in eth_dev_ops. The function calls the AdminQ command to fetch the current NIC timestamp synchronously, updates the cached timestamp used for reconstruction, and returns the full 64-bit value. Signed-off-by: Mark Blasko Reviewed-by: Joshua Washington Reviewed-by: Jasper Tran O'Leary --- v4: - Fix mutex initialization order: initialize nic_ts_lock before calling gve_init_priv() (which invokes early setup-time read). - Fix mutex teardown order: destroy nic_ts_lock only after the background sync thread has been joined and stopped. v3: - Add mutex lock to protect shared NIC timestamp memzone access. - Fix missing read_clock assignment to DQO queue ops table (accidental omission in v2). v2: - Scoped read_clock ethdev operation strictly to DQO queues. --- drivers/net/gve/gve_ethdev.c | 57 +++++++++++++++++++++++++++++++----- drivers/net/gve/gve_ethdev.h | 1 + 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index fa91575b3e..111f66efa8 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -463,11 +463,13 @@ gve_read_nic_clock(void *arg) if (!priv || !priv->nic_ts_report_mz) return; + pthread_mutex_lock(&priv->nic_ts_lock); memset(priv->nic_ts_report, 0, sizeof(struct gve_nic_ts_report)); err = gve_adminq_report_nic_timestamp(priv, priv->nic_ts_report_mz->iova); if (err == 0) { ts = be64_to_cpu(priv->nic_ts_report->nic_timestamp); + pthread_mutex_unlock(&priv->nic_ts_lock); rte_atomic_store_explicit(&priv->last_read_nic_timestamp, ts, rte_memory_order_relaxed); PMD_DRV_LOG(DEBUG, "Fetched NIC Timestamp: %" PRIu64, ts); @@ -476,6 +478,7 @@ gve_read_nic_clock(void *arg) rte_atomic_store_explicit(&priv->nic_ts_stale, 0, rte_memory_order_release); } else { + pthread_mutex_unlock(&priv->nic_ts_lock); PMD_DRV_LOG(ERR, "Failed to read NIC clock, AQ err: %d", err); fails = rte_atomic_fetch_add_explicit(&priv->nic_ts_read_fails, 1, rte_memory_order_relaxed) + 1; @@ -705,12 +708,13 @@ gve_dev_close(struct rte_eth_dev *dev) if (gve_get_flow_subsystem_ok(priv)) gve_teardown_flow_subsystem(priv); - pthread_mutex_destroy(&priv->flow_rule_lock); - gve_free_queues(dev); gve_teardown_device_resources(priv); gve_adminq_free(priv); + pthread_mutex_destroy(&priv->flow_rule_lock); + pthread_mutex_destroy(&priv->nic_ts_lock); + dev->data->mac_addrs = NULL; return err; @@ -1278,6 +1282,38 @@ gve_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops) return 0; } +static int +gve_read_clock(struct rte_eth_dev *dev, uint64_t *clock) +{ + struct gve_priv *priv = dev->data->dev_private; + uint64_t ts; + int err; + + if (!priv->nic_timestamp_supported) + return -EOPNOTSUPP; + + if (!priv->nic_ts_report_mz) + return -EIO; + + pthread_mutex_lock(&priv->nic_ts_lock); + err = gve_adminq_report_nic_timestamp(priv, priv->nic_ts_report_mz->iova); + if (err != 0) { + pthread_mutex_unlock(&priv->nic_ts_lock); + return err; + } + + ts = be64_to_cpu(priv->nic_ts_report->nic_timestamp); + pthread_mutex_unlock(&priv->nic_ts_lock); + *clock = ts; + + /* Update the cached value */ + rte_atomic_store_explicit(&priv->last_read_nic_timestamp, ts, rte_memory_order_relaxed); + rte_atomic_store_explicit(&priv->nic_ts_read_fails, 0, rte_memory_order_relaxed); + rte_atomic_store_explicit(&priv->nic_ts_stale, 0, rte_memory_order_release); + + return 0; +} + static const struct eth_dev_ops gve_eth_dev_ops = { .dev_configure = gve_dev_configure, .dev_start = gve_dev_start, @@ -1332,6 +1368,7 @@ static const struct eth_dev_ops gve_eth_dev_ops_dqo = { .rss_hash_conf_get = gve_rss_hash_conf_get, .reta_update = gve_rss_reta_update, .reta_query = gve_rss_reta_query, + .read_clock = gve_read_clock, }; static int @@ -1640,9 +1677,18 @@ gve_dev_init(struct rte_eth_dev *eth_dev) priv->max_nb_txq = max_tx_queues; priv->max_nb_rxq = max_rx_queues; + pthread_mutexattr_init(&mutexattr); + pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED); + pthread_mutex_init(&priv->flow_rule_lock, &mutexattr); + pthread_mutex_init(&priv->nic_ts_lock, &mutexattr); + pthread_mutexattr_destroy(&mutexattr); + err = gve_init_priv(priv, false); - if (err) + if (err) { + pthread_mutex_destroy(&priv->flow_rule_lock); + pthread_mutex_destroy(&priv->nic_ts_lock); return err; + } if (gve_is_gqi(priv)) { eth_dev->dev_ops = &gve_eth_dev_ops; @@ -1656,11 +1702,6 @@ gve_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->mac_addrs = &priv->dev_addr; - pthread_mutexattr_init(&mutexattr); - pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED); - pthread_mutex_init(&priv->flow_rule_lock, &mutexattr); - pthread_mutexattr_destroy(&mutexattr); - return 0; } diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 4dcbaa9971..1e80f3a906 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -366,6 +366,7 @@ struct gve_priv { bool nic_timestamp_supported; const struct rte_memzone *nic_ts_report_mz; struct gve_nic_ts_report *nic_ts_report; + pthread_mutex_t nic_ts_lock; RTE_ATOMIC(uint64_t) last_read_nic_timestamp; RTE_ATOMIC(uint32_t) nic_ts_read_fails; RTE_ATOMIC(uint8_t) nic_ts_stale; -- 2.54.0.1189.g8c84645362-goog