Changeset 2f0141c49bb55157f24738404aa77367a6a45fed

Timestamp:

06/08/09 18:29:43 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

5987af1b79b0c1fbd4aa9d30a53ec6879853ece3

Parents:

03dc5e370ef4fbf66e34cbe5bc5b878ed764149c

git-committer:

Neutron Soutmun <neo.neutron@…> (06/08/09 18:29:43)

Message:

Implement IFB to replace the IMQ

• IFB (Intermediate Functional Block) is more clearly work in the SMP.
• Implement IFB on config, bandwidth task and support scripts.
• IMQ is now deprecated. (not support).

Files:

• src/rh-config.c (modified) (2 diffs)
• src/rh-config.h (modified) (4 diffs)
• src/rh-task-bandwidth.c (modified) (11 diffs)
• tools/bandwidth.sh.in (modified) (11 diffs)
• tools/firewall.sh.in (modified) (1 diff)

src/rh-config.c

@@ -13 +13 @@
 #include "rahunasd.h"
 #include "rh-config.h"
+
+GList *interfaces_list = NULL;
+static unsigned long ifb_reserved = 0;
 
 enum lcfg_status rahunas_visitor(const char *key, void *data, size_t size, 
@@ -346 +349 @@
   return 0;
 }
+
+
+GList *append_interface (GList *inf, 
+                         const char *inf_name)
+{
+  GList *runner = NULL;
+  struct interfaces *iface = NULL;
+  struct interfaces *item  = NULL;
+  int    ifb_ifno;
+
+  if (!inf_name)
+    return inf;
+
+  item = (struct interfaces *) malloc (sizeof (struct interfaces));
+  if (!item)
+    return inf;
+
+  runner = g_list_first (inf);
+  while (runner != NULL)
+    {
+      iface = (struct interfaces *)runner->data;
+      if (strncmp(iface->dev_internal, inf_name, strlen(inf_name)) == 0)
+        {
+          // Already in the list
+          (iface->hit)++;
+          free(item); 
+          return inf;
+        }
+      runner = g_list_next (runner);
+    }
+
+done:
+  ifb_ifno = ifb_interface_reserve ();
+  if (ifb_ifno < 0)
+    {
+      free (item);
+      return inf;
+    }
+
+  strncpy(item->dev_internal, inf_name, 32);
+  sprintf(item->dev_ifb, "ifb%d", ifb_ifno);
+  item->init = 0;
+  item->hit  = 1;
+  DP ("Interface append: %s, %s", item->dev_internal, item->dev_ifb);
+  
+  return g_list_append (inf, item);
+}
+
+GList *remove_interface (GList *inf,
+                         const char *inf_name)
+{
+  GList *runner = NULL;
+  struct interfaces *iface = NULL;
+  int    ifb_ifno;
+
+  if (!inf_name || !inf)
+    return inf;
+
+  runner = g_list_first (inf);
+  while (runner != NULL)
+    {
+      iface = (struct interfaces *)runner->data;
+      if (strncmp (iface->dev_internal, inf_name, strlen (inf_name)) == 0)
+        {
+          iface->hit--;
+          if (iface->hit <=0 )
+            {
+              sscanf (iface->dev_ifb, "ifb%d", &ifb_ifno);
+              ifb_interface_release (ifb_ifno);
+              if (iface)
+                free (iface);
+
+              return g_list_delete_link (inf, runner);
+            }
+        }
+
+      runner = g_list_next (runner);
+    }
+
+  return inf;
+}
+
+
+struct interfaces *get_interface (GList *inf,
+                                  const char *inf_name)
+{
+  GList *runner = NULL;
+  struct interfaces *iface = NULL;
+  
+  if (!inf_name || !inf)
+    return NULL;
+
+  runner = g_list_first (inf);
+
+  while (runner != NULL)
+    {
+      iface = (struct interfaces *) runner->data;
+      if (strncmp (iface->dev_internal, inf_name, strlen (inf_name)) == 0)
+        return iface;
+
+      runner = g_list_next (runner);
+    } 
+
+  return NULL;
+}
+
+int ifb_interface_reserve (void)
+{
+  int i;
+  unsigned long mask = 1;
+
+  for (i=0; i < MAX_IFB_IFACE; i++)
+    {
+      mask <<= i;
+      if (!(ifb_reserved & mask))
+        {
+          ifb_reserved |= mask;
+          return i;
+        } 
+    }
+
+  return -1;
+}
+
+void ifb_interface_release (int ifno)
+{
+  unsigned long mask = 1;
+
+  mask <<= ifno;
+  mask = ~mask;
+  ifb_reserved &= mask;
+}

