Skip to contentSkip to conversation

Remus: Use kmods in pvops tree instead of building standalone versions

PATCH New Brendan Cully 2 participants 6 messages Sep 3, 2010 – Sep 7, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remus: Use kmods in pvops tree instead of building standalone versions

These two patches switch Remus to using the sch_plug qdisc that has recently been included in the pvops tree, removing the standalone versions whose build process is racy.

#1 lore raw

PATCH 1/1 Remus: use plug qdisc for network buffering instead of queue

# HG changeset patch
# User Brendan Cully <[email protected]>
# Date 1283549071 25200
# Node ID 28b1cd50c43d408c43f89c177b720984168ee196 # Parent 930cd1ca2ddc548f5647b433a90fce96989646f3
Remus: use plug qdisc for network buffering instead of queue

It was renamed in the pvops tree.

tools/python/xen/remus/device.py +8 -8
@@ -281,12 +281,12 @@
         if not self.installed:
             self.install()
 
-        self._sendqmsg(qdisc.TC_QUEUE_CHECKPOINT)
+        self._sendqmsg(qdisc.TC_PLUG_CHECKPOINT)
 
     def commit(self):
         '''Called when checkpoint has been acknowledged by
         the backup'''
-        self._sendqmsg(qdisc.TC_QUEUE_RELEASE)
+        self._sendqmsg(qdisc.TC_PLUG_RELEASE)
 
     # private
     def _sendqmsg(self, action):
@@ -296,7 +296,7 @@
         return True
 
     def setup(self):
-        """install Remus queue on VIF outbound traffic"""
+        """install Remus plug on VIF outbound traffic"""
         self.bufdev = self.pool.get()
 
         devname = self.bufdev.devname
@@ -308,19 +308,19 @@
 
         self.bufdevno = bufdev['index']
         self.handle = qdisc.TC_H_ROOT
-        self.q = qdisc.QueueQdisc()
+        self.q = qdisc.PlugQdisc()
 
-        if not util.modprobe('sch_queue'):
-            raise BufferedNICException('could not load sch_queue module')
+        if not util.modprobe('sch_plug'):
+            raise BufferedNICException('could not load sch_plug module')
 
     def install(self):
         devname = self.bufdev.devname
         q = self.rth.getqdisc(self.bufdevno)
         if q:
-            if q['kind'] == 'queue':
+            if q['kind'] == 'plug':
                 self.installed = True
                 return
-            if q['kind'] != 'pfifo_fast':
+            if q['kind'] not in ('ingress', 'pfifo_fast'):
                 raise BufferedNICException('there is already a queueing '
                                            'discipline on %s' % devname)
 
tools/python/xen/remus/qdisc.py +8 -8
@@ -146,17 +146,17 @@
 
 qdisc_kinds['cfifo'] = CfifoQdisc
 
-TC_QUEUE_CHECKPOINT = 0
-TC_QUEUE_RELEASE = 1
+TC_PLUG_CHECKPOINT = 0
+TC_PLUG_RELEASE = 1
 
-class QueueQdisc(Qdisc):
+class PlugQdisc(Qdisc):
     fmt = 'I'
 
     def __init__(self, qdict=None):
         if not qdict:
