From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (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 DF3AE47B41C for ; Thu, 3 Sep 2026 21:56:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788472580; cv=none; b=m5JwK3526TgQnGy0PFOda4kAxbaLFaXaerZ6HLqVNOXAJ8ob77qFqwinQgD7LwAGmlnywFA9KVQ2FeNqpxAWwq9T14C0oWplzGDzh7alS8aNEkJ9Y75UJiTsxBSf3Wm6ScV5TV/TYzOb6H2k1/W1yj3HzPeKM4ZaSI7TYT2OgSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788472580; c=relaxed/simple; bh=UyCu6zaHd9Mtt6oi1kGQ/laLILUKBplkYapgmvTp6uM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RiQV9uHFjU7BShBrPMy4ruSIXMfl0zMAMD2DdgE4SzCg1CHKg2Mg2hY1yIWyWE7Z7WNPu1eIkIfIMnW5DGidg/ASrlDpj9u3QSRfXlNlurnnlgff8KFBqHP12gDtuevb+XbakwuVOSFnqXMgHeJxlhWdN5crPe2A6tw3VAQvR+A= 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=jv8qKs+S; arc=none smtp.client-ip=209.85.215.200 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="jv8qKs+S" Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cc1b8088203so464687a12.3 for ; Thu, 03 Sep 2026 14:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788472577; x=1789077377; 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=7J2P94AGfyQbQcsczyvGgrjPXcbDaXoY2R0Xbl6/Fag=; b=jv8qKs+SYySKSqA5U9ZqL3I5ohJ1Xseaud1CVPWKBtjAg3x8QWImVxE2uPYYKoDDR1 Tr02fxHgQBhUZs2AmhL8ik8KBXy/Y+MImMmQBKanjUXn3J40IHng3IhKBI0uA8B8Khhr E8NVEC8+101Kk24ixpc+vLqy/QidcXp63drgHGNsuULdwCeJVoK5uwqvLz9FwmuChaHz S2iESoBVlRWF02CQSDougf0svE0h2ffuF8FHpUF787Jw1YZ4L94RJzGD+idynpYlHZZS lPvb1a3KQsXDVMSTw6Xv7MpvvnTt/U5fQiPkbPW1D/r2fxsTu0B8osmWZyVA0K7KKjEx JJsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788472577; x=1789077377; 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=7J2P94AGfyQbQcsczyvGgrjPXcbDaXoY2R0Xbl6/Fag=; b=jwYWAZ29EN1iAn8xYpDYTbyMYG1PuOow4MhuCoCQyoggiUtmXTE914I1oXSiXaI4DX kbvaORLTP63PwrtYSYbWZ8imBTMonP+j6mVBFvD4VBGf7iHhH3+1mNX9XYzxratAVMKk V5vGL7Ews9jnNq8pQsiA/Wa1VCdyuNsq0x/foUB8fTDPhi/PE438jSKM7tS78NYnigPN tX0xo08T6xlDB51qcX3b4A0D8Gk/bRX56+DEeLOvAIJxhx+XmtbOlv5ZRtTCbC2hGPfK wNULdEtkQln3bHrVe2aWBsN0XpOV2tlhzaAQSGkBdpOz84gWXI4ksHxCm5BoagN1s6FG MXBg== X-Gm-Message-State: AFuF++m7nX3iR/3VUZfQ7xjeiRVtvg+XvbLS1i1iEzl0OUqqpVzLV3E/ TNGD4AkHIMZtcAXiI8OfnPht2b0NlMX9SSk1xacUnnlZD9zMwPNi2ID3pSxAfr9kyRm4C+Ihf+J R9clYwtrN0J1yo1b3C3V8zrH98qfKTcyPLZav9T9ov3jNhJc3o7CeyxkhJyGYQm1APO8SsNolm6 3NCxYx3FtaCz4FumXrtw5YhbgimFj1WwFtOR/sdlNjvHDYpUxHQJPj3CciUSQiSeE= X-Received: from pfbna18.prod.google.com ([2002:a05:6a00:3e12:b0:84b:9a71:ba78]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:181c:b0:85f:b00b:8760 with SMTP id d2e1a72fcca58-86168f83f7amr2457618b3a.5.1788472576700; Thu, 03 Sep 2026 14:56:16 -0700 (PDT) Date: Thu, 3 Sep 2026 21:56:04 +0000 In-Reply-To: <20260903215606.31633-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260903215606.31633-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog Message-ID: <20260903215606.31633-11-hramamurthy@google.com> Subject: [PATCH net-next v5 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 a160d36f718b..8522a495b78a 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