From nobody Wed Nov 22 08:00:39 2023 X-Original-To: dev-commits-src-branches@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 4SZtw811rrz524tL; Wed, 22 Nov 2023 08:00:40 +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 4SZtw80X25z3DZc; Wed, 22 Nov 2023 08:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700640040; 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=yKHFDw0vrFC9++u6NkSijKp49M+r3MjLzHNVubVjWJw=; b=rF2rYVuQeF0euHCka35srXcSltBbR7k2kP+RFKxJUyeOM7VKIMSxhySmXhmHWATMakuw0A BUXal1FzMRqm9v+8VvfNLcW8bQQLB9si34iyawIN41/YRdN1ZIIiZhyDSLIjPEzWzUe4E1 6Nw1s/erJIVhihXY+GnuPPuQc3OtnQqlkG4m9UueeB6kc93llHll8vpdg0dEoGZ48AcOoO C6Z3SukQo3jHqqdcej1J+P3REOJc+Sr7KXY3bWDAbcMedIKn2eWXiLn7qAaVkjYZ5RPCtJ olpAICXGei8DqzRlAT0zN1a0VZySWJeFU7sAZrMRCG8JK6YET8VQm59N5BdIcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700640040; 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=yKHFDw0vrFC9++u6NkSijKp49M+r3MjLzHNVubVjWJw=; b=v9d1AwfV5CB3MeplylD0oy3a72oLBGVgNoC4Zh3FvuViSMsSPB1ciKH6bv/igbC4tY3Ham G2N1jE+gcAOSQr+ppdR2x1Yz0bjXQmjuIY/Qjfu9/YpY7Q+0eGtXjuRKNP+XK1ZmqvRhlx JYc910Cih11SbuI9FrRi4pXLdELZT6fWUHkhJKQMttEucRWtMqRvsvAGIOXh8+wHS8EK0e 63NEWRok6H+8EKXY8R97p5cb8FlVlY23PiwWtWDeTrGXKJMzB3B7qlDsleWt7dRj63zQo7 PG/akuKXN0wGj8cAn1OdSchiWQECKvLoSRRClQ8fNXATVYJEC8C4+AuTpWJdVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700640040; a=rsa-sha256; cv=none; b=n1WcEI2fGpbUyy70RKC9ejNUqjzJ7A9OaV9DtvCku1Fi6IqhE+uT1YA4vuEydE3jR2WTs6 G5l65PIpYF90aJIUROR9JhuEOif9qUll3+9OJJ2u+w4ArmSUUCs0Bo+W8cXIP5XbUaYGtA a1ZI0jD1yI8cxACgxqr0FQR5IC0l33tudeuBFuXLLz2BEXOglKjazKJ/sM9vTrmcKh0I8M sEhhxJtrOTslx/8Uu4E6fRc8tcZflGeQqKsl5PDRoBGowzF4p5JQU74LRPOcv0lRWBGcet rMRM9+3yiTPV4Zauc8FPx2jinHlpHDR968Pxdx+hBkXBRpf3O/LdhjkxwcnCYw== 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 4SZtw76l6Nz18lq; Wed, 22 Nov 2023 08:00:39 +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 3AM80dg4094096; Wed, 22 Nov 2023 08:00:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AM80dRx094093; Wed, 22 Nov 2023 08:00:39 GMT (envelope-from git) Date: Wed, 22 Nov 2023 08:00:39 GMT Message-Id: <202311220800.3AM80dRx094093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: ac83e415ef08 - stable/14 - mlx5_core: fix deadlock when using RXTLS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ac83e415ef083da400509c6fa434ee59cfe9668f Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ac83e415ef083da400509c6fa434ee59cfe9668f commit ac83e415ef083da400509c6fa434ee59cfe9668f Author: Martin Matuska AuthorDate: 2023-11-13 13:29:27 +0000 Commit: Martin Matuska CommitDate: 2023-11-22 08:00:23 +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 Reviewed by: kib Tested by: mm Differential Revision: https://reviews.freebsd.org/D42368 (cherry picked from commit a592812327deaf69ab226afc5c8a01af43dc03c2) --- 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); }