From nobody Tue Apr 22 11:22:48 2025 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 4Zhfwp2PGyz5sTyq; Tue, 22 Apr 2025 11:22:50 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zhfwn0C7hz3C1m; Tue, 22 Apr 2025 11:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745320969; 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=YRTv7q4e4FP01G82PoYxZdCU6Bujhaf+EXHxv/utr7I=; b=WttZKsk2RWuO7QC4F52cbDvjhLyKSfK/vMuJzFYv2fpIsRPYEQYs2WvU/ELG74X5ACwaRq dL3YokJctxaDeZo4J5UY6q0uqr+5iPLfoYf18DERD8mEnep12kqMn3RSHuzdlO/nW1jJ7D HVv+Okg+Ucdxe9e9SJ+haodutqnqgoZKACYUR/EBqhiuK9Djd7dxyrwA4hLD2h0klMSLbk 31P7xen0aVcFUzUYnoqSaK4ksIfNENnqOiuo8tGnqzaidUVbKVjMZCOpADCDHDZ4EWcgs/ SMHhKyCUnvNp7UufEBelNgQEYe34vxxNBxB/NKSIy1yqgMRt4X98VCGNX3cPkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745320969; a=rsa-sha256; cv=none; b=U4eGsO/bbJdae+FwHfzaPDcuvePWDFtTPeiOAE5rDDd0xC2qXm0DFuXCemec9+obN2PT7p yh7tDgTR/tiChg7NG8cjTuKrjRIw8AMEaChFxz8Pv/yp+yKZ6HUHCOPIFmqiOHg7E418HD nYhoiTXgKWEYsjctNHiuytfFEaP0VWuHjfW9Crv2uQC+YMv/qDnuEC2jq3iXoD5/GfeJSm D18GuvEMoOZkW/bjIAjDjQC924fivB6I508/HkkInlZ3A9FGCuNAyWcQGil6mQ+/Bjz2Kp FcHjz4xVPS5U+mrtiTBmXZVuVEwiOfvKukkDVePFT8loKcBgLusTn5rDp245Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745320969; 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=YRTv7q4e4FP01G82PoYxZdCU6Bujhaf+EXHxv/utr7I=; b=Wk2G3bqmuOwjJsFq+tOF9VZOy6F/Le7EOwtOVgxY7T+ARJGKzvBCVRZemCBp7kI2F2CMeU pX4hodxj7f8WNahQ2eCymdMQdol38z31y/lK17W5tVwMT7m92OvPMZvZWMrtcamsIP/W0v 7pPXQu4Z3rC4y5CfGPH0BSd0wEne0pv4ft1ZalsEP5AEUV+vPRRV4qmyGx2xcPCwo621e8 PHodXAqZXamr64UU6bsGvUSoHCt0cohweM5gnRJuHJeUhJY2y93wqJBZEzm+Zyi6V2mCCW fn1c2BPhOWXLGwtpj12+unwU/0zUyvs/AuOn0CMnsqUREV4MNcuMKckebGDt4Q== 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 4Zhfwm6v8wz20b; Tue, 22 Apr 2025 11:22:48 +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 53MBMmkO026152; Tue, 22 Apr 2025 11:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MBMm1L026149; Tue, 22 Apr 2025 11:22:48 GMT (envelope-from git) Date: Tue, 22 Apr 2025 11:22:48 GMT Message-Id: <202504221122.53MBMm1L026149@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: 4e9f82956158 - stable/14 - cxgbe(4): Use correct priority in begin_synchronized_op. 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: 4e9f82956158d689e378e7dd12f5e1b29d8e25d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4e9f82956158d689e378e7dd12f5e1b29d8e25d2 commit 4e9f82956158d689e378e7dd12f5e1b29d8e25d2 Author: Navdeep Parhar AuthorDate: 2024-10-04 18:14:33 +0000 Commit: Navdeep Parhar CommitDate: 2025-04-22 11:12:46 +0000 cxgbe(4): Use correct priority in begin_synchronized_op. It was always set to PCATCH because the driver tested (INTR_OK) instead of (flags & INTR_OK). Fit a WITNESS_WARN in a single line while here. Sponsored by: Chelsio Communications (cherry picked from commit 04bf43505bae1bb20d315a44e977d97aed3e5733) --- sys/dev/cxgbe/t4_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index f79fb799f5e1..87ef7a53ff6f 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -6338,20 +6338,13 @@ int begin_synchronized_op(struct adapter *sc, struct vi_info *vi, int flags, char *wmesg) { - int rc, pri; + int rc; #ifdef WITNESS /* the caller thinks it's ok to sleep, but is it really? */ if (flags & SLEEP_OK) - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "begin_synchronized_op"); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, __func__); #endif - - if (INTR_OK) - pri = PCATCH; - else - pri = 0; - ADAPTER_LOCK(sc); for (;;) { @@ -6370,7 +6363,8 @@ begin_synchronized_op(struct adapter *sc, struct vi_info *vi, int flags, goto done; } - if (mtx_sleep(&sc->flags, &sc->sc_lock, pri, wmesg, 0)) { + if (mtx_sleep(&sc->flags, &sc->sc_lock, + flags & INTR_OK ? PCATCH : 0, wmesg, 0)) { rc = EINTR; goto done; }