blk-cgroup: Pre-allocate tree node on blkg_conf_prep
Subsystems (3)
PATCH 1/1 blk-cgroup: Pre-allocate tree node on blkg_conf_prep
Similarly to commit 457e490f2b741 ("blkcg: allocate struct blkcg_gq outside request queue spinlock"), blkg_create can also trigger occasional -ENOMEM failures at the radix insertion because any allocation inside blkg_create has to be non-blocking, making it more likely to fail. This causes trouble for userspace tools trying to configure io weights who need to deal with this condition.
This patch reduces the occurrence of -ENOMEMs on this path by preloading the radix tree element on a GFP_KERNEL context, such that we guarantee the later non-blocking insertion won't fail.
A similar solution exists in blkcg_init_queue for the same situation.
--- block/blk-cgroup.c | 8 ++++++++ 1 file changed, 8 insertions(+)
block/blk-cgroup.c +8 -0
@@ -612,6 +612,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,struct gendisk *disk;struct request_queue *q;struct blkcg_gq *blkg; +bool preloaded = false;int ret; disk =blkcg_conf_get_disk (&input);
@@ -657,6 +658,8 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, goto fail; } + preloaded = !radix_tree_preload (GFP_KERNEL ); +rcu_read_lock ();spin_lock_irq (&q->queue_lock);
@@ -676,6 +679,9 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, } } +if (preloaded) +radix_tree_preload_end (); +if (pos == blkcg) goto success; }
@@ -688,6 +694,8 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, fail_unlock:spin_unlock_irq (&q->queue_lock);rcu_read_unlock (); +if (preloaded) +radix_tree_preload_end (); fail:put_disk_and_module (disk);/*
Signature · 1 line
2.28.0
A message that is not in the archive (sent off-list or not yet received): 20201022182945.1679730-1-krisman-ZGY8ohtN/[email protected]
block/blk-cgroup.c int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, · line 661
Quoted 5 lines · Gabriel Krisman Bertazi
block/blk-cgroup.c +1
-0@@ -657,6 +658,8 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, goto fail; } + preloaded = !radix_tree_preload (GFP_KERNEL );
I think we can just fail the function if GFP_KERNEL preload fails.
Thanks.
Signature · 1 line
tejun