From patchwork Thu Feb 22 09:22:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhaoyang.huang" X-Patchwork-Id: 13566930 Received: from SHSQR01.spreadtrum.com (mx1.unisoc.com [222.66.158.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39A99376FC; Thu, 22 Feb 2024 09:22:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=222.66.158.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708593779; cv=none; b=Uj7kPLpMP+XEgMTKb5xjaWX5RbrPPnbWT2L/nyKhT5N6d3mHWJi2ZafDe6a4YoMg2LisKNG99BDWkDvbH2uevkMFClVFeFgE/CpKHvSZbbzuKOVineYGS02Qg592evK9lt0zxvlbFvpVQCELg3E+nPO3r19oO5dSFVmvhEOd1K8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708593779; c=relaxed/simple; bh=ujbmUgxGOpenZbV+oP1/IFMPiRVz/EeLf/b+iP4JGxI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LuTSYzSVuVFn8MWNtAwpn9Oh5kptv5znEN8TYG3MZuLiO9d217l8qDLcrpW3vYljmzFnMpKH6k7KqNwIQynSCvSxGNstUMq+cdGIGZvld22LHdq00SdIO80H261g465/ZhXcf/NRKEl1qP5wgvpgVedegrVqUD0hDNcZ9yKviv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com; spf=pass smtp.mailfrom=unisoc.com; arc=none smtp.client-ip=222.66.158.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 41M9MQYU042352; Thu, 22 Feb 2024 17:22:26 +0800 (+08) (envelope-from zhaoyang.huang@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4TgSMK4dw3z2KL7sp; Thu, 22 Feb 2024 17:21:49 +0800 (CST) Received: from bj03382pcu01.spreadtrum.com (10.0.73.40) by BJMBX01.spreadtrum.com (10.0.64.7) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Thu, 22 Feb 2024 17:22:24 +0800 From: "zhaoyang.huang" To: Vincent Guittot , Jens Axboe , , , Zhaoyang Huang , Subject: [PATCHv2 2/2] block: adjust CFS request expire time Date: Thu, 22 Feb 2024 17:22:20 +0800 Message-ID: <20240222092220.642294-2-zhaoyang.huang@unisoc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240222092220.642294-1-zhaoyang.huang@unisoc.com> References: <20240222092220.642294-1-zhaoyang.huang@unisoc.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX01.spreadtrum.com (10.0.64.7) X-MAIL: SHSQR01.spreadtrum.com 41M9MQYU042352 From: Zhaoyang Huang According to current policy, CFS's may suffer involuntary IO-latency by being preempted by RT/DL tasks or IRQ since they possess the privilege for both of CPU and IO scheduler. This commit introduce an approximate and light method to decrease these affection by adjusting the expire time via the CFS's proportion among the whole cpu active time. The average utilization of cpu's run queue could reflect the historical active proportion of different types of task that can be proved valid for this goal from belowing three perspective, 1. All types of sched class's load(util) are tracked and calculated in the same way(using a geometric series which known as PELT) 2. Keep the legacy policy by NOT adjusting rq's position in fifo_list but only make changes over expire_time. 3. The fixed expire time(hundreds of ms) is in the same range of cpu avg_load's account series(the utilization will be decayed to 0.5 in 32ms) TaskA sched in | | | submit_bio | | | fifo_time = jiffies + expire (insert_request) TaskB sched in | | vfs_xxx | |preempted by RT,DL,IRQ |\ | This period time is unfair to TaskB's IO request, should be adjust |/ | submit_bio | | | fifo_time = jiffies + expire * CFS_PROPORTION(rq) (insert_request) Signed-off-by: Zhaoyang Huang --- change of v2: introduce direction and threshold to make the hack working as a guard for CFS's over-preempted. --- --- block/mq-deadline.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/block/mq-deadline.c b/block/mq-deadline.c index f958e79277b8..b477ba1bf6d2 100644 --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -54,6 +54,7 @@ enum dd_prio { enum { DD_PRIO_COUNT = 3 }; +#define CFS_PROP_THRESHOLD 60 /* * I/O statistics per I/O priority. It is fine if these counters overflow. * What matters is that these counters are at least as wide as @@ -802,6 +803,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, u8 ioprio_class = IOPRIO_PRIO_CLASS(ioprio); struct dd_per_prio *per_prio; enum dd_prio prio; + int fifo_expire; lockdep_assert_held(&dd->lock); @@ -828,6 +830,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, rq->fifo_time = jiffies; } else { struct list_head *insert_before; + unsigned long se_prop, rq_prop; deadline_add_rq_rb(per_prio, rq); @@ -839,8 +842,21 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, /* * set expire time and add to fifo list + * The expire time is adjusted when current CFS task is + * over-preempted by RT/DL/IRQ which is calculated by the + * proportion of cfs_rq's activation among whole cpu time during + * last several dozen's ms.Whearas, this would NOT affect the + * rq's position in fifo_list but only take effect when this + * rq is checked for its expire time when at head. */ - rq->fifo_time = jiffies + dd->fifo_expire[data_dir]; + fifo_expire = dd->fifo_expire[data_dir]; + if (data_dir == DD_READ && + cfs_prop_by_util(current, &se_prop, &rq_prop) && + rq_prop < CFS_PROP_THRESHOLD) + fifo_expire = dd->fifo_expire[data_dir] * rq_prop / 100; + + rq->fifo_time = jiffies + fifo_expire; + insert_before = &per_prio->fifo_list[data_dir]; #ifdef CONFIG_BLK_DEV_ZONED /*