Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp693233imj; Sat, 9 Feb 2019 06:08:30 -0800 (PST) X-Google-Smtp-Source: AHgI3IZEz26iFa/F17zRjKjUF1+eVPLw2jFGMlYwm5m1/7ikBedqcggnSGcBBqqdZV+rmLis29zx X-Received: by 2002:a62:2b8b:: with SMTP id r133mr27726766pfr.246.1549721310064; Sat, 09 Feb 2019 06:08:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549721310; cv=none; d=google.com; s=arc-20160816; b=hcw33PUv2CFBTldpB+z4VDYSJwnF9x2UY2UxazBcpVi2ifBxHY+OAYl0gyhWaBcm8j nqFsy//oLTTKHeCaPZWJZzIqWgcZoD7N7e7Q2YKiZAGHnEL+JaybMdF8UkcFvObqrTnv /JtVeDrreu3g7Guo/dFoaTCxm0/RpfYw4TKKyrLAydukIuvJKcHioF86ToIcsSCkIjk/ 4g8OPn01sWU0lGajVc7Xp8DR947duE1ZUQ7+mOuLqA2J6ZJmXOiLStVkuXxaLbONI3d9 veZzZZQej0i3C7itJX7wcFsILxhDEtYN/t4qC60R6hzaPBPdI8xAu6tmJbG9DJfXilyg Ve7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=qhFJHI0MUpB/qkZtdC4zNEo5CgNcks1YjBBXggGnxos=; b=g030qx/C+F1MGDa3Bed5hSSLg+blRaMVx0xHyk4foS7u8y5gPYiTh9Dg++KFFpylzm d6Uat2RVchEywAHU2IlkETXKOstWwkUXkLL0XxxAM78n/eiF6gkDSKKyd0XSfIPjMKvX mGHMzRRT430C+YPQwem20a6dhIR15vVL6jHTHGUTVx6BTKNoVYCr2tSXp1CprH5/s7Ii ctp3rOUVwRUGcvqM2tzquxAfaWSnE44s7rszOnojgU6NEjYPvQvDjp+uDV4D1Ww4tvA7 39A7eD8DWuJ30mlOCs8NfFIztyoaL+fCmNYdlR0H/5Cu3mZacQj0D//B4/4yw6wl5hwh fMOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="Jptnm/0T"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m5si4574663pgp.224.2019.02.09.06.07.59; Sat, 09 Feb 2019 06:08:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="Jptnm/0T"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726898AbfBIOHz (ORCPT + 99 others); Sat, 9 Feb 2019 09:07:55 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38861 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726791AbfBIOHy (ORCPT ); Sat, 9 Feb 2019 09:07:54 -0500 Received: by mail-wm1-f67.google.com with SMTP id v26so8342117wmh.3; Sat, 09 Feb 2019 06:07:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=qhFJHI0MUpB/qkZtdC4zNEo5CgNcks1YjBBXggGnxos=; b=Jptnm/0TSLN+0SqgSQcv/qmGWDPk2bgkA90HtnL52WCtRaFsgUL/hE044Oh03h5Riz 3DSMOGQiOEKQsy6cNPhGtBOhAl4lMRPUGuCKcxlni/yfmSzBMBqmeFBY2a6buSJw/Tkh NvDB4r/YQ1AvqzpqCmqCzC3jXxZWVv5eDCUM3nK3IFxbkPx2zSY8ZXL1nFRz6BCnHgbU 4w2s2TVQ2wr7jiLEHBamGqShRfVF2Ow1QGObwf7yj1+dQk68WJEhotkjVXLTlqnub7+n NiP+3H9UH/c7+dZY9iGFfj2c18GC70BLCpsVStGrpYuxr/9QI3cdCxsUWohWTxbikMbM aZLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=qhFJHI0MUpB/qkZtdC4zNEo5CgNcks1YjBBXggGnxos=; b=Qy7UGG4mtkFOukxYMZLAu62ic6zdrJ1b7vb/k52naGbpn/1nMNB1z708E6PAvJsrLM CQ7U7EAzErCp53r6QEJYuKKTup84f5c8n+LuR6l0fmFlZ08TSBY5yKUYjyeKO9QCIUFm thAg6V1d/gvANmEC714zi/4CYVWnCr6/r7nGkz7pDPYEzBoUDhcRJN8kIPWLGiCdHoVj OHkpkn12Yb7s3dM3j5VW3JWqpwrc+z/sZqs/q//z4zKmhq8glbzBI0L08WT8q+JL6OkJ onv494dMpXoygZZPvGCjeEjRSrMZQTUun3BZlcJys5oicRzl51+0+XfhBC4v242F8jM2 W0oQ== X-Gm-Message-State: AHQUAuZc7N9E/0TZ34KFfzXRDG8bLXRriMREVWCTZFOs+0j4p0G6t1/u Gnkxy/aIKsycmmrSst+mEw== X-Received: by 2002:a5d:438a:: with SMTP id i10mr20490432wrq.111.1549721271711; Sat, 09 Feb 2019 06:07:51 -0800 (PST) Received: from localhost ([95.238.120.247]) by smtp.gmail.com with ESMTPSA id q9sm2805351wmc.10.2019.02.09.06.07.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Feb 2019 06:07:50 -0800 (PST) Date: Sat, 9 Feb 2019 15:07:49 +0100 From: Andrea Righi To: Josef Bacik Cc: Paolo Valente , Tejun Heo , Li Zefan , Johannes Weiner , Jens Axboe , Vivek Goyal , Dennis Zhou , cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v2] blkcg: prevent priority inversion problem during sync() Message-ID: <20190209140749.GB1910@xps-13> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an attempt to mitigate the priority inversion problem of a high-priority blkcg issuing a sync() and being forced to wait the completion of all the writeback I/O generated by any other low-priority blkcg, causing massive latencies to processes that shouldn't be I/O-throttled at all. The idea is to save a list of blkcg's that are waiting for writeback: every time a sync() is executed the current blkcg is added to the list. Then, when I/O is throttled, if there's a blkcg waiting for writeback different than the current blkcg, no throttling is applied (we can probably refine this logic later, i.e., a better policy could be to adjust the throttling I/O rate using the blkcg with the highest speed from the list of waiters - priority inheritance, kinda). This topic has been discussed here: https://lwn.net/ml/cgroups/20190118103127.325-1-righi.andrea@gmail.com/ But we didn't come up with any definitive solution. This patch is not a definitive solution either, but it's an attempt to continue addressing this issue and handling the priority inversion problem with sync() in a better way. Signed-off-by: Andrea Righi --- Changes in v2: - fix: use the proper current blkcg in blkcg_wb_waiters_on_bdi() block/blk-cgroup.c | 69 ++++++++++++++++++++++++++++++++ block/blk-throttle.c | 11 +++-- fs/fs-writeback.c | 4 ++ include/linux/backing-dev-defs.h | 2 + include/linux/blk-cgroup.h | 18 ++++++++- mm/backing-dev.c | 2 + 6 files changed, 102 insertions(+), 4 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 2bed5725aa03..21f14148a9c6 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1635,6 +1635,75 @@ static void blkcg_scale_delay(struct blkcg_gq *blkg, u64 now) } } +/** + * blkcg_wb_waiters_on_bdi - check for writeback waiters on a block device + * @blkcg: current blkcg cgroup + * @bdi: block device to check + * + * Return true if any other blkcg is waiting for writeback on the target block + * device, false otherwise. + */ +bool blkcg_wb_waiters_on_bdi(struct blkcg *blkcg, struct backing_dev_info *bdi) +{ + struct blkcg *wait_blkcg; + bool ret = false; + + if (unlikely(!bdi)) + return false; + + rcu_read_lock(); + list_for_each_entry_rcu(wait_blkcg, &bdi->cgwb_waiters, cgwb_wait_node) + if (wait_blkcg != blkcg) { + ret = true; + break; + } + rcu_read_unlock(); + + return ret; +} + +/** + * blkcg_start_wb_wait_on_bdi - add current blkcg to writeback waiters list + * @bdi: target block device + * + * Add current blkcg to the list of writeback waiters on target block device. + */ +void blkcg_start_wb_wait_on_bdi(struct backing_dev_info *bdi) +{ + struct blkcg *blkcg; + + rcu_read_lock(); + blkcg = css_to_blkcg(task_css(current, io_cgrp_id)); + if (blkcg) { + spin_lock(&bdi->cgwb_waiters_lock); + list_add_rcu(&blkcg->cgwb_wait_node, &bdi->cgwb_waiters); + spin_unlock(&bdi->cgwb_waiters_lock); + } + rcu_read_unlock(); +} + +/** + * blkcg_stop_wb_wait_on_bdi - remove current blkcg from writeback waiters list + * @bdi: target block device + * + * Remove current blkcg from the list of writeback waiters on target block + * device. + */ +void blkcg_stop_wb_wait_on_bdi(struct backing_dev_info *bdi) +{ + struct blkcg *blkcg; + + rcu_read_lock(); + blkcg = css_to_blkcg(task_css(current, io_cgrp_id)); + if (blkcg) { + spin_lock(&bdi->cgwb_waiters_lock); + list_del_rcu(&blkcg->cgwb_wait_node); + spin_unlock(&bdi->cgwb_waiters_lock); + } + rcu_read_unlock(); + synchronize_rcu(); +} + /* * This is called when we want to actually walk up the hierarchy and check to * see if we need to throttle, and then actually throttle if there is some diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 1b97a73d2fb1..da817896cded 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -970,9 +970,13 @@ static bool tg_may_dispatch(struct throtl_grp *tg, struct bio *bio, { bool rw = bio_data_dir(bio); unsigned long bps_wait = 0, iops_wait = 0, max_wait = 0; + struct throtl_data *td = tg->td; + struct request_queue *q = td->queue; + struct backing_dev_info *bdi = q->backing_dev_info; + struct blkcg_gq *blkg = tg_to_blkg(tg); /* - * Currently whole state machine of group depends on first bio + * Currently whole state machine of group depends on first bio * queued in the group bio list. So one should not be calling * this function with a different bio if there are other bios * queued. @@ -981,8 +985,9 @@ static bool tg_may_dispatch(struct throtl_grp *tg, struct bio *bio, bio != throtl_peek_queued(&tg->service_queue.queued[rw])); /* If tg->bps = -1, then BW is unlimited */ - if (tg_bps_limit(tg, rw) == U64_MAX && - tg_iops_limit(tg, rw) == UINT_MAX) { + if (blkcg_wb_waiters_on_bdi(blkg->blkcg, bdi) || + (tg_bps_limit(tg, rw) == U64_MAX && + tg_iops_limit(tg, rw) == UINT_MAX)) { if (wait) *wait = 0; return true; diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 36855c1f8daf..13880774af3c 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -2446,6 +2446,8 @@ void sync_inodes_sb(struct super_block *sb) return; WARN_ON(!rwsem_is_locked(&sb->s_umount)); + blkcg_start_wb_wait_on_bdi(bdi); + /* protect against inode wb switch, see inode_switch_wbs_work_fn() */ bdi_down_write_wb_switch_rwsem(bdi); bdi_split_work_to_wbs(bdi, &work, false); @@ -2453,6 +2455,8 @@ void sync_inodes_sb(struct super_block *sb) bdi_up_write_wb_switch_rwsem(bdi); wait_sb_inodes(sb); + + blkcg_stop_wb_wait_on_bdi(bdi); } EXPORT_SYMBOL(sync_inodes_sb); diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index 07e02d6df5ad..095e4dd0427b 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -191,6 +191,8 @@ struct backing_dev_info { struct rb_root cgwb_congested_tree; /* their congested states */ struct mutex cgwb_release_mutex; /* protect shutdown of wb structs */ struct rw_semaphore wb_switch_rwsem; /* no cgwb switch while syncing */ + struct list_head cgwb_waiters; /* list of all waiters for writeback */ + spinlock_t cgwb_waiters_lock; /* protect cgwb_waiters list */ #else struct bdi_writeback_congested *wb_congested; #endif diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index 76c61318fda5..5ea6b31c1df4 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -56,6 +56,7 @@ struct blkcg { struct list_head all_blkcgs_node; #ifdef CONFIG_CGROUP_WRITEBACK + struct list_head cgwb_wait_node; struct list_head cgwb_list; refcount_t cgwb_refcnt; #endif @@ -454,6 +455,10 @@ static inline void blkcg_cgwb_put(struct blkcg *blkcg) blkcg_destroy_blkgs(blkcg); } +bool blkcg_wb_waiters_on_bdi(struct blkcg *blkcg, struct backing_dev_info *bdi); +void blkcg_start_wb_wait_on_bdi(struct backing_dev_info *bdi); +void blkcg_stop_wb_wait_on_bdi(struct backing_dev_info *bdi); + #else static inline void blkcg_cgwb_get(struct blkcg *blkcg) { } @@ -464,6 +469,14 @@ static inline void blkcg_cgwb_put(struct blkcg *blkcg) blkcg_destroy_blkgs(blkcg); } +static inline bool +blkcg_wb_waiters_on_bdi(struct blkcg *blkcg, struct backing_dev_info *bdi) +{ + return false; +} +static inline void blkcg_start_wb_wait_on_bdi(struct backing_dev_info *bdi) { } +static inline void blkcg_stop_wb_wait_on_bdi(struct backing_dev_info *bdi) { } + #endif /** @@ -772,6 +785,7 @@ static inline void blkcg_bio_issue_init(struct bio *bio) static inline bool blkcg_bio_issue_check(struct request_queue *q, struct bio *bio) { + struct backing_dev_info *bdi = q->backing_dev_info; struct blkcg_gq *blkg; bool throtl = false; @@ -785,9 +799,11 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q, bio_devname(bio, b)); bio_associate_blkg(bio); } - blkg = bio->bi_blkg; + if (blkcg_wb_waiters_on_bdi(blkg->blkcg, bdi)) + bio_set_flag(bio, BIO_THROTTLED); + throtl = blk_throtl_bio(q, blkg, bio); if (!throtl) { diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 72e6d0c55cfa..8848d26e8bf6 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -686,10 +686,12 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi) { int ret; + INIT_LIST_HEAD(&bdi->cgwb_waiters); INIT_RADIX_TREE(&bdi->cgwb_tree, GFP_ATOMIC); bdi->cgwb_congested_tree = RB_ROOT; mutex_init(&bdi->cgwb_release_mutex); init_rwsem(&bdi->wb_switch_rwsem); + spin_lock_init(&bdi->cgwb_waiters_lock); ret = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL); if (!ret) { -- 2.17.1