From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (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 E88743DCD85 for ; Wed, 30 Sep 2026 19:04:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790795082; cv=none; b=puxEhHpk8ZgQ0kUoDYu3kxBOzbqIh9Gc4PsM018aZEun+BniAwmpBYd8WVgXXtXU3uokYEwRRVLj7yW1etsIY9mkwrwOtECxes58MuH3YkOXKoOrGe1QtfH7oCEJrwZA8CHSlLXy5dlY/PTS70ou4bLEmDjxPY2yS91PeXKIGNc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790795082; c=relaxed/simple; bh=iYeq1h0BsW51+FPmUPjLy4JZnaOmLkiTAyPz5NCgsUs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=d/BEo7Q3reM4+0/MAK+6sIiQCqMEnODOCABOQV2F9w2UJ6Ke1h/R147Kir+gT7MGmVAtqylasw484UOyCpjHANN3/EjoyR8+3jNBGzdJauZ3pdV9jh/8w9ePpB9hpFj5BfhO0wgAFpqqKAgmofss4+THrTPiyGpXhQSKmfFkJXQ= 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=Ay53+D/r; arc=none smtp.client-ip=209.85.215.198 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="Ay53+D/r" Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cbb92868263so3611797a12.2 for ; Wed, 30 Sep 2026 12:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790795078; x=1791399878; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=pWLoFKUccgreDwfZT2WoX8/M1kXj1E7YMH/nXM20FUE=; b=Ay53+D/rDnKs37fWPXTE7jznj8+zbDANzpg+Ltsl9F6mElW/iaqsKWKo/SmJ1+NUfw fEQciQrKETaLbLlT3v+c41kMyplZJ9hi7NfSb7yYQC+YVQ6MccBNABlz3bzOLGyDS2ms ejSEecSbi2x0xaDcwU2K67Cf5DxBZueNhu0SV4mTyaF6GwRoq10ZJ9+dgd0D9MCAX263 2X/4CxZQNKf844Ghi+bPjH7ziaOnL3UUSZLvzyotBOrd8bH+aO20R6jw1vTegNEBZ1Im Ppxgb0T5hqAnAI2qlwTkF/0ZePX9kTkWIVNSHgcSJbty8Q5/NGG8+Kxi97FI1uOGYpUB RF2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790795078; x=1791399878; h=content-type: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:content-type; bh=pWLoFKUccgreDwfZT2WoX8/M1kXj1E7YMH/nXM20FUE=; b=gPkgRmiTFqbjElHLZa48f7oUVj4/MSlRmb/lL2qPTrpjYQJNfgpEiSt5OsFllRaKDg NoDNO5kqPvgir9I1QRSgTUppGFpm1FZ0CaAFWJAOKPRVeYz7X7MbNT49y5xH9RDE4rim dorPAWy7ONMZOPH4eo48ilEOwWM08+OuLjuhZWgw1p3JQ6VeluKrJrbW4jzjZfkdTMxl Dn8a6RjbtlkHAbyxMUtbdhpT5PsnE6wlLgLvZvOMFOzbJXAyoFGbIwzHqW3xuE6KEPYp xGqXnFu6C+KWX0kunEbj65jFpDuGAZ9V+q8jd4KH5PJCaIqYrd/P1LsmAcAbeQaDRLjQ ZTxg== X-Forwarded-Encrypted: i=1; AKwUvBzuZSI6gElSPSuUjqDyrNeSKqZwxaV3sSCunlrU581enpmvDiFXB2PpCiqQEQOX3JY9CLzH5KZtyG2t8cQ=@vger.kernel.org X-Gm-Message-State: AFuF++ns0UlyLmginV7fI3dahqLWBgwMjoNIFBxevAiLaHF9ZuadfVO+ 8pMkt4J236i8rNPAMOsaCQo1TT0fCqBSWXHFLFzTEbtkWLMl113sUiTmqrXaVxeDcVg98M1t3r8 nyzWoMTB6K7QN1gyB4MJyQe8JiA== X-Received: from pgaz6.prod.google.com ([2002:a05:6a02:50e6:b0:cc7:e28f:161e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2591:b0:3de:5b57:565f with SMTP id adf61e73a8af0-3de9e8443e3mr2347201637.23.1790795077499; Wed, 30 Sep 2026 12:04:37 -0700 (PDT) Date: Wed, 30 Sep 2026 19:04:23 +0000 In-Reply-To: <20260930190428.1130007-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: <20260930190428.1130007-1-hramamurthy@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20260930190428.1130007-8-hramamurthy@google.com> Subject: [PATCH net-next v9 07/12] gve: add gve_ctrl_ops for gve initialization/teardown sequences 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, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Type: text/plain; charset="UTF-8" From: Joshua Washington Driver initialization and teardown involve a number of control plane operations that need to be defined for gve_probe to operate in both mailbox and adminq modes. This list includes: - get_ptype_map: a mapping of packet types (L3+L4) held in RX completion descriptors - configure_rss: set up default RSS configuration if the device is not queryable - setup_stats_report: set up DMA region for stats report (AQ-only) - reset_flow_rules: needed in teardown; flushes all flow rules from device Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 12 ++++++++++ drivers/net/ethernet/google/gve/gve_adminq.c | 7 +++--- drivers/net/ethernet/google/gve/gve_adminq.h | 3 +-- drivers/net/ethernet/google/gve/gve_main.c | 23 +++++++++++++++----- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index 026d685ecaee..e0583e8cd2cd 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -833,12 +833,24 @@ struct gve_device_info { * structures stored in @priv to be used during initialization. * @set_num_ntfy_blks: Sets no. of vectors into @priv to be used during * initialization. + * @get_ptype_map: Learn packet type map from device and store it in @priv + * @configure_rss: Set up default RSS configuration + * @setup_stats_report: Set up DMA region for stats report (AdminQ only) + * @reset_flow_rules: Flush all flow rules from device */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); void (*unmap_db_bar)(struct gve_priv *priv); void (*set_num_queues)(struct gve_priv *priv); int (*set_num_ntfy_blks)(struct gve_priv *priv); + int (*get_ptype_map)(struct gve_priv *priv); + int (*configure_rss)(struct gve_priv *priv, + struct ethtool_rxfh_param *param); + int (*setup_stats_report)(struct gve_priv *priv, + u64 stats_report_len, + dma_addr_t stats_report_addr, + u64 interval_ms); /* AQ-specific */ + int (*reset_flow_rules)(struct gve_priv *priv); }; struct gve_priv { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c index 901673d2e264..1176e13fafc0 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1329,8 +1329,7 @@ int gve_adminq_report_nic_ts(struct gve_priv *priv, return gve_adminq_execute_cmd(priv, &cmd); } -int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, - struct gve_ptype_lut *ptype_lut) +int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv) { struct gve_ptype_map *ptype_map; union gve_adminq_command cmd; @@ -1356,9 +1355,9 @@ int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, /* Populate ptype_lut. */ for (i = 0; i < GVE_NUM_PTYPES; i++) { - ptype_lut->ptypes[i].l3_type = + priv->ptype_lut_dqo->ptypes[i].l3_type = ptype_map->ptypes[i].l3_type; - ptype_lut->ptypes[i].l4_type = + priv->ptype_lut_dqo->ptypes[i].l4_type = ptype_map->ptypes[i].l4_type; } err: diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/ethernet/google/gve/gve_adminq.h index fe1e8868cdfe..5e51c060e237 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -652,8 +652,7 @@ int gve_adminq_report_nic_ts(struct gve_priv *priv, dma_addr_t nic_ts_report_addr); struct gve_ptype_lut; -int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, - struct gve_ptype_lut *ptype_lut); +int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv); int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv); void gve_adminq_set_num_queues(struct gve_priv *priv); int gve_adminq_map_db_bar(struct gve_priv *priv); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 3ca0f8dba683..156bee612ba6 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -707,7 +707,8 @@ static int gve_alloc_control_plane_resources(struct gve_priv *priv) static int gve_setup_control_plane_resources(struct gve_priv *priv) { - int err = 0; + const struct gve_ctrl_ops *ops = priv->ctrl_ops; + int err; err = gve_adminq_configure_device_resources(priv, priv->counter_array_bus, @@ -722,7 +723,7 @@ static int gve_setup_control_plane_resources(struct gve_priv *priv) } if (!gve_is_gqi(priv)) { - err = gve_adminq_get_ptype_map_dqo(priv, priv->ptype_lut_dqo); + err = ops->get_ptype_map(priv); if (err) { dev_err(&priv->pdev->dev, "Failed to get ptype map: err=%d\n", err); @@ -744,12 +745,13 @@ static int gve_setup_control_plane_resources(struct gve_priv *priv) goto deconfigure_device; } - err = gve_adminq_report_stats(priv, priv->stats_report_len, + err = ops->setup_stats_report(priv, priv->stats_report_len, priv->stats_report_bus, GVE_STATS_REPORT_TIMER_PERIOD); if (err) dev_err(&priv->pdev->dev, "Failed to report stats: err=%d\n", err); + gve_set_device_resources_ok(priv); return 0; @@ -771,6 +773,7 @@ static int gve_setup_control_plane_resources(struct gve_priv *priv) */ static void gve_teardown_control_plane_resources(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops = priv->ctrl_ops; int err; if (priv->ptp) @@ -783,7 +786,8 @@ static void gve_teardown_control_plane_resources(struct gve_priv *priv) dev_err(&priv->pdev->dev, "Failed to reset flow rules: err=%d\n", err); /* detach the stats report */ - err = gve_adminq_report_stats(priv, 0, 0x0, GVE_STATS_REPORT_TIMER_PERIOD); + err = ops->setup_stats_report(priv, 0, 0x0, + GVE_STATS_REPORT_TIMER_PERIOD); if (err) dev_err(&priv->pdev->dev, "Failed to detach stats report: err=%d\n", err); @@ -1820,6 +1824,7 @@ static int gve_xdp(struct net_device *dev, struct netdev_bpf *xdp) int gve_init_rss_config(struct gve_priv *priv, u16 num_queues) { + const struct gve_ctrl_ops *ops = priv->ctrl_ops; struct gve_rss_config *rss_config = &priv->rss_config; struct ethtool_rxfh_param rxfh = {0}; u16 i; @@ -1835,15 +1840,17 @@ int gve_init_rss_config(struct gve_priv *priv, u16 num_queues) rxfh.hfunc = ETH_RSS_HASH_TOP; - return gve_adminq_configure_rss(priv, &rxfh); + return ops->configure_rss(priv, &rxfh); } int gve_flow_rules_reset(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops = priv->ctrl_ops; + if (!priv->max_flow_rules) return 0; - return gve_adminq_reset_flow_rules(priv); + return ops->reset_flow_rules(priv); } int gve_adjust_config(struct gve_priv *priv, @@ -2484,6 +2491,10 @@ static const struct gve_ctrl_ops gve_adminq_ops = { .unmap_db_bar = gve_adminq_unmap_db_bar, .set_num_queues = gve_adminq_set_num_queues, .set_num_ntfy_blks = gve_adminq_set_num_ntfy_blks, + .get_ptype_map = gve_adminq_get_ptype_map_dqo, + .reset_flow_rules = gve_adminq_reset_flow_rules, + .setup_stats_report = gve_adminq_report_stats, + .configure_rss = gve_adminq_configure_rss, }; static int gve_init_priv(struct gve_priv *priv) -- 2.56.0.rc1.315.gc6ed9934b7-goog