mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] scsi: mpi3mr: Fix start_time and error return in mpi3mr_bring_ioc_ready()
@ 2026-11-19 17:09 Ian Rogers
  0 siblings, 0 replies; only message in thread
From: Ian Rogers @ 2026-11-19 17:09 UTC (permalink / raw)
  To: Sathya Prakash Veerichetty, Kashyap Desai, Sumit Saxena,
	Sreekanth Reddy, James E.J. Bottomley, Martin K. Petersen
  Cc: mpi3mr-linuxdrv.pdl, linux-scsi, linux-kernel, llvm, Elkin Cruz,
	Ian Rogers

mpi3mr_bring_ioc_ready() has three bugs in its failure and retry
handling:

1. start_time is only assigned after MPI3_SYSIF_IOC_CONFIG_ENABLE_IOC
   when retry == 0, after three earlier 'goto out_failed' paths. If
   soft reset, reset-state polling, or admin queue setup fails on the
   first attempt, out_failed computes elapsed_time_sec from an
   uninitialized start_time, and if a retry occurs (retry == 1),
   start_time remains uninitialized for the ready-polling loop as well.

2. In 'elapsed_time_sec < (mrioc->ready_timeout - 60)', ready_timeout
   is u32, so values below 60 wrap around in 32-bit unsigned arithmetic
   before zero-extending to u64, spuriously retrying past the timeout.

3. After mpi3mr_setup_admin_qpair() sets retval = 0 (or on entry where
   retval is initialized to 0), controller fault/reset-history checks,
   ready-state timeouts, and early unrecoverable or device-not-present
   exits return retval == 0 (success) to mpi3mr_init_ioc() and
   mpi3mr_reinit_ioc() even though controller bringup failed.

Initialize start_time = jiffies at function entry for pre-enable failure
exits, reset start_time = jiffies the first time
MPI3_SYSIF_IOC_CONFIG_ENABLE_IOC is written so pre-enable waits do not
drain ready_timeout, rewrite the retry window check as
'elapsed_time_sec + 60 < mrioc->ready_timeout', and ensure retval = -1
on all failure exits.

Found via Clang -Wconditional-uninitialized on an x86_64 allyesconfig
build. Verified by building drivers/scsi/mpi3mr/mpi3mr_fw.o with
LLVM=1 W=1 (-Werror) and -Wconditional-uninitialized, and with a
standalone C logic reproducer under ASan/UBSan; not runtime-tested on
physical MPI3 hardware.

Fixes: 59bd9cfe3fa0 ("scsi: mpi3mr: Code refactor of IOC init - part2")
Fixes: 0a319f162949 ("scsi: mpi3mr: Wait for diagnostic save during controller init")
Fixes: 9634bb07083c ("scsi: mpi3mr: Enhance the Enable Controller retry logic")
Fixes: 4616a4b3cb8a ("scsi: mpi3mr: Improve wait logic while controller transitions to READY state")
Fixes: fb6eb98f3965 ("scsi: mpi3mr: Handling of fault code for insufficient power")
Signed-off-by: Ian Rogers <irogers@google.com>
---
 drivers/scsi/mpi3mr/mpi3mr_fw.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index f0d3cd398dd0..b92b2467e995 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -1582,8 +1582,9 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 	int retval = 0;
 	enum mpi3mr_iocstate ioc_state;
 	u64 base_info;
+	bool enable_started = false;
 	u8 retry = 0;
-	u64 start_time, elapsed_time_sec;
+	u64 start_time = jiffies, elapsed_time_sec;
 
 retry_bring_ioc_ready:
 
@@ -1595,6 +1596,7 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 
 	if (!mpi3mr_is_fault_recoverable(mrioc)) {
 		mrioc->unrecoverable = 1;
+		retval = -1;
 		goto out_device_not_present;
 	}
 
@@ -1621,6 +1623,7 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 		if (!pci_device_is_present(mrioc->pdev)) {
 			mrioc->unrecoverable = 1;
 			ioc_err(mrioc, "controller is not present while waiting to reset\n");
+			retval = -1;
 			goto out_device_not_present;
 		}
 
@@ -1654,6 +1657,7 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 				if (!pci_device_is_present(mrioc->pdev)) {
 					mrioc->unrecoverable = 1;
 					ioc_err(mrioc, "controller is not present at the bringup\n");
+					retval = -1;
 					goto out_device_not_present;
 				}
 				msleep(100);
@@ -1690,8 +1694,10 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 	ioc_config |= MPI3_SYSIF_IOC_CONFIG_ENABLE_IOC;
 	writel(ioc_config, &mrioc->sysif_regs->ioc_configuration);
 
-	if (retry == 0)
+	if (!enable_started) {
 		start_time = jiffies;
+		enable_started = true;
+	}
 
 	timeout = mrioc->ready_timeout * 10;
 	do {
@@ -1731,7 +1737,7 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 
 out_failed:
 	elapsed_time_sec = jiffies_to_msecs(jiffies - start_time)/1000;
-	if ((retry < 2) && (elapsed_time_sec < (mrioc->ready_timeout - 60))) {
+	if (retry < 2 && elapsed_time_sec + 60 < mrioc->ready_timeout) {
 		retry++;
 
 		ioc_warn(mrioc, "retrying to bring IOC ready, retry_count:%d\n"
@@ -1739,6 +1745,8 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
 
 		goto retry_bring_ioc_ready;
 	}
+	if (!retval)
+		retval = -1;
 	ioc_state = mpi3mr_get_iocstate(mrioc);
 	ioc_err(mrioc,
 	    "failed to bring to ready state,  current state: %s\n",
-- 
2.56.1.708.g77570a6a1d-goog


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-19 17:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 17:09 [PATCH] scsi: mpi3mr: Fix start_time and error return in mpi3mr_bring_ioc_ready() Ian Rogers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®