-            qdict = {'kind': 'queue',
+            qdict = {'kind': 'plug',
                      'handle': TC_H_ROOT}
-        super(QueueQdisc, self).__init__(qdict)
+        super(PlugQdisc, self).__init__(qdict)
 
         self.action = 0
 
@@ -169,10 +169,10 @@
         arg = args[0]
 
         if arg == 'checkpoint':
-            self.action = TC_QUEUE_CHECKPOINT
+            self.action = TC_PLUG_CHECKPOINT
         elif arg == 'release':
-            self.action = TC_QUEUE_RELEASE
+            self.action = TC_PLUG_RELEASE
         else:
             raise QdiscException('unknown action')
 
-qdisc_kinds['queue'] = QueueQdisc
+qdisc_kinds['plug'] = PlugQdisc
#2 lore raw

PATCH 1/1 Remove Remus kernel extensions (now distributed with pvops kernel)

In reply to Brendan Cully

# HG changeset patch
# User Brendan Cully <[email protected]>
# Date 1283549073 25200
# Node ID 3da9f0de715657ae1d1fa622802564ac845d0be3
# Parent 28b1cd50c43d408c43f89c177b720984168ee196 Remove Remus kernel extensions (now distributed with pvops kernel)

Note that 2.6.18 doesn't have these extensions, so as of this patch Remus no longer supports 2.6.18 dom0 (2.6.18 is still the preferred kernel for domU, since it contains the suspend event channel).

tools/remus/Makefile +0 -2
@@ -1,8 +1,6 @@
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-SUBDIRS-$(CONFIG_Linux) := imqebt kmod
-
 SCRIPTS = remus
 
 .PHONY: all
tools/remus/imqebt/Makefile deleted +0 -98

98 lines not on this page · raw message

tools/remus/imqebt/README deleted +0 -2
deleted file mode 100644
@@ -1,2 +0,0 @@
-This is a fork of ebtables for installing IMQ on a bridged device.
-Like the original code, it is released under the GPL.
\ No newline at end of file
tools/remus/imqebt/communication.c deleted +0 -762

762 lines not on this page · raw message

tools/remus/imqebt/ebtables-standalone.c deleted +0 -14
deleted file mode 100644
@@ -1,14 +0,0 @@
-#include <string.h>
-#include "include/ebtables_u.h"
-
-static struct ebt_u_replace replace;
-void ebt_early_init_once();
-
-int main(int argc, char *argv[])
-{
-       ebt_silent = 0;
-       ebt_early_init_once();
-       strcpy(replace.name, "filter");
-       do_command(argc, argv, EXEC_STYLE_PRG, &replace);
-       return 0;
-}
tools/remus/imqebt/ebtables.c deleted +0 -1233

1,233 lines not on this page · raw message

tools/remus/imqebt/extensions/Makefile deleted +0 -29
deleted file mode 100644
@@ -1,29 +0,0 @@
-#! /usr/bin/make
-
-EXT_FUNC+=standard imq
-EXT_TABLES+=filter
-EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/ebt_$(T).o)
-EXT_OBJS+=$(foreach T,$(EXT_TABLES), extensions/ebtable_$(T).o)
-EXT_LIBS+=$(foreach T,$(EXT_FUNC), extensions/libebt_$(T).so)
-EXT_LIBS+=$(foreach T,$(EXT_TABLES), extensions/libebtable_$(T).so)
-EXT_LIBSI+=$(foreach T,$(EXT_FUNC), -lebt_$(T))
-EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
-
-extensions/ebt_%.so: extensions/ebt_%.o
-	$(CC) -shared -o $@ -lc $< -nostartfiles
-
-extensions/libebt_%.so: extensions/ebt_%.so
-	mv $< $@
-
-extensions/ebtable_%.so: extensions/ebtable_%.o
-	$(CC) -shared -o $@ -lc $< -nostartfiles
-
-extensions/libebtable_%.so: extensions/ebtable_%.so
-	mv $< $@
-
-extensions/ebt_%.o: extensions/ebt_%.c include/ebtables_u.h
-	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
-
-extensions/ebtable_%.o: extensions/ebtable_%.c
-	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(PROGSPECS) -c -o $@ $< -I$(KERNEL_INCLUDES)
-
tools/remus/imqebt/extensions/ebt_imq.c deleted +0 -84

84 lines not on this page · raw message

tools/remus/imqebt/extensions/ebt_standard.c deleted +0 -90

90 lines not on this page · raw message

tools/remus/imqebt/extensions/ebtable_filter.c deleted +0 -35
deleted file mode 100644
@@ -1,35 +0,0 @@
-/* ebtable_filter
- *
- * Authors:
- * Bart De Schuymer <[email protected]>
- *
- * April, 2002
- */
-
-#include <stdio.h>
-#include "../include/ebtables_u.h"
-
-#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
-   (1 << NF_BR_LOCAL_OUT))
-
-static void print_help(const char **hn)
-{
-       int i;
-
-       printf("Supported chains for the filter table:\n");
-       for (i = 0; i < NF_BR_NUMHOOKS; i++)
-               if (FILTER_VALID_HOOKS & (1 << i))
-                       printf("%s ", hn[i]);
-       printf("\n");
-}
-
-static struct ebt_u_table table =
-{
-       .name           = "filter",
-       .help           = print_help,
-};
-
-void _init(void)
-{
-       ebt_register_table(&table);
-}
tools/remus/imqebt/getethertype.c deleted +0 -162

162 lines not on this page · raw message

tools/remus/imqebt/include/ebtables_u.h deleted +0 -379

379 lines not on this page · raw message

tools/remus/imqebt/include/ethernetdb.h deleted +0 -58

58 lines not on this page · raw message

tools/remus/imqebt/include/linux/if_ether.h deleted +0 -146

