Commit 52591f64 authored by Hongyu Jin's avatar Hongyu Jin Committed by Wen Zhiwei
Browse files

block: Fix where bio IO priority gets set 

stable inclusion
from stable-v6.6.53
commit c20e89c96f1446b68b4e63db8cec66a2d3f4de70
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ0GM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c20e89c96f1446b68b4e63db8cec66a2d3f4de70



--------------------------------

[ Upstream commit f3c89983cb4fc00be64eb0d5cbcfcdf2cacb965e ]

Commit 82b74cac ("blk-ioprio: Convert from rqos policy to direct
call") pushed setting bio I/O priority down into blk_mq_submit_bio()
-- which is too low within block core's submit_bio() because it
skips setting I/O priority for block drivers that implement
fops->submit_bio() (e.g. DM, MD, etc).

Fix this by moving bio_set_ioprio() up from blk-mq.c to blk-core.c and
call it from submit_bio().  This ensures all block drivers call
bio_set_ioprio() during initial bio submission.

Fixes: a78418e6 ("block: Always initialize bio IO priority on submit")
Co-developed-by: default avatarYibin Ding <yibin.ding@unisoc.com>
Signed-off-by: default avatarYibin Ding <yibin.ding@unisoc.com>
Signed-off-by: default avatarHongyu Jin <hongyu.jin@unisoc.com>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarMikulas Patocka <mpatocka@redhat.com>
[snitzer: revised commit header]
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20240130202638.62600-2-snitzer@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 366d85fb

block/blk-core.c

+10 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "blk-pm.h"

#include "blk-cgroup.h"

#include "blk-throttle.h"

#include "blk-ioprio.h"



struct dentry *blk_debugfs_root;
@@ -847,6 +848,14 @@ void submit_bio_noacct(struct bio *bio) 
}

EXPORT_SYMBOL(submit_bio_noacct);



static void bio_set_ioprio(struct bio *bio)

{

	/* Nobody set ioprio so far? Initialize it based on task's nice value */

	if (IOPRIO_PRIO_CLASS(bio->bi_ioprio) == IOPRIO_CLASS_NONE)

		bio->bi_ioprio = get_current_ioprio();

	blkcg_set_ioprio(bio);

}



/**

 * submit_bio - submit a bio to the block device layer for I/O

 * @bio: The &struct bio which describes the I/O
@@ -869,6 +878,7 @@ void submit_bio(struct bio *bio) 
		count_vm_events(PGPGOUT, bio_sectors(bio));

	}



	bio_set_ioprio(bio);

	submit_bio_noacct(bio);

}

EXPORT_SYMBOL(submit_bio);

block/blk-mq.c

+0 −10
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "blk-stat.h"

#include "blk-mq-sched.h"

#include "blk-rq-qos.h"

#include "blk-ioprio.h"



static DEFINE_PER_CPU(struct llist_head, blk_cpu_done);

static DEFINE_PER_CPU(call_single_data_t, blk_cpu_csd);
@@ -2970,14 +2969,6 @@ static bool blk_mq_can_use_cached_rq(struct request *rq, struct blk_plug *plug, 
	return true;

}



static void bio_set_ioprio(struct bio *bio)

{

	/* Nobody set ioprio so far? Initialize it based on task's nice value */

	if (IOPRIO_PRIO_CLASS(bio->bi_ioprio) == IOPRIO_CLASS_NONE)

		bio->bi_ioprio = get_current_ioprio();

	blkcg_set_ioprio(bio);

}



/**

 * blk_mq_submit_bio - Create and send a request to block device.

 * @bio: Bio pointer.
@@ -3002,7 +2993,6 @@ void blk_mq_submit_bio(struct bio *bio) 
	blk_status_t ret;



	bio = blk_queue_bounce(bio, q);

	bio_set_ioprio(bio);



	if (plug) {

		rq = rq_list_peek(&plug->cached_rq);