From nobody Wed Apr 06 17:46:13 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 4C7FC1AA6863; Wed, 6 Apr 2022 17:46:14 +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 4KYX4P5wxkz3DMj; Wed, 6 Apr 2022 17:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649267174; 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=dC8znyTwJPDooGedbC4vBUkAeR6ZHMrCgaCFHJXnUW4=; b=QCYBWZ+DhLfC8Z+tQaZXo+xYwsb58RKDzz+IVAPIp/ojRvoL5j2ys7iokHZ54LdpdGNFQE wrU0mHpBh7QwprQvl9Qn1Ypu1Xte4tfAlIGEVnSBexMdW0NBjSrsquLtd4juJ9ECSpXLC5 qLf3Jlz92Bu1EJQTn/uKuqr90vLvBUiGkTveywbMIfl0h6+W+wcrI4zb3e3sCSKw+cbkVk 2YjX/b4PyO/6CttKRxrgP9KViTuXZzYD+47ZfBj8eD3y95IiLBzudcTOPK+Pl89ME5TXOC 6xzSZiUFkNsh5Gxa8R9wLeqhBxIeHphmTiPj1sPtzlDydsDS85Ppb4gfXbuy1g== 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 984881F5CD; Wed, 6 Apr 2022 17:46:13 +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 236HkDbs022807; Wed, 6 Apr 2022 17:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236HkDiP022806; Wed, 6 Apr 2022 17:46:13 GMT (envelope-from git) Date: Wed, 6 Apr 2022 17:46:13 GMT Message-Id: <202204061746.236HkDiP022806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: cf523b815c78 - releng/13.1 - mrsas: remove additional MPT command allocation for R1 FP command 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: cf523b815c780f741b5f4b7d1cd1258d0118ad1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649267174; 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=dC8znyTwJPDooGedbC4vBUkAeR6ZHMrCgaCFHJXnUW4=; b=b8IPcAd1B/bAZdyngbmdLAhDcuMMJg/Iz1oL3pR8l6EF2VOPRdbZe64BvMh0FUVhJm2Tu/ rlD2NswItVpT2lQuvSaMWI9Bonegvm9jhfzlgu8JzcPP7BTviO12YYaf5CsR+8V8+89sl/ cF8CURDsdn31z5VzVoVRdJlixUUL4ckNfGIESXYhg9b+dovkfymJvDb6R2Xvi6EIfxHSZK 228elr88+w1bNW5oKq725AwVOtpr3Ty2RMNTHGQlGuVyRpK38qlkdJtQoYwCqLBYnLB4t4 kEU/qFly2IBiVDDQMPU1bugYwbhfaJ2c4GiMyxKBgkLI0jPlMYqaihjtKVEoIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649267174; a=rsa-sha256; cv=none; b=eeYcDanoBiFEZkmb4myqCwAmZJSrofLzJZLO+L999/u2oHfbNtxcsR9RRrZ+QYTySuRviO eVJgmARzEGouETjnjvKRiN2MWPcuGiO+9CGlkTXzlaF3lv/y0gjKu/3GUSmtr8UH8zBBlW gY1VqY5+cS7maZ0UDlttiT57dkI7u8LuUqngGWCzrGzcyPWh8P2YH7llvNjqIZhrw890NV 0qmA7mmnQCVoW+r80uRQFfYmMBFlslxKYeZ8Wb+3jnWhuOX+ous1BIqNGKujMn/UH0H3dc 3BisCQKMJ3SDfwHigzMewQX92Q0rwk4dh+VDdanEna6DJbhYXX5xzNzIoqaDNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cf523b815c780f741b5f4b7d1cd1258d0118ad1f commit cf523b815c780f741b5f4b7d1cd1258d0118ad1f Author: Chandrakanth Patil AuthorDate: 2022-01-21 12:11:49 +0000 Commit: Warner Losh CommitDate: 2022-04-06 17:45:50 +0000 mrsas: remove additional MPT command allocation for R1 FP command There is an additional MPT command allocation for R1 fp command which will lead to MPT command unavailablity in case of rigorous R1 FP IOs. Remove additional MPT command allocation for R1 FP. Approved by: re@ (gjb) Reviewed by: imp PR: 261377 (cherry picked from commit 241bb95552a39d440519162b544c776adcb7cf57) (cherry picked from commit 2ebe51859723fd3cb4cf02dc560441fc0ec50dc1) --- sys/dev/mrsas/mrsas_cam.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/mrsas/mrsas_cam.c b/sys/dev/mrsas/mrsas_cam.c index 85dacdb9f306..8841908051b8 100644 --- a/sys/dev/mrsas/mrsas_cam.c +++ b/sys/dev/mrsas/mrsas_cam.c @@ -1075,7 +1075,6 @@ mrsas_setup_io(struct mrsas_softc *sc, struct mrsas_mpt_cmd *cmd, if (fp_possible && (io_info.r1_alt_dev_handle != MR_DEVHANDLE_INVALID) && (raid->level == 1) && !io_info.isRead) { - r1_cmd = mrsas_get_mpt_cmd(sc); if (mrsas_atomic_inc_return(&sc->fw_outstanding) > sc->max_scsi_cmds) { fp_possible = FALSE; mrsas_atomic_dec(&sc->fw_outstanding);