From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5AA2F3597E; Mon, 23 Jun 2025 22:07:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716439; cv=none; b=jNf2rq3CobPQFeDsi9hGqy7loWlp91hlbAW8RQVGut+zc6DHVN2WmUII2UQhCCn4lLBi7KZqs6uNWKaJgNzbzb/jQZfyf5TLjQ5hiaNU2BTVDSXU1Z6VwpaMz/5eiit6K9MTt8FH44Mh7Nz2at71VB1n9QhkNEv8Z5ewfz1SRro= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716439; c=relaxed/simple; bh=ozXbhn2t5NXrt6WjHnRozpUk0zaCuunYSMezK5C834c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=depx6XE6KLCV5O0nScrn66JamO8cADslp8EFhzawjMDASoX+z9ctyQvJLVapbj7h3FeH6wFZhchfbfGl1tSLzfEGkdl5Qo7ttTbumj/vWUwyUkybi4/rImJJj6v4jn5cFB0PfSNsPaBgCsLO8dfsHaOQusgd4rfdFCVwGGYd/nk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gdgK4IQA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gdgK4IQA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF033C4CEEA; Mon, 23 Jun 2025 22:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716439; bh=ozXbhn2t5NXrt6WjHnRozpUk0zaCuunYSMezK5C834c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gdgK4IQAF2sMTNL/UzqfP9xyxVsl63soBjRVUDW1LbPLWLY00yREdOeX8WlqDbWAC oWOij6xuGnEjdapffUgKEGw/nRgncLY5YP+Ps7QGr2bi3bEK1UhDKr1RJ8K4N8dGgw oRQ8OI8bpIl0BVffv6cziAfbez50z9zVD3Pnb2IQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Justin Sanders , Valentin Kleibel , Jens Axboe , Sasha Levin Subject: [PATCH 6.15 523/592] aoe: clean device rq_list in aoedev_downdev() Date: Mon, 23 Jun 2025 15:08:01 +0200 Message-ID: <20250623130712.875624836@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130700.210182694@linuxfoundation.org> References: <20250623130700.210182694@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Justin Sanders [ Upstream commit 7f90d45e57cb2ef1f0adcaf925ddffdfc5e680ca ] An aoe device's rq_list contains accepted block requests that are waiting to be transmitted to the aoe target. This queue was added as part of the conversion to blk_mq. However, the queue was not cleaned out when an aoe device is downed which caused blk_mq_freeze_queue() to sleep indefinitely waiting for those requests to complete, causing a hang. This fix cleans out the queue before calling blk_mq_freeze_queue(). Link: https://bugzilla.kernel.org/show_bug.cgi?id=212665 Fixes: 3582dd291788 ("aoe: convert aoeblk to blk-mq") Signed-off-by: Justin Sanders Link: https://lore.kernel.org/r/20250610170600.869-1-jsanders.devel@gmail.com Tested-By: Valentin Kleibel Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/aoe/aoedev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c index 141b2a0e03f2c..8c18034cb3d69 100644 --- a/drivers/block/aoe/aoedev.c +++ b/drivers/block/aoe/aoedev.c @@ -198,6 +198,7 @@ aoedev_downdev(struct aoedev *d) { struct aoetgt *t, **tt, **te; struct list_head *head, *pos, *nx; + struct request *rq, *rqnext; int i; d->flags &= ~DEVFL_UP; @@ -223,6 +224,13 @@ aoedev_downdev(struct aoedev *d) /* clean out the in-process request (if any) */ aoe_failip(d); + /* clean out any queued block requests */ + list_for_each_entry_safe(rq, rqnext, &d->rq_list, queuelist) { + list_del_init(&rq->queuelist); + blk_mq_start_request(rq); + blk_mq_end_request(rq, BLK_STS_IOERR); + } + /* fast fail all pending I/O */ if (d->blkq) { /* UP is cleared, freeze+quiesce to insure all are errored */ -- 2.39.5