From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-fsdevel@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Christoph Hellwig <hch@lst.de>,
Niklas Cassel <Niklas.Cassel@wdc.com>,
Avri Altman <Avri.Altman@wdc.com>, Bean Huo <huobean@gmail.com>,
Daejun Park <daejun7.park@samsung.com>,
Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <dlemoal@kernel.org>,
Niklas Cassel <niklas.cassel@wdc.com>
Subject: [PATCH v2 02/15] blk-ioprio: Modify fewer bio->bi_ioprio bits
Date: Thu, 5 Oct 2023 12:40:48 -0700 [thread overview]
Message-ID: <20231005194129.1882245-3-bvanassche@acm.org> (raw)
In-Reply-To: <20231005194129.1882245-1-bvanassche@acm.org>
A later patch will store the data lifetime in the bio->bi_ioprio member
before the blk-ioprio policy is applied. Make sure that this policy doesn't
clear more bits than necessary.
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
block/blk-ioprio.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/blk-ioprio.c b/block/blk-ioprio.c
index 4051fada01f1..2db86f153b6d 100644
--- a/block/blk-ioprio.c
+++ b/block/blk-ioprio.c
@@ -202,7 +202,8 @@ void blkcg_set_ioprio(struct bio *bio)
* to achieve this.
*/
if (IOPRIO_PRIO_CLASS(bio->bi_ioprio) != IOPRIO_CLASS_RT)
- bio->bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_RT, 4);
+ ioprio_set_class_and_level(&bio->bi_ioprio,
+ IOPRIO_PRIO_VALUE(IOPRIO_CLASS_RT, 4));
return;
}
@@ -213,10 +214,10 @@ void blkcg_set_ioprio(struct bio *bio)
* If the bio I/O priority equals IOPRIO_CLASS_NONE, the cgroup I/O
* priority is assigned to the bio.
*/
- prio = max_t(u16, bio->bi_ioprio,
+ prio = max_t(u16, bio->bi_ioprio & IOPRIO_CLASS_LEVEL_MASK,
IOPRIO_PRIO_VALUE(blkcg->prio_policy, 0));
- if (prio > bio->bi_ioprio)
- bio->bi_ioprio = prio;
+ if (prio > (bio->bi_ioprio & IOPRIO_CLASS_LEVEL_MASK))
+ ioprio_set_class_and_level(&bio->bi_ioprio, prio);
}
void blk_ioprio_exit(struct gendisk *disk)
next prev parent reply other threads:[~2023-10-05 19:41 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-05 19:40 [PATCH v2 00/15] Pass data temperature information to UFS devices Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 01/15] block: Make bio_set_ioprio() modify fewer bio->bi_ioprio bits Bart Van Assche
2023-10-06 6:28 ` Kanchan Joshi
2023-10-06 18:20 ` Bart Van Assche
2023-10-10 5:22 ` Kanchan Joshi
2023-10-11 16:52 ` Bart Van Assche
2023-10-12 8:49 ` Kanchan Joshi
2023-10-12 14:03 ` Niklas Cassel
2023-10-12 17:42 ` Bart Van Assche
2023-10-05 19:40 ` Bart Van Assche [this message]
2023-10-06 6:36 ` [PATCH v2 02/15] blk-ioprio: Modify " Kanchan Joshi
2023-10-06 18:25 ` Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 03/15] block: Support data lifetime in the I/O priority bitfield Bart Van Assche
2023-10-06 6:42 ` Kanchan Joshi
2023-10-06 8:19 ` Damien Le Moal
2023-10-06 9:53 ` Niklas Cassel
2023-10-06 18:07 ` Bart Van Assche
2023-10-11 20:51 ` Bart Van Assche
2023-10-12 1:02 ` Damien Le Moal
2023-10-12 18:00 ` Bart Van Assche
2023-10-13 1:08 ` Damien Le Moal
2023-10-13 9:33 ` Niklas Cassel
2023-10-13 21:20 ` Bart Van Assche
2023-10-16 9:20 ` Niklas Cassel
2023-10-16 16:36 ` Bart Van Assche
2023-10-13 20:18 ` Bart Van Assche
2023-10-15 22:22 ` Damien Le Moal
2023-10-16 16:31 ` Bart Van Assche
2023-10-16 6:17 ` Christoph Hellwig
2023-10-16 16:32 ` Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 04/15] fs: Restore write hint support Bart Van Assche
2023-10-10 5:42 ` Kanchan Joshi
2023-10-11 16:56 ` Bart Van Assche
2023-10-16 6:20 ` Christoph Hellwig
2023-10-05 19:40 ` [PATCH v2 05/15] fs/f2fs: Restore the whint_mode mount option Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 06/15] scsi: core: Query the Block Limits Extension VPD page Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 07/15] scsi_proto: Add structures and constants related to I/O groups and streams Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 08/15] sd: Translate data lifetime information Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 09/15] scsi_debug: Reduce code duplication Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 10/15] scsi_debug: Support the block limits extension VPD page Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 11/15] scsi_debug: Rework page code error handling Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 12/15] scsi_debug: Rework subpage " Bart Van Assche
2023-10-05 19:40 ` [PATCH v2 13/15] scsi_debug: Implement the IO Advice Hints Grouping mode page Bart Van Assche
2023-10-05 19:41 ` [PATCH v2 14/15] scsi_debug: Implement GET STREAM STATUS Bart Van Assche
2023-10-05 19:41 ` [PATCH v2 15/15] scsi_debug: Maintain write statistics per group number Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231005194129.1882245-3-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=Avri.Altman@wdc.com \
--cc=Niklas.Cassel@wdc.com \
--cc=axboe@kernel.dk \
--cc=daejun7.park@samsung.com \
--cc=dlemoal@kernel.org \
--cc=hch@lst.de \
--cc=huobean@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).