Unverified Commit 413aaa51 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4211 blk-mq: avoid housekeeping CPUs scheduling a worker on a non-housekeeping CPU 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C27GJUUI43R2EGDZWJS3UOUDKDS5R5NK/ 
 
https://gitee.com/openeuler/kernel/issues/I8YB4M 
 
Link:https://gitee.com/openeuler/kernel/pulls/4211

 

Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents cf2950c7 5f205417

block/blk-mq.c

+10 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/sched/sysctl.h>

#include <linux/sched/topology.h>

#include <linux/sched/signal.h>

#include <linux/sched/isolation.h>

#include <linux/delay.h>

#include <linux/crash_dump.h>

#include <linux/prefetch.h>
@@ -2223,9 +2224,17 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx) 
 */

void blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs)

{

	int work_cpu;



	if (unlikely(blk_mq_hctx_stopped(hctx)))

		return;

	kblockd_mod_delayed_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work,



	if (enhanced_isolcpus && tick_nohz_full_enabled() &&

	    housekeeping_cpu(raw_smp_processor_id(), HK_TYPE_WQ))

		work_cpu = raw_smp_processor_id();

	else

		work_cpu = blk_mq_hctx_next_cpu(hctx);

	kblockd_mod_delayed_work_on(work_cpu, &hctx->run_work,

				    msecs_to_jiffies(msecs));

}

EXPORT_SYMBOL(blk_mq_delay_run_hw_queue);

include/linux/sched/isolation.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ enum hk_type { 
};



#ifdef CONFIG_CPU_ISOLATION

extern bool enhanced_isolcpus;

DECLARE_STATIC_KEY_FALSE(housekeeping_overridden);

extern int housekeeping_any_cpu(enum hk_type type);

extern const struct cpumask *housekeeping_cpumask(enum hk_type type);
@@ -29,6 +30,8 @@ extern void __init housekeeping_init(void); 


#else



#define enhanced_isolcpus 0



static inline int housekeeping_any_cpu(enum hk_type type)

{

	return smp_processor_id();

kernel/sched/isolation.c

+8 −0
Original line number Diff line number Diff line
@@ -239,3 +239,11 @@ static int __init housekeeping_isolcpus_setup(char *str) 
	return housekeeping_setup(str, flags);

}

__setup("isolcpus=", housekeeping_isolcpus_setup);



bool enhanced_isolcpus;

static int __init enhanced_isolcpus_setup(char *str)

{

	enhanced_isolcpus = true;

	return 0;

}

__setup("enhanced_isolcpus", enhanced_isolcpus_setup);