aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Harmening <jah@FreeBSD.org>2020-12-30 23:29:44 +0000
committerJason A. Harmening <jah@FreeBSD.org>2021-01-11 23:36:57 +0000
commite8a5a1ad7154dc34e3a5234267e19faa86d5ff33 (patch)
tree25a8e27270ca7a3f0a86c77045136f89b5cd3a4e
parent2defbe9f0e01381da0550e7ffbf4e75c723c9331 (diff)
downloadsrc-e8a5a1ad7154dc34e3a5234267e19faa86d5ff33.tar.gz
src-e8a5a1ad7154dc34e3a5234267e19faa86d5ff33.zip
rctl(4): support throttling resource usage to 0
For rate-based resources that support throttling (e.g. readiops/writeips), this fixes a divide-by-zero panic when rctl(8) passes 0 as the throttle value. For these resources, treat zero-throttle requests as requests to suspend forward progress as long as possible using the duration specified in kern.racct.rctl.throttle_max. PR: 251803 Reported by: chris@cretaforce.gr Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27858
-rw-r--r--sys/kern/kern_rctl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c
index 9a0e0651750f..90e2f7832691 100644
--- a/sys/kern/kern_rctl.c
+++ b/sys/kern/kern_rctl.c
@@ -600,6 +600,11 @@ rctl_enforce(struct proc *p, int resource, uint64_t amount)
if (p->p_state != PRS_NORMAL)
continue;
+ if (rule->rr_amount == 0) {
+ racct_proc_throttle(p, rctl_throttle_max);
+ continue;
+ }
+
/*
* Make the process sleep for a fraction of second
* proportional to the ratio of process' resource