From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 7 Dec 2021 09:24:44 +0000 (+0100)
Subject: Merge pull request #20522 from yuwata/cgroup-fix
X-Git-Tag: v250-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b0bc54cdb35a5353e09a49e0732bf5601c749ad;p=thirdparty%2Fsystemd.git

Merge pull request #20522 from yuwata/cgroup-fix

core/cgroup: fix io.weight and blkio.weight
---

8b0bc54cdb35a5353e09a49e0732bf5601c749ad
diff --cc src/core/cgroup.c
index 5c2c9ed54ea,fa397ba8498..f58de95a491
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@@ -37,14 -36,14 +37,20 @@@
  #include "string-util.h"
  #include "virt.h"
  
 +#if BPF_FRAMEWORK
 +#include "bpf-dlopen.h"
 +#include "bpf-link.h"
 +#include "bpf/restrict_fs/restrict-fs-skel.h"
 +#endif
 +
  #define CGROUP_CPU_QUOTA_DEFAULT_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
  
+ /* Special values for the bfq.weight attribute */
+ #define CGROUP_BFQ_WEIGHT_INVALID UINT64_MAX
+ #define CGROUP_BFQ_WEIGHT_MIN UINT64_C(1)
+ #define CGROUP_BFQ_WEIGHT_MAX UINT64_C(1000)
+ #define CGROUP_BFQ_WEIGHT_DEFAULT UINT64_C(100)
+ 
  /* Returns the log level to use when cgroup attribute writes fail. When an attribute is missing or we have access
   * problems we downgrade to LOG_DEBUG. This is supposed to be nice to container managers and kernels which want to mask
   * out specific attributes from us. */