From nobody Wed Apr 30 17:21:47 2025 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 4ZnkWH4r63z5tj3X; Wed, 30 Apr 2025 17:21:47 +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 4ZnkWH1jpLz3MCr; Wed, 30 Apr 2025 17:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033707; 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=tAiktpL+qlsNrTk39r4qdsbiO3p64o+1ntT4ir1hPzw=; b=GYZeKaV7gjTgtTd7q5+EQEn5EMDjr5hJJzFa8ndelCTGwDXy615u+5zi1INTHo7cBijMjy r66EjQXekfDd/aB6UUnXagiib9pol4BlmtQ+4RPWKCcL10mIn0keSoJ8B4etp6Z7vaGELx 7ZiBoOyf9lLyRO6mKkDQ/C2ztx/EvqP8AZgCqCUacKRCiD1j7VT40gIpKLDQZoyyF1kOr2 wfxDc0JfK/I1Pbw/XAx0BSb+Age8UVkLWs896UycW9xWSf6AivfHCdv+WJDBn3ebEnmt02 j/haATjVmdqCIacWgqQ2U6Nzj9UYrhYghSXVhcp6dP5kJ9lgTcaOqZNrzL8+3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033707; a=rsa-sha256; cv=none; b=H140pku/c4KiFhcvnIRg8INiS+AUQhwwthIYKP41kDTGxi0LIU6eI43FJ1uSjdof7nWS3e mQ4S8xZVbIPNelVKkgHnT7mhgCFn0YLqF4ydLGuPDb8HkJEZsoQIRWgbi643w7YYudluEQ /5fe4rkk6XtG40+Qa2bd6Ukdxp/WhSomGorZ39kaLrpVKbaIRiI6/eDvWI0ZEpOu4HleTQ 5YVrrNHQyOn4Wp9yF08crqVJksFAYfi5tEXqFBVuhxeaADGCQuJ3dgpuTDyemDCOkAD7vd fzM4+pH6FHs8BeSkE1wdraJa3Yocxjno98XVfAziA7xnlv+lAWYz5u5Z0wOJNw== 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=1746033707; 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=tAiktpL+qlsNrTk39r4qdsbiO3p64o+1ntT4ir1hPzw=; b=CuQEZUxX+h4evewy1o8Vi/JubD4KCa0GO6JeWyDJ6Wd9fnMi/LnbfS66X42kDbydiqz2iD LJ+soWVXpWVCafLii8IAV9iqoZe/oWwkPG1Uz4Awz47jS8a5Zz08CHdYDUxztyBRpKRzHS stDHcSPJ3xHbWTNw5ioHQBsi1h7vQNHuNXlwXgsIiEw1snGp5lOl1K2MUZGKhkrO5Ssqc0 lbkFF1T+COaVljrIzB/VJdkgD+/FH2ul5L5hoV7mMjOESH4BcMV384v4lrrSu0o/DZM2P2 TH0QLwH92fCNZbB+uCa+wDO7N6c6Yri0zcHJmk3tAwHoJ33cxQES508242sWxA== 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 4ZnkWH1KWYzgh; Wed, 30 Apr 2025 17:21:47 +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 53UHLlSl095146; Wed, 30 Apr 2025 17:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHLlx0095143; Wed, 30 Apr 2025 17:21:47 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:21:47 GMT Message-Id: <202504301721.53UHLlx0095143@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: 1fc80c01391e - stable/14 - mpi3mr: Track IO per target counter during queue poll with local variable 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fc80c01391e58fa484021e37b4ca36307bb340b Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1fc80c01391e58fa484021e37b4ca36307bb340b commit 1fc80c01391e58fa484021e37b4ca36307bb340b Author: Chandrakanth patil AuthorDate: 2024-06-06 10:28:38 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:05:52 +0000 mpi3mr: Track IO per target counter during queue poll with local variable Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D44494 (cherry picked from commit 8d3c3b52423f9740da424aa6dd73a20e694a9e08) --- sys/dev/mpi3mr/mpi3mr_cam.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index dca194a5c8cd..537811077164 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1840,6 +1840,7 @@ int mpi3mr_remove_device_from_os(struct mpi3mr_softc *sc, U16 handle) { int retval = 0; struct mpi3mr_target *target; + unsigned int target_outstanding; mpi3mr_dprint(sc, MPI3MR_EVENT, "Removing Device (dev_handle: %d)\n", handle); @@ -1857,16 +1858,17 @@ int mpi3mr_remove_device_from_os(struct mpi3mr_softc *sc, U16 handle) target->flags |= MPI3MRSAS_TARGET_INREMOVAL; - if (mpi3mr_atomic_read(&target->outstanding)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "there are [%2d] outstanding IOs on target: %d" - "Poll reply queue once\n", mpi3mr_atomic_read(&target->outstanding), - target->per_id); - mpi3mr_poll_pend_io_completions(sc); - if (mpi3mr_atomic_read(&target->outstanding)) - mpi3mr_dprint(sc, MPI3MR_ERROR, "[%2d] outstanding IOs present on target: %d" - "despite poll\n", mpi3mr_atomic_read(&target->outstanding), - target->per_id); - } + target_outstanding = mpi3mr_atomic_read(&target->outstanding); + if (target_outstanding) { + mpi3mr_dprint(sc, MPI3MR_ERROR, "there are [%2d] outstanding IOs on target: %d " + "Poll reply queue once\n", target_outstanding, target->per_id); + mpi3mr_poll_pend_io_completions(sc); + target_outstanding = mpi3mr_atomic_read(&target->outstanding); + if (target_outstanding) + target_outstanding = mpi3mr_atomic_read(&target->outstanding); + mpi3mr_dprint(sc, MPI3MR_ERROR, "[%2d] outstanding IOs present on target: %d " + "despite poll\n", target_outstanding, target->per_id); + } if (target->exposed_to_os && !sc->reset_in_progress) { mpi3mr_rescan_target(sc, target);