back ported from recent util-vserver

diff --git a/lib/sched_cmd.h b/lib/sched_cmd.h
new file mode 100644 (file)
index 0000000..2a6f55b
--- /dev/null
+++ b/lib/sched_cmd.h
@@ -0,0 +1,47 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+/*  sched vserver commands */
+
+#define VCMD_set_sched_v2      VC_CMD(SCHED, 1, 2)
+#define VCMD_set_sched         VC_CMD(SCHED, 1, 3)
+
+struct vcmd_set_sched_v2 {
+       int32_t fill_rate;
+       int32_t interval;
+       int32_t tokens;
+       int32_t tokens_min;
+       int32_t tokens_max;
+       uint64_t cpu_mask;
+};
+
+struct vcmd_set_sched_v3 {
+       uint32_t set_mask;
+       int32_t fill_rate;
+       int32_t interval;
+       int32_t tokens;
+       int32_t tokens_min;
+       int32_t tokens_max;
+       int32_t priority_bias;
+};
+
+
+#define VXSM_FILL_RATE         0x0001
+#define VXSM_INTERVAL          0x0002
+#define VXSM_TOKENS            0x0010
+#define VXSM_TOKENS_MIN                0x0020
+#define VXSM_TOKENS_MAX                0x0040
+#define VXSM_PRIO_BIAS         0x0100
+
+#define SCHED_KEEP             (-2)
+
+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
+
+extern int vc_set_sched_v1(uint32_t, void __user *);
+extern int vc_set_sched_v2(uint32_t, void __user *);
+extern int vc_set_sched(uint32_t, void __user *);
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */

diff --git a/lib/syscall_setsched-v13.hc b/lib/syscall_setsched-v13.hc
new file mode 100644 (file)
index 0000000..02284e0
--- /dev/null
+++ b/lib/syscall_setsched-v13.hc
@@ -0,0 +1,70 @@
+// $Id: syscall_setsched-v13.hc,v 1.4 2004/10/19 21:04:23 ensc Exp $    --*- c -*--
+
+// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+//  
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//  
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//  
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include "vserver.h"
+#include "sched_cmd.h"
+
+#define VCGET(MASK,VAL)                ((data->set_mask & (MASK)) ? (VAL) : SCHED_KEEP);
+
+
+static inline ALWAYSINLINE int
+vc_set_sched_v13obs(xid_t xid, struct vc_set_sched const *data)
+{
+#warning vc_set_sched_v13() uses an obsolete interface; remove it in the final version
+  struct vcmd_set_sched_v2     k_data;
+
+  
+  k_data.cpu_mask    = 0;
+  k_data.fill_rate   = VCGET(VC_VXSM_FILL_RATE,  data->fill_rate);
+  k_data.interval    = VCGET(VC_VXSM_INTERVAL,   data->interval);
+  k_data.tokens      = VCGET(VC_VXSM_TOKENS,     data->tokens);
+  k_data.tokens_min  = VCGET(VC_VXSM_TOKENS_MIN, data->tokens_min);
+  k_data.tokens_max  = VCGET(VC_VXSM_TOKENS_MAX, data->tokens_max);
+
+  return vserver(VCMD_set_sched_v2, CTX_USER2KERNEL(xid), &k_data);
+}
+
+#define X(ATTR)                ENSC_SAME_STRUCT_IDX(k_data, *data, ATTR)
+
+static inline ALWAYSINLINE int
+vc_set_sched_v13b(xid_t xid, struct vc_set_sched const *data)
+{
+  struct vcmd_set_sched_v3     k_data;
+
+    // This expression will be evaluated at compile-time
+  if (sizeof(struct vcmd_set_sched_v3)==sizeof(struct vc_set_sched) &&
+      X(set_mask)   && X(fill_rate)  && X(interval)   && X(tokens) &&
+      X(tokens_min) && X(tokens_max) && X(priority_bias))
+    return vserver(VCMD_set_sched, CTX_USER2KERNEL(xid),
+                  (struct vc_set_sched *)(data));
+  else {
+    k_data.set_mask      = data->set_mask;
+    k_data.fill_rate     = data->fill_rate;
+    k_data.interval      = data->interval;
+    k_data.tokens        = data->tokens;
+    k_data.tokens_min    = data->tokens_min;
+    k_data.tokens_max   = data->tokens_max;
+    k_data.priority_bias = data->priority_bias;
+
+    return vserver(VCMD_set_sched, CTX_USER2KERNEL(xid), &k_data);
+  }
+}

diff --git a/lib/syscall_setsched.c b/lib/syscall_setsched.c
new file mode 100644 (file)
index 0000000..5884fc0
--- /dev/null
+++ b/lib/syscall_setsched.c
@@ -0,0 +1,42 @@
+// $Id: syscall_setsched.c,v 1.2 2004/09/22 20:45:37 ensc Exp $    --*- c -*--
+
+// Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+//  
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//  
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//  
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+#include "compat.h"
+
+#include "vserver.h"
+
+#define VC_MULTIVERSION_SYSCALL        1
+#include "vserver-internal.h"
+
+#include "linuxvirtual.h"
+
+#define VC_ENABLE_API_V13
+
+#ifdef VC_ENABLE_API_V13
+#  include "syscall_setsched-v13.hc"
+#endif
+
+int
+vc_set_sched(xid_t xid, struct vc_set_sched const *data)
+{
+  CALL_VC(CALL_VC_V13B  (vc_set_sched,xid,data),
+         CALL_VC_V13OBS(vc_set_sched,xid,data));
+}