From nobody Fri Feb 14 06:39:08 2025 X-Original-To: dev-commits-src-main@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 4YvMpP4Shwz5ntSq; Fri, 14 Feb 2025 06:39:09 +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 4YvMpN6FwJz3cwK; Fri, 14 Feb 2025 06:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739515148; 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=uXAg06GATVtukIjZagzZR/RuTVa9+JNCzDmD+zTEDTE=; b=n4SZtV1c/RBakH8KhTq1ysmF1ip5zIhyODc+7kEOonJLRv4hRzkKIabw89G66FgShBeaWw JFs1/EWQRF9dFXQDEfxDFBZ+WUo504iQ26vwk50VqITuoxzJ9XH4Y4QKaC0qzEDwvYl5AZ AVWXe1vfEEOTF1aT2xJruzsNjTge4+WQgh4ZcAVt1VPjIzLrLLPaM6hZ/aZVfrUArYBbXL Ld30jbjf6r6T/bXDXLlYwolHAqXgrrSJ08locvKvGD6Jn3VvE2OGQcemyqgMzzDeofJ6WP 7JGkRhsYXdio82kKwpdNfXWKYgfcSitmWnhqaNuBZS3Vfahfuy6heYOCOPpetg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739515148; 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=uXAg06GATVtukIjZagzZR/RuTVa9+JNCzDmD+zTEDTE=; b=utH54w+KVxnrz/1lNk1yzNTwiRm/VqG0rXZSOPoilAsqo3oLVtsczVL6tK6JBaJcX5/Xv9 FEN7Yky6wKOgyONwzlXOeE7GTIu6dequhaOU8Yv+Mgo2gwBqBl/6rHPzBT94GPIItjTbxI zP+/eqtV1F0yN7MBfzMTBfmzniAWfeY5J3zUkf4k3q4jklh/E/9yub1wAL9PzBj8Lw2rse n0XmoMGabegDUlHYZd3NpvzqxaVWO8AMtCKOctOPmwBYdecgkvFTwE5VYieQquM6Q5OZwh UJuurxB5MdCyOfuJMxHnUiTouriTwHxNxct09C3MEKPgF8Ybe0YMCLBvL91z7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739515148; a=rsa-sha256; cv=none; b=mYBHZom2oov5Vo1l18RtUNXycraBux+phWH7e7mlJDVdKYdK8Kbczu3XXdenb5yfMkVt9X k7VC1epPCsZYTmvvaje7qdtvWtcyp8jt29aST/MLr577hamRNprirTu7AZ1h0Y2dYFRUPi lJ+2a1ngdwonKHwbAJe12PF8JVkC7wdQpcx1O22ISp5YRTo6cjP4SDYJUmJ4+SoM4xSLuX pFnQXEeNp/y/lkOvrDJ8riiosOrZ8HegSiIOzCaiQwKZgBV6EGgoICjj8nnzCJfOMkiSrb VTN8fUqjGMAWgCSvlaTPQU6SwIKuJ6eY8Rzt61gFmLoCf/bU2GGLJxNINw4MMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YvMpN5rgsz3g7; Fri, 14 Feb 2025 06:39:08 +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 51E6d8Yu097897; Fri, 14 Feb 2025 06:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E6d8CM097894; Fri, 14 Feb 2025 06:39:08 GMT (envelope-from git) Date: Fri, 14 Feb 2025 06:39:08 GMT Message-Id: <202502140639.51E6d8CM097894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 04bf43505bae - main - cxgbe(4): Use correct priority in begin_synchronized_op. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 04bf43505bae1bb20d315a44e977d97aed3e5733 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=04bf43505bae1bb20d315a44e977d97aed3e5733 commit 04bf43505bae1bb20d315a44e977d97aed3e5733 Author: Navdeep Parhar AuthorDate: 2024-10-04 18:14:33 +0000 Commit: Navdeep Parhar CommitDate: 2025-02-14 06:15:18 +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. MFC after: 1 week Sponsored by: Chelsio Communications --- 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 5542481e03d8..51ba6d94b5fa 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -6324,20 +6324,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 (;;) { @@ -6356,7 +6349,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; }