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 A325FCD4846 for ; Tue, 12 May 2026 00:51:07 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CDCB402BC; Tue, 12 May 2026 02:51:06 +0200 (CEST) Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by mails.dpdk.org (Postfix) with ESMTP id 217D140278 for ; Tue, 12 May 2026 02:51:05 +0200 (CEST) Received: by mail-qv1-f73.google.com with SMTP id 6a1803df08f44-8b7e68098dcso116812806d6.3 for ; Mon, 11 May 2026 17:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778547064; x=1779151864; darn=dpdk.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=Iji3DWnHmLvR/5YoFj6Cpa9Caw9UyTZmH7Vssk7HsTI=; b=jjPjJMiLAoRijGNED2xxN2wg9auNrRJgLwlsIPlAXbD+X01RzJYFqi4ENTURSjIu3n Zvj4u41WNuRA2ODCg75YJT8gaWLwmrwQZ9nZCopGGb3Fa+hPjPaNaz74eAGLe8iferGb fb/UM03s150T3+tjuBwFvBZB17qM3C/RGT5Qlo61o5FxIgCw7a+ZAvCvaxTu0JQNRAAV /0z2qgjqYOFJYFewergqONW6MQRs6/ovmJ/uwbcaIz4YaJ2bVaJ3j4fufydx1QtNjMI3 BEny/aytDFKHCzuvbeQvd2nrhHCiJ+hawoXktIwlFBsQuOEZmYl5u2of5RptLAIsJV8A Vk0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778547064; x=1779151864; h=content-transfer-encoding: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=Iji3DWnHmLvR/5YoFj6Cpa9Caw9UyTZmH7Vssk7HsTI=; b=cJpriwf6wNE6wJiM8so4INWH54xmzKsssJuGYfWjBjoU+GshXWt+OVYjRefVsJYA0v Ms3gu8gfUlouqbBczzbilswc+EyetSmZ3ZB0e8KbSfy6Qs4fcm7jbxgQuw2i0TJiZ/DT PVj7rdt9uTeBLMbYXnNg9FlxEn3cYhRDFnpWQHJRuiUMUgWznms9ua/NJVL/wKG83SBI HdnuCMtmQ3TCtSXKLBs6Puby8W6J1Ei9/LKNbyF05CIhxsDsZoYFmGUv9AVjxdewdceW 7IsgOlf+FdizFHr+k4NtgKyh3RHLWgqY6+HboCmmsxhhWiW8ZDYsaRzEeu+rmNgx7FKA gfrg== X-Gm-Message-State: AOJu0Yy2KaC4PlE1OXqAiYSbYNnybhD6ZnSoBl51SmgRd1jx5/2nBGE4 eS3aUKM30Pze1SsFUL8gow+AmeNwFLzIv//D8yl5skS2aYZLFE+YPpZc96zrzXRp5Vm47styklT SyCbbdQ== X-Received: from qvp14.prod.google.com ([2002:ad4:5b8e:0:b0:8ad:d521:d444]) (user=blasko job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:268c:b0:8b3:fb6a:d35d with SMTP id 6a1803df08f44-8c1b0570a36mr196253856d6.47.1778547064278; Mon, 11 May 2026 17:51:04 -0700 (PDT) Date: Tue, 12 May 2026 00:50:50 +0000 In-Reply-To: <20260512005057.944672-1-blasko@google.com> Mime-Version: 1.0 References: <20260512005057.944672-1-blasko@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512005057.944672-2-blasko@google.com> Subject: [PATCH 1/6] net/gve: add thread safety to admin queue From: mark-blasko To: stephen@networkplumber.org Cc: dev@dpdk.org, Mark Blasko , Joshua Washington , "Jasper Tran O'Leary" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 From: Mark Blasko Introduce a pthread_mutex to protect the admin queue operations. Locking was added around gve_adminq_execute_cmd and the batch queue creation/destruction functions. Signed-off-by: Mark Blasko Reviewed-by: Joshua Washington Reviewed-by: Jasper Tran O'Leary --- .mailmap | 1 + drivers/net/gve/base/gve_adminq.c | 68 +++++++++++++++++++++++++------ drivers/net/gve/gve_ethdev.h | 1 + 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index 3ab7364668..7f7590866b 100644 --- a/.mailmap +++ b/.mailmap @@ -1009,6 +1009,7 @@ Mario Carrillo M=C3=A1rio Kuka Mariusz Drost Mark Asselstine +Mark Blasko Mark Bloch Mark Gillott Mark Kavanagh diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_a= dminq.c index 9c5316fb00..28661fb6cd 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -216,6 +216,7 @@ gve_process_device_options(struct gve_priv *priv, =20 int gve_adminq_alloc(struct gve_priv *priv) { + pthread_mutexattr_t mutexattr; uint8_t pci_rev_id; =20 priv->adminq =3D gve_alloc_dma_mem(&priv->adminq_dma_mem, PAGE_SIZE); @@ -241,6 +242,12 @@ int gve_adminq_alloc(struct gve_priv *priv) priv->adminq_get_ptype_map_cnt =3D 0; priv->adminq_cfg_flow_rule_cnt =3D 0; =20 + pthread_mutexattr_init(&mutexattr); + pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED); + pthread_mutexattr_setrobust(&mutexattr, PTHREAD_MUTEX_ROBUST); + pthread_mutex_init(&priv->adminq_lock, &mutexattr); + pthread_mutexattr_destroy(&mutexattr); + /* Setup Admin queue with the device */ rte_pci_read_config(priv->pci_dev, &pci_rev_id, sizeof(pci_rev_id), RTE_PCI_REVISION_ID); @@ -304,6 +311,7 @@ void gve_adminq_free(struct gve_priv *priv) return; gve_adminq_release(priv); gve_free_dma_mem(&priv->adminq_dma_mem); + pthread_mutex_destroy(&priv->adminq_lock); gve_clear_admin_queue_ok(priv); } =20 @@ -418,7 +426,10 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv, (tail & priv->adminq_mask)) { int err; =20 - /* Flush existing commands to make room. */ + /* Flush existing commands to make room. + * Note: This kicks the doorbell for all staged commands. + * Any failure here means we failed after attempting to kick. + */ err =3D gve_adminq_kick_and_wait(priv); if (err) return err; @@ -509,17 +520,24 @@ static int gve_adminq_execute_cmd(struct gve_priv *pr= iv, u32 tail, head; int err; =20 + pthread_mutex_lock(&priv->adminq_lock); tail =3D ioread32be(&priv->reg_bar0->adminq_event_counter); head =3D priv->adminq_prod_cnt; - if (tail !=3D head) + if (tail !=3D head) { /* This is not a valid path */ - return -EINVAL; + err =3D -EINVAL; + goto unlock_and_return; + } =20 err =3D gve_adminq_issue_cmd(priv, cmd_orig); if (err) - return err; + goto unlock_and_return; =20 - return gve_adminq_kick_and_wait(priv); + err =3D gve_adminq_kick_and_wait(priv); + +unlock_and_return: + pthread_mutex_unlock(&priv->adminq_lock); + return err; } =20 static int gve_adminq_execute_extended_cmd(struct gve_priv *priv, u32 opco= de, @@ -693,13 +711,19 @@ int gve_adminq_create_tx_queues(struct gve_priv *priv= , u32 num_queues) int err; u32 i; =20 + pthread_mutex_lock(&priv->adminq_lock); + for (i =3D 0; i < num_queues; i++) { err =3D gve_adminq_create_tx_queue(priv, i); if (err) - return err; + goto unlock_and_return; } =20 - return gve_adminq_kick_and_wait(priv); + err =3D gve_adminq_kick_and_wait(priv); + +unlock_and_return: + pthread_mutex_unlock(&priv->adminq_lock); + return err; } =20 static int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_ind= ex) @@ -747,13 +771,19 @@ int gve_adminq_create_rx_queues(struct gve_priv *priv= , u32 num_queues) int err; u32 i; =20 + pthread_mutex_lock(&priv->adminq_lock); + for (i =3D 0; i < num_queues; i++) { err =3D gve_adminq_create_rx_queue(priv, i); if (err) - return err; + goto unlock_and_return; } =20 - return gve_adminq_kick_and_wait(priv); + err =3D gve_adminq_kick_and_wait(priv); + +unlock_and_return: + pthread_mutex_unlock(&priv->adminq_lock); + return err; } =20 static int gve_adminq_destroy_tx_queue(struct gve_priv *priv, u32 queue_in= dex) @@ -779,13 +809,19 @@ int gve_adminq_destroy_tx_queues(struct gve_priv *pri= v, u32 num_queues) int err; u32 i; =20 + pthread_mutex_lock(&priv->adminq_lock); + for (i =3D 0; i < num_queues; i++) { err =3D gve_adminq_destroy_tx_queue(priv, i); if (err) - return err; + goto unlock_and_return; } =20 - return gve_adminq_kick_and_wait(priv); + err =3D gve_adminq_kick_and_wait(priv); + +unlock_and_return: + pthread_mutex_unlock(&priv->adminq_lock); + return err; } =20 static int gve_adminq_destroy_rx_queue(struct gve_priv *priv, u32 queue_in= dex) @@ -811,13 +847,19 @@ int gve_adminq_destroy_rx_queues(struct gve_priv *pri= v, u32 num_queues) int err; u32 i; =20 + pthread_mutex_lock(&priv->adminq_lock); + for (i =3D 0; i < num_queues; i++) { err =3D gve_adminq_destroy_rx_queue(priv, i); if (err) - return err; + goto unlock_and_return; } =20 - return gve_adminq_kick_and_wait(priv); + err =3D gve_adminq_kick_and_wait(priv); + +unlock_and_return: + pthread_mutex_unlock(&priv->adminq_lock); + return err; } =20 static int gve_set_desc_cnt(struct gve_priv *priv, diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 0577f03974..524e48e723 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -339,6 +339,7 @@ struct gve_priv { struct gve_tx_queue **txqs; struct gve_rx_queue **rxqs; =20 + pthread_mutex_t adminq_lock; /* Protects AdminQ command execution */ uint32_t stats_report_len; const struct rte_memzone *stats_report_mem; uint16_t stats_start_idx; /* start index of array of stats written by NIC= */ --=20 2.54.0.563.g4f69b47b94-goog