From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 003.mia.mailroute.net (003.mia.mailroute.net [199.89.3.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E499301482 for ; Thu, 30 Oct 2025 19:41:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.6 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761853305; cv=none; b=sTeSMMxvCRrfqzJU5+/0M6gt8XPJiHIy3Ybw/qSrfchf6LYYBt6cAyhn7Ddb1oTO835xNkwGtCBb4DtFl9oRaoRcHwwrrGaEnr/HukiyaMxRCVZRlVul8kxJD4CDCGl+f44UJpYD9IWchFPWoO8DjYSZuxB2wi9erBhkKMCNL30= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761853305; c=relaxed/simple; bh=2aKqJPpsUXelRNGM8VDB2408JM+MxwsqHYktufL8xgc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WTr58duQpuJ1++ofBYOYITF0CFGzaVgoD/8lylRR1oAjwRY9qys9XOl9nmKK5tgMadTVnVqIhttISrk6GVYBmsyOxwt91NDMymYi8MdCv/Nxmw2ANa1Wp6ohjlDjiOgITnQpnMzlXeu2uocV8GMhIkk5LaLzUJAD4vv43nz8LMg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org; spf=pass smtp.mailfrom=acm.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b=AdASQ4/2; arc=none smtp.client-ip=199.89.3.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=acm.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b="AdASQ4/2" Received: from localhost (localhost [127.0.0.1]) by 003.mia.mailroute.net (Postfix) with ESMTP id 4cyDyG5TxnzlvhyK; Thu, 30 Oct 2025 19:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=mr01; t=1761853301; x=1764445302; bh=FE4/E F7bK4XWgYKyiP+jJLG0NPr51im8fLDAEknQASI=; b=AdASQ4/2U6pmtPY7riorq 1RNOpJxOO+86MLL7RN7s3UTlMD9kzjm2+pEK0du5srCfIYXBJyL0k5W8j34RE4ET wZEDRu8tAHQsuz6dIIJnuyaXdGY7HLhC0xnFECX3bsiCumqcNb4N/h/NvH8EAkUI ECk4gKVWlhDuk8WbxmTonXMD/XO5ZNmezXYx5IUpjyFVOqfOL8yiXg/fCMD72tpF QvznPoqKWmv3U8ikRafUA9AEGAQMbyXqVY3zi5jrYBsOsm4TfTywV/UGhCc70am6 ZsO55ynAqCe4DGuwWmMoSHrda8BWn7rz59qUT5QO+HUjbJWpH+Lpa1wfu82Qw/eY w== X-Virus-Scanned: by MailRoute Received: from 003.mia.mailroute.net ([127.0.0.1]) by localhost (003.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id dLOhwSg4GMyu; Thu, 30 Oct 2025 19:41:41 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.180.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 003.mia.mailroute.net (Postfix) with ESMTPSA id 4cyDy65vLXzlvRxf; Thu, 30 Oct 2025 19:41:34 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , "James E.J. Bottomley" , Peter Wang , Avri Altman , Bean Huo , "Bao D. Nguyen" , Adrian Hunter Subject: [PATCH v7 26/28] ufs: core: Make blk_mq_tagset_busy_iter() skip reserved requests Date: Thu, 30 Oct 2025 12:36:25 -0700 Message-ID: <20251030193720.871635-27-bvanassche@acm.org> X-Mailer: git-send-email 2.51.1.930.gacf6e81ea2-goog In-Reply-To: <20251030193720.871635-1-bvanassche@acm.org> References: <20251030193720.871635-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable A later patch will convert hba->reserved_slot into a reserved tag. Make blk_mq_tagset_busy_iter() skip reserved requests such that device management commands are skipped. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index cc57e82ec1fb..e9ae27f0c25a 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -644,7 +644,8 @@ static bool ufshcd_print_tr_iter(struct request *req,= void *priv) struct Scsi_Host *shost =3D sdev->host; struct ufs_hba *hba =3D shost_priv(shost); =20 - ufshcd_print_tr(hba, blk_mq_rq_to_pdu(req), *(bool *)priv); + if (!blk_mq_is_reserved_rq(req)) + ufshcd_print_tr(hba, blk_mq_rq_to_pdu(req), *(bool *)priv); =20 return true; } @@ -5752,7 +5753,7 @@ static bool ufshcd_mcq_force_compl_one(struct reque= st *rq, void *priv) struct ufs_hba *hba =3D shost_priv(shost); struct ufs_hw_queue *hwq =3D ufshcd_mcq_req_to_hwq(hba, rq); =20 - if (!hwq) + if (blk_mq_is_reserved_rq(rq) || !hwq) return true; =20 ufshcd_mcq_compl_all_cqes_lock(hba, hwq); @@ -5779,7 +5780,7 @@ static bool ufshcd_mcq_compl_one(struct request *rq= , void *priv) struct ufs_hba *hba =3D shost_priv(shost); struct ufs_hw_queue *hwq =3D ufshcd_mcq_req_to_hwq(hba, rq); =20 - if (hwq) + if (!blk_mq_is_reserved_rq(rq) && hwq) ufshcd_mcq_poll_cqe_lock(hba, hwq); =20 return true; @@ -6647,6 +6648,9 @@ static bool ufshcd_abort_one(struct request *rq, vo= id *priv) struct Scsi_Host *shost =3D sdev->host; struct ufs_hba *hba =3D shost_priv(shost); =20 + if (blk_mq_is_reserved_rq(rq)) + return true; + *ret =3D ufshcd_try_to_abort_task(hba, tag); dev_err(hba->dev, "Aborting tag %d / CDB %#02x %s\n", tag, ufshcd_is_scsi_cmd(cmd) ? cmd->cmnd[0] : -1, @@ -7596,7 +7600,7 @@ static bool ufshcd_clear_lu_cmds(struct request *re= q, void *priv) const u64 lun =3D *(u64 *)priv; const u32 tag =3D req->tag; =20 - if (sdev->lun !=3D lun) + if (blk_mq_is_reserved_rq(req) || sdev->lun !=3D lun) return true; =20 if (ufshcd_clear_cmd(hba, tag) < 0) {