From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (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 CD8D44AA56F for ; Thu, 24 Sep 2026 18:53:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790276014; cv=none; b=h/zIDGSlyAV5zU3jmbqwxDc/DUKdoE0O5lF5Lxr2Rrn0o8v+S5wFMMff1M+NLiLnWjW9/SAcD/hv/Lt0Hnmi5aMQNq8apgbcNpVZ/QaEIKG/SPpPElLh0TdPvhSVfJVW/zG5g9wpyfTZCqJmvFrnK5fve18HxoPEW84CDXN9vNo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790276014; c=relaxed/simple; bh=kAcpY4KD54QmBP7GL2UFi2y5LKkvrlh+OdEF+NBOXoE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=afk95MZmAONHHk1GxNlnEoW5J1Spg+nIaRQ6JtJrP48YDqpSeaEhhND6HbFaCeN3FiyFE7qKU7hhdg6ZJ9P1bA9KIhKf7TfZTBOAhkl2/Jt/FpWp+zgHk7oM/oCd9Bl6XA8cgOOtJK4j7pnJdarvDT9KfNr9M2nYdUZvKj925tQ= 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=IZXDTLmW; arc=none smtp.client-ip=209.85.216.71 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="IZXDTLmW" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-395543dc382so176639a91.0 for ; Thu, 24 Sep 2026 11:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790276005; x=1790880805; 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=SEXhKf0YHEVXlTj7OJFhNik/oKMJPJKlM09suwVREiU=; b=IZXDTLmWI0wtwlrADT10Ode4Zvp3vy+xOcQqTDOlr38HgDSaohNxrI6s4m423tai0W tBgiGVKMR8UjlQskorqc3S1I928/WLtpPVyi1wu+EMHtKiv53QW0KBA41L+XqcEHnaTl bm7+o3Qi0S3BV0THB++2bgKmRR/B7DyrY8nmzG3+WZ2ifVBQNgqR/FG8ujdK+4ZXi1S/ cci7frzHmjjhoks7wxkvDLuskgTrOMzn41SiO9NzX1JAVj2wEfg4eD4PKG97GZ/aLOYY Mss6wHL1IL+K3kr0Ef6HTR1n5sWJ278W0cK83GJ5upLd9AL0OanTOsWFwyDgLgmYNUn0 hq0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790276005; x=1790880805; 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=SEXhKf0YHEVXlTj7OJFhNik/oKMJPJKlM09suwVREiU=; b=dzE8cEsgCLJ8NokhB7nnFL2ljGtu43lGonBVj0fOC2gRl98w4u4vir6HW11xWeWai/ tTn1RNR1Jh5roTVCPXLq6hZVJBwyWBIoXYdCQO9x31mBdj8DaSRx9lvhe1tkQ7BZoFer Zwv7dAKmob5tM+WgIEN4zUjwsWu6CMunAHnXpHz8DAm9E8VPga1FxM/VlrFt8+6C6+Uh 5SImVqFnwuMIzrNUKCXIMBDCl5z67jHuXV19i+qV8fLWssfcJf5aZP/9+v4UODZb0pW1 rd59Nie/hfFCbkbeSLjTubxaOj4aN3fVI87v3iWF2UIMmGSVd6V4DgjZTGJY55JyMtI7 Z3yA== X-Gm-Message-State: AFuF++n31VtE7JKpbYUutWsz4hBspx7UGqTqawRA8f4llzhwy2XEMBJ2 6MyOEkzTXomhS0diAu1Z7I1WhCQCfwfCZkNs8qbfFkhFvNZ1ELGDTOz+JWK9+fLeXEcNEwXABJB PiiWiZwJY0p5lngD1eqR729pPab88JuyX8Kmnxw3C5RYKKnllu4MuSUdudAxtg0OYsGgnkgvW4K Sz2sLIQgfE0C4G+oXlHJgV0H98TPOdm6NCnYcglf/eI2UDtCTbUto928pA61kOQ4Y= X-Received: from pjbsq12.prod.google.com ([2002:a17:90b:530c:b0:3a0:8124:2580]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4e8f:b0:39e:6c68:1551 with SMTP id 98e67ed59e1d1-3a09896c4demr2911658a91.25.1790276004353; Thu, 24 Sep 2026 11:53:24 -0700 (PDT) Date: Thu, 24 Sep 2026 18:53:11 +0000 In-Reply-To: <20260924185316.2831077-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260924185316.2831077-1-hramamurthy@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20260924185316.2831077-8-hramamurthy@google.com> Subject: [PATCH net-next v8 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 | 24 ++++++++++++++++++------ 4 files changed, 34 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 07135c52a707..45451eac3e0a 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -706,7 +706,8 @@ abort: 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, @@ -721,7 +722,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); @@ -743,12 +744,13 @@ static int gve_setup_control_plane_resources(struct gve_priv *priv) goto teardown_clock; } - 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; @@ -772,6 +774,7 @@ deconfigure_device: */ static void gve_teardown_control_plane_resources(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops = priv->ctrl_ops; int err; /* Tell device its resources are being freed */ @@ -781,11 +784,13 @@ 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); gve_teardown_clock(priv); + err = gve_adminq_deconfigure_device_resources(priv); if (err) dev_err(&priv->pdev->dev, @@ -1819,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; @@ -1834,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, @@ -2483,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.310.g51773c2048-goog