From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63CD4C47422 for ; Fri, 26 Jan 2024 08:00:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC0FA6B00CA; Fri, 26 Jan 2024 03:00:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D70C36B00CB; Fri, 26 Jan 2024 03:00:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C39106B00CC; Fri, 26 Jan 2024 03:00:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B2D166B00CA for ; Fri, 26 Jan 2024 03:00:05 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2F58AA18AB for ; Fri, 26 Jan 2024 08:00:05 +0000 (UTC) X-FDA: 81720713970.21.F3D8BD7 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by imf23.hostedemail.com (Postfix) with ESMTP id 40E7014001E for ; Fri, 26 Jan 2024 08:00:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WTHGoaax; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of huangzhaoyang@gmail.com designates 209.85.167.41 as permitted sender) smtp.mailfrom=huangzhaoyang@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706256002; a=rsa-sha256; cv=none; b=DN+0lekWp701j7MwKgWFjBZ/dqgqwLs67HJQpr9SJn4A3o6WImGWrDn+g+17KNQxCQA0l1 2slmvCLiqOhn8fJml4DDJe6FWeRuIzTgOA+/gyFbZvyreSUkndwsyZrX4kcxwonbt8xpTP RgiaT6auwjOPSGcmMyLsNuyHZWkoGYw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WTHGoaax; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of huangzhaoyang@gmail.com designates 209.85.167.41 as permitted sender) smtp.mailfrom=huangzhaoyang@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706256002; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/8hqt2SFHfJ4q86HFT49vy1zOoWWvxgjVKCrnK0jkDQ=; b=bbni/HB7559o5QvoZeTc0lokAH13kLQloRgGZ7YRapabIQoLIxzVnXphEMMhFo8pEGdRbS YKl+nZdJvfyow+snn0qDYuboKHYPbPNd83eXbDXhikaBb5rcNnFwmltJnsOGL0bRIGRxOK IQdlCJTFfZxrhA0sxjEtprgJRaHtBx8= Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-51005675963so554770e87.0 for ; Fri, 26 Jan 2024 00:00:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706256000; x=1706860800; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=/8hqt2SFHfJ4q86HFT49vy1zOoWWvxgjVKCrnK0jkDQ=; b=WTHGoaaxALhuPMWzy+aBv/vjFAZekK+sW5SItg1SKOgsqfFh2c10V1difQKbt+mH9+ mphAR3Ij/0wCBYTCtWGT3hUDblWwjrMTMlnG9eAnMbKi3brjTex+tO7xMTsXPHRsnWPQ OxZJ86XmzT7nX4j7hWUBIRDlmEJyBcyrsFO/ov9tcPh2SIIsZRx1jjEUueplSHCspQL/ Uc54xP1L+wgQPlyqKTdl7U4CSCydglyHInFtx1YdKchJVzyJtS+/Da45ME++4zJRYjCI UVgPxsl3DTQiWDIwCZ+8fPKpRWnGmnFm0pZOdoRMwHq8wS9/KuN2aobLd5zfbEqwolWM 8XmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706256000; x=1706860800; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/8hqt2SFHfJ4q86HFT49vy1zOoWWvxgjVKCrnK0jkDQ=; b=YFgnGRH2GzWbmibb99XpznGV1yPjo/hJIutMnSHS99CDE/Bvd3Z6mARHehQxOe5eT/ 2OskmkQOz92Wt2r0qmEFVaQZwABgWaBY5ducWTNOaJftsgPBNNwxqZewfOyc9Ss9GSFk Zunky08Jxo8dV4oBGLIodyjnIIquguijZPugdgww8NtvyV2yrUL9h2kRLPiUghwFQqIR KKRNcwKqazG7ONPgOEDHCKRTXLSrQSRZVJ7KBallIkVWhJSX7OMbU8lvDYdx6UGFSsm/ H4VFa33QP6qrxp+Z3szVtPn/P5Lp+3Lc3XCP95VaEsqlXefKN3NL9YQLRFH2sAxX7WIJ 8JcA== X-Gm-Message-State: AOJu0YyK/8H3lcp6dc/mXAS3Z3uMuThZ37E39tsyD49G9h13Illc8TK3 RVl2GJgfgY2vcxfqFKwmDMPg9cmugqswYj9XfR8PwUrxKMJI5VXg5ZbWbIa2dgH5uzF9jXlhE95 0FHI1iIVKMob+l5LRc0cl1MTbkD4= X-Google-Smtp-Source: AGHT+IHCgCuxb4c2ngXVrYMFx9oVSfgBF9mfeeCBMXL3orNFZBA2hzGGkT7mfAZ9oxWspVLQvpi/MzClMoasYmg7sck= X-Received: by 2002:a19:ad08:0:b0:510:11de:c384 with SMTP id t8-20020a19ad08000000b0051011dec384mr325378lfc.55.1706255999939; Thu, 25 Jan 2024 23:59:59 -0800 (PST) MIME-Version: 1.0 References: <20240125071901.3223188-1-zhaoyang.huang@unisoc.com> In-Reply-To: <20240125071901.3223188-1-zhaoyang.huang@unisoc.com> From: Zhaoyang Huang Date: Fri, 26 Jan 2024 15:59:48 +0800 Message-ID: Subject: Re: [PATCHv3 1/1] block: introduce content activity based ioprio To: "zhaoyang.huang" , Matthew Wilcox , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org Cc: Andrew Morton , Jens Axboe , Yu Zhao , Damien Le Moal , Niklas Cassel , "Martin K . Petersen" , Hannes Reinecke , Linus Walleij , linux-mm@kvack.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, steve.kang@unisoc.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 40E7014001E X-Stat-Signature: uusuj9nzwut657sc3sg18cxost6kb39t X-HE-Tag: 1706256001-420163 X-HE-Meta: U2FsdGVkX18a12DzmIjOnQfAFbSl/+96yTbMTCCUzPcWqHSbd4vEkDg0V/xvEN/EiudlMg2rv+SdkhBVxrK/5erR+yelLRB3ev6tWK17d8UQRy0B4sTzlyh+gTone4tkQRLrbWo5D+PpBkU5Kdr1t7P16a1/ea5Smev9zlCuiJVvOb5XJRcG0ZqxVOMns1rgyM5hCIaZF3Yb18/yfYoBgeztcW8LHlbtS0oApW697NhmjDdJhRNrtQD1RMZi1SHMX8QERQa0czmesatmMCLkgi89+4ebqTjJp13drpos0yOyWnxMJ3bbizVvxwEhMQr5gy5u4KjsC9vSh6bMD8EYrbvysURc+4loI9J5CRI9XPg9S3hzD3Mp2PevXL39Pc86PEM5Jp0NLRnc88PJYz+vDJdLNBR6w5sNp5lu5PJmE7aUuSkeEPkKt72PDa/YXydnAzANWN+y7adZIOSy6MCyaBkE3PBK+iHGUXOJvVAGh7VEY+fRMHBiffAL4lzrJSv5jcwJ3AN4awQSgc6TEC1IvdV313ulvqwjYPjTJ15YwQf0ThUW8yxMB3zzggT9FukDpzeaN44j11Se3gs0bSpFVNnqi0bUn9Tswkrisb0FUeCJQ0sWqo3k77FznRrqghI5qQqpRVv6R5Xi9RADGEzZQE2Ax4GYG5evIQmqC7GC7UJEcQc4eGxYiYquH5nCMl30lNJfYunRd2JbAIkji2TNyC6Y3zBc6/5HXkG1BYXy2gI5mnFVAgYb3A8MFM5ZCA5cxrHuc+1Eykgti20/6lKg768di1r7GRhl1xqVegfAmYhRn+TootuBafA/1GeYMejCcE5KkB8pCjVaH04qgJYZ70Ao+V+ZSwaLxsd468I7JqiYiWE+FsX/p+WkuwDmRGz/bGbbusBM5pAHnw6UjO7WV8ds7EMEKjcHf/4/WjiaPJbUnmsYQ0nnyaj40F/aYiv9OizgaRn0oqQZJ1loA0E Dw/Mk7yT C7IrYHOeeasAAD4io0Dca4oUIlPF+Pdi92BaQXmxUOpbwJWZy0K11bu93L83J6iH0lYglCXj/A5C3t3EI2r9cJ05BTKRr/8THdE95AfMMWZh4Aoc2KPuEp3sGJQBFLA0u58W1pduX1F7hSHuVcE5KEKLEYgFUYKgjKPRIaVb9aDcR5ViViKNqRY0kl5QxIcojfYxXIyOCktSaCMEnEg0D7I4OgVLQ4pqAB/TICC73iNQ33bE0lHL2t9AZdpXMRsOw1ouMiW+YuQsidl7eSKJL5m//gwpw7hGEcVbKnsZs1DywJ/pD0Ve/kOjjdml3EEXy4STNUqZbY27GZ/cN8ddZ0KvhcQPSGnHLfRyvAPnz+QtsH75iOuX1CGpuUMM+KkiooPj8pcrY3ybaLP3E4FJpswAONRRQyMK7U8rE X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: loop more mm and fs guys for more comments On Thu, Jan 25, 2024 at 3:22=E2=80=AFPM zhaoyang.huang wrote: > > From: Zhaoyang Huang > > Currently, request's ioprio are set via task's schedule priority(when no > blkcg configured), which has high priority tasks possess the privilege on > both of CPU and IO scheduling. > This commit works as a hint of original policy by promoting the request i= oprio > based on the page/folio's activity. The original idea comes from LRU_GEN > which provides more precised folio activity than before. This commit try > to adjust the request's ioprio when certain part of its folios are hot, > which indicate that this request carry important contents and need be > scheduled ealier. > > This commit is verified on a v6.6 6GB RAM android14 system via 4 test cas= es > by changing the bio_add_page/folio API in ext4 and f2fs. > > Case 1: > script[a] which get significant improved fault time as expected[b] > where dd's cost also shrink from 55s to 40s. > (1). fault_latency.bin is an ebpf based test tool which measure all task'= s > iowait latency during page fault when scheduled out/in. > (2). costmem generate page fault by mmaping a file and access the VA. > (3). dd generate concurrent vfs io. > > [a] > ./fault_latency.bin 1 5 > /data/dd_costmem & > costmem -c0 -a2048000 -b128000 -o0 1>/dev/null & > costmem -c0 -a2048000 -b128000 -o0 1>/dev/null & > costmem -c0 -a2048000 -b128000 -o0 1>/dev/null & > costmem -c0 -a2048000 -b128000 -o0 1>/dev/null & > dd if=3D/dev/block/sda of=3D/data/ddtest bs=3D1024 count=3D2048000 & > dd if=3D/dev/block/sda of=3D/data/ddtest1 bs=3D1024 count=3D2048000 & > dd if=3D/dev/block/sda of=3D/data/ddtest2 bs=3D1024 count=3D2048000 & > dd if=3D/dev/block/sda of=3D/data/ddtest3 bs=3D1024 count=3D2048000 > [b] > mainline commit > io wait 836us 156us > > Case 2: > fio -filename=3D/dev/block/by-name/userdata -rw=3Drandread -direct=3D0 -b= s=3D4k -size=3D2000M -numjobs=3D8 -group_reporting -name=3Dmytest > mainline: 513MiB/s > READ: bw=3D531MiB/s (557MB/s), 531MiB/s-531MiB/s (557MB/s-557MB/s), io=3D= 15.6GiB (16.8GB), run=3D30137-30137msec > READ: bw=3D543MiB/s (569MB/s), 543MiB/s-543MiB/s (569MB/s-569MB/s), io=3D= 15.6GiB (16.8GB), run=3D29469-29469msec > READ: bw=3D474MiB/s (497MB/s), 474MiB/s-474MiB/s (497MB/s-497MB/s), io=3D= 15.6GiB (16.8GB), run=3D33724-33724msec > READ: bw=3D535MiB/s (561MB/s), 535MiB/s-535MiB/s (561MB/s-561MB/s), io=3D= 15.6GiB (16.8GB), run=3D29928-29928msec > READ: bw=3D523MiB/s (548MB/s), 523MiB/s-523MiB/s (548MB/s-548MB/s), io=3D= 15.6GiB (16.8GB), run=3D30617-30617msec > READ: bw=3D492MiB/s (516MB/s), 492MiB/s-492MiB/s (516MB/s-516MB/s), io=3D= 15.6GiB (16.8GB), run=3D32518-32518msec > READ: bw=3D533MiB/s (559MB/s), 533MiB/s-533MiB/s (559MB/s-559MB/s), io=3D= 15.6GiB (16.8GB), run=3D29993-29993msec > READ: bw=3D524MiB/s (550MB/s), 524MiB/s-524MiB/s (550MB/s-550MB/s), io=3D= 15.6GiB (16.8GB), run=3D30526-30526msec > READ: bw=3D529MiB/s (554MB/s), 529MiB/s-529MiB/s (554MB/s-554MB/s), io=3D= 15.6GiB (16.8GB), run=3D30269-30269msec > READ: bw=3D449MiB/s (471MB/s), 449MiB/s-449MiB/s (471MB/s-471MB/s), io=3D= 15.6GiB (16.8GB), run=3D35629-35629msec > > commit: 633MiB/s > READ: bw=3D668MiB/s (700MB/s), 668MiB/s-668MiB/s (700MB/s-700MB/s), io=3D= 15.6GiB (16.8GB), run=3D23952-23952msec > READ: bw=3D589MiB/s (618MB/s), 589MiB/s-589MiB/s (618MB/s-618MB/s), io=3D= 15.6GiB (16.8GB), run=3D27164-27164msec > READ: bw=3D638MiB/s (669MB/s), 638MiB/s-638MiB/s (669MB/s-669MB/s), io=3D= 15.6GiB (16.8GB), run=3D25071-25071msec > READ: bw=3D714MiB/s (749MB/s), 714MiB/s-714MiB/s (749MB/s-749MB/s), io=3D= 15.6GiB (16.8GB), run=3D22409-22409msec > READ: bw=3D600MiB/s (629MB/s), 600MiB/s-600MiB/s (629MB/s-629MB/s), io=3D= 15.6GiB (16.8GB), run=3D26669-26669msec > READ: bw=3D592MiB/s (621MB/s), 592MiB/s-592MiB/s (621MB/s-621MB/s), io=3D= 15.6GiB (16.8GB), run=3D27036-27036msec > READ: bw=3D691MiB/s (725MB/s), 691MiB/s-691MiB/s (725MB/s-725MB/s), io=3D= 15.6GiB (16.8GB), run=3D23150-23150msec > READ: bw=3D569MiB/s (596MB/s), 569MiB/s-569MiB/s (596MB/s-596MB/s), io=3D= 15.6GiB (16.8GB), run=3D28142-28142msec > READ: bw=3D563MiB/s (590MB/s), 563MiB/s-563MiB/s (590MB/s-590MB/s), io=3D= 15.6GiB (16.8GB), run=3D28429-28429msec > READ: bw=3D712MiB/s (746MB/s), 712MiB/s-712MiB/s (746MB/s-746MB/s), io=3D= 15.6GiB (16.8GB), run=3D22478-22478msec > > Case 3: > This commit is also verified by the case of launching camera APP which is > usually considered as heavy working load on both of memory and IO, which > shows 12%-24% improvement. > > ttl =3D 0 ttl =3D 50 ttl =3D 100 > mainline 2267ms 2420ms 2316ms > commit 1992ms 1806ms 1998ms > > case 4: > androbench has no improvment as well as regression which supposed to be > its test time is short which MGLRU hasn't take effect yet. > > Signed-off-by: Zhaoyang Huang > --- > change of v2: calculate page's activity via helper function > change of v3: solve layer violation by move API into mm > change of v4: keep block clean by removing the page related API > --- > --- > include/linux/act_ioprio.h | 62 +++++++++++++++++++++++++++++++++++++ > include/uapi/linux/ioprio.h | 44 +++++++++++++++++++++++--- > mm/Kconfig | 8 +++++ > 3 files changed, 110 insertions(+), 4 deletions(-) > create mode 100644 include/linux/act_ioprio.h > > diff --git a/include/linux/act_ioprio.h b/include/linux/act_ioprio.h > new file mode 100644 > index 000000000000..8cfb3df270bd > --- /dev/null > +++ b/include/linux/act_ioprio.h > @@ -0,0 +1,62 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +#ifndef _ACT_IOPRIO_H > +#define _ACT_IOPRIO_H > + > +#include > + > +#ifdef CONFIG_CONTENT_ACT_BASED_IOPRIO > +bool BIO_ADD_FOLIO(struct bio *bio, struct folio *folio, size_t len, > + size_t off) > +{ > + int class, level, hint, activity; > + > + if (len > UINT_MAX || off > UINT_MAX) > + return false; > + > + class =3D IOPRIO_PRIO_CLASS(bio->bi_ioprio); > + level =3D IOPRIO_PRIO_LEVEL(bio->bi_ioprio); > + hint =3D IOPRIO_PRIO_HINT(bio->bi_ioprio); > + activity =3D IOPRIO_PRIO_ACTIVITY(bio->bi_ioprio); > + > + activity +=3D (bio->bi_vcnt + 1 <=3D IOPRIO_NR_ACTIVITY && > + PageWorkingset(&folio->page)) ? 1 : 0; > + if (activity >=3D bio->bi_vcnt / 2) > + class =3D IOPRIO_CLASS_RT; > + else if (activity >=3D bio->bi_vcnt / 4) > + class =3D max(IOPRIO_PRIO_CLASS(get_current_ioprio()), IO= PRIO_CLASS_BE); > + > + bio->bi_ioprio =3D IOPRIO_PRIO_VALUE_ACTIVITY(class, level, hint,= activity); > + > + return bio_add_page(bio, &folio->page, len, off) > 0; > +} > + > +int BIO_ADD_PAGE(struct bio *bio, struct page *page, > + unsigned int len, unsigned int offset) > +{ > + int class, level, hint, activity; > + > + if (bio_add_page(bio, page, len, offset) > 0) { > + class =3D IOPRIO_PRIO_CLASS(bio->bi_ioprio); > + level =3D IOPRIO_PRIO_LEVEL(bio->bi_ioprio); > + hint =3D IOPRIO_PRIO_HINT(bio->bi_ioprio); > + activity =3D IOPRIO_PRIO_ACTIVITY(bio->bi_ioprio); > + activity +=3D (bio->bi_vcnt <=3D IOPRIO_NR_ACTIVITY && Pa= geWorkingset(page)) ? 1 : 0; > + bio->bi_ioprio =3D IOPRIO_PRIO_VALUE_ACTIVITY(class, leve= l, hint, activity); > + } > + > + return len; > +} > +#else > +bool BIO_ADD_FOLIO(struct bio *bio, struct folio *folio, size_t len, > + size_t off) > +{ > + return bio_add_folio(bio, folio, len, off); > +} > + > +int BIO_ADD_PAGE(struct bio *bio, struct page *page, > + unsigned int len, unsigned int offset) > +{ > + return bio_add_page(bio, page, len, offset); > +} > +#endif > +#endif > diff --git a/include/uapi/linux/ioprio.h b/include/uapi/linux/ioprio.h > index bee2bdb0eedb..f933af54d71e 100644 > --- a/include/uapi/linux/ioprio.h > +++ b/include/uapi/linux/ioprio.h > @@ -71,12 +71,24 @@ enum { > * class and level. > */ > #define IOPRIO_HINT_SHIFT IOPRIO_LEVEL_NR_BITS > +#ifdef CONFIG_CONTENT_ACT_BASED_IOPRIO > +#define IOPRIO_HINT_NR_BITS 3 > +#else > #define IOPRIO_HINT_NR_BITS 10 > +#endif > #define IOPRIO_NR_HINTS (1 << IOPRIO_HINT_NR_BITS= ) > #define IOPRIO_HINT_MASK (IOPRIO_NR_HINTS - 1) > #define IOPRIO_PRIO_HINT(ioprio) \ > (((ioprio) >> IOPRIO_HINT_SHIFT) & IOPRIO_HINT_MASK) > > +#ifdef CONFIG_CONTENT_ACT_BASED_IOPRIO > +#define IOPRIO_ACTIVITY_SHIFT (IOPRIO_HINT_NR_BITS + IOPRIO_LEV= EL_NR_BITS) > +#define IOPRIO_ACTIVITY_NR_BITS 7 > +#define IOPRIO_NR_ACTIVITY (1 << IOPRIO_ACTIVITY_NR_BITS) > +#define IOPRIO_ACTIVITY_MASK (IOPRIO_NR_ACTIVITY - 1) > +#define IOPRIO_PRIO_ACTIVITY(ioprio) \ > + (((ioprio) >> IOPRIO_ACTIVITY_SHIFT) & IOPRIO_ACTIVITY_MASK) > +#endif > /* > * I/O hints. > */ > @@ -104,24 +116,48 @@ enum { > > #define IOPRIO_BAD_VALUE(val, max) ((val) < 0 || (val) >=3D (max)) > > +#ifndef CONFIG_CONTENT_ACT_BASED_IOPRIO > /* > * Return an I/O priority value based on a class, a level and a hint. > */ > static __always_inline __u16 ioprio_value(int prioclass, int priolevel, > - int priohint) > + int priohint) > { > if (IOPRIO_BAD_VALUE(prioclass, IOPRIO_NR_CLASSES) || > - IOPRIO_BAD_VALUE(priolevel, IOPRIO_NR_LEVELS) || > - IOPRIO_BAD_VALUE(priohint, IOPRIO_NR_HINTS)) > + IOPRIO_BAD_VALUE(priolevel, IOPRIO_NR_LEVELS) || > + IOPRIO_BAD_VALUE(priohint, IOPRIO_NR_HINTS)) > return IOPRIO_CLASS_INVALID << IOPRIO_CLASS_SHIFT; > > return (prioclass << IOPRIO_CLASS_SHIFT) | > (priohint << IOPRIO_HINT_SHIFT) | priolevel; > } > - > #define IOPRIO_PRIO_VALUE(prioclass, priolevel) \ > ioprio_value(prioclass, priolevel, IOPRIO_HINT_NONE) > #define IOPRIO_PRIO_VALUE_HINT(prioclass, priolevel, priohint) \ > ioprio_value(prioclass, priolevel, priohint) > +#else > +/* > + * Return an I/O priority value based on a class, a level and a hint. > + */ > +static __always_inline __u16 ioprio_value(int prioclass, int priolevel, > + int priohint, int activity) > +{ > + if (IOPRIO_BAD_VALUE(prioclass, IOPRIO_NR_CLASSES) || > + IOPRIO_BAD_VALUE(priolevel, IOPRIO_NR_LEVELS) || > + IOPRIO_BAD_VALUE(priohint, IOPRIO_NR_HINTS) || > + IOPRIO_BAD_VALUE(activity, IOPRIO_NR_ACTIVITY)) > + return IOPRIO_CLASS_INVALID << IOPRIO_CLASS_SHIFT; > > + return (prioclass << IOPRIO_CLASS_SHIFT) | > + (activity << IOPRIO_ACTIVITY_SHIFT) | > + (priohint << IOPRIO_HINT_SHIFT) | priolevel; > +} > + > +#define IOPRIO_PRIO_VALUE(prioclass, priolevel) \ > + ioprio_value(prioclass, priolevel, IOPRIO_HINT_NONE, 0) > +#define IOPRIO_PRIO_VALUE_HINT(prioclass, priolevel, priohint) \ > + ioprio_value(prioclass, priolevel, priohint, 0) > +#define IOPRIO_PRIO_VALUE_ACTIVITY(prioclass, priolevel, priohint, activ= ity) \ > + ioprio_value(prioclass, priolevel, priohint, activity) > +#endif > #endif /* _UAPI_LINUX_IOPRIO_H */ > diff --git a/mm/Kconfig b/mm/Kconfig > index 264a2df5ecf5..e0e5a5a44ded 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -1240,6 +1240,14 @@ config LRU_GEN_STATS > from evicted generations for debugging purpose. > > This option has a per-memcg and per-node memory overhead. > + > +config CONTENT_ACT_BASED_IOPRIO > + bool "Enable content activity based ioprio" > + depends on LRU_GEN > + default n > + help > + This item enable the feature of adjust bio's priority by > + calculating its content's activity. > # } > > config ARCH_SUPPORTS_PER_VMA_LOCK > -- > 2.25.1 >