From patchwork Thu Apr 3 21:17:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878127 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 705E11F585E for ; Thu, 3 Apr 2025 21:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715436; cv=none; b=nr3SkUs2+Dhy1IsVeaXzLJ9sJqp1hRtPlATAvMsKxWq6iQl3pdb+YH8+r82FF24rds9/tDBUQb5i6ehT2PCwFcJHhMsfmPKF3gWEkWTLD8gjMG7tzVcfufo0FdvvxAcJlXAn/9OIMPfqKJBot7h4rV3XdL8KTiRdTL8V9OzXW3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715436; c=relaxed/simple; bh=gvMXVyHioxJoLe7MeKoQXEVxKHy+A9DSEklrOhqiXQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0kXrTgzaw8XfFVtKmFhTkXE/g8YbfiqH6un0hDhOWo+pVVRK4PnmYNxXnXtMl5345b5honu3NkM9/Gc44Jb4ey0RZqLEryxkLef/slWUYY+e4ZwXSXhEx9hwyvr4umS0p2TihMvmu4EP1FrXkudjP2irYX/0PeXb2xXeoESCZg= 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=vDltzdBC; arc=none smtp.client-ip=199.89.3.7 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="vDltzdBC" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF4T1zvqzm0pKy; Thu, 3 Apr 2025 21:19:53 +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=1743715191; x=1746307192; bh=cNJom yGwYjKjG1gqYJoIZcPEOZ8+P+y08GVMdQ1EedA=; b=vDltzdBCEkHywYPhKMExT fluH97eLfaRrxohvULVm+wG+A54Vq/VO3fYRE7/GVJiB8fP4wtNb3VH74brPiE5a sg7ytax7mM3/gg6PrqXhG2CwcBGJpCokMmu5rCVkOlaq50/jjvQB7LEdKLADne40 54cOxo77FVhkA+1XfID1ugYFOS3e4jgetsLr1hXQ5uwKtHJZn68tsRVRI4PRCzN0 cRUDOrLggADwb97m89wEDfse7427MKeiPTe6VqZX6KlOkMetwdj/LbgaD01t2rTx +Z8ey119UOaTXKjualoVbq0EtNhiN40Y8XVVvTHFkqan/ElZ72BGVrFGpk4oqTaH A== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id Ccb-ly0ylSOJ; Thu, 3 Apr 2025 21:19:51 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF4M4Sm1zm0ySc; Thu, 3 Apr 2025 21:19:46 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , John Garry , "James E.J. Bottomley" Subject: [PATCH 01/24] scsi: core: Make scsi_cmd_to_rq() accept const arguments Date: Thu, 3 Apr 2025 14:17:45 -0700 Message-ID: <20250403211937.2225615-2-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of requiring the caller to cast away constness, make scsi_cmd_to_rq() accept const arguments. Cc: Hannes Reinecke Cc: John Garry Signed-off-by: Bart Van Assche --- drivers/scsi/scsi_logging.c | 10 +++++----- include/scsi/scsi_cmnd.h | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c index b02af340c2d3..5aaff629b999 100644 --- a/drivers/scsi/scsi_logging.c +++ b/drivers/scsi/scsi_logging.c @@ -28,7 +28,7 @@ static void scsi_log_release_buffer(char *bufptr) static inline const char *scmd_name(const struct scsi_cmnd *scmd) { - struct request *rq = scsi_cmd_to_rq((struct scsi_cmnd *)scmd); + const struct request *rq = scsi_cmd_to_rq(scmd); if (!rq->q || !rq->q->disk) return NULL; @@ -94,7 +94,7 @@ void scmd_printk(const char *level, const struct scsi_cmnd *scmd, if (!logbuf) return; off = sdev_format_header(logbuf, logbuf_len, scmd_name(scmd), - scsi_cmd_to_rq((struct scsi_cmnd *)scmd)->tag); + scsi_cmd_to_rq(scmd)->tag); if (off < logbuf_len) { va_start(args, fmt); off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args); @@ -374,8 +374,8 @@ EXPORT_SYMBOL(__scsi_print_sense); void scsi_print_sense(const struct scsi_cmnd *cmd) { scsi_log_print_sense(cmd->device, scmd_name(cmd), - scsi_cmd_to_rq((struct scsi_cmnd *)cmd)->tag, - cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE); + scsi_cmd_to_rq(cmd)->tag, cmd->sense_buffer, + SCSI_SENSE_BUFFERSIZE); } EXPORT_SYMBOL(scsi_print_sense); @@ -393,7 +393,7 @@ void scsi_print_result(const struct scsi_cmnd *cmd, const char *msg, return; off = sdev_format_header(logbuf, logbuf_len, scmd_name(cmd), - scsi_cmd_to_rq((struct scsi_cmnd *)cmd)->tag); + scsi_cmd_to_rq(cmd)->tag); if (off >= logbuf_len) goto out_printk; diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 8ecfb94049db..154fbb39ca0c 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -144,10 +144,11 @@ struct scsi_cmnd { }; /* Variant of blk_mq_rq_from_pdu() that verifies the type of its argument. */ -static inline struct request *scsi_cmd_to_rq(struct scsi_cmnd *scmd) -{ - return blk_mq_rq_from_pdu(scmd); -} +#define scsi_cmd_to_rq(scmd) \ + _Generic(scmd, \ + const struct scsi_cmnd *: (const struct request *) \ + blk_mq_rq_from_pdu((void *)scmd), \ + struct scsi_cmnd *: blk_mq_rq_from_pdu((void *)scmd)) /* * Return the driver private allocation behind the command. From patchwork Thu Apr 3 21:17:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878140 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 498AC19D065 for ; Thu, 3 Apr 2025 21:19:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715202; cv=none; b=Vh4eWaoNwxQkVXkssoaO+K2c2n7cdyzNqiyqbowVKNDI5r+dPN59ixSIiKqTI2POYTkr4WwY9vkf44uOAPIO4H60xINC88Hxp9wDzeT2bIiHpWbe6/8kQwdCR2Hw3FrWngrZ9uJKlTH54dy0H4bCjGRtDMb8Q//vFqwKKFmjubs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715202; c=relaxed/simple; bh=aLKrEGkdu8qkM80iPwJ96qInXcmFJZ5fhQoB6GHg4dg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VtsFu6c90kaUWDUls+60+AkN5yW3vJwTgVUYCnkarSTm+rFNkk9yZJryrHUwFh5HgBTShPTmRsKI8N0wqDkVhWiZkOh+viH4Uc2/mF6rQMhUflwwYT0FXbaAtl2ZvtsZXyID+3prwoJcMjTrzBkJsQJxRSthpFUemkNfz7fyNB4= 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=4XLGALtK; arc=none smtp.client-ip=199.89.3.7 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="4XLGALtK" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF4b1jhkzm0yQB; Thu, 3 Apr 2025 21:19:59 +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=1743715197; x=1746307198; bh=+LNiJ IkXS4qHzIIC/MRpdEnHE3PKREXliZ1yMFmbWmE=; b=4XLGALtKRV6sVFxajSHdQ hiAmh5DR/vVOy1DtT+S5JtyczgT+ahy1/RSSeRsVGe7Jqy5kv4C6GNYEWNai3Flj i5cIcBXu0UNZta4E1YWNmt1Fxls7oWSKPsg5dOnfjxo0rMTzy+5GWR0GzXuZY5td 6c2ZVMRKL0jOCMyTeWN50OxAnJ63tLeIFrIbbcAKYM9m0ADn4KMrmoxiy36uZd6f EmDGf2gKGz5FS8hZ+/eU/zQFDsfYpBz3bzfkXrIlvdgRJ+lKQF9zM9LeKWWUtvbO /SX9JKT2ux+t68jsmsRlw2KIrqMnD1cSWaFJbEJ4ytNE4QEkNKDqgTayzKMPveJ+ w== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id vrHm4tEtbLJN; Thu, 3 Apr 2025 21:19:57 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF4S5ycKzm0yV3; Thu, 3 Apr 2025 21:19:52 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , John Garry , "James E.J. Bottomley" Subject: [PATCH 02/24] scsi: core: Make scsi_cmd_priv() accept const arguments Date: Thu, 3 Apr 2025 14:17:46 -0700 Message-ID: <20250403211937.2225615-3-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of requiring the caller to cast away constness, make scsi_cmd_priv() accept const arguments. Cc: Hannes Reinecke Cc: John Garry Signed-off-by: Bart Van Assche --- include/scsi/scsi_cmnd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 154fbb39ca0c..09176b07e891 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -154,10 +154,10 @@ struct scsi_cmnd { * Return the driver private allocation behind the command. * Only works if cmd_size is set in the host template. */ -static inline void *scsi_cmd_priv(struct scsi_cmnd *cmd) -{ - return cmd + 1; -} +#define scsi_cmd_priv(cmd) \ + _Generic(cmd, \ + const struct scsi_cmnd *: (const void *)(cmd + 1), \ + struct scsi_cmnd *: (void *)(cmd + 1)) void scsi_done(struct scsi_cmnd *cmd); void scsi_done_direct(struct scsi_cmnd *cmd); From patchwork Thu Apr 3 21:17:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878139 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 9C6472E62A6 for ; Thu, 3 Apr 2025 21:20:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715219; cv=none; b=RINTSLPKVMVXyRezvQxG2PZFFn9Meyg0hggJsDeznVIBJcMUYU83xogJ9GBh7933k2n96WWiJp3woy1kUABO4Y4s0dvuZa/Z/u7mlLAFlFmSPNcAcuHzYZgzVdK1vZ/huMzVCiUuoHOpeZ+VTbpXxUCGo5f+mHSrjOn7G0VdKQg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715219; c=relaxed/simple; bh=8u6aKBsRuvyyKw+KQPRIlUt7vDp0fsL80YTbySuoXiY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Coczc4s2GCIZSZm8JQUOw3jLT1VEch7wPqAGuqYD8RiYn0m7Q1u0+IBauU1NZV6JkK7eV90Zpr8/26fULhKCw09pQ+JwHLI1YJ1/AZ6vJilTdZEqeKoPf0XjZQa8C7kXGEWxW0KzyuuYcg5F17V5OvzC6mMcJOPIGP+z+JYkQBA= 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=wCmXf6ft; arc=none smtp.client-ip=199.89.3.7 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="wCmXf6ft" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF4t42lKzmWSLK; Thu, 3 Apr 2025 21:20:14 +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=1743715213; x=1746307214; bh=7U0nx JcXoFx0gPpz4DQBiBVkPHA5xxY45iObj9TF/Zo=; b=wCmXf6ftCnhwlaFrOk6qv GC6byuPmuETS/DlbwWyKrpVhOy6YTYVy03v+JUIfOmSSl+/gX4dAhpVMjlvl5mbn KaWUWfui+nYpGHMjv0Tvb8ZiUoSuxbl9QBzpOSY1aq7bjowCq9AnivHFhNPPMxo3 LXZoUdRB5FPaNijzGxk3ZPtLnB6e4xc9TRRW/wTq/cosbsZ2Itd22dz0suPHwwoh 7E0NuEsQBEE0k3pa2KLaQRas6HDt3rHQ97Cuzev0NWX9A8Mr2qju2tEF9pw+MhYF 43E0k1bBBjL3xL1gSvx9BtiKCc+eKYBsEkMmKdSYzZx75kHu9LeJ18VfaKRWHXk8 A== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id nwWmZwwnlr-s; Thu, 3 Apr 2025 21:20:13 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF4m22qqzmWSKc; Thu, 3 Apr 2025 21:20:05 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Hannes Reinecke , John Garry , "James E.J. Bottomley" Subject: [PATCH 04/24] scsi: core: Implement reserved command handling Date: Thu, 3 Apr 2025 14:17:48 -0700 Message-ID: <20250403211937.2225615-5-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hannes Reinecke Quite some drivers are using management commands internally. These commands typically use the same tag pool as regular SCSI commands. Tags for these management commands are set aside before allocating the block-mq tag bitmap for regular SCSI commands. The block layer already supports this via the reserved tag mechanism. Add a new field 'nr_reserved_cmds' to the SCSI host template to instruct the block layer to set aside a tag space for these management commands by using reserved tags. Exclude reserved commands from .can_queue because .can_queue is visible in sysfs. Signed-off-by: Hannes Reinecke [ bvanassche: modified patch description ] Cc: John Garry Signed-off-by: Bart Van Assche --- drivers/scsi/hosts.c | 3 +++ drivers/scsi/scsi_lib.c | 4 +++- include/scsi/scsi_host.h | 22 +++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index e021f1106bea..c2c6c96781e3 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -495,6 +495,9 @@ struct Scsi_Host *scsi_host_alloc(const struct scsi_host_template *sht, int priv if (sht->virt_boundary_mask) shost->virt_boundary_mask = sht->virt_boundary_mask; + if (sht->nr_reserved_cmds) + shost->nr_reserved_cmds = sht->nr_reserved_cmds; + device_initialize(&shost->shost_gendev); dev_set_name(&shost->shost_gendev, "host%d", shost->host_no); shost->shost_gendev.bus = &scsi_bus_type; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 1da26f300287..94dafa5ceaaa 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2083,7 +2083,9 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost) tag_set->ops = &scsi_mq_ops_no_commit; tag_set->nr_hw_queues = shost->nr_hw_queues ? : 1; tag_set->nr_maps = shost->nr_maps ? : 1; - tag_set->queue_depth = shost->can_queue; + tag_set->queue_depth = + shost->can_queue + shost->nr_reserved_cmds; + tag_set->reserved_tags = shost->nr_reserved_cmds; tag_set->cmd_size = cmd_size; tag_set->numa_node = dev_to_node(shost->dma_dev); if (shost->hostt->tag_alloc_policy_rr) diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 26bc23419cfd..2c0f5ec1046e 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -375,10 +375,19 @@ struct scsi_host_template { /* * This determines if we will use a non-interrupt driven * or an interrupt driven scheme. It is set to the maximum number - * of simultaneous commands a single hw queue in HBA will accept. + * of simultaneous commands a single hw queue in HBA will accept + * excluding internal commands. */ int can_queue; + /* + * This determines how many commands the HBA will set aside + * for internal commands. This number will be added to + * @can_queue to calcumate the maximum number of simultaneous + * commands sent to the host. + */ + int nr_reserved_cmds; + /* * In many instances, especially where disconnect / reconnect are * supported, our host also has an ID on the SCSI bus. If this is @@ -611,6 +620,11 @@ struct Scsi_Host { unsigned short max_cmd_len; int this_id; + + /* + * Number of commands this host can handle at the same time. + * This excludes reserved commands as specified by nr_reserved_cmds. + */ int can_queue; short cmd_per_lun; short unsigned int sg_tablesize; @@ -631,6 +645,12 @@ struct Scsi_Host { */ unsigned nr_hw_queues; unsigned nr_maps; + + /* + * Number of reserved commands to allocate, if any. + */ + unsigned nr_reserved_cmds; + unsigned active_mode:2; /* From patchwork Thu Apr 3 21:17:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878138 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 1E4B72E62BF for ; Thu, 3 Apr 2025 21:20:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715236; cv=none; b=oayom87nw+OLAICwKJOOcw8hL8NNZiKTY7w5Zt8uDU7/Qq0vvvqjrCPE+o+oAVMPcOPjZcZ2hfoGccR+VfH+O9fvi7mMxxXoMVhtr5M5Z1WfHgFLhqbfA0HtTttJELbyLm15GjADiJCOAosqY4nveBI9fkASyrS0tjFCnqjwgm8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715236; c=relaxed/simple; bh=D1oYvdSS3vWEsGDMRNU7CesR0gufUfF6/KHQifh6r5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFiSR4SU4myGcVeEuSRpoO+aeFfUKATCo7wDtPsDYXh9EUUB+v5qu4tgaaoJPstAl+fR+j5wGZEE/KaxJeHTCCCuPQoS4EgcQw1k2c2BtKtmSbBV6m2FVFoZlAfvEY21efbrp/6j7/TzA+wFBpZif/drqAujmEu8RBNPkmeYMrQ= 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=vp40vjeb; arc=none smtp.client-ip=199.89.3.7 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="vp40vjeb" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF5G0fc2zm0yV3; Thu, 3 Apr 2025 21:20:34 +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=1743715232; x=1746307233; bh=ASITi mpvXpJNtaITIDhV0SD4xzhbY9rDjZmUuBjbjYM=; b=vp40vjebmn4QK5I2zwg06 YOAYUTTQi3+HNK58ES9d3hUgi6WTM701takvU1RozkzhZ8iOE3TYbxuuXrdWgvob TwvOlpxujQ6vhoZrvx8SecSnNk95f8RudFHm+J8SeBSV68xEG/pQNMGbzb/X2sTI gtnSCkMHRZJdUY7gVI+B7kdYoTsKsEaf2KuAADEED1fVkY8AuB34IHpA0EawlAb6 1W6ASfxjDDoMfhvnoQkcG6kgH1ttIPyk31qcL3vqKrA1naNjTU0fFv/9iqwb8moO v+ZhBJFW9lrda9OOCv69XO9pTkCiilSerhhNjdQ9CFNTSZkn8diS7EYouo1AskTs w== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id iYei7ENTolLk; Thu, 3 Apr 2025 21:20:32 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF54190bzm0yVH; Thu, 3 Apr 2025 21:20:22 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 06/24] scsi: ufs: core: Change the type of one ufshcd_add_cmd_upiu_trace() argument Date: Thu, 3 Apr 2025 14:17:50 -0700 Message-ID: <20250403211937.2225615-7-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Change the 'tag' argument into an LRB pointer. This patch prepares for the removal of the hba->lrb[] array. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index c4448b94092f..3b470f564313 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -355,10 +355,11 @@ static void ufshcd_configure_wb(struct ufs_hba *hba) ufshcd_wb_toggle_buf_flush(hba, true); } -static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag, +static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, + struct ufshcd_lrb *lrb, enum ufs_trace_str_t str_t) { - struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; + struct utp_upiu_req *rq = lrb->ucd_req_ptr; struct utp_upiu_header *header; if (!trace_ufshcd_upiu_enabled()) @@ -367,7 +368,7 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag, if (str_t == UFS_CMD_SEND) header = &rq->header; else - header = &hba->lrb[tag].ucd_rsp_ptr->header; + header = &lrb->ucd_rsp_ptr->header; trace_ufshcd_upiu(hba, str_t, header, &rq->sc.cdb, UFS_TSF_CDB); @@ -441,7 +442,7 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, return; /* trace UPIU also */ - ufshcd_add_cmd_upiu_trace(hba, tag, str_t); + ufshcd_add_cmd_upiu_trace(hba, lrbp, str_t); if (!trace_ufshcd_command_enabled()) return; From patchwork Thu Apr 3 21:17:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878137 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 DE9D21A5B9D for ; Thu, 3 Apr 2025 21:20:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715259; cv=none; b=Hm66VhxFzIzFBG+um7+sI6q3p/LZGeQz2IuaMmqCGcOMaVCjzDVwWtgy3/uMum5TzTKQiV3QbRrXJh6PYMnxlt/DsGPcuWLCcxSKIxZ5aRQ6P4BwvzwBdCNGcumQtfEML4ZWDPNWNHH90S/WBMi7rj9QgnqIGCWojgLEkaW7NTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715259; c=relaxed/simple; bh=ZfTVCKNnSI2ZxYj0aQOY5jbnFaipyxJcAKMQfZoSDT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WHGYTL5vYvRYkGDpfVchg6CyRdJ6ZgMBTftmcMTOcTbPcBsYOyfCv9dvx5n7qKyQ0xJ1VWE0k4lstKf+QMx9vtJ/RWZLaCDdKtjU5q7LLAVn/azpWM1d9cxtrNJaQOOhCBCkBHIxo9QqH5xSPh2OZCjFwzlgTn44OFePPTbV3ZQ= 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=TD9MGtuL; arc=none smtp.client-ip=199.89.3.7 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="TD9MGtuL" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF5h6K3Xzm2bhF; Thu, 3 Apr 2025 21:20:56 +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=1743715255; x=1746307256; bh=nmZim V+MUgeBGJkCLra/6DkBWtm8nL3e7obXmRzOfCo=; b=TD9MGtuLdSG7mEIVgXuuX rFFIVtB+DMVyJacYaJ6QcSUZdjn5kllZlQajiEd5Sw/NNqMOXcDa2AZExRNgzd6M 9+yJWwqQ4fuKZ+PodJqLHtnQ9HL7crjVdAjOPCh+7Hp6CTlatSJLwcnkdgJkkd8x tESL8xmEr8f4cGvP8KM8Q4sxkm2SNeIPBAyp0sWc7lFRdIrRhChBvM4OGb39QaQN u9Aq7hg5ypvVioZUMLofu8C+DB2Ny7saqddX/Sq1xfoI2vwW0/BvszSV99EIyTmh zmCSRzz4mJ6hcCQkj3tMy4/bFu3B1iZdZ09b4ec79L3WPSVvz7kbtmiXmC/aP3B2 A== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id FDvojVFzEsot; Thu, 3 Apr 2025 21:20:55 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF5X5fqgzm0yV3; Thu, 3 Apr 2025 21:20:48 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 08/24] scsi: ufs: core: Change the type of one ufshcd_add_command_trace() argument Date: Thu, 3 Apr 2025 14:17:52 -0700 Message-ID: <20250403211937.2225615-9-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Change the 'tag' argument into a SCSI command pointer. This patch prepares for the removal of the hba->lrb[] array. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 94cf864ac62b..f87526443d8d 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -425,7 +425,7 @@ static void ufshcd_add_uic_command_trace(struct ufs_hba *hba, ufshcd_readl(hba, REG_UIC_COMMAND_ARG_3)); } -static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, +static void ufshcd_add_command_trace(struct ufs_hba *hba, struct scsi_cmnd *cmd, enum ufs_trace_str_t str_t) { u64 lba = 0; @@ -433,9 +433,9 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, u32 doorbell = 0; u32 intr; int hwq_id = -1; - struct ufshcd_lrb *lrbp = &hba->lrb[tag]; - struct scsi_cmnd *cmd = lrbp->cmd; struct request *rq = scsi_cmd_to_rq(cmd); + unsigned int tag = rq->tag; + struct ufshcd_lrb *lrbp = &hba->lrb[tag]; int transfer_len = -1; /* trace UPIU also */ @@ -453,7 +453,7 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, be32_to_cpu(lrbp->ucd_req_ptr->sc.exp_data_transfer_len); lba = scsi_get_lba(cmd); if (opcode == WRITE_10) - group_id = lrbp->cmd->cmnd[6]; + group_id = cmd->cmnd[6]; } else if (opcode == UNMAP) { /* * The number of Bytes to be unmapped beginning with the lba. @@ -2307,7 +2307,7 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag, lrbp->compl_time_stamp = ktime_set(0, 0); lrbp->compl_time_stamp_local_clock = 0; if (lrbp->cmd) { - ufshcd_add_command_trace(hba, task_tag, UFS_CMD_SEND); + ufshcd_add_command_trace(hba, lrbp->cmd, UFS_CMD_SEND); ufshcd_clk_scaling_start_busy(hba); } if (unlikely(ufshcd_should_inform_monitor(hba, lrbp))) @@ -5564,7 +5564,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag, if (cmd) { if (unlikely(ufshcd_should_inform_monitor(hba, lrbp))) ufshcd_update_monitor(hba, lrbp); - ufshcd_add_command_trace(hba, task_tag, UFS_CMD_COMP); + ufshcd_add_command_trace(hba, cmd, UFS_CMD_COMP); cmd->result = ufshcd_transfer_rsp_status(hba, lrbp, cqe); ufshcd_release_scsi_cmd(hba, lrbp); /* Do not touch lrbp after scsi done */ From patchwork Thu Apr 3 21:17:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878135 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 3405D2E62D2 for ; Thu, 3 Apr 2025 21:21:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715279; cv=none; b=RmMS86Dro9zi9XwNHhBPHsObKh65yA1ASoGd11DPF1aqdoKG2LBmgo/V0ugIzl2qPHola862U+4aayVbHiOxnMTUaU/K92ZS/58cy8jSWZib8FkftUaIHLRpElyakqD4tndgZugYB9RgH3aO6XJQozY0IDLFMDzPynJ9enMRNp8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715279; c=relaxed/simple; bh=vS9u4bCVRVICiXOlFPvw29S4uXbEEw4ErwOjAokFggU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QeMj9NIh7uKrViHe++9b1XdjBGRjLLtAIf7R+qVYSLU3Q02Ym310GPL5EUyI14BQQCLUWcOzwnO+4MQi20lRUciEJCaWok/Btvf5MVFpGPH7Zja27y3hkw6GSmGfp1I9kk6pXOP5C755mcse/5eBMKvrlegCM52FxfqDXrJkMuA= 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=KMJ2tVKQ; arc=none smtp.client-ip=199.89.3.7 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="KMJ2tVKQ" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF650qGPzm0yQB; Thu, 3 Apr 2025 21:21:17 +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=1743715275; x=1746307276; bh=EKeT0 DzIFw4mXbh52QnrRVTDHuXPM6V1Prk90et8Skc=; b=KMJ2tVKQvNMXYjnS4Rjmr F4prc1gi4qlieaBmhq3vx8VSQDBf0cEopUh3+seDzZSv/m6i905I+oZlp2WGuMsV fzkjkmYyDE5Oc8x0Djra+SMEYvdQidfL5htkSkDB4J6tKI+U0vBLH12BCCTQsFOw 8QlMF50+cnNIzDkTMlrOlmoidHhktS8NCCxAYme8BmzHHwjCwFwY6xhPAp1kNE1d 9TqCk4BoqHeE4+Dl4aYgRWogObfgx8tCdYckv5Izgp8y8YPlAMTXsb5ZXntQOZat 7jlvtk17CP4EGkQ11sdkjGYOpRodT1bEn9EbYEdYWAqPBw+FcBg+8aiYvf5iE+zp A== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id QuVK7hB9vAp9; Thu, 3 Apr 2025 21:21:15 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF5y255Kzm1Hch; Thu, 3 Apr 2025 21:21:08 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 10/24] scsi: ufs: core: Only call ufshcd_should_inform_monitor() for SCSI commands Date: Thu, 3 Apr 2025 14:17:54 -0700 Message-ID: <20250403211937.2225615-11-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ufshcd_should_inform_monitor() only returns 'true' for SCSI commands. Instead of checking inside ufshcd_should_inform_monitor() whether its second argument represents a SCSI command, only call this function for SCSI commands. This patch prepares for removing the lrbp->cmd member. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 883551274330..f61ba94a8204 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2235,12 +2235,13 @@ static inline int ufshcd_monitor_opcode2dir(u8 opcode) return -EINVAL; } +/* Must only be called for SCSI commands. */ static inline bool ufshcd_should_inform_monitor(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) { const struct ufs_hba_monitor *m = &hba->monitor; - return (m->enabled && lrbp && lrbp->cmd && + return (m->enabled && (!m->chunk_size || m->chunk_size == lrbp->cmd->sdb.length) && ktime_before(hba->monitor.enabled_ts, lrbp->issue_time_stamp)); } @@ -2308,9 +2309,9 @@ static inline void ufshcd_send_command(struct ufs_hba *hba, if (lrbp->cmd) { ufshcd_add_command_trace(hba, lrbp->cmd, UFS_CMD_SEND); ufshcd_clk_scaling_start_busy(hba); + if (unlikely(ufshcd_should_inform_monitor(hba, lrbp))) + ufshcd_start_monitor(hba, lrbp); } - if (unlikely(ufshcd_should_inform_monitor(hba, lrbp))) - ufshcd_start_monitor(hba, lrbp); if (hba->mcq_enabled) { int utrd_size = sizeof(struct utp_transfer_req_desc); From patchwork Thu Apr 3 21:17:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878134 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 1631A80B for ; Thu, 3 Apr 2025 21:21:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715298; cv=none; b=rZO0d7+zHPGg6+8KeQ404zyseE0iWsuz4hBfkzKZUQEJIU36hOl66W91WHE3m66j992aeJcZyuFivZQsBLKM8uVSw3gV5yRGN1rITqVq4RWYsB73hqplkwqQDo+mceVvMMmqd3Vv1nuJixoDIoc+fCAGCOoRc3mLLnjBNM9URDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715298; c=relaxed/simple; bh=xCOIQCkJpdOMQzY/DrDuJV1Oy0FRCX5dBN6WtM3UaoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ND8OUAsslPJ+Yhlko4ZpCm1//A97X2tJUz84XslpEopRk6vhzi3qdL6B2ytIfh3CaAcotypbQhDrMxZJ3ezzSQP5x0WM3lvItUMkbjGtFNwD3coiwFLKVLEldoPLnU40PMTdx20Bx5TFSKMeVVKpb3IFKmk7grdKIEiu98YlOto= 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=Tope2Eqh; arc=none smtp.client-ip=199.89.3.7 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="Tope2Eqh" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF6S0Vqbzm0yVH; Thu, 3 Apr 2025 21:21:36 +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=1743715294; x=1746307295; bh=xYRLW D5X2om02WIA1YVwWI5j0tonfPMlbIEyZuyiwzI=; b=Tope2Eqh4Fds/Y6b/yZZA PucraHehLyYgDY2OBQbQPgGpVrglTWkc5720KxC2ikyzGSASY18NM4Ga9QpQEHNn bXh9QSnTzHw105fpnQfSD8PQN40n3g1lenafCzMqG7dusDL9ns+hjcyskzWFF0j9 qFMPxwO0fYHZEx/mh8VxfPmwkLNj5mZLpVd8zoXxAlek6N4oFMebAaPmJh7UDLeS SiLZuRT1BSO5If5H0mKKDCJwkAZIPRHEW8/tAHwJtn+4k1bIZlGLEY9+lovrw8Tv X1zF72xMW+vDrOxah+MfmPQMKMpDCNQNxwJ6N4Jh051woPNP+5FXWLI2jq1bxXDp Q== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id kcG_IlsdviPe; Thu, 3 Apr 2025 21:21:34 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF6K145lzm0yVk; Thu, 3 Apr 2025 21:21:28 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 12/24] scsi: ufs: core: Rework ufshcd_mcq_compl_pending_transfer() Date: Thu, 3 Apr 2025 14:17:56 -0700 Message-ID: <20250403211937.2225615-13-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace a tag loop with blk_mq_tagset_busy_iter(). This patch prepares for removing the hba->lrb[] array. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 74 ++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 4b5734bbb12b..a5faf5af462e 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -5651,6 +5651,44 @@ static int ufshcd_poll(struct Scsi_Host *shost, unsigned int queue_num) return completed_reqs != 0; } +static bool ufshcd_mcq_force_compl_one(struct request *rq, void *priv) +{ + struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(rq); + struct scsi_device *sdev = rq->q->queuedata; + struct Scsi_Host *shost = sdev->host; + struct ufs_hba *hba = shost_priv(shost); + struct ufshcd_lrb *lrbp = &hba->lrb[rq->tag]; + struct ufs_hw_queue *hwq = ufshcd_mcq_req_to_hwq(hba, rq); + unsigned long flags; + + ufshcd_mcq_compl_all_cqes_lock(hba, hwq); + /* + * For those cmds of which the cqes are not present + * in the cq, complete them explicitly. + */ + spin_lock_irqsave(&hwq->cq_lock, flags); + if (cmd && !test_bit(SCMD_STATE_COMPLETE, &cmd->state)) { + set_host_byte(cmd, DID_REQUEUE); + ufshcd_release_scsi_cmd(hba, lrbp); + scsi_done(cmd); + } + spin_unlock_irqrestore(&hwq->cq_lock, flags); + + return true; +} + +static bool ufshcd_mcq_compl_one(struct request *rq, void *priv) +{ + struct scsi_device *sdev = rq->q->queuedata; + struct Scsi_Host *shost = sdev->host; + struct ufs_hba *hba = shost_priv(shost); + struct ufs_hw_queue *hwq = ufshcd_mcq_req_to_hwq(hba, rq); + + ufshcd_mcq_poll_cqe_lock(hba, hwq); + + return true; +} + /** * ufshcd_mcq_compl_pending_transfer - MCQ mode function. It is * invoked from the error handler context or ufshcd_host_reset_and_restore() @@ -5665,38 +5703,10 @@ static int ufshcd_poll(struct Scsi_Host *shost, unsigned int queue_num) static void ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba, bool force_compl) { - struct ufs_hw_queue *hwq; - struct ufshcd_lrb *lrbp; - struct scsi_cmnd *cmd; - unsigned long flags; - int tag; - - for (tag = 0; tag < hba->nutrs; tag++) { - lrbp = &hba->lrb[tag]; - cmd = lrbp->cmd; - if (!ufshcd_cmd_inflight(cmd) || - test_bit(SCMD_STATE_COMPLETE, &cmd->state)) - continue; - - hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd)); - - if (force_compl) { - ufshcd_mcq_compl_all_cqes_lock(hba, hwq); - /* - * For those cmds of which the cqes are not present - * in the cq, complete them explicitly. - */ - spin_lock_irqsave(&hwq->cq_lock, flags); - if (cmd && !test_bit(SCMD_STATE_COMPLETE, &cmd->state)) { - set_host_byte(cmd, DID_REQUEUE); - ufshcd_release_scsi_cmd(hba, lrbp); - scsi_done(cmd); - } - spin_unlock_irqrestore(&hwq->cq_lock, flags); - } else { - ufshcd_mcq_poll_cqe_lock(hba, hwq); - } - } + blk_mq_tagset_busy_iter(&hba->host->tag_set, + force_compl ? ufshcd_mcq_force_compl_one : + ufshcd_mcq_compl_one, + NULL); } /** From patchwork Thu Apr 3 21:17:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878132 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 404372E62D3 for ; Thu, 3 Apr 2025 21:22:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715348; cv=none; b=Qkypi7gL572FL8Bej/AWIQPeD4sWvuX6DgdRlwMsdhRQK/MW7a7TQofkt3dogZiUVMryF23Fr+cs8a/YF4EDRsUb3hgnK/80fZTMpgcFAbVhMQRZ5B2IgJmPazqumGEmi50MUsH6QocTyvy+wsYirihgwY4RmCRXK/jYMEFTySA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715348; c=relaxed/simple; bh=wRZToAgNJr1RJEIcBlg+PO6CMws4fb54TniPtfMB9+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z01kAoFIy6lzgcZdNOkpn4DpgNGpsBKhQDXwaQO50uFyhRDZ/cMPVHpdBiHkHCNYy7/dGjAf6N3iW/gZV+2+VxNMEQvmC1zo+dVg/CQ1h6PGBD1/vt1OCrn9CPzL+ZaRFU+6+yA/jgQ4jo/2jMDLi2Km9+ASnQaWPRXLoU218a8= 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=t3ADBS8f; arc=none smtp.client-ip=199.89.3.7 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="t3ADBS8f" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF7Q166fzm0yR0; Thu, 3 Apr 2025 21:22:26 +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=1743715343; x=1746307344; bh=kK9jx zYXZUiIjKjFJNPAFPff98b2IRRVksUMPd9xqbk=; b=t3ADBS8fXyZ+rh68llMyj iyG6i4Q5DfkDpd5FkqrcIjBs0bwqbBh1kgKYje255O/9b85RamHMK4X/ZhDTtOz2 TEJKow9OoAFoyDBTJ2LBoKrdnvpp1ybJyHHru4eGIHZP/EHTuCQq+OLwtEmGRc65 Fu8+8FERvVclqF650GQPeYVQw8Bb+ohQi5HTFBQtACztPkjrQy8BZlNdSNhYI9cF isJ4P2hgbON3Cc4+1xUIZPQkmPGYbsCDopyslHSpMuKUlDVHnS2GJ/Io3RiWDvae 4F9Upqxhwqj/IW/jNl2N7VYlVnvzxtmRGma7xjdEVuDLhYLItr1Io/nM8yoNbsUy g== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id FLRkbLS9xNgo; Thu, 3 Apr 2025 21:22:23 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF774c5kzmWSLL; Thu, 3 Apr 2025 21:22:10 +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 , Minwoo Im , Manivannan Sadhasivam , Al Viro , Chanwoo Lee , Bean Huo , Can Guo , Ziqi Chen , "Bao D. Nguyen" , Avri Altman Subject: [PATCH 15/24] scsi: ufs: core: Add an argument to ufshcd_mcq_decide_queue_depth() Date: Thu, 3 Apr 2025 14:17:59 -0700 Message-ID: <20250403211937.2225615-16-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Prepare for allocating SCSI commands in two steps by making the UFS device queue depth an argument of ufshcd_mcq_decide_queue_depth(). Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufs-mcq.c | 14 ++++++++------ drivers/ufs/core/ufshcd-priv.h | 2 +- drivers/ufs/core/ufshcd.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c index 240ce135bbfb..cec21bb50cec 100644 --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@ -132,6 +132,7 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_queue_cfg_addr); /** * ufshcd_mcq_decide_queue_depth - decide the queue depth * @hba: per adapter instance + * @ufs_dev_qd: maximum queue depth supported by the UFS device * * Return: queue-depth on success, non-zero on error * @@ -140,7 +141,7 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_queue_cfg_addr); * Calculates and adjusts the queue depth based on the depth * supported by the HC and ufs device. */ -int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba) +int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba, u32 ufs_dev_qd) { int mac; @@ -160,13 +161,14 @@ int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba) if (mac < 0) goto err; - WARN_ON_ONCE(!hba->dev_info.bqueuedepth); /* - * max. value of bqueuedepth = 256, mac is host dependent. - * It is mandatory for UFS device to define bQueueDepth if - * shared queuing architecture is enabled. + * According to the UFS standard, the UFS device queue depth + * (bQueueDepth) must be in the range 1..255 if the shared queueing + * architecture is supported. bQueueDepth is zero if the shared queueing + * architecture is not supported. */ - return min_t(int, mac, hba->dev_info.bqueuedepth); + WARN_ON_ONCE(!ufs_dev_qd); + return min(mac, ufs_dev_qd); err: dev_err(hba->dev, "Failed to get mac, err=%d\n", mac); diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h index d0a2c963a27d..3cf06fc708b4 100644 --- a/drivers/ufs/core/ufshcd-priv.h +++ b/drivers/ufs/core/ufshcd-priv.h @@ -65,7 +65,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag, struct cq_entry *cqe); int ufshcd_mcq_init(struct ufs_hba *hba); void ufshcd_mcq_disable(struct ufs_hba *hba); -int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba); +int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba, u32 ufs_dev_qd); int ufshcd_mcq_memory_alloc(struct ufs_hba *hba); struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba, struct request *req); diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 26aa07712507..99cc7c49619f 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8728,7 +8728,7 @@ static int ufshcd_alloc_mcq(struct ufs_hba *hba) int ret; int old_nutrs = hba->nutrs; - ret = ufshcd_mcq_decide_queue_depth(hba); + ret = ufshcd_mcq_decide_queue_depth(hba, hba->dev_info.bqueuedepth); if (ret < 0) return ret; From patchwork Thu Apr 3 21:18:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878131 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 A8B2115575C for ; Thu, 3 Apr 2025 21:22:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715372; cv=none; b=fgnw9KvK6C+w5B/y0nWfXT3Jz+ewlb3G6aTtiR84UDP0qO/ir3ZNDVfmDvmU5l/zp3Cbm5esxLUyR7WKeq2mpIJR2J/2kYgg0tV6e1FpAqGJuKcGucevohOYZW2zXyb9h0db6NtIS8MRwk8BiaHw50PNKb4nQmPAEpV2X3dRwsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715372; c=relaxed/simple; bh=CdiSyc3UJ/WhIY6m41JoKtF/D+07nIc3nBsyjhSvnPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tIS3qVwG8LdHWGAgd05LzR6Rci9UBR1bMsa9tIHGj1c01vqC6CqmWHFOpIhyDmmEXaYh+rh26EPudripnB3Dae97YIggv35rSxxp+ygMWIak8l6dMc1dGoFEqqYZQ7Z9QMcXt46dUcUp1y4bnwaPcsMYiD5M3SqSvzuScmJ8y6U= 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=RR6DEH8/; arc=none smtp.client-ip=199.89.3.7 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="RR6DEH8/" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF7s4Vnbzm0yTx; Thu, 3 Apr 2025 21:22:49 +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=1743715368; x=1746307369; bh=fMrHI Q3ONQ+El6AsLrZd/WYp0ZRI7WCxz0rnFvRAn/I=; b=RR6DEH8/1u/Q5+y78s7Tn sWchUKs23W0ht2pSaBcJJjz7vA2BwlmHACD+LyWUOpfWddbxBwchcNrnISmT0jJA nv9Hv+CgimgdwI7XhJBrZCPGEj+/D4UMrYabqOzBUa1Rp3DJPA0LMKWSE12m9RCw fJ9JX25HcIrC8Dnn6Y+MOk/HpEKSkv10YYUjSZjS4Nf/lOuamotBRQN53eBZA9CP P6JW5QFzoYWTOob8sfGFLq48EdNtHTO/92GEY5lN3EELRFODD7B4z4eybF07yt/9 mk0Y/2MJoqVHnZXRgZo5xFH4M4vxTcbbsq3Ef8non81vbt1NUU5Lr3Hi/FpAxXRJ A== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id Ul2Sk8MT0t0g; Thu, 3 Apr 2025 21:22:48 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF7j58cPzm0ySc; Thu, 3 Apr 2025 21:22:40 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 17/24] scsi: ufs: core: Call ufshcd_mcq_init() once Date: Thu, 3 Apr 2025 14:18:01 -0700 Message-ID: <20250403211937.2225615-18-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Make sure that ufshcd_mcq_init() is called once even if ufshcd_alloc_mcq() is called twice. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index acbf173a3732..6dcac4143f4f 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8733,9 +8733,16 @@ static int ufshcd_alloc_mcq(struct ufs_hba *hba, u32 ufs_dev_qd) return ret; hba->nutrs = ret; - ret = ufshcd_mcq_init(hba); - if (ret) - goto err; + if (hba->host->nr_hw_queues == 0) { + /* + * ufshcd_mcq_init() is independent of hba->nutrs. Hence, only + * call ufshcd_mcq_init() the first time ufshcd_alloc_mcq() is + * called. + */ + ret = ufshcd_mcq_init(hba); + if (ret) + goto err; + } /* * Previously allocated memory for nutrs may not be enough in MCQ mode. From patchwork Thu Apr 3 21:18:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878129 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 B9BA71A83FF for ; Thu, 3 Apr 2025 21:23:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715393; cv=none; b=cb/e/HaOXxUuUS+F8jdUxH+y1hxN5k60xUAeXB7Ol2Hz1Zl+TDXfx12I5W/yAl07U2JL/fm3dB/UVLGLR+ypRmwTZF/7C1nBYrVCoW/onhl03EwypEaWjr+IQ0ObrjBN5UAvqsWcVsoXjrhRTq5pouh5+2GlJ7DtWVRegjijb2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715393; c=relaxed/simple; bh=UIURsZW3ch5WcrE7xfaWTMnatNO6eQE1Utc0ogc5a3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p2omkmsfn0O4cw/ZuPjs75i8vBG76EtR3CumLnWgo2eKZ+aYhBQNXjR7zke/+Fdwteze87DJOXLKe/Rd+IOIsFme0wMp9RFUSkoGPzrrpArW6m0z8xNiUowo3lAnf+wWKx7kHwWr45DFgnqUMm9HLVu5O7vzU0hSDvLCZhF30JA= 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=h6QnZnEh; arc=none smtp.client-ip=199.89.3.7 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="h6QnZnEh" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF8G52pGzm0yVW; Thu, 3 Apr 2025 21:23:10 +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=1743715388; x=1746307389; bh=59c7p /IyoVQUGaXWI/BGRG0h1Lr+TMOa5Rx4ilLEyOA=; b=h6QnZnEhihZ824IXXb52V 2UEmV8g+8D8pdipKtiwKoxXgnaSQxVIup1ktHq9vah3mAVnB0y1SyeoTXJJG9v2a K7SNacbYHTWKt5aGgZ9TekTzsBgRyFW7mYCjSgwkAa2J5OsIHdO2UnhW1zfWw9Ya eu0/9M+apVfgkP8Cu27JLfiscxd+q/X6lab5jG9F05W9AisZfmI6Em+BPHPT0ZQ5 7H7EMUiO0adIaacOlEisXGOu+N276npIUtm2IR6zR6dVo86c/zLma5x+YrcY8cBW AenWJM8lcZ6GF9hjeZLSYGGw1iNyC12miSfVP1Sng9Jt976nUuDdNT9h6hhmubjW w== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id VzSMIfdrJd9k; Thu, 3 Apr 2025 21:23:08 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF866G0vzm0ySc; Thu, 3 Apr 2025 21:23:01 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 19/24] scsi: ufs: core: Call ufshcd_init_lrb() later Date: Thu, 3 Apr 2025 14:18:03 -0700 Message-ID: <20250403211937.2225615-20-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Call ufshcd_init_lrb() from inside ufshcd_setup_dev_cmd() instead of ufshcd_host_memory_configure(). This patch prepares for calling ufshcd_host_memory_configure() before the information is available that is required to call ufshcd_setup_dev_cmd(). Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 7cbc7a3cf2db..df90163939d0 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2868,8 +2868,32 @@ static void ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) ufshcd_prepare_utp_scsi_cmd_upiu(lrbp, upiu_flags); } -static void __ufshcd_setup_cmd(struct ufshcd_lrb *lrbp, struct scsi_cmnd *cmd, u8 lun, int tag) +static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i) +{ + struct utp_transfer_cmd_desc *cmd_descp = + (void *)hba->ucdl_base_addr + i * ufshcd_get_ucd_size(hba); + struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr; + dma_addr_t cmd_desc_element_addr = + hba->ucdl_dma_addr + i * ufshcd_get_ucd_size(hba); + u16 response_offset = le16_to_cpu(utrdlp[i].response_upiu_offset); + u16 prdt_offset = le16_to_cpu(utrdlp[i].prd_table_offset); + + lrb->utr_descriptor_ptr = utrdlp + i; + lrb->utrd_dma_addr = + hba->utrdl_dma_addr + i * sizeof(struct utp_transfer_req_desc); + lrb->ucd_req_ptr = (struct utp_upiu_req *)cmd_descp->command_upiu; + lrb->ucd_req_dma_addr = cmd_desc_element_addr; + lrb->ucd_rsp_ptr = (struct utp_upiu_rsp *)cmd_descp->response_upiu; + lrb->ucd_rsp_dma_addr = cmd_desc_element_addr + response_offset; + lrb->ucd_prdt_ptr = (struct ufshcd_sg_entry *)cmd_descp->prd_table; + lrb->ucd_prdt_dma_addr = cmd_desc_element_addr + prdt_offset; +} + +static void __ufshcd_setup_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, + struct scsi_cmnd *cmd, u8 lun, int tag) { + ufshcd_init_lrb(hba, lrbp, tag); + memset(lrbp->ucd_req_ptr, 0, sizeof(*lrbp->ucd_req_ptr)); lrbp->cmd = cmd; @@ -2881,7 +2905,7 @@ static void __ufshcd_setup_cmd(struct ufshcd_lrb *lrbp, struct scsi_cmnd *cmd, u static void ufshcd_setup_scsi_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, struct scsi_cmnd *cmd, u8 lun, int tag) { - __ufshcd_setup_cmd(lrbp, cmd, lun, tag); + __ufshcd_setup_cmd(hba, lrbp, cmd, lun, tag); lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba); lrbp->req_abort_skip = false; @@ -2936,27 +2960,6 @@ static void ufshcd_map_queues(struct Scsi_Host *shost) } } -static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i) -{ - struct utp_transfer_cmd_desc *cmd_descp = (void *)hba->ucdl_base_addr + - i * ufshcd_get_ucd_size(hba); - struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr; - dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr + - i * ufshcd_get_ucd_size(hba); - u16 response_offset = le16_to_cpu(utrdlp[i].response_upiu_offset); - u16 prdt_offset = le16_to_cpu(utrdlp[i].prd_table_offset); - - lrb->utr_descriptor_ptr = utrdlp + i; - lrb->utrd_dma_addr = hba->utrdl_dma_addr + - i * sizeof(struct utp_transfer_req_desc); - lrb->ucd_req_ptr = (struct utp_upiu_req *)cmd_descp->command_upiu; - lrb->ucd_req_dma_addr = cmd_desc_element_addr; - lrb->ucd_rsp_ptr = (struct utp_upiu_rsp *)cmd_descp->response_upiu; - lrb->ucd_rsp_dma_addr = cmd_desc_element_addr + response_offset; - lrb->ucd_prdt_ptr = (struct ufshcd_sg_entry *)cmd_descp->prd_table; - lrb->ucd_prdt_dma_addr = cmd_desc_element_addr + prdt_offset; -} - /** * ufshcd_queuecommand - main entry point for SCSI requests * @host: SCSI host pointer @@ -3049,7 +3052,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) static void ufshcd_setup_dev_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, enum dev_cmd_type cmd_type, u8 lun, int tag) { - __ufshcd_setup_cmd(lrbp, NULL, lun, tag); + __ufshcd_setup_cmd(hba, lrbp, NULL, lun, tag); lrbp->intr_cmd = true; /* No interrupt aggregation */ hba->dev_cmd.type = cmd_type; } @@ -3978,8 +3981,6 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) utrdlp[i].response_upiu_length = cpu_to_le16(ALIGNED_UPIU_SIZE >> 2); } - - ufshcd_init_lrb(hba, &hba->lrb[i], i); } } From patchwork Thu Apr 3 21:18:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878128 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 0C9A61C7009 for ; Thu, 3 Apr 2025 21:23:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715413; cv=none; b=R5QJBfUkRekp4z9MEsE61tGQ9Z0MDXKmLj+VMtwtWzRbfoe4LqycAO1DpUj6pKcZ8F9JyxbU163ODXEGaAot974WcwWCHSkq6eqvic1+ncg5Sv7qBvNNaNmXeAOxBNMcWIl67nD1IliQp59CybKiTYOu2E1quss6OEtFBOibxUc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715413; c=relaxed/simple; bh=0uggVkirTxOeA7ASZqaFgg2LoAcykcoTXdq/NVfgxYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lVJawxZHurD7AxwgptjKHTHSQFznc1OJ7H1p+3n7tHMCwYra0AZ04gzg+cC+v+zYrjXxTTYq6rLH3bXQS2RLrQbPIE+7+UBUXWnrBIGXQ6gsBTu8E34+SZt6xb8GiLHfkBptGJpY/lU8qdwH7BhfdoqSec86kJ1vbQGFDEdzA5s= 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=oqJMx3DN; arc=none smtp.client-ip=199.89.3.7 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="oqJMx3DN" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF8g0LB2zm0yQC; Thu, 3 Apr 2025 21:23:31 +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=1743715409; x=1746307410; bh=cj7Sr /89SQLHOAejVTUaNJSzOmLG1NG+0tX6LWsv2Pw=; b=oqJMx3DN2bp7IIadFys71 MVYLST258XLmHK+G4BnFMKVgsSgVg9W/2fxrGnqBtvr8mRt5w6CMYpok/zrPbqic Gra1L1+hWJ/sJMGBr96NPv0FcMGfLQH3EPvqVaA4BPKsL0dUnXv+Uih0BddlxLN9 YwPPUigCayaChm8b4HSMMxbJk/gmC1uFZWKkxTHJUQIOEgeVdvnyEeCRjisNsD5h RXRffhPPFROWu1IxL8bWbhw9PNaNCRfxaQGb1bvvvJrUI0e+YGbi5d+IDhvd+A9u nD9GLYcICYAOyw8yOSw2G7tzFGllcwfLnqurQsChyiTMXRHh88m6jZpD6EPjG4qN A== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id FuN-CT2aM2u0; Thu, 3 Apr 2025 21:23:29 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF8W6p1Gzm0yTx; Thu, 3 Apr 2025 21:23:22 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" Subject: [PATCH 21/24] scsi: ufs: core: Allocate the reserved slot as a reserved request Date: Thu, 3 Apr 2025 14:18:05 -0700 Message-ID: <20250403211937.2225615-22-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of letting the SCSI core allocate hba->nutrs - 1 commands, let the SCSI core allocate hba->nutrs commands, set the number of reserved tags to 1 and use the reserved tag for device management commands. This patch changes the 'reserved slot' from hba->nutrs - 1 into 0 because the block layer reserves the smallest tags for reserved commands. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index df90163939d0..0adc0f879196 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2417,7 +2417,7 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba) hba->nutrs = (hba->capabilities & MASK_TRANSFER_REQUESTS_SLOTS_SDB) + 1; hba->nutmrs = ((hba->capabilities & MASK_TASK_MANAGEMENT_REQUEST_SLOTS) >> 16) + 1; - hba->reserved_slot = hba->nutrs - 1; + hba->reserved_slot = 0; hba->nortt = FIELD_GET(MASK_NUMBER_OUTSTANDING_RTT, hba->capabilities) + 1; @@ -8762,7 +8762,8 @@ static int ufshcd_alloc_mcq(struct ufs_hba *hba, u32 ufs_dev_qd) goto err; hba->host->can_queue = hba->nutrs - UFSHCD_NUM_RESERVED; - hba->reserved_slot = hba->nutrs - UFSHCD_NUM_RESERVED; + hba->host->nr_reserved_cmds = UFSHCD_NUM_RESERVED; + hba->reserved_slot = 0; return 0; err: @@ -10593,6 +10594,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) host->can_queue = hba->nutrs - UFSHCD_NUM_RESERVED; host->cmd_per_lun = hba->nutrs - UFSHCD_NUM_RESERVED; + host->nr_reserved_cmds = UFSHCD_NUM_RESERVED; host->max_id = UFSHCD_MAX_ID; host->max_lun = UFS_MAX_LUNS; host->max_channel = UFSHCD_MAX_CHANNEL; From patchwork Thu Apr 3 21:18:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 878126 Received: from 004.mia.mailroute.net (004.mia.mailroute.net [199.89.3.7]) (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 683BB1E3DF4 for ; Thu, 3 Apr 2025 21:24:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715468; cv=none; b=KOvCZIpf6Sg1q52xOlzvJOBeMoDxhGMEYjs8eDg1Ho8amNpwPQb3FwlP574+nsNmYLCQnyEFb9veeros7lvBOc2oHmTk/0UXOyfGUOoqNyxtYLuLGV58vI4qJZ6n2YrcrPfYmokgRrilZELCP+4Hl+2T64yJzsXBBij/PTxPaiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743715468; c=relaxed/simple; bh=+RxQEQmVfKMACMiyIKRidyDQHU9bwGpPa9mMnRLaV98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hc1/N/fqGbI65qvkC7dzVLUA/LJ2UY76IwlaVbwYeCutvEbaY5xXLE5OajORiu2S8/yyFwE3NW7TfX9kLFoaP9Pz8IyF+QYj3gBF1btvUGg9EejYzQUprjf+OTz4NSngV4/GkIUZdIjshhwuZ2K0pnOjy4wWX0jezroAoa0PvKY= 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=NbOT0GHT; arc=none smtp.client-ip=199.89.3.7 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="NbOT0GHT" Received: from localhost (localhost [127.0.0.1]) by 004.mia.mailroute.net (Postfix) with ESMTP id 4ZTF9j4lXTzm0yTm; Thu, 3 Apr 2025 21:24:25 +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=1743715463; x=1746307464; bh=EsIjn RP1RlEFwQs2OjKNrJ99ezPgM7ADtqMEOoQetYo=; b=NbOT0GHTFYryFdHw+FmFL dNO7LImgVQvvAOA4ADKLmwZsDzrii0hraEF4bJqqsC/RaKGCy/uons11UK4vbiwu QYHyk3ZglTbgZ3kQ2mCliMemojhqs7dZ+n+jD/g8ul6j3fzE3EplxDv/oMF4mKVR PlRzIBwF2xNWCygyklmt/NIQ8r0fA0AA+twrYlPfX24EaMHKxVFC9DTHWTH3nslh v+LnmtP0d3ChmwrS6sc+HQrqnDFCpQoc1xqUmqI5fJCvPLj62XouC7jWCbf4EzJA oH4XGOhiIzzJfv2kraxu9+dKZm/MCEBYI7uUIq4GplWrmHVcjXA6GOXUJz62i+L2 Q== X-Virus-Scanned: by MailRoute Received: from 004.mia.mailroute.net ([127.0.0.1]) by localhost (004.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id bt3_HBEbMKLO; Thu, 3 Apr 2025 21:24:23 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (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 004.mia.mailroute.net (Postfix) with ESMTPSA id 4ZTF9X0TkFzm272S; Thu, 3 Apr 2025 21:24:15 +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 , Manivannan Sadhasivam , "Bao D. Nguyen" , Eric Biggers , Can Guo , Minwoo Im Subject: [PATCH 24/24] scsi: ufs: core: Remove the ufshcd_lrb task_tag member Date: Thu, 3 Apr 2025 14:18:08 -0700 Message-ID: <20250403211937.2225615-25-bvanassche@acm.org> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog In-Reply-To: <20250403211937.2225615-1-bvanassche@acm.org> References: <20250403211937.2225615-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the ufshcd_lrb task_tag member and use scsi_cmd_to_rq(cmd)->tag instead. Use rq->tag instead of lrbp->task_tag. Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 66 +++++++++++++++++++-------------------- include/ufs/ufshcd.h | 1 - 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 1b8be737e470..b7769eb190f7 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -551,7 +551,7 @@ static void ufshcd_print_tr(struct ufs_hba *hba, struct scsi_cmnd *cmd, bool pr_prdt) { struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); - const int tag = lrbp->task_tag; + const int tag = scsi_cmd_to_rq(cmd)->tag; int prdt_length; dev_err(hba->dev, "UPIU[%d] - issue time %lld us\n", @@ -2312,6 +2312,7 @@ static inline void ufshcd_send_command(struct ufs_hba *hba, struct ufs_hw_queue *hwq) { struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); + const int tag = scsi_cmd_to_rq(cmd)->tag; unsigned long flags; lrbp->issue_time_stamp = ktime_get(); @@ -2338,11 +2339,10 @@ static inline void ufshcd_send_command(struct ufs_hba *hba, } else { spin_lock_irqsave(&hba->outstanding_lock, flags); if (hba->vops && hba->vops->setup_xfer_req) - hba->vops->setup_xfer_req(hba, lrbp->task_tag, + hba->vops->setup_xfer_req(hba, tag, ufshcd_is_scsi_cmd(cmd)); - __set_bit(lrbp->task_tag, &hba->outstanding_reqs); - ufshcd_writel(hba, 1 << lrbp->task_tag, - REG_UTP_TRANSFER_REQ_DOOR_BELL); + __set_bit(tag, &hba->outstanding_reqs); + ufshcd_writel(hba, 1 << tag, REG_UTP_TRANSFER_REQ_DOOR_BELL); spin_unlock_irqrestore(&hba->outstanding_lock, flags); } } @@ -2760,6 +2760,7 @@ static void ufshcd_prepare_utp_scsi_cmd_upiu(struct scsi_cmnd *cmd, u8 upiu_flags) { struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); + const int tag = scsi_cmd_to_rq(cmd)->tag; struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr; unsigned short cdb_len; @@ -2767,11 +2768,11 @@ static void ufshcd_prepare_utp_scsi_cmd_upiu(struct scsi_cmnd *cmd, .transaction_code = UPIU_TRANSACTION_COMMAND, .flags = upiu_flags, .lun = lrbp->lun, - .task_tag = lrbp->task_tag, + .task_tag = tag, .command_set_type = UPIU_COMMAND_SET_TYPE_SCSI, }; - WARN_ON_ONCE(ucd_req_ptr->header.task_tag != lrbp->task_tag); + WARN_ON_ONCE(ucd_req_ptr->header.task_tag != tag); ucd_req_ptr->sc.exp_data_transfer_len = cpu_to_be32(cmd->sdb.length); @@ -2791,6 +2792,8 @@ static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, u8 upiu_flags) { struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr; + struct scsi_cmnd *cmd = (struct scsi_cmnd *)lrbp - 1; + const int tag = scsi_cmd_to_rq(cmd)->tag; struct ufs_query *query = &hba->dev_cmd.query; u16 len = be16_to_cpu(query->request.upiu_req.length); @@ -2799,7 +2802,7 @@ static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba, .transaction_code = UPIU_TRANSACTION_QUERY_REQ, .flags = upiu_flags, .lun = lrbp->lun, - .task_tag = lrbp->task_tag, + .task_tag = tag, .query_function = query->request.query_func, /* Data segment length only need for WRITE_DESC */ .data_segment_length = @@ -2823,12 +2826,14 @@ static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba, static inline void ufshcd_prepare_utp_nop_upiu(struct ufshcd_lrb *lrbp) { struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr; + struct scsi_cmnd *cmd = (struct scsi_cmnd *)lrbp - 1; + const int tag = scsi_cmd_to_rq(cmd)->tag; memset(ucd_req_ptr, 0, sizeof(struct utp_upiu_req)); ucd_req_ptr->header = (struct utp_upiu_header){ .transaction_code = UPIU_TRANSACTION_NOP_OUT, - .task_tag = lrbp->task_tag, + .task_tag = tag, }; memset(lrbp->ucd_rsp_ptr, 0, sizeof(struct utp_upiu_rsp)); @@ -2864,7 +2869,7 @@ static int ufshcd_compose_devman_upiu(struct ufs_hba *hba, * ufshcd_comp_scsi_upiu - UFS Protocol Information Unit(UPIU) * for SCSI Purposes * @hba: per adapter instance - * @lrbp: pointer to local reference block + * @cmd: SCSI command */ static void ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct scsi_cmnd *cmd) { @@ -2912,7 +2917,6 @@ static void __ufshcd_setup_cmd(struct ufs_hba *hba, struct scsi_cmnd *cmd, memset(lrbp->ucd_req_ptr, 0, sizeof(*lrbp->ucd_req_ptr)); - lrbp->task_tag = tag; lrbp->lun = lun; ufshcd_prepare_lrbp_crypto(cmd ? scsi_cmd_to_rq(cmd) : NULL, lrbp); } @@ -3203,6 +3207,8 @@ ufshcd_dev_cmd_completion(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, int max_timeout) { + struct scsi_cmnd *cmd = (struct scsi_cmnd *)lrbp - 1; + const int tag = scsi_cmd_to_rq(cmd)->tag; unsigned long time_left = msecs_to_jiffies(max_timeout); unsigned long flags; bool pending; @@ -3219,18 +3225,18 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, } else { err = -ETIMEDOUT; dev_dbg(hba->dev, "%s: dev_cmd request timedout, tag %d\n", - __func__, lrbp->task_tag); + __func__, tag); /* MCQ mode */ if (hba->mcq_enabled) { /* successfully cleared the command, retry if needed */ - if (ufshcd_clear_cmd(hba, lrbp->task_tag) == 0) + if (ufshcd_clear_cmd(hba, tag) == 0) err = -EAGAIN; return err; } /* SDB mode */ - if (ufshcd_clear_cmd(hba, lrbp->task_tag) == 0) { + if (ufshcd_clear_cmd(hba, tag) == 0) { /* successfully cleared the command, retry if needed */ err = -EAGAIN; /* @@ -3239,11 +3245,9 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, * variable. */ spin_lock_irqsave(&hba->outstanding_lock, flags); - pending = test_bit(lrbp->task_tag, - &hba->outstanding_reqs); + pending = test_bit(tag, &hba->outstanding_reqs); if (pending) - __clear_bit(lrbp->task_tag, - &hba->outstanding_reqs); + __clear_bit(tag, &hba->outstanding_reqs); spin_unlock_irqrestore(&hba->outstanding_lock, flags); if (!pending) { @@ -3256,11 +3260,10 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, } } else { dev_err(hba->dev, "%s: failed to clear tag %d\n", - __func__, lrbp->task_tag); + __func__, tag); spin_lock_irqsave(&hba->outstanding_lock, flags); - pending = test_bit(lrbp->task_tag, - &hba->outstanding_reqs); + pending = test_bit(tag, &hba->outstanding_reqs); spin_unlock_irqrestore(&hba->outstanding_lock, flags); if (!pending) { @@ -5384,6 +5387,7 @@ static inline int ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct cq_entry *cqe) { struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); + const int tag = scsi_cmd_to_rq(cmd)->tag; int result = 0; int scsi_status; enum utp_ocs ocs; @@ -5455,10 +5459,8 @@ static inline int ufshcd_transfer_rsp_status(struct ufs_hba *hba, case OCS_ABORTED: case OCS_INVALID_COMMAND_STATUS: result |= DID_REQUEUE << 16; - dev_warn(hba->dev, - "OCS %s from controller for tag %d\n", - (ocs == OCS_ABORTED ? "aborted" : "invalid"), - lrbp->task_tag); + dev_warn(hba->dev, "OCS %s from controller for tag %d\n", + ocs == OCS_ABORTED ? "aborted" : "invalid", tag); break; case OCS_INVALID_CMD_TABLE_ATTR: case OCS_INVALID_PRDT_ATTR: @@ -5471,9 +5473,8 @@ static inline int ufshcd_transfer_rsp_status(struct ufs_hba *hba, case OCS_GENERAL_CRYPTO_ERROR: default: result |= DID_ERROR << 16; - dev_err(hba->dev, - "OCS error from controller = %x for tag %d\n", - ocs, lrbp->task_tag); + dev_err(hba->dev, "OCS error from controller = %x for tag %d\n", + ocs, tag); ufshcd_print_evt_hist(hba); ufshcd_print_host_state(hba); break; @@ -7540,8 +7541,8 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag) u8 resp = 0xF; for (poll_cnt = 100; poll_cnt; poll_cnt--) { - err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag, - UFS_QUERY_TASK, &resp); + err = ufshcd_issue_tm_cmd(hba, lrbp->lun, tag, UFS_QUERY_TASK, + &resp); if (!err && resp == UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED) { /* cmd pending in the device */ dev_err(hba->dev, "%s: cmd pending in the device. tag = %d\n", @@ -7574,8 +7575,7 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag) if (!poll_cnt) return -EBUSY; - err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag, - UFS_ABORT_TASK, &resp); + err = ufshcd_issue_tm_cmd(hba, lrbp->lun, tag, UFS_ABORT_TASK, &resp); if (err || resp != UPIU_TASK_MANAGEMENT_FUNC_COMPL) { if (!err) { err = resp; /* service response error */ @@ -7685,7 +7685,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto release; } - err = ufshcd_try_to_abort_task(hba, lrbp->task_tag); + err = ufshcd_try_to_abort_task(hba, tag); if (err) { dev_err(hba->dev, "%s: failed with err %d\n", __func__, err); ufshcd_set_req_abort_skip(hba, hba->outstanding_reqs); diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h index 3e7ee781b841..0e61d89e83ce 100644 --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@ -188,7 +188,6 @@ struct ufshcd_lrb { int scsi_status; int command_type; - int task_tag; u8 lun; /* UPIU LUN id field is only 8-bit wide */ bool intr_cmd; ktime_t issue_time_stamp;