]> www.infradead.org Git - users/jedix/linux-maple.git/commit
nvme-pci: fix timeout request state check
authorKeith Busch <kbusch@kernel.org>
Wed, 18 Jan 2023 16:44:16 +0000 (08:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Feb 2023 07:34:25 +0000 (08:34 +0100)
commit4888f9fc03fc7e9c9ef51cb2ac338680b4a2320c
tree102d1724ca134cb992aa7aa313085635a1c9168d
parent58bdab02b2250acdb18fc8e7d1a10d2a43fb54f6
nvme-pci: fix timeout request state check

[ Upstream commit 1c5842085851f786eba24a39ecd02650ad892064 ]

Polling the completion can progress the request state to IDLE, either
inline with the completion, or through softirq. Either way, the state
may not be COMPLETED, so don't check for that. We only care if the state
isn't IN_FLIGHT.

This is fixing an issue where the driver aborts an IO that we just
completed. Seeing the "aborting" message instead of "polled" is very
misleading as to where the timeout problem resides.

Fixes: bf392a5dc02a9b ("nvme-pci: Remove tag from process cq")
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/pci.c