From nobody Mon Oct 21 18:39:36 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 4XXPHF0Szkz5Zc72; Mon, 21 Oct 2024 18:39:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPHD3T84z4GbD; Mon, 21 Oct 2024 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535976; 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=FdfD/7e71HKMNqcni3COR/2PAIeAIl/a1ScU7++8vHc=; b=TC39NbYvDqk8x6Y/hKb6ASa/dA48wdNQ/K5X75pcbGeRTiE7H21CLE0dJnk3CJsP/7Ga6Z 6xlSTEpYj3M8U6RUeq8XAymXighdX+EVe/MhASO5D5Ql2tDiMw+bTUQxjzUIO3QIg+ZBD9 3TUwAr3aeXPPxVpWq/q9F6HSOZtaQMRdFG6U+0iRuqAiJVEYnZ4VzBgzpNaLeutR0DBqNc L2xDAAR8Gq9Y7RHmvKzFRpT2JFirNoDKpyYm1lHFBZT8NhWXJJViXv9VYucnRJXrDzkKsN bEnFeg+T0QqO0LGQGOmgc+WODtu3/PJCzV6/Tm4qWrMxmFd6/5F0/3GL9dX8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535976; 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=FdfD/7e71HKMNqcni3COR/2PAIeAIl/a1ScU7++8vHc=; b=yoZUkl4bFP9m3JFbEq30ukIhxmp+5YzuWvw1n2ED5mb0YQyI+mM+JrnDjfmA3Tmvkf3RvK tpLg0M8TkwbgMlrV3DgreUgts5LVLu6u3BXHbgdmHjmi3H1Yi/Rv7UrJUXc61/7WSvRQ2R R91wCsCn1GSCp5PUnvTiIrnQqi2PDxzKwOcVwJwWKdEM/qlG7eclheI3s+Zamq8bIgQKPT 34luGSA0lCOtiSS+BbOEggtuqgbWQFwzwRDa9XR9oRoYtfY+Lz768n0CvAiIYup7LT9ode bohvWJBPTUuSGT8Cf2y4pOkCURX0fUsEz68OKpi8hTwAGkCxXQE9DdL1h48emA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535976; a=rsa-sha256; cv=none; b=UgReJyMIeOvYJg/EwtI6DtBQtFNsy4c0DUC16tI/GH/g2L5x9EM4ylM4Uz6iEf9a9qMxeR wKf/rJ0jDZMdMJyXhNmKqWzdAJHJHP8NN3mV+aEK6X1UBJjcyYmjX5RTUqaHNAAUDYJcq1 uQd0VDFZbVLD6XYfu4wmq/KFLzjb/qa/aSsmytiGjUqjybDZrf5WOJsdpQzKgN39khj6hu PQT7rJ+L9Vc6WiLUf1Lpc3aZyZ9NvzdF4eHpvcNjeDsI71oCIlJtZPb3GwplxzMhY9FyQz yVrAVRbiUZYx3B0Hg9eyO/6D/H9JiDk3/mfl+/M8rpDTVu6jJyyJwS/1HZiNUQ== 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 4XXPHD35Hgzh8F; Mon, 21 Oct 2024 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdaHM037457; Mon, 21 Oct 2024 18:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdabl037454; Mon, 21 Oct 2024 18:39:36 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:36 GMT Message-Id: <202410211839.49LIdabl037454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 42d8f6b75933 - stable/14 - cxgbe(4): Use correct synchronization when marking the adapter offline. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 42d8f6b75933329aaa7fcffed3abc5c7bfb43cb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=42d8f6b75933329aaa7fcffed3abc5c7bfb43cb2 commit 42d8f6b75933329aaa7fcffed3abc5c7bfb43cb2 Author: Navdeep Parhar AuthorDate: 2024-10-04 18:11:22 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:15:33 +0000 cxgbe(4): Use correct synchronization when marking the adapter offline. adapter->flags are guarded by a synch_op, as noted in the comment in adapter.h where the flags are defined. Fixes: 5241b210a4e cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset. Sponsored by: Chelsio Communications (cherry picked from commit 52e5a66eac22d24e29f204c5b65232378e71f4cf) --- sys/dev/cxgbe/t4_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index f4e6b41d9fb4..769d4778a8d2 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1990,18 +1990,23 @@ restart_adapter(struct adapter *sc) static inline void set_adapter_hwstatus(struct adapter *sc, const bool usable) { - mtx_lock(&sc->reg_lock); if (usable) { /* Must be marked reusable by the designated thread. */ + ASSERT_SYNCHRONIZED_OP(sc); MPASS(sc->reset_thread == curthread); + mtx_lock(&sc->reg_lock); atomic_clear_int(&sc->error_flags, HW_OFF_LIMITS); + mtx_unlock(&sc->reg_lock); } else { /* Mark the adapter totally off limits. */ + begin_synchronized_op(sc, NULL, SLEEP_OK, "t4hwsts"); + mtx_lock(&sc->reg_lock); atomic_set_int(&sc->error_flags, HW_OFF_LIMITS); + mtx_unlock(&sc->reg_lock); sc->flags &= ~(FW_OK | MASTER_PF); sc->reset_thread = NULL; + end_synchronized_op(sc, 0); } - mtx_unlock(&sc->reg_lock); } static int