From nobody Fri Jan 12 12:02:45 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 4TBKsy1fYxz56hSc; Fri, 12 Jan 2024 12:02:46 +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 4TBKsy0sqKz4tFC; Fri, 12 Jan 2024 12:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705060966; 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=9qbsxvO7uqrpN6azesXn79md172GYcxyr5d1wwGEgMc=; b=Y2HUemhNmOW/6aI6W5kYhONcrv9FZ5UPzWmrK/7r52u1vy/wTlYOUXg6e0MJ/+fXQrH5zF 8PPaILGhLsc7xCaYi7RKXKvqD0QqjyXCRB5UVC5GdAZdMK43jCIG/5G5T41UqPsTo5AFx9 GC6dyoLigHMC3W0eoT4NIE/m0dAeSFkmzvlTvgc6PrhWs17BljLWfZXYHZR+G8PbwR8ev/ nvpL8sbnjvh0CSMjXggTUlkUtJcdSPMPr2v4UgY7uWvg6PkAaG2JWy1iZL6B7+ozZrnGn7 0w4u5ocPjWvigQ00dCO+V+PV06MLpXFLtMfu71Kl68jy5I+KbiVo8kOnHztIdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705060966; 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=9qbsxvO7uqrpN6azesXn79md172GYcxyr5d1wwGEgMc=; b=DDyr8a3lRxhH9BfNWaWGJi+tBKvqy6tDXupsh98pXKIcxYHqQLXvnrb1P7IBQ/uIScxDug ZumJLT3zy4X2/2YjZee/g25IHd7A8WKkPmQjbWlzCRowAT1lqiAX+79/BmyC3VkIFRJeLV EeKT7MUkPIoOxW0MWjm5YXoO7DCtXToIVZ0yeOWgdWob05MlIhSQvRMEPgQ7rKZk2lDUo/ Gy9OYo5CDlo9NgAAII+jgXr70kxelZ97FHZwL9/VIbQ3VozX+Z2k3f8rjjIWnHRgcsgCNY NWEigraObzgMpGSkRyGNtoemLuNlQ+C9/MnFgQw9yrcL/UkIag9wQdxTk988sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705060966; a=rsa-sha256; cv=none; b=NQZzpv42WtElXUo07+tzPmCkTjeUt3MxGo9mxsnCcMwGcJznTiRRbnZQKxa3Wi5LqzVwR8 AWxLGRlIEZvrLYqsHkTehf6bOOEXjSkDmgvvsv3UCJtxOzXlKs6ZgV3+S8egk/ywRa6ZdY EG4Er300YfoKSrp23EAYb3LqXKdqq5BIWDLKHQ5NcYV+32A0YibjKuhw0kMOuBrQqBfoC6 Cgvbt2z4/Mp+9ofGZFAP3RCT1Q4G8PV3bJ2ZTs92o6tKWX9Yz/V3zqotn1a6JXLqeLtzRn OsMB5v88xHq3yWyaqoawgjEQpn8i0houHa/uLdU8XWoxeSF9YGiVT6tZrKY9oQ== 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 4TBKsx722bz1236; Fri, 12 Jan 2024 12:02:45 +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 40CC2jjI005485; Fri, 12 Jan 2024 12:02:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CC2j3l005482; Fri, 12 Jan 2024 12:02:45 GMT (envelope-from git) Date: Fri, 12 Jan 2024 12:02:45 GMT Message-Id: <202401121202.40CC2j3l005482@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: a85df799787b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a85df799787b8c441bf7d7238f02ca057b7378e5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a85df799787b8c441bf7d7238f02ca057b7378e5 commit a85df799787b8c441bf7d7238f02ca057b7378e5 Author: Konstantin Belousov AuthorDate: 2023-12-29 03:14:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-11 16:47:51 +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 958b4a7df747..d866e40372ab 100644 --- a/sys/dev/mlx5/driver.h +++ b/sys/dev/mlx5/driver.h @@ -708,6 +708,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 2e0aa2a00cd5..0a05d559072f 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -1702,7 +1702,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); @@ -1736,8 +1738,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)) {