src/rh-config.h

@@ -20 +20 @@
 #define XMLSERVICE_URL  "/rahunas_service/xmlrpc_service.php"
 
+#define MAX_IFB_IFACE   64
+
 #define CONFIG_FILE RAHUNAS_CONF_DIR "rahunas.conf"
 #define DEFAULT_PID RAHUNAS_RUN_DIR "rahunasd.pid"
 #define DB_NAME "rahunas"
+
+struct interfaces {
+  char dev_internal[32];
+  char dev_ifb[32];
+  int  hit;
+  int  init;
+};
 
 struct rahunas_main_config {
@@ -40 +49 @@
   char *dev_external;
   char *dev_internal;
+  struct interfaces *iface;
   char *vlan;
   char *vlan_raw_dev_external;
@@ -91 +101 @@
 };
 
+extern GList *interfaces_list;
+
 int get_config(const char *cfg_file, union rahunas_config *config);
 int get_value(const char *cfg_file, const char *key, void **data, size_t *len);
@@ -98 +110 @@
 enum lcfg_status rahunas_visitor(const char *key, void *data, size_t size, 
                                  void *user_data);
+
+GList *append_interface (GList *inf, 
+                         const char *inf_name);
+GList *remove_interface (GList *inf,
+                         const char *inf_name);
+struct interfaces *get_interface (GList *inf,
+                                  const char *inf_name);
+int    ifb_interface_reserve (void);
+void    ifb_interface_release (int ifno);
 #endif // __RH_CONFIG_H 

src/rh-task-bandwidth.c

@@ -18 +18 @@
 #include "rh-task-memset.h"
 #include "rh-utils.h"
-
-
 
 #define BANDWIDTH_WRAPPER "/etc/rahunas/bandwidth.sh"
@@ -136 +134 @@
 }
 
