From patchwork Tue Dec 5 05:32:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 13479367 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D38BB10F for ; Mon, 4 Dec 2023 21:32:32 -0800 (PST) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-286e57fde73so48687a91.1 for ; Mon, 04 Dec 2023 21:32:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701754352; x=1702359152; 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=UMMQm/8P5vDhCfMmFJjm2M83Sx0o997ekT2Y80iR8f8=; b=ExJcudSis6llxTY2TogWHGFae748F8t89hsCbTqNumaEGuaJmtrnCUxZKGiYgl4eFu ypQaSbu//rnNAUDbfxRtgrkXEHFxmWoIvxUn7kriX/Kqsb2c6DMGAFkbKgEBXRf128th oTzB6aDOjws6imqAfKl3Dq4i7elE8g4OTfsRsg7sfXNWx8QyJaRQ6FVPsSLBU4IoD4Q2 JIc6NHT6YotzcXxEmXYpIPEAmy/EVO+ZickQviVrgiQHSR9NfK7NvCDrsDt6U58D7EjJ 1T0jBbYe3mY4MT8niSkViSxqxYld2Z5wdSHkdrE7H5iU++IIv8SkEFQ6rHb93K7A5y4J k2FA== X-Gm-Message-State: AOJu0YxBlyiDqRaesQPMTZC6/+NbiAKdHXhcK29dTDWdvi2DIPKmpHPe iTW5qjD14lmow4Dq3H0UTiY= X-Google-Smtp-Source: AGHT+IGgws/bmi2E3douBuTpj4XcQe6ylLbfH46MSfmxeHEJ5C3RKS2PJHd7xnkcx4c1AatjuGrDgA== X-Received: by 2002:a17:90b:4a06:b0:286:6cc0:b909 with SMTP id kk6-20020a17090b4a0600b002866cc0b909mr418195pjb.64.1701754352199; Mon, 04 Dec 2023 21:32:32 -0800 (PST) Received: from bvanassche-glaptop2.roam.corp.google.com (rrcs-173-197-90-226.west.biz.rr.com. [173.197.90.226]) by smtp.gmail.com with ESMTPSA id b13-20020a170902d30d00b001cfcc10491fsm1145375plc.161.2023.12.04.21.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 21:32:31 -0800 (PST) From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Jaegeuk Kim , Bart Van Assche , Damien Le Moal Subject: [PATCH 1/3] block/mq-deadline: Use dd_rq_ioclass() instead of open-coding it Date: Mon, 4 Dec 2023 21:32:11 -0800 Message-ID: <20231205053213.522772-2-bvanassche@acm.org> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog In-Reply-To: <20231205053213.522772-1-bvanassche@acm.org> References: <20231205053213.522772-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use an existing helper function instead of open-coding it. No functionality is changed by this patch. Cc: Damien Le Moal Signed-off-by: Bart Van Assche Reviewed-by: Damien Le Moal Reviewed-by: Christoph Hellwig --- block/mq-deadline.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/mq-deadline.c b/block/mq-deadline.c index f958e79277b8..e558f3660357 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -798,8 +798,6 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, struct request_queue *q = hctx->queue; struct deadline_data *dd = q->elevator->elevator_data; const enum dd_data_dir data_dir = rq_data_dir(rq); - u16 ioprio = req_get_ioprio(rq); - u8 ioprio_class = IOPRIO_PRIO_CLASS(ioprio); struct dd_per_prio *per_prio; enum dd_prio prio; @@ -811,7 +809,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, */ blk_req_zone_write_unlock(rq); - prio = ioprio_class_to_prio[ioprio_class]; + prio = ioprio_class_to_prio[dd_rq_ioclass(rq)]; per_prio = &dd->per_prio[prio]; if (!rq->elv.priv[0]) { per_prio->stats.inserted++; From patchwork Tue Dec 5 05:32:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 13479368 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41632109 for ; Mon, 4 Dec 2023 21:32:34 -0800 (PST) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-286ccf660fbso884065a91.0 for ; Mon, 04 Dec 2023 21:32:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701754353; x=1702359153; 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=sL5unJHU5DJvy6MvHB/R0QfG33NtZCRnYDTLK5Cmqkg=; b=ohrgOYI05hrOJmuUgGHg/rIaXnDSrbUysFVbMhkF9ld7bYYIP+BV4F0PxY1e+jreKv ShvDmJ1fGdOXRZPAH8uYHK0uE5OKRSo2ax89EzAONqABnlfOJHFGNhelmgZIWro/kM7U MnQTwG7GZdqbbf8bBBrEw6nox0BqYpwSMbDJb5Yb4GJ900XBJJWVVwQnt4flS63VwmeJ TJwWRYxWN87RoDlROBXFNzVrS1/E9rcD60nUMXWwClC/sKhP+l/xaAOgeLji46wFlwH7 r5eldMsZVPDHAGtTSLFZVSeWoEE+lQ19hAgG7da68IxW4P9Z9k3Y5g72+a1JrdHYrBwI 9/eA== X-Gm-Message-State: AOJu0YxUiVB1qyN5vmuwv/cMkgu8nlVCemvWUR8X7p1HlFyk1TlUgclw 3LWH+a/RFrka5TDUSshvoqWeOF+lKFM= X-Google-Smtp-Source: AGHT+IE/v3DSsvp7whs4/DSEJhwtSkYdwZav5myfQ/UmjITOGfjgrloeAd2ixKzYrK3bDQCT3kEnMA== X-Received: by 2002:a17:90b:84:b0:286:815b:8c75 with SMTP id bb4-20020a17090b008400b00286815b8c75mr524274pjb.16.1701754353621; Mon, 04 Dec 2023 21:32:33 -0800 (PST) Received: from bvanassche-glaptop2.roam.corp.google.com (rrcs-173-197-90-226.west.biz.rr.com. [173.197.90.226]) by smtp.gmail.com with ESMTPSA id b13-20020a170902d30d00b001cfcc10491fsm1145375plc.161.2023.12.04.21.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 21:32:33 -0800 (PST) From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Jaegeuk Kim , Bart Van Assche , Damien Le Moal Subject: [PATCH 2/3] block/mq-deadline: Introduce dd_bio_ioclass() Date: Mon, 4 Dec 2023 21:32:12 -0800 Message-ID: <20231205053213.522772-3-bvanassche@acm.org> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog In-Reply-To: <20231205053213.522772-1-bvanassche@acm.org> References: <20231205053213.522772-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Prepare for disabling I/O prioritization in certain cases. Cc: Damien Le Moal Signed-off-by: Bart Van Assche Reviewed-by: Damien Le Moal --- block/mq-deadline.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block/mq-deadline.c b/block/mq-deadline.c index e558f3660357..fe5da2ade953 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -128,6 +128,11 @@ static u8 dd_rq_ioclass(struct request *rq) return IOPRIO_PRIO_CLASS(req_get_ioprio(rq)); } +static u8 dd_bio_ioclass(struct bio *bio) +{ + return IOPRIO_PRIO_CLASS(bio->bi_ioprio); +} + /* * get the request before `rq' in sector-sorted order */ @@ -744,7 +749,7 @@ static int dd_request_merge(struct request_queue *q, struct request **rq, struct bio *bio) { struct deadline_data *dd = q->elevator->elevator_data; - const u8 ioprio_class = IOPRIO_PRIO_CLASS(bio->bi_ioprio); + const u8 ioprio_class = dd_bio_ioclass(bio); const enum dd_prio prio = ioprio_class_to_prio[ioprio_class]; struct dd_per_prio *per_prio = &dd->per_prio[prio]; sector_t sector = bio_end_sector(bio); From patchwork Tue Dec 5 05:32:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 13479369 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B79DD10F for ; Mon, 4 Dec 2023 21:32:35 -0800 (PST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1cfabcbda7bso26928965ad.0 for ; Mon, 04 Dec 2023 21:32:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701754355; x=1702359155; 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=MjbZkv80aDx60HkZ6B1AvjqTEYjhY0/sLArGOw6uMtk=; b=WzPvzZeWMIentYv+0WVJ60uCG6rS6Q+Gb0ZW69ZfkHHNCv5kcfiOJMtaxxsZosLWvg uH2AwvkqseA9AeQGRulfh2sr0y25Fip8JFVIO+TFgOu+cxVrzC3ssNFm8+fGWqbDR2o5 XBRcJMoHPpDAIjfBu7z7lPHhiTDQ8p7aTtAQ71Ta83Dpdf5yyj3KzsD/13hnuwYb2ge1 1Tq+PsHc+11rvEgxnb3j8HduaUzWMr2wMhwl7DHgM1FHunrESdnP44r1mo2LXcZ4mB/N AwDDyJabCuKqCacfaTPwbWt3mT8gR5bX0n3efMxZcFgGKeEbjznsOV4zRH/bMgevogXu 3VlA== X-Gm-Message-State: AOJu0YzGstwQge6tIWYu7Xvfrr0VBVXJF9GF6dYp/ZAPvaaRvZMrD58X NyFDDO3FRIiy9LX4wM28LoM= X-Google-Smtp-Source: AGHT+IGjxJ8LpW5ouLrRH+uTvBN5R+xucl7OdDRC84RdVSpM+DQFYRWYHvvZbz1Q8S+a+1zcd7e1KQ== X-Received: by 2002:a17:902:7481:b0:1d0:6ffd:6103 with SMTP id h1-20020a170902748100b001d06ffd6103mr1115695pll.37.1701754355080; Mon, 04 Dec 2023 21:32:35 -0800 (PST) Received: from bvanassche-glaptop2.roam.corp.google.com (rrcs-173-197-90-226.west.biz.rr.com. [173.197.90.226]) by smtp.gmail.com with ESMTPSA id b13-20020a170902d30d00b001cfcc10491fsm1145375plc.161.2023.12.04.21.32.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 21:32:34 -0800 (PST) From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Jaegeuk Kim , Bart Van Assche , Damien Le Moal Subject: [PATCH 3/3] block/mq-deadline: Disable I/O prioritization in certain cases Date: Mon, 4 Dec 2023 21:32:13 -0800 Message-ID: <20231205053213.522772-4-bvanassche@acm.org> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog In-Reply-To: <20231205053213.522772-1-bvanassche@acm.org> References: <20231205053213.522772-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fix the following two issues: - Even with prio_aging_expire set to zero, I/O priorities still affect the request order. - Assigning I/O priorities with the ioprio cgroup policy breaks zoned storage support in the mq-deadline scheduler. This patch fixes both issues by disabling I/O prioritization for these two cases. Cc: Damien Le Moal Signed-off-by: Bart Van Assche Signed-off-by: Bart Van Assche --- block/mq-deadline.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/block/mq-deadline.c b/block/mq-deadline.c index fe5da2ade953..6781cef0109e 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -123,14 +123,16 @@ deadline_rb_root(struct dd_per_prio *per_prio, struct request *rq) * Returns the I/O priority class (IOPRIO_CLASS_*) that has been assigned to a * request. */ -static u8 dd_rq_ioclass(struct request *rq) +static u8 dd_rq_ioclass(struct deadline_data *dd, struct request *rq) { - return IOPRIO_PRIO_CLASS(req_get_ioprio(rq)); + return dd->prio_aging_expire ? IOPRIO_PRIO_CLASS(req_get_ioprio(rq)) : + IOPRIO_CLASS_NONE; } -static u8 dd_bio_ioclass(struct bio *bio) +static u8 dd_bio_ioclass(struct deadline_data *dd, struct bio *bio) { - return IOPRIO_PRIO_CLASS(bio->bi_ioprio); + return dd->prio_aging_expire ? IOPRIO_PRIO_CLASS(bio->bi_ioprio) : + IOPRIO_CLASS_NONE; } /* @@ -233,7 +235,7 @@ static void dd_request_merged(struct request_queue *q, struct request *req, enum elv_merge type) { struct deadline_data *dd = q->elevator->elevator_data; - const u8 ioprio_class = dd_rq_ioclass(req); + const u8 ioprio_class = dd_rq_ioclass(dd, req); const enum dd_prio prio = ioprio_class_to_prio[ioprio_class]; struct dd_per_prio *per_prio = &dd->per_prio[prio]; @@ -253,7 +255,7 @@ static void dd_merged_requests(struct request_queue *q, struct request *req, struct request *next) { struct deadline_data *dd = q->elevator->elevator_data; - const u8 ioprio_class = dd_rq_ioclass(next); + const u8 ioprio_class = dd_rq_ioclass(dd, next); const enum dd_prio prio = ioprio_class_to_prio[ioprio_class]; lockdep_assert_held(&dd->lock); @@ -550,7 +552,7 @@ static struct request *__dd_dispatch_request(struct deadline_data *dd, dd->batching++; deadline_move_request(dd, per_prio, rq); done: - ioprio_class = dd_rq_ioclass(rq); + ioprio_class = dd_rq_ioclass(dd, rq); prio = ioprio_class_to_prio[ioprio_class]; dd->per_prio[prio].latest_pos[data_dir] = blk_rq_pos(rq); dd->per_prio[prio].stats.dispatched++; @@ -749,7 +751,7 @@ static int dd_request_merge(struct request_queue *q, struct request **rq, struct bio *bio) { struct deadline_data *dd = q->elevator->elevator_data; - const u8 ioprio_class = dd_bio_ioclass(bio); + const u8 ioprio_class = dd_bio_ioclass(dd, bio); const enum dd_prio prio = ioprio_class_to_prio[ioprio_class]; struct dd_per_prio *per_prio = &dd->per_prio[prio]; sector_t sector = bio_end_sector(bio); @@ -814,7 +816,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, */ blk_req_zone_write_unlock(rq); - prio = ioprio_class_to_prio[dd_rq_ioclass(rq)]; + prio = ioprio_class_to_prio[dd_rq_ioclass(dd, rq)]; per_prio = &dd->per_prio[prio]; if (!rq->elv.priv[0]) { per_prio->stats.inserted++; @@ -923,7 +925,7 @@ static void dd_finish_request(struct request *rq) { struct request_queue *q = rq->q; struct deadline_data *dd = q->elevator->elevator_data; - const u8 ioprio_class = dd_rq_ioclass(rq); + const u8 ioprio_class = dd_rq_ioclass(dd, rq); const enum dd_prio prio = ioprio_class_to_prio[ioprio_class]; struct dd_per_prio *per_prio = &dd->per_prio[prio];