From nobody Sun Feb 8 23:34:55 2026 Received: from mail-il1-f228.google.com (mail-il1-f228.google.com [209.85.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 945D226B96B for ; Wed, 23 Apr 2025 20:51:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745441497; cv=none; b=eji6nrJ8PCdvd9xV8q99iBCDVO29B0XO92Sf/35qPyjHgD0v5crvcOM04Hi8cMW4SKMvpdU/mAlVm10G+CM31OPOe1OP22HBEJBHBWtmcjdQvkw4ADl7YoNfs0HAH0oSBIrCoNFj245P6pv1gVRJBCR/FQ5rnN9BhQWFH36DUbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745441497; c=relaxed/simple; bh=ti5z4JVtSZzRIvZC6dUX4azsCUaOndsOm7qk1lMNfYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ooXzwapZCQ0j2VIlaSmbWErk4s+4mAeMRd3ByxqzVNMfeCtg5IuGnRRm8srVOoPtdH6rH0KxGS9jfqRX7eq8bg0CjtlI2E15oGbB9hpBC9T7ivsN+LrGN0LaAi1dtSFzqi4f1euJP+T4ikiTSVZFOx4gL19ybO3hE+VUDnWMOA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=MOAAfZN+; arc=none smtp.client-ip=209.85.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="MOAAfZN+" Received: by mail-il1-f228.google.com with SMTP id e9e14a558f8ab-3d90215ff34so137385ab.0 for ; Wed, 23 Apr 2025 13:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745441493; x=1746046293; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=io7FZ7jM2VblIMiViDDtGdBTQwQ9HPxFb0/zqdALMPI=; b=MOAAfZN+T+TEdN5yhZmCsvpA7+DybaWK/V/IZHRG6ImaubJSB9SAPrjkna60/+uHvG nsGdFQz24ARaYmKIYHAge0+BryN64kQ8ik3ODv3cpS/pNI/n35mZuyeJldfww3I3NR+V ruVoHTf5jp1pNAwdqR0fX9IBnU0WwqiWzpitEIEPq/2/7YVC9EFV5xw6yG8hCSJ3Xwhl GMxhoGXlQeI8IPeGFNViIZsDV/uI3tL9Lj5kr3PEGA3NKsQeAeHqWZWPoyzviREQ2z8p Yu1eQzJVS0NCWP9BZQT3py93xmllkNS07J3FTt8VVgSg1bIXexsqV3qjc95DET6CgxZu yTXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745441493; x=1746046293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=io7FZ7jM2VblIMiViDDtGdBTQwQ9HPxFb0/zqdALMPI=; b=K1uRwA9L9wb3jsolpIEV6sg8lKVz0aijJpToAgK+XLwakNUZ3r6fhO3U0QjsG3Rhz3 lIWlyO1zPWbJjL8VwxDLQYrFvSQJeDnmTiGdGTTLylDPRFPGGXxPm/X+LnlD+g3DcYDb qGHzQbFmF+1J0YLLb4jFwky4KtwRJvL8vfeH1Rx3wHZbN5nUi2MbqBxnKcZFnc2fCmif QZPm7X7pUmCwj6tQHG0X71Mq80xpqr1U0RcH4KXlEbXddWgLa750FgMTCkkwDoODi+uu 1h58wUy3jegvU8ECRnLh03pk/5rCndqplSij0c9tzwFqiIBK8sz08WU1iLSwjY5vfQXl lrtw== X-Forwarded-Encrypted: i=1; AJvYcCUO/hT6W+jnXO7ltEc5304nGZrWhRM1mnTLU/S487UHPdOCtR+3ekQORBrEGtKWL08YMa4gpAxtTe0B+Iw=@vger.kernel.org X-Gm-Message-State: AOJu0YxGa56Wq+knt/wtFlmaPp7zA8F6n/+2nNr1qxtum6QU+8/mXebV HCecFViTtprGiqpKLZfoTyZtEy4LuwUNCWwV5el8SD8B7AXsYj6iL8O3Jr7MO/BAC95OY4YM8E0 lJioAf7v8Bol7i5mPvmztVmy1l5cDx+r+aZxrPzqj9VKfn87O X-Gm-Gg: ASbGncvWEhVg1M6lqiKXkyYuO50f6SWM/1OLe90n2bWbwX93qxI6UDlecxagjN/ccb2 tprKhURW5O7Z/NAv2+ywafwl7KeQwrseCI3d2WqkQrVd3sMK4X34ij/hNLHw0Ki15U6WNro2bbi u3K69WkZY1/HcvhZTZtpVkdVmJ//bR5F1JWiAIKRbM8/x+6hVjpKJXrWPIx7zOIe7Pcu3qn/o18 2Ua8cbdyPq7K/mCoQDZPfbGat7RQcgUZDmPjEsNM6NQxDJCGDgkAfWGaKR9BVePrJzmAs7AJun6 /KSmtvXuhNOwez5TZWvOnAkv20WJeQ== X-Google-Smtp-Source: AGHT+IH2QoG9AKfqv9dap7Sq/fd6X84H+flJOYdI2qKcxs5wCyuBiQ9DiPZiZOePpQ0Cj6W+5e0sHjw2hq4k X-Received: by 2002:a05:6e02:17cd:b0:3d9:2d10:9dd2 with SMTP id e9e14a558f8ab-3d930481fefmr272895ab.7.1745441493683; Wed, 23 Apr 2025 13:51:33 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-4f6a39602d6sm496856173.65.2025.04.23.13.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 13:51:33 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::418a]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 55BDA34058D; Wed, 23 Apr 2025 14:51:33 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 50B25E42828; Wed, 23 Apr 2025 14:51:33 -0600 (MDT) From: Caleb Sander Mateos To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 1/3] block: take rq_list instead of plug in dispatch functions Date: Wed, 23 Apr 2025 14:51:25 -0600 Message-ID: <20250423205127.2976981-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250423205127.2976981-1-csander@purestorage.com> References: <20250423205127.2976981-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" blk_mq_plug_issue_direct(), __blk_mq_flush_plug_list(), and blk_mq_dispatch_plug_list() take a struct blk_plug * but only use its mq_list. Pass the struct rq_list * instead in preparation for calling them with other lists of requests. Drop "plug" from the function names as they are no longer plug-specific. Signed-off-by: Caleb Sander Mateos Reviewed-by: Christoph Hellwig --- block/blk-mq.c | 26 ++++++++++++-------------- block/mq-deadline.c | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 554380bfd002..fb514fd41d76 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2788,19 +2788,19 @@ static blk_status_t blk_mq_request_issue_directly(s= truct request *rq, bool last) if (!blk_mq_get_budget_and_tag(rq)) return BLK_STS_RESOURCE; return __blk_mq_issue_directly(hctx, rq, last); } =20 -static void blk_mq_plug_issue_direct(struct blk_plug *plug) +static void blk_mq_issue_direct(struct rq_list *rqs) { struct blk_mq_hw_ctx *hctx =3D NULL; struct request *rq; int queued =3D 0; blk_status_t ret =3D BLK_STS_OK; =20 - while ((rq =3D rq_list_pop(&plug->mq_list))) { - bool last =3D rq_list_empty(&plug->mq_list); + while ((rq =3D rq_list_pop(rqs))) { + bool last =3D rq_list_empty(rqs); =20 if (hctx !=3D rq->mq_hctx) { if (hctx) { blk_mq_commit_rqs(hctx, queued, false); queued =3D 0; @@ -2827,29 +2827,28 @@ static void blk_mq_plug_issue_direct(struct blk_plu= g *plug) out: if (ret !=3D BLK_STS_OK) blk_mq_commit_rqs(hctx, queued, false); } =20 -static void __blk_mq_flush_plug_list(struct request_queue *q, - struct blk_plug *plug) +static void __blk_mq_flush_list(struct request_queue *q, struct rq_list *r= qs) { if (blk_queue_quiesced(q)) return; - q->mq_ops->queue_rqs(&plug->mq_list); + q->mq_ops->queue_rqs(rqs); } =20 -static void blk_mq_dispatch_plug_list(struct blk_plug *plug, bool from_sch= ed) +static void blk_mq_dispatch_list(struct rq_list *rqs, bool from_sched) { struct blk_mq_hw_ctx *this_hctx =3D NULL; struct blk_mq_ctx *this_ctx =3D NULL; struct rq_list requeue_list =3D {}; unsigned int depth =3D 0; bool is_passthrough =3D false; LIST_HEAD(list); =20 do { - struct request *rq =3D rq_list_pop(&plug->mq_list); + struct request *rq =3D rq_list_pop(rqs); =20 if (!this_hctx) { this_hctx =3D rq->mq_hctx; this_ctx =3D rq->mq_ctx; is_passthrough =3D blk_rq_is_passthrough(rq); @@ -2858,13 +2857,13 @@ static void blk_mq_dispatch_plug_list(struct blk_pl= ug *plug, bool from_sched) rq_list_add_tail(&requeue_list, rq); continue; } list_add_tail(&rq->queuelist, &list); depth++; - } while (!rq_list_empty(&plug->mq_list)); + } while (!rq_list_empty(rqs)); =20 - plug->mq_list =3D requeue_list; + *rqs =3D requeue_list; trace_block_unplug(this_hctx->queue, depth, !from_sched); =20 percpu_ref_get(&this_hctx->queue->q_usage_counter); /* passthrough requests should never be issued to the I/O scheduler */ if (is_passthrough) { @@ -2912,23 +2911,22 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, = bool from_schedule) * already know at this point that all requests belong to the * same queue, caller must ensure that's the case. */ if (q->mq_ops->queue_rqs) { blk_mq_run_dispatch_ops(q, - __blk_mq_flush_plug_list(q, plug)); + __blk_mq_flush_list(q, &plug->mq_list)); if (rq_list_empty(&plug->mq_list)) return; } =20 - blk_mq_run_dispatch_ops(q, - blk_mq_plug_issue_direct(plug)); + blk_mq_run_dispatch_ops(q, blk_mq_issue_direct(&plug->mq_list)); if (rq_list_empty(&plug->mq_list)) return; } =20 do { - blk_mq_dispatch_plug_list(plug, from_schedule); + blk_mq_dispatch_list(&plug->mq_list, from_schedule); } while (!rq_list_empty(&plug->mq_list)); } =20 static void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx, struct list_head *list) diff --git a/block/mq-deadline.c b/block/mq-deadline.c index 754f6b7415cd..2edf1cac06d5 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -713,11 +713,11 @@ static void dd_insert_request(struct blk_mq_hw_ctx *h= ctx, struct request *rq, list_add_tail(&rq->queuelist, &per_prio->fifo_list[data_dir]); } } =20 /* - * Called from blk_mq_insert_request() or blk_mq_dispatch_plug_list(). + * Called from blk_mq_insert_request() or blk_mq_dispatch_list(). */ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx, struct list_head *list, blk_insert_t flags) { --=20 2.45.2