-int bandwidth_start(void)
-{
-  char *args[3];
+int bandwidth_start(struct vserver *vs)
+{
+  char *args[5];
+  struct interfaces *iface = vs->vserver_config->iface;
+  int  ret;
 
   DP("Bandwidth: start");
@@ -144 +144 @@
   args[0] = BANDWIDTH_WRAPPER;
   args[1] = "start";
-  args[2] = (char *) 0;
-
-  return bandwidth_exec(NULL, args);
-}
-
-int bandwidth_stop(void)
-{
-  char *args[3];
+  args[2] = iface->dev_internal;
+  args[3] = iface->dev_ifb;
+  args[4] = (char *) 0;
+
+  ret = bandwidth_exec(vs, args);
+  return ret; 
+}
+
+int bandwidth_stop(struct vserver *vs)
+{
+  char *args[5];
+  struct interfaces *iface = vs->vserver_config->iface;
+  int  ret;
 
   DP("Bandwidth: stop");
@@ -157 +162 @@
   args[0] = BANDWIDTH_WRAPPER;
   args[1] = "stop";
-  args[2] = (char *) 0;
-
-  return bandwidth_exec(NULL, args);
+  args[2] = iface->dev_internal;
+  args[3] = iface->dev_ifb;
+  args[4] = (char *) 0;
+
+  ret = bandwidth_exec(vs, args);
+  return ret; 
 }
 
 int bandwidth_add(struct vserver *vs, struct bandwidth_req *bw_req)
 {
-  char *args[7];
+  char *args[9];
+  struct interfaces *iface = vs->vserver_config->iface;
 
   DP("Bandwidth: request %s %s %s %s", bw_req->slot_id, 
@@ -175 +184 @@
   args[4] = bw_req->bandwidth_max_down;
   args[5] = bw_req->bandwidth_max_up;
-  args[6] = (char *) 0;
+  args[6] = iface->dev_internal;
+  args[7] = iface->dev_ifb;
+  args[8] = (char *) 0;
 
   return bandwidth_exec(vs, args);
@@ -182 +193 @@
 int bandwidth_del(struct vserver *vs, struct bandwidth_req *bw_req)
 {
-  char *args[4];
+  char *args[6];
+  struct interfaces *iface = vs->vserver_config->iface;
 
   DP("Bandwidth: request %s", bw_req->slot_id);
@@ -189 +201 @@
   args[1] = "del";
   args[2] = bw_req->slot_id;
-  args[3] = (char *) 0;
+  args[3] = iface->dev_internal;
+  args[4] = iface->dev_ifb;
+  args[5] = (char *) 0;
 
   return bandwidth_exec(vs, args);
@@ -197 +211 @@
 static int startservice (void)
 {
-  return bandwidth_start();
+  /* Do nothing */
 }
 
@@ -203 +217 @@
 static int stopservice (void)
 {
-  return bandwidth_stop();
+  /* Do nothing */
 }
 
@@ -209 +223 @@
 static void init (struct vserver *vs)
 {
-  /* Do nothing */
+  struct interfaces *iface = NULL;
+  if (!vs)
+    return;
+
+  if (vs->vserver_config->init_flag == VS_RELOAD)
+    return;
+
+  interfaces_list = append_interface (interfaces_list, 
+                                      vs->vserver_config->dev_internal);
+  vs->vserver_config->iface = get_interface (interfaces_list, 
+                                             vs->vserver_config->dev_internal);
+  iface = vs->vserver_config->iface;
+  if (!iface->init)
+    if (bandwidth_start(vs) >= 0)
+      iface->init = 1;
 }
 
@@ -215 +243 @@
 static int cleanup (struct vserver *vs)
 {
-  /* Do nothing */
+  struct interfaces *iface = NULL;
+  if (!vs)
+    return;
+
+  if (vs->vserver_config->init_flag == VS_RELOAD)
+    return;
+
+  iface = vs->vserver_config->iface;
+  DP ("Bandwidth Cleanup: init=%d, hit=%d", iface->init, iface->hit);
+  if (iface->init && iface->hit <= 1)
+    if (bandwidth_stop(vs) >= 0)
+      iface->init = 0;
+
+  interfaces_list = remove_interface (interfaces_list, 
+                                      vs->vserver_config->dev_internal);
 }
 

tools/bandwidth.sh.in

@@ -9 +9 @@
 TC=/sbin/tc
 IP=/sbin/ip
+IFCONFIG=/sbin/ifconfig
 
 INIT=@sysconfdir@/default/rahunas
@@ -16 +17 @@
 INTERFACE_SPEED=102400
 
-SHAPING_DOWN_INF=imq0
-SHAPING_UP_INF=imq1
-
 INTERFACE_ID=9999
 BITTORRENT_ID=9998
@@ -29 +27 @@
 test "$RUN_DAEMON" = "yes" || exit 0
 test -f $RAHUNAS_CONFIG || exit 1
+
+SHAPING_DOWN_INF=""
+SHAPING_UP_INF=""
 
 set -e
@@ -56 +57 @@
 
       # Interface Uplink
+      $IFCONFIG $SHAPING_UP_INF up
       $TC qdisc add dev $SHAPING_UP_INF root handle 2: htb \
         default ${INTERFACE_ID} 
       $TC class add dev $SHAPING_UP_INF parent 2: classid 2:${INTERFACE_ID} \
         htb rate ${INTERFACE_SPEED}Kbit
+
+      # Redirect incoming traffic to IFB
+      $TC qdisc add dev $SHAPING_DOWN_INF ingress
+      $TC filter add dev $SHAPING_DOWN_INF parent ffff: protocol ip prio 2 u32 \
+        match u32 0 0 flowid 1:${INTERFACE_ID} \
+        action mirred egress redirect dev $SHAPING_UP_INF
       ;;
   stop)
+      # Redirect incoming traffic to IFB
+      $TC filter del dev $SHAPING_DOWN_INF parent ffff: protocol ip prio 2 u32 \
+        match u32 0 0 flowid 1:${INTERFACE_ID} \
+        action mirred egress redirect dev $SHAPING_UP_INF
+      $TC qdisc del dev $SHAPING_DOWN_INF ingress
+
       # Interface Downlink
       $TC qdisc del dev $SHAPING_DOWN_INF root
@@ -67 +81 @@
       # Interface Uplink
       $TC qdisc del dev $SHAPING_UP_INF root
+
+      $IFCONFIG $SHAPING_UP_INF down
       ;;
   esac
@@ -114 +130 @@
 
 usage_add() {
-  echo "Usage: $1 add ID IP DOWNSPEED UPSPEED"
+  echo "Usage: $1 add ID IP DOWNSPEED UPSPEED DOWN_IF UP_IF"
   echo "         ID - ID number from 1 to 9900"
   echo "         IP - IPv4 Address"
   echo "  DOWNSPEED - Download speed (bits/s)"
   echo "    UPSPEED - Upload speed (bits/s)"
+  echo "    DOWN_IF - Downstream interface (eth0, eth1, vlan1, ...)"
+  echo "      UP_IF - Upstream interface (ifb0, ifb1, ...)"
 }
 
 usage_del() {
-  echo "Usage: $1 del ID"
+  echo "Usage: $1 del ID DOWN_IF UP_IF"
   echo "         ID - ID number from 1 to 9900"
+  echo "    DOWN_IF - Downstream interface (eth0, eth1, vlan1, ...)"
+  echo "      UP_IF - Upstream interface (ifb0, ifb1, ...)"
 }
 
@@ -175 +195 @@
 case "$1" in
   start)
-    start || true 
+    if [ -z "$2" ] || [ -z "$3" ]; then
+      MESSAGE="NOT COMPLETED"  
+    else
+      SHAPING_DOWN_INF=$2
+      SHAPING_UP_INF=$3
+      RUN=${RUN}-${SHAPING_DOWN_INF}-${SHAPING_UP_INF}
+      start || true 
+    fi
+
     test -n "$MESSAGE" || MESSAGE="NOT COMPLETED"
     echo $MESSAGE
     ;;
   stop)
-    stop || true
+    if [ -z "$2" ] || [ -z "$3" ]; then
+      MESSAGE="NOT COMPLETED"  
+    else
+      SHAPING_DOWN_INF=$2
+      SHAPING_UP_INF=$3
+      RUN=${RUN}-${SHAPING_DOWN_INF}-${SHAPING_UP_INF}
+      stop || true
+    fi
+
     test -n "$MESSAGE" || MESSAGE="NOT COMPLETED"
     echo $MESSAGE
@@ -186 +222 @@
     ;;
   restart)
