From nobody Thu Nov 16 11:17:50 2023 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 4SWHZR2P5mz50WZM; Thu, 16 Nov 2023 11:17:51 +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 4SWHZR1p87z4PjX; Thu, 16 Nov 2023 11:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700133471; 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=dxTBRupgADc92H4j5gvEn41ACkAsmsC9TrzyzSEOHSQ=; b=KPJBFh9ESHW8s3oZzHWZuaMrlV0vbCYW7iBiRn3HlMrzLEZEjfN+1CBFQqL1X1G2ciOdpI zpDjxVspSNSsk92cgz7VU7JsJqaDFKU1QRwNXwgrUWzdbP5yWF/1+qm3wpcgz5MxY5HLST T1b+PiCLjsPaN6qIvgmTufzywFsLppx2rcJZv5hxRYPmybEUwo1FWPGJK42AwQJOuXGvqn 4so/1EE1Ej0Lp503daWhnyfCXJspW3bhNzeVuxQ5LEe8yV2ya8F0cMrQ0mCD7qmJYDnbNm DZjSnEvlF/GUE+HztzZTgHJjyP3yz8wgJsPXSskDdPSM5J9Axt7v06jwMUgNCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700133471; 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=dxTBRupgADc92H4j5gvEn41ACkAsmsC9TrzyzSEOHSQ=; b=VM5fOVgKchIivDy0cOWNVPwFYhGIx5r1O8AdClGU0ka3LntMKtPjIvjgUu0jW6topWWGqE fJ1DX6O/RzohKeisy3L+3S0uPvhprcZFAas2Y4rYp1BaU5jZBvnvXflMw1x2wOLfwRRrIT qedfwpJxEUSM/Sjdz1bV505QlWIyvuVTDa8+vXpgvg4RSEN6wpP7JcATUJpVQLoBk7Kqd0 EeoRYkiGPw7a+yRpc+RM+pdJ6xTbpoAJa9B/k0za7eOloWbMkm20jv7Tz9KP/Fd7HT8smR 8Go88mbHF1nnXzbnvSYurflvJLgVsmMo3JvgMsRDXSSjB4rWePRlpFm5H8fRPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700133471; a=rsa-sha256; cv=none; b=LoLANejH988XRzlKzKVsHiwYg5Dbq8QAW4eker5Wio16M0I2zWeIob+CGSGtOBBX5gyr7Z 8yhJU+GNsph26RyAaKyRJ32Vg4wO4TxQP9Txwoi/bHifY45WHEGp8A4mGoAGD40TE6umiE GN82vuMJWqTQ99cMnOKbVutUHlizYbYlSKZ7W/KrWyM+gD96miVVHQVc9aodtnj1cpJA1s OO0ZJlM6r8TJB9WQ+pVTeWhcih1uTWMMnLiijuVjCs3K50VB+sC4xuPeoslMEYkfPTgy8L dQJumiUpdiAldd/qYCADrZKj55qp8kAbbQ2ww2wHlHJwvp3T8wW4lD4qFbApBg== 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 4SWHZR0mpMzxcx; Thu, 16 Nov 2023 11:17:51 +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 3AGBHooZ085689; Thu, 16 Nov 2023 11:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGBHoeN085686; Thu, 16 Nov 2023 11:17:50 GMT (envelope-from git) Date: Thu, 16 Nov 2023 11:17:50 GMT Message-Id: <202311161117.3AGBHoeN085686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: a592812327de - main - mlx5_core: fix deadlock when using RXTLS 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a592812327deaf69ab226afc5c8a01af43dc03c2 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a592812327deaf69ab226afc5c8a01af43dc03c2 commit a592812327deaf69ab226afc5c8a01af43dc03c2 Author: Martin Matuska AuthorDate: 2023-11-13 13:29:27 +0000 Commit: Martin Matuska CommitDate: 2023-11-16 11:17:41 +0000 mlx5_core: fix deadlock when using RXTLS If removing a node of type FS_TYPE_FLOW_DEST we lock the flow group too late. This can lead to a deadlock with fs_add_dst_fg(). PR: 274715 MFC after: 1 week Reviewed by: kib Tested by: mm Differential Revision: https://reviews.freebsd.org/D42368 --- sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c index 5966a73c58d1..b76ea7b60582 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c @@ -229,14 +229,19 @@ static void __fs_remove_node(struct kref *kref) { struct fs_base *node = container_of(kref, struct fs_base, refcount); - if (node->parent) + if (node->parent) { + if (node->type == FS_TYPE_FLOW_DEST) + mutex_lock(&node->parent->parent->lock); mutex_lock(&node->parent->lock); + } mutex_lock(&node->lock); cmd_remove_node(node); mutex_unlock(&node->lock); complete(&node->complete); if (node->parent) { mutex_unlock(&node->parent->lock); + if (node->type == FS_TYPE_FLOW_DEST) + mutex_unlock(&node->parent->parent->lock); _fs_put(node->parent, _fs_remove_node, false); } } @@ -1719,7 +1724,7 @@ static void fs_del_dst(struct mlx5_flow_rule *dst) fs_get_parent(fte, dst); fs_get_parent(fg, fte); - mutex_lock(&fg->base.lock); + sx_assert(&fg->base.lock.sx, SX_XLOCKED); memcpy(match_value, fte->val, sizeof(fte->val)); /* ft can't be changed as fg is locked */ fs_get_parent(ft, fg); @@ -1739,7 +1744,6 @@ static void fs_del_dst(struct mlx5_flow_rule *dst) } call_to_del_rule_notifiers(dst, fte); err: - mutex_unlock(&fg->base.lock); kvfree(match_value); }