From nobody Fri Jan 12 12:01:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TBKrL09FMz56h0Z; Fri, 12 Jan 2024 12:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TBKrK6r0Cz4ps7; Fri, 12 Jan 2024 12:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705060882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BELx2rBVsWj4CauK7HfsUXKj7N8pcX1qpJIMTyhllE4=; b=mpRmF9nO+Re513dg6oglrKcpChZV/QrAukckRNTvpZfoAPFNSicdoAGVkEf3vo96DndnXS fA9j5iJg9H+7pRdpWWfXJ/R1e3y3+6BicEwD0BHULmR7p5ShjknpCg3JrOFg2p9GKQb02Z gZcOvmirYyeBd8jnIFdf+kKlcpb3VhVb5fa0PXp9Iv5+YR6Okh6h/3WbLox+JvEu+At86P cHuTVaR27P8ljdbXDCxF/Vh/xXxApaMzX0gMVybb3IxZ6Wh2+G98NaaiMfVyb93ChnNMUz HZOj4MpaDo67yBtzVsUH+56zRjlVkRWCLI+OgUoHgMyBWPys3FNTSzhPZuhgtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705060882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BELx2rBVsWj4CauK7HfsUXKj7N8pcX1qpJIMTyhllE4=; b=DXxVYLiloTBVs3sXvr/l0UlR8ydJNJsH90Wt2IenMRQo1WzTEf+6V9MVvSImC20TlE/Fx5 4XCVb/xALiUbcfxPEaJRbFN8qn4CIx1S7/hRuKQIfDC7SDIncUU7dl3G1aRmjS+n38cQmq xeDzTwXDH6etp80jgHwRVOOLV0zm5TtX27PrX1kRAnkBo6tIpANDq7QbcrSpz3W3vfBOxp fUcMWweIpTcBvf8P6B0IG/ZHS4bEUZKE+mutFt3JyjMd9SOWcst85Ts95ZneKlIyl66nbR Fyket8n3xe6UwkkW9cnH1I4it0hhtIC9ABdXlAPujrqylXpiBfS8AUuxYksvXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705060882; a=rsa-sha256; cv=none; b=GydUlj129/dr/c2mHd0FhksG8m/FtVTLND2U9dpRH98dP6Mf3xmf31MdBkwDzvSR4JYl5d H7RzqMsbHtYrNozyuRS46NW7amkSr6o2HyZ/bHgpPB8kk60ROlZIOL99qDf9dwmhIWCa1y KevKlMr8WnVw72O7FcNAys5xYIKQ6PkABZK5kdku1FNfrp+Pg/R0ONw2UzQDJOXXzjCGuQ YGRtY9kmm5OGR2P+2GSKujEJe1eo+0VuuMZbBDjrPAibm2oN6xnrK3u2mp17dZNlhbfdLU L58umhLgxZayzlIpE86yQzXk2wHZeumrEOS5eYJOyQ/qR86hbvtd8LC4Q+A7nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TBKrK5thhz11Nt; Fri, 12 Jan 2024 12:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CC1L3q000457; Fri, 12 Jan 2024 12:01:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CC1LC3000454; Fri, 12 Jan 2024 12:01:21 GMT (envelope-from git) Date: Fri, 12 Jan 2024 12:01:21 GMT Message-Id: <202401121201.40CC1LC3000454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a76475313d65 - stable/14 - mlx5(4): only detach IOV children if iov was successfully initialized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a76475313d6580cb36eb940d5730407d832246de Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a76475313d6580cb36eb940d5730407d832246de commit a76475313d6580cb36eb940d5730407d832246de Author: Konstantin Belousov AuthorDate: 2023-12-29 03:14:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-11 16:46:52 +0000 mlx5(4): only detach IOV children if iov was successfully initialized (cherry picked from commit 987446fa39e8f6887ea16ad49f00f699b2efd210) --- sys/dev/mlx5/driver.h | 2 ++ sys/dev/mlx5/mlx5_core/mlx5_main.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/dev/mlx5/driver.h b/sys/dev/mlx5/driver.h index 9daa1235bd9c..6ebe4171a503 100644 --- a/sys/dev/mlx5/driver.h +++ b/sys/dev/mlx5/driver.h @@ -736,6 +736,8 @@ struct mlx5_core_dev { bool dump_copyout; struct mtx dump_lock; + bool iov_pf; + struct sysctl_ctx_list sysctl_ctx; int msix_eqvec; int pwr_status; diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index f6dc1158f085..6b9b63a24714 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -1719,7 +1719,9 @@ static int init_one(struct pci_dev *pdev, pci_iov_schema_add_uint64(vf_schema, iov_port_guid_name, 0, 0); err = pci_iov_attach(bsddev, pf_schema, vf_schema); - if (err != 0) { + if (err == 0) { + dev->iov_pf = true; + } else { device_printf(bsddev, "Failed to initialize SR-IOV support, error %d\n", err); @@ -1753,8 +1755,11 @@ static void remove_one(struct pci_dev *pdev) struct mlx5_priv *priv = &dev->priv; #ifdef PCI_IOV - pci_iov_detach(pdev->dev.bsddev); - mlx5_eswitch_disable_sriov(priv->eswitch); + if (dev->iov_pf) { + pci_iov_detach(pdev->dev.bsddev); + mlx5_eswitch_disable_sriov(priv->eswitch); + dev->iov_pf = false; + } #endif if (mlx5_unload_one(dev, priv, true)) {