-    stop || true
-    test -n "$MESSAGE" || MESSAGE="NOT COMPLETED"
-    echo $MESSAGE
-
-    start || true
+    if [ -z "$2" ] || [ -z "$3" ]; then
+      MESSAGE="NOT COMPLETED"  
+    else
+      SHAPING_DOWN_INF=$2
+      SHAPING_UP_INF=$3
+      RUN=${RUN}-${SHAPING_DOWN_INF}-${SHAPING_UP_INF}
+      stop || true
+      start || true
+    fi
+
     test -n "$MESSAGE" || MESSAGE="NOT COMPLETED"
     echo $MESSAGE
@@ -201 +242 @@
     fi
 
-    if [ $# != 5 ]; then
+    if [ $# != 7 ]; then
       echo "Error: too few arguments"
       usage_add $N
@@ -207 +248 @@
     fi
 
-    bw_add $2 $3 $4 $5 || true
+    if [ -z "$6" ] || [ -z "$7" ]; then
+      MESSAGE="NOT COMPLETED"  
+    else
+      SHAPING_DOWN_INF=$6
+      SHAPING_UP_INF=$7
+      RUN=${RUN}-${SHAPING_DOWN_INF}-${SHAPING_UP_INF}
+      bw_add $2 $3 $4 $5 || true
+    fi
     echo $MESSAGE
     ;;
@@ -216 +264 @@
     fi
 
-    if [ $# != 2 ]; then
+    if [ $# != 4 ]; then
       echo "Error: too few arguments"
       usage_del $N
       exit 1
     fi
-
-    bw_del $2 || true
+    if [ -z "$3" ] || [ -z "$4" ]; then
+      MESSAGE="NOT COMPLETED"  
+    else
+      SHAPING_DOWN_INF=$3
+      SHAPING_UP_INF=$4
+      RUN=${RUN}-${SHAPING_DOWN_INF}-${SHAPING_UP_INF}
+      bw_del $2 || true
+    fi
     echo $MESSAGE
     ;;

tools/firewall.sh.in

@@ -585 +585 @@
       -j CONNMARK --set-mark 2
   done 
-  
-  ##
-  # Bandwidth Shaping: IMQ - Intermediate Queueing Device
-  ##
-  if [ "$BANDWIDTH_SHAPE" = "yes" ]; then
-    $IPTABLES -t mangle -I $CHAIN_MANGLE_POSTROUTING $DEV_OUT_PARAM $DEV_INTERNAL -j IMQ --todev 0
-    $IPTABLES -t mangle -I $CHAIN_MANGLE_PREROUTING $DEV_IN_PARAM $DEV_INTERNAL -j IMQ --todev 1
-  fi
 
   ##