From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 76EF349DBA5 for ; Wed, 9 Sep 2026 19:11:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981114; cv=none; b=NMVU8Qe86muiqV2QneQnwv+c6wjt0cufw2XZMkX2xaSWxDJfLTyyMPZKi0qtsCv1owDjJr1BUS5WuSZz1vubERmEBQoDAuHb7F1cyCq2YJmKEHRjuy0Q9QReiO8E9YKBtdMlouKZl87uR2nVGC/dr4ppKOgkhH/cRaLUX3tqXUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981114; c=relaxed/simple; bh=AcENafcDiTZP0n259Q8//HEAgEabE68i/MJGsM6Vyks=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=q/EfEHid+0xvXqhUic+iOQs1KVu7ezDVcARS+u7kzotZAJDAnB9fWySSB/Cq4NS1nzFy44tg6SeeEBEHOoIl6/v7nI8FiZoeiJzEmdBbiPL1JturEoymbGj0t3sBMjekd2AcXGJfhJySZ77KH9OK9bWgZ/aI37ZGnkahwg3dF78= 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=LDvBOJuY; arc=none smtp.client-ip=209.85.214.197 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="LDvBOJuY" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2d6f80c76e6so120332125ad.3 for ; Wed, 09 Sep 2026 12:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981107; x=1789585907; 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=RRTWKGMES+1AC/FpM+C1+0inOvt7Elo1ZARglMXx7Dc=; b=LDvBOJuYCE6TE8ooXKr3naD+Q7JCDvQrFMYaPZAV/wRlTXxQO8wgAreDbhhKPlP0SK EV/k1hQL1a6+7RWUsAmmOXSXiFXvgmLHHv+I9q/68H9ov3qWhtgso6wOQcSLR/VZEiB4 Wx8zqsRfHtVI8ozCjF6dGteBlOZGNhCYeR/mE5tli71jR6OgiQ9Ry3fjlrF+rPyE/jYJ dFoS8M4ooEY6JIGu/9pbvj7qdlA7fPk9GgpwIG1F1MFzvlizF+E9v5s6s4LX2qJwcGkn 6T+NEz9B4QNliRmdVR8FMRfgVX3Gf2mt2DR1s60i9ioWRAivSQUXDoZl12764KwM1vgH /ktQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981107; x=1789585907; 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=RRTWKGMES+1AC/FpM+C1+0inOvt7Elo1ZARglMXx7Dc=; b=K7qfHJX+POKImCH4AaAy024ycEU1wnHeT9erTJNXS17A9QffR1SJw0ttXwTMODzKV/ O5N2qyS4uoRDSUDD0CSNXLG7Hpfe5MaVDNpo0bJq1AWE4cYy+UNBYawPkJiQ6Ylw0JRa h8FAL3kOVLMWgGriguagu79k4BgtTGrBvw0MZXOcr6AbGYNRidIot5X/iUS0onypDH9c +1+8fOYG9omhl1oqPUvj9cSgm48JAcBVs6b6aS39TkH1gd919nwNWNbwLfKWQYx1O46W ha3u+lfj+q2qsa44sdR2hfvrXYxvTErjxvMbiDGCZrQ13qucIcKxRITs25OETh2sihQn u/WA== X-Gm-Message-State: AFuF++mHDiMJMK/s5Hiu3s9S0gxuchD/9+4HdjCu9Gy0C4cqMNcw/M2g ebisfCneUCndbiv+3WtScs8+MIP4j3tFNgKlOJPOqOruhUGl5uFVijyXrHm1cxTRrGtwPRb68Km lw+MolF68neewrRNReeNzcxBFNar7cJXVo881ANNJZmZvlNP5vlSQSG9kHGgf6iW/lnijGi5S+H XK0CjEVShv7g2u95BBKluaP5tgMpKcJglU8tFYQciVzE33FKcez/ftk2obbsuysiA= X-Received: from pjyo18.prod.google.com ([2002:a17:90a:eb92:b0:39b:6595:d1ac]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3851:b0:396:40e6:f631 with SMTP id 98e67ed59e1d1-39bac1389e1mr10557621a91.3.1788981106645; Wed, 09 Sep 2026 12:11:46 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:33 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-11-hramamurthy@google.com> Subject: [PATCH net-next v6 10/12] gve: setup and teardown management interrupts 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 Introduce control ops to setup/teardown control plane IRQs. Admin queue-specific functionality is moved to admin queue files. 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 | 4 +++ drivers/net/ethernet/google/gve/gve_adminq.c | 36 ++++++++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 ++ drivers/net/ethernet/google/gve/gve_main.c | 32 +++++------------ 4 files changed, 51 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index 6c46c842070b..016e85ed91a5 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -837,6 +837,8 @@ struct gve_device_info { * @request_db_info: Request and store doorbell information into @priv * @release_db_resources: Release device hold on DMA memory holding doorbell * info (AdminQ only) + * @setup_mgmt_irq: Setup control plane IRQ + * @teardown_mgmt_irq: Teardown control plane IRQ * @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) @@ -849,6 +851,8 @@ struct gve_ctrl_ops { int (*set_num_ntfy_blks)(struct gve_priv *priv); int (*request_db_info)(struct gve_priv *priv); void (*release_db_resources)(struct gve_priv *priv); + int (*setup_mgmt_irq)(struct gve_priv *priv); + void (*teardown_mgmt_irq)(struct gve_priv *priv); int (*get_ptype_map)(struct gve_priv *priv); int (*configure_rss)(struct gve_priv *priv, struct ethtool_rxfh_param *param); diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c index b89825a85db8..c3c10d5062f5 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1755,3 +1755,39 @@ void gve_adminq_release_db_resources(struct gve_priv *priv) "Could not deconfigure device resources: err=%d\n", err); } + +static irqreturn_t gve_mgmnt_intr(int irq, void *arg) +{ + struct gve_priv *priv = arg; + + /* Device resources are not okay; consider the interrupt spurious. */ + if (!gve_get_device_resources_ok(priv)) + return IRQ_NONE; + + queue_work(priv->gve_wq, &priv->service_task); + return IRQ_HANDLED; +} + +int gve_adminq_setup_mgmt_irq(struct gve_priv *priv) +{ + int err; + + snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), + "gve-mgmnt@pci:%s", pci_name(priv->pdev)); + err = request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, + gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv); + if (err) + return err; + + priv->mgmt_irq_requested = true; + + return 0; +} + +void gve_adminq_teardown_mgmt_irq(struct gve_priv *priv) +{ + if (priv->mgmt_irq_requested) { + free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); + priv->mgmt_irq_requested = false; + } +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/ethernet/google/gve/gve_adminq.h index 52172bf228eb..0b48e9f2a82a 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -659,4 +659,6 @@ int gve_adminq_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(struct gve_priv *priv); int gve_adminq_request_db_info(struct gve_priv *priv); void gve_adminq_release_db_resources(struct gve_priv *priv); +int gve_adminq_setup_mgmt_irq(struct gve_priv *priv); +void gve_adminq_teardown_mgmt_irq(struct gve_priv *priv); #endif /* _GVE_ADMINQ_H */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 84efcdea6be9..e7ebc4e0f24b 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -290,18 +290,6 @@ static void gve_free_stats_report(struct gve_priv *priv) priv->stats_report = NULL; } -static irqreturn_t gve_mgmnt_intr(int irq, void *arg) -{ - struct gve_priv *priv = arg; - - /* Device resources are not okay; consider the interrupt spurious. */ - if (!gve_get_device_resources_ok(priv)) - return IRQ_NONE; - - queue_work(priv->gve_wq, &priv->service_task); - return IRQ_HANDLED; -} - static irqreturn_t gve_intr(int irq, void *arg) { struct gve_notify_block *block = arg; @@ -526,6 +514,7 @@ static int gve_alloc_notify_blocks(struct gve_priv *priv) static void gve_teardown_notify_blocks(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops = priv->ctrl_ops; int i; if (!priv->ntfy_blocks) @@ -545,29 +534,24 @@ static void gve_teardown_notify_blocks(struct gve_priv *priv) block->irq_requested = false; } - if (priv->mgmt_irq_requested) { - free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); - priv->mgmt_irq_requested = false; - } + ops->teardown_mgmt_irq(priv); } static int gve_setup_notify_blocks(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops = priv->ctrl_ops; const struct cpumask *node_mask; unsigned int cur_cpu; int i; int err; - /* Setup Management Vector - the last vector */ - snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), - "gve-mgmnt@pci:%s", pci_name(priv->pdev)); - err = request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, - gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv); + /* Setup Management Vector */ + err = ops->setup_mgmt_irq(priv); if (err) { - dev_err(&priv->pdev->dev, "Did not receive management vector.\n"); + dev_err(&priv->pdev->dev, + "Did not receive management vector.\n"); return err; } - priv->mgmt_irq_requested = true; node_mask = gve_get_node_mask(priv); cur_cpu = cpumask_first(node_mask); @@ -2500,6 +2484,8 @@ static const struct gve_ctrl_ops gve_adminq_ops = { .configure_rss = gve_adminq_configure_rss, .request_db_info = gve_adminq_request_db_info, .release_db_resources = gve_adminq_release_db_resources, + .setup_mgmt_irq = gve_adminq_setup_mgmt_irq, + .teardown_mgmt_irq = gve_adminq_teardown_mgmt_irq, }; static int gve_init_priv(struct gve_priv *priv) -- 2.55.0.979.g7e5102b832-goog