cgroup: improve conversion from shares to weight

The OCI CPU shares (range [2-262144]) to cgroup v2
`cpu.weight` (range [1-10000]) conversion formula has been
updated to use a quadratic function so that min, max and default
values match.

Closes: #1721

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Author: giuseppe

configure.ac

@@ -321,6 +321,8 @@ fi
 
 AC_SEARCH_LIBS([argp_parse], [argp], [], [AC_MSG_ERROR([*** argp functions not found - install libargp or argp_standalone])])
 
+AC_SEARCH_LIBS([log2], [m], [AC_DEFINE([HAVE_LOG2], 1, [Define if log2 is available])], [])
+
 AM_CONDITIONAL([PYTHON_BINDINGS], [test "x$with_python_bindings" = "xyes"])
 AM_CONDITIONAL([LUA_BINDINGS], [test "x$with_lua_bindings" = "xyes"])
 AM_CONDITIONAL([CRIU_SUPPORT], [test "x$have_criu" = "xyes"])

crun.1

@@ -846,7 +846,10 @@ allbox;
 l l l l 
 l l l l .
 \fBOCI (x)\fP	\fBcgroup 2 value (y)\fP	\fBconversion\fP	\fBcomment\fP
-shares	cpu.weight	y = (1 + ((x - 2) * 9999) / 262142)	T{
+shares	cpu.weight	T{
+y=10^((log2(x)^2 + 125 * log2(x)) / 612.0 - 7.0 / 34.0)
+T}
+	T{
 convert from [2-262144] to [1-10000]
 T}
 period	cpu.max	y = x	T{

crun.1.md

@@ -712,11 +712,11 @@ they are converted when needed from the cgroup v1 configuration.
 
 ## CPU controller
 
-| OCI (x) | cgroup 2 value (y) | conversion  |  comment |
-|---|---|---|---|
-| shares | cpu.weight | y = (1 + ((x - 2) \* 9999) / 262142) | convert from [2-262144] to [1-10000]|
-| period | cpu.max | y = x| period and quota are written together|
-| quota | cpu.max | y = x| period and quota are written together|
+| OCI (x) | cgroup 2 value (y) | conversion                                              | comment                               |
+|---------|--------------------|---------------------------------------------------------|---------------------------------------|
+| shares  | cpu.weight         | y=10^((log2(x)^2 + 125 * log2(x)) / 612.0 - 7.0 / 34.0) | convert from [2-262144] to [1-10000]  |
+| period  | cpu.max            | y = x                                                   | period and quota are written together |
+| quota   | cpu.max            | y = x                                                   | period and quota are written together |
 
 ## blkio controller
 

src/libcrun/cgroup-internal.h

@@ -21,6 +21,11 @@
 #include "container.h"
 #include "utils.h"
 
+#include <stdint.h>
+#ifdef HAVE_LOG2
+#  include <math.h>
+#endif
+
 enum
 {
   CGROUP_MEMORY = 1 << 0,
@@ -76,8 +81,42 @@ int libcrun_cgroup_pause_unpause_path (const char *cgroup_path, const bool pause
 static inline uint64_t
 convert_shares_to_weight (uint64_t shares)
 {
-  /* convert linearly from 2-262144 to 1-10000.  */
-  return (1 + ((shares - 2) * 9999) / 262142);
+  /* The value of 0 means "unset".  */
+  if (shares == 0)
+    return 0;
+  if (shares < 2)
+    return 1;
+  if (shares > 262144)
+    return 10000;
+
+#ifdef HAVE_LOG2
+  double l, exponent;
+
+  l = log2 ((double) shares);
+
+  /* Quadratic function which fits min, max, and default.  */
+  exponent = (l * l + 125 * l) / 612.0 - 7.0 / 34.0;
+
+  return (uint64_t) ceil (pow (10, exponent));
+#else
+  /* Simplified version if the math library is not present.  */
+
+  /* Split the interval in two segments making sure to map the minimum, default, and maximum value.  */
+  uint64_t weight;
+
+  if (shares < 1024)
+    {
+      /* Segment 1: Shares 2 -> 1024 maps to Weight 1 -> 100.  */
+      weight = (99ULL * shares + 824ULL) / 1022ULL;
+    }
+  else
+    {
+      /* Segment 2: Shares 1024 -> 262144 maps to Weight 100 -> 10000.  */
+      weight = (9900ULL * shares + 15974400ULL) / 261120ULL;
+    }
+
+  return weight;
+#endif
 }
 
 int initialize_cpuset_subsystem (const char *path, libcrun_error_t *err);

tests/test_resources.py

@@ -291,13 +291,14 @@ def test_resources_cpu_weight_systemd():
             sys.stderr.write("# found wrong CPUWeight for the systemd scope\n")
             return 1
 
-        run_crun_command(['update', '--cpu-share', '4321', cid])
+        cpu_shares = 4321
+        run_crun_command(['update', '--cpu-share', str(cpu_shares), cid])
         # this is the expected cpu weight after the conversion from the CPUShares
-        expected_weight = "165"
+        expected_weight = str(max(1, min(10000, cpu_shares * 100 // 1024)))
 
         out = run_crun_command(["exec", cid, "/init", "cat", "/sys/fs/cgroup/cpu.weight"])
         if expected_weight not in out:
-            sys.stderr.write("# found wrong CPUWeight %s for the container cgroup\n" % out)
+            sys.stderr.write("found wrong CPUWeight %s instead of %s for the container cgroup\n" % (out, expected_weight))
             return -1
 
         out = subprocess.check_output(['systemctl', 'show','-PCPUWeight', scope ], close_fds=False).decode().strip()