45 lines not on this page · raw message

tools/remus/imqebt/include/linux/netfilter_bridge.h deleted +0 -91

91 lines not on this page · raw message

tools/remus/imqebt/include/linux/netfilter_bridge/ebt_imq.h deleted +0 -8
deleted file mode 100644

Lines of this file are not shown. View the raw message.

tools/remus/imqebt/include/linux/netfilter_bridge/ebtables.h deleted +0 -276

276 lines not on this page · raw message

tools/remus/imqebt/include/linux/types.h deleted +0 -209

209 lines not on this page · raw message

tools/remus/imqebt/libebtc.c deleted +0 -1280

1,280 lines not on this page · raw message

tools/remus/imqebt/useful_functions.c deleted +0 -413

413 lines not on this page · raw message

tools/remus/kmod/Kbuild deleted +0 -1
deleted file mode 100644

Lines of this file are not shown. View the raw message.

tools/remus/kmod/Makefile deleted +0 -27
deleted file mode 100644

Lines of this file are not shown. View the raw message.

tools/remus/kmod/ebt_imq.c deleted +0 -96

96 lines not on this page · raw message

tools/remus/kmod/ebt_imq.h deleted +0 -14
deleted file mode 100644

Lines of this file are not shown. View the raw message.

tools/remus/kmod/sch_queue.c deleted +0 -245

245 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#3 lore raw

Re: [PATCH 2 of 2] Remove Remus kernel extensions (now distributed with pvops kernel)

Quoted 11 lines · Brendan Cully

# HG changeset patch
# User Brendan Cully <[email protected]>
# Date 1283549073 25200
# Node ID 3da9f0de715657ae1d1fa622802564ac845d0be3
# Parent 28b1cd50c43d408c43f89c177b720984168ee196 Remove Remus kernel extensions (now distributed with pvops kernel)

Note that 2.6.18 doesn't have these extensions, so as of this patch Remus no longer supports 2.6.18 dom0 (2.6.18 is still the preferred kernel for domU, since it contains the suspend event channel).

Hmm.. so pvops kernel *does* work for domU?
But it's *preferred* to use linux-2.6.18-xen ?

-- Pasi

#4 lore raw

Re: [PATCH 2 of 2] Remove Remus kernel extensions (now distributed with pvops kernel)

Quoted 8 lines · Pasi Kärkkäinen
Quoted 7 lines · Brendan Cully

# HG changeset patch
# User Brendan Cully <[email protected]>
# Date 1283549073 25200
# Node ID 3da9f0de715657ae1d1fa622802564ac845d0be3
# Parent 28b1cd50c43d408c43f89c177b720984168ee196 Remove Remus kernel extensions (now distributed with pvops kernel)

Quoted 7 lines
Quoted 4 lines

Note that 2.6.18 doesn't have these extensions, so as of this patch Remus no longer supports 2.6.18 dom0 (2.6.18 is still the preferred kernel for domU, since it contains the suspend event channel).

Hmm.. so pvops kernel *does* work for domU?
But it's *preferred* to use linux-2.6.18-xen ?

Er, no, not as of the last time I checked. pvops *should* work but it has a bug handling suspend_cancel that prevents it from resuming correctly after the first checkpoint. So, you're right, 2.6.18 or HVM is the only currently working domU configuration.

#5 lore raw

Re: [PATCH 2 of 2] Remove Remus kernel extensions (now distributed with pvops kernel)

Quoted 14 lines · Brendan Cully
Quoted 13 lines · Pasi Kärkkäinen
Quoted 11 lines · Brendan Cully

# HG changeset patch
# User Brendan Cully <[email protected]>
# Date 1283549073 25200
# Node ID 3da9f0de715657ae1d1fa622802564ac845d0be3
# Parent 28b1cd50c43d408c43f89c177b720984168ee196 Remove Remus kernel extensions (now distributed with pvops kernel)

Note that 2.6.18 doesn't have these extensions, so as of this patch Remus no longer supports 2.6.18 dom0 (2.6.18 is still the preferred kernel for domU, since it contains the suspend event channel).

Quoted 8 lines
Quoted 2 lines

Hmm.. so pvops kernel *does* work for domU?
But it's *preferred* to use linux-2.6.18-xen ?

Er, no, not as of the last time I checked. pvops *should* work but it has a bug handling suspend_cancel that prevents it from resuming correctly after the first checkpoint. So, you're right, 2.6.18 or HVM is the only currently working domU configuration.

Ok, thanks for the confirmation.

-- Pasi