From: Tejun Heo <tj@kernel.org> To: axboe@kernel.dk, newella@fb.com, clm@fb.com, josef@toxicpanda.com, dennisz@fb.com, lizefan@huawei.com, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH 11/10] block: omit request->pre_start_time_ns if !CONFIG_BLK_CGROUP_IOCOST work-conserving porportional controller Date: Wed, 10 Jul 2019 14:21:42 -0700 Message-ID: <20190710212142.GP657710@devbig004.ftw2.facebook.com> (raw) In-Reply-To: <20190710205128.1316483-1-tj@kernel.org> From e2693136fa64d5c9dde73d2d663bde84f8326877 Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Wed, 10 Jul 2019 14:18:12 -0700 request->pre_start_time is currently only used by the iocost controller. Let's omit the field if disabled and avoid wasting space in struct request. Signed-off-by: Tejun Heo <tj@kernel.org> Suggested-by: Jens Axboe <axboe@kernel.dk> --- The git branch is updated accordingly. Thanks. block/blk-mq.c | 2 ++ include/linux/blkdev.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/block/blk-mq.c b/block/blk-mq.c index 90b46988cc02..ce96bcd7e260 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -325,7 +325,9 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, RB_CLEAR_NODE(&rq->rb_node); rq->rq_disk = NULL; rq->part = NULL; +#ifdef CONFIG_BLK_CGROUP_IOCOST rq->pre_start_time_ns = pre_start_time_ns; +#endif if (blk_mq_need_time_stamp(rq)) rq->start_time_ns = ktime_get_ns(); else diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4247a9bc44b7..2425af6d3f5e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -194,8 +194,10 @@ struct request { struct gendisk *rq_disk; struct hd_struct *part; +#ifdef CONFIG_BLK_CGROUP_IOCOST /* Time that the first bio started allocating this request. */ u64 pre_start_time_ns; +#endif /* Time that this request was allocated for this IO. */ u64 start_time_ns; /* Time that I/O was submitted to the device. */ @@ -635,8 +637,13 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q); test_bit(QUEUE_FLAG_SCSI_PASSTHROUGH, &(q)->queue_flags) #define blk_queue_pci_p2pdma(q) \ test_bit(QUEUE_FLAG_PCI_P2PDMA, &(q)->queue_flags) + +#ifdef CONFIG_BLK_CGROUP_IOCOST #define blk_queue_rec_prestart(q) \ test_bit(QUEUE_FLAG_REC_PRESTART, &(q)->queue_flags) +#else +#define blk_queue_rec_prestart(q) false +#endif #define blk_noretry_request(rq) \ ((rq)->cmd_flags & (REQ_FAILFAST_DEV|REQ_FAILFAST_TRANSPORT| \ -- 2.17.1
prev parent reply index Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-10 20:51 [PATCHSET v2 block/for-linus] IO cost model based " Tejun Heo 2019-07-10 20:51 ` [PATCH 01/10] blkcg: pass @q and @blkcg into blkcg_pol_alloc_pd_fn() Tejun Heo 2019-07-10 20:51 ` [PATCH 02/10] blkcg: make ->cpd_init_fn() optional Tejun Heo 2019-07-10 20:51 ` [PATCH 03/10] blkcg: separate blkcg_conf_get_disk() out of blkg_conf_prep() Tejun Heo 2019-07-10 20:51 ` [PATCH 04/10] block/rq_qos: add rq_qos_merge() Tejun Heo 2019-07-10 20:51 ` [PATCH 05/10] block/rq_qos: implement rq_qos_ops->queue_depth_changed() Tejun Heo 2019-07-10 20:51 ` [PATCH 06/10] blkcg: s/RQ_QOS_CGROUP/RQ_QOS_LATENCY/ Tejun Heo 2019-07-10 20:51 ` [PATCH 07/10] blk-mq: add optional request->pre_start_time_ns Tejun Heo 2019-07-10 20:51 ` [PATCH 08/10] blkcg: implement blk-iocost Tejun Heo 2019-07-10 20:51 ` [PATCH 09/10] blkcg: add tools/cgroup/iocost_monitor.py Tejun Heo 2019-07-10 20:51 ` [PATCH 10/10] blkcg: add tools/cgroup/iocost_coef_gen.py Tejun Heo 2019-07-10 21:21 ` Tejun Heo [this message]
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=20190710212142.GP657710@devbig004.ftw2.facebook.com \ --to=tj@kernel.org \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=clm@fb.com \ --cc=dennisz@fb.com \ --cc=hannes@cmpxchg.org \ --cc=josef@toxicpanda.com \ --cc=kernel-team@fb.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lizefan@huawei.com \ --cc=newella@fb.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
Linux-Block Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-block/0 linux-block/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-block linux-block/ https://lore.kernel.org/linux-block \ linux-block@vger.kernel.org public-inbox-index linux-block Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-block AGPL code for this site: git clone https://public-inbox.org/public-inbox.git