From nobody Sat Apr 02 01:49:21 2022 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 2192A1A57D44; Sat, 2 Apr 2022 01:49: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 4KVg2B0MZyz3PXP; Sat, 2 Apr 2022 01:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648864162; 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=2rcpVN2vH+tJg1wLlz6msJYwE70p0qNCctClby7iY7w=; b=dpBOYW+bXrzY8lIcoyFnDBWdkVCHDx4NpkYioCgqm3AslkOTViekQ0Io368ybOmNCcR+5x 9w4jss4Am5cph22svAvMcZj0dpN81/pS8FMIWoWEGeE1Q1s0lWQJP9F+w4bKKgdOJn6izg DhraSbqIOzn5/WAUq0rEdg/jndQOA9/BBdnf5fGCV6aG0To5VU/fJsIDM1FOztK0CAw985 2tASOoehZTLGR6FnlbKiUEB2sVnWgCh4pKDDgPj0fvfLG6zZWWfjOcKcVWNLD/NCj4Sq1a sk5MzLL8kMgiVCRTML8HClbbb/tt/9LMh7Hy6ucOUTqB32tuvxrqXVwgcURw1Q== 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 DA0EB1F87F; Sat, 2 Apr 2022 01:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2321nLW8026633; Sat, 2 Apr 2022 01:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2321nLmk026632; Sat, 2 Apr 2022 01:49:21 GMT (envelope-from git) Date: Sat, 2 Apr 2022 01:49:21 GMT Message-Id: <202204020149.2321nLmk026632@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: 82386f825eb7 - stable/13 - cxgbe(4): Allow dump_cimla and dump_devlog to sleep. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82386f825eb724b9369bf32d4a17976bcaf06e67 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648864162; 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=2rcpVN2vH+tJg1wLlz6msJYwE70p0qNCctClby7iY7w=; b=qvQVBHfD3LFr9k/+hoK8bcK8Xj5JF/gUxvhGpX9BNUL837YSweAqdM/ON1ZMrnZW5/og61 8YXFu8i6LNqxiF86qmIDakRaYKoj0vo4QKSGSuMT3pKLYigA8u14JjGH9UPwuOcefMgRbm XcyzVkyyQzXTiYQzOgQxIS3j4yt77N+gQkllsar1irAxJXvx2BS2ZrMEX0dB20JKeXxjjR eId5+Um0Y4drWvVlb3bZGtLoit4Lru+u05/nCOkRYHTZ55uAFLe50SEzwx/0YH8E+IqTJJ yYfyN30jJDu7trbH7j9QA2w+7xGGQeq/TGtNHm2gC1hXicDFn+h72FWsnGsMgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648864162; a=rsa-sha256; cv=none; b=fiTistV8qnZGM+VykZo5m6IjuUWMfqifIYBQosCgvmA4lzHDGcvc/ocgo0zufnDt2N2YP5 OjfmVlCanZQvuUzBgGqvnEuntjdQwVeEMB2ge3PpnDj3u5sEX5+MaEqSfUslI0SYgfYBbd wV3Ds6cQE7DLgyb+1sJ0Cj2evg39q31bwZzSNEbcUYd2JNlvWTpO3Vhi5BY6W9nALOQo+A 6gvoTIaZlwFytLVGy+5jAOVvQf3+2VH0TsCYlocA8Ftl5lWRPorkoXXf29XQgIz+K2LTHy E3CFYHUNpyZk/qscnMA50tCG4sdUUbJMjEObAg34Pcp3hWHkGC8HrFP1u5f7tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=82386f825eb724b9369bf32d4a17976bcaf06e67 commit 82386f825eb724b9369bf32d4a17976bcaf06e67 Author: Navdeep Parhar AuthorDate: 2022-03-22 20:13:56 +0000 Commit: Navdeep Parhar CommitDate: 2022-04-02 01:48:52 +0000 cxgbe(4): Allow dump_cimla and dump_devlog to sleep. This has been safe since e9e7bc82505, which moved parts of error handling from the ithread to a taskqueue. Sponsored by: Chelsio Communications (cherry picked from commit 41c4e1c7f738de2e88acb77911a22dbd57ad7d79) --- sys/dev/cxgbe/t4_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 2db23d218366..703335d9bc87 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -9064,7 +9064,7 @@ dump_cimla(struct adapter *sc) device_get_nameunit(sc->dev)); return; } - rc = sbuf_cim_la(sc, &sb, M_NOWAIT); + rc = sbuf_cim_la(sc, &sb, M_WAITOK); if (rc == 0) { rc = sbuf_finish(&sb); if (rc == 0) { @@ -9505,7 +9505,7 @@ dump_devlog(struct adapter *sc) device_get_nameunit(sc->dev)); return; } - rc = sbuf_devlog(sc, &sb, M_NOWAIT); + rc = sbuf_devlog(sc, &sb, M_WAITOK); if (rc == 0) { rc = sbuf_finish(&sb); if (rc == 0) {