|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH V9 07/12] remus: Remus network buffering core and APIs to setup/teardown
From: Shriram Rajagopalan <rshriram@xxxxxxxxx>
1.Add two members in libxl_domain_remus_info:
netbuf: whether netbuf is enabled
netbufscript: the path of the script which will be run to setup
and tear down the guest's interface.
2.introduces remus-netbuf-setup hotplug script responsible for
setting up and tearing down the necessary infrastructure required for
network output buffering in Remus. This script is intended to be invoked
by libxl for each guest interface, when starting or stopping Remus.
Apart from returning success/failure indication via the usual hotplug
entries in xenstore, this script also writes to xenstore, the name of
the IFB device to be used to control the vif's network output.
The script relies on libnl3 command line utilities to perform various
setup/teardown functions. The script is confined to Linux platforms only
since NetBSD does not seem to have libnl3.
The following steps are taken during init:
a) establish a dedicated remus context containing libnl related
state (netlink sockets, qdisc caches, etc.,)
The following steps are taken for each vif during setup:
a) call the hotplug script to setup its network buffer
b) Obtain handles to plug qdiscs installed on the IFB devices
chosen by the hotplug scripts.
And during teardown, the netlink resources are released, followed by
invocation of hotplug scripts to remove the ifb devices.
Signed-off-by: Shriram Rajagopalan <rshriram@xxxxxxxxx>
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Reviewed-by: Wen Congyang <wency@xxxxxxxxxxxxxx>
---
docs/misc/xenstore-paths.markdown | 4 +
tools/hotplug/Linux/Makefile | 1 +
tools/hotplug/Linux/remus-netbuf-setup | 183 +++++++++++++++
tools/libxl/libxl.c | 17 ++
tools/libxl/libxl.h | 13 ++
tools/libxl/libxl_internal.h | 2 +
tools/libxl/libxl_netbuffer.c | 403 +++++++++++++++++++++++++++++++++
tools/libxl/libxl_nonetbuffer.c | 23 ++
tools/libxl/libxl_remus_device.c | 22 +-
tools/libxl/libxl_remus_device.h | 2 +
tools/libxl/libxl_types.idl | 2 +
11 files changed, 670 insertions(+), 2 deletions(-)
create mode 100644 tools/hotplug/Linux/remus-netbuf-setup
diff --git a/docs/misc/xenstore-paths.markdown
b/docs/misc/xenstore-paths.markdown
index 70ab7f4..039eaea 100644
--- a/docs/misc/xenstore-paths.markdown
+++ b/docs/misc/xenstore-paths.markdown
@@ -385,6 +385,10 @@ The guest's virtual time offset from UTC in seconds.
The device model version for a domain.
+#### /libxl/$DOMID/remus/netbuf/$DEVID/ifb = STRING [n,INTERNAL]
+
+ifb device used by Remus to buffer network output from the associated vif.
+
[BLKIF]:
http://xenbits.xen.org/docs/unstable/hypercall/include,public,io,blkif.h.html
[FBIF]:
http://xenbits.xen.org/docs/unstable/hypercall/include,public,io,fbif.h.html
[HVMPARAMS]:
http://xenbits.xen.org/docs/unstable/hypercall/include,public,hvm,params.h.html
diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index a14cb42..baaaa41 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -15,6 +15,7 @@ XEN_SCRIPTS += network-nat vif-nat
XEN_SCRIPTS += vif-openvswitch
XEN_SCRIPTS += vif2
XEN_SCRIPTS += vif-setup
+XEN_SCRIPTS-$(CONFIG_REMUS_NETBUF) += remus-netbuf-setup
XEN_SCRIPTS += block
XEN_SCRIPTS += block-enbd block-nbd
XEN_SCRIPTS-$(CONFIG_BLKTAP1) += blktap
diff --git a/tools/hotplug/Linux/remus-netbuf-setup
b/tools/hotplug/Linux/remus-netbuf-setup
new file mode 100644
index 0000000..aed2583
--- /dev/null
+++ b/tools/hotplug/Linux/remus-netbuf-setup
@@ -0,0 +1,183 @@
+#!/bin/bash
+#============================================================================
+# ${XEN_SCRIPT_DIR}/remus-netbuf-setup
+#
+# Script for attaching a network buffer to the specified vif (in any mode).
+# The hotplugging system will call this script when starting remus via libxl
+# API, libxl_domain_remus_start.
+#
+# Usage:
+# remus-netbuf-setup (setup|teardown)
+#
+# Environment vars:
+# vifname vif interface name (required).
+# XENBUS_PATH path in Xenstore, where the IFB device details will be stored
+# or read from (required).
+# (libxl passes /libxl/<domid>/remus/netbuf/<devid>)
+# IFB ifb interface to be cleaned up (required). [for teardown op only]
+
+# Written to the store: (setup operation)
+# XENBUS_PATH/ifb=<ifbdevName> the IFB device serving
+# as the intermediate buffer through which the interface's network output
+# can be controlled.
+#
+# To install a network buffer on a guest vif (vif1.0) using ifb (ifb0)
+# we need to do the following
+#
+# ip link set dev ifb0 up
+# tc qdisc add dev vif1.0 ingress
+# tc filter add dev vif1.0 parent ffff: proto ip \
+# prio 10 u32 match u32 0 0 action mirred egress redirect dev ifb0
+# nl-qdisc-add --dev=ifb0 --parent root plug
+# nl-qdisc-add --dev=ifb0 --parent root --update plug --limit=10000000
+# (10MB limit on buffer)
+#
+# So order of operations when installing a network buffer on vif1.0
+# 1. find a free ifb and bring up the device
+# 2. redirect traffic from vif1.0 to ifb:
+# 2.1 add ingress qdisc to vif1.0 (to capture outgoing packets from guest)
+# 2.2 use tc filter command with actions mirred egress + redirect
+# 3. install plug_qdisc on ifb device, with which we can buffer/release
+# guest's network output from vif1.0
+#
+#
+
+#============================================================================
+
+# Unlike other vif scripts, vif-common is not needed here as it executes vif
+#specific setup code such as renaming.
+dir=$(dirname "$0")
+. "$dir/xen-hotplug-common.sh"
+
+findCommand "$@"
+
+if [ "$command" != "setup" -a "$command" != "teardown" ]
+then
+ echo "Invalid command: $command"
+ log err "Invalid command: $command"
+ exit 1
+fi
+
+evalVariables "$@"
+
+: ${vifname:?}
+: ${XENBUS_PATH:?}
+
+check_libnl_tools() {
+ if ! command -v nl-qdisc-list > /dev/null 2>&1; then
+ fatal "Unable to find nl-qdisc-list tool"
+ fi
+ if ! command -v nl-qdisc-add > /dev/null 2>&1; then
+ fatal "Unable to find nl-qdisc-add tool"
+ fi
+ if ! command -v nl-qdisc-delete > /dev/null 2>&1; then
+ fatal "Unable to find nl-qdisc-delete tool"
+ fi
+}
+
+# We only check for modules. We don't load them.
+# User/Admin is supposed to load ifb during boot time,
+# ensuring that there are enough free ifbs in the system.
+# Other modules will be loaded automatically by tc commands.
+check_modules() {
+ for m in ifb sch_plug sch_ingress act_mirred cls_u32
+ do
+ if ! modinfo $m > /dev/null 2>&1; then
+ fatal "Unable to find $m kernel module"
+ fi
+ done
+}
+
+setup_ifb() {
+
+ for ifb in `ifconfig -a -s|egrep ^ifb|cut -d ' ' -f1`
+ do
+ local installed=`nl-qdisc-list -d $ifb`
+ [ -n "$installed" ] && continue
+ IFB="$ifb"
+ break
+ done
+
+ if [ -z "$IFB" ]
+ then
+ fatal "Unable to find a free IFB device for $vifname"
+ fi
+
+ do_or_die ip link set dev "$IFB" up
+}
+
+redirect_vif_traffic() {
+ local vif=$1
+ local ifb=$2
+
+ do_or_die tc qdisc add dev "$vif" ingress
+
+ tc filter add dev "$vif" parent ffff: proto ip prio 10 \
+ u32 match u32 0 0 action mirred egress redirect dev "$ifb" >/dev/null
2>&1
+
+ if [ $? -ne 0 ]
+ then
+ do_without_error tc qdisc del dev "$vif" ingress
+ fatal "Failed to redirect traffic from $vif to $ifb"
+ fi
+}
+
+add_plug_qdisc() {
+ local vif=$1
+ local ifb=$2
+
+ nl-qdisc-add --dev="$ifb" --parent root plug >/dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ do_without_error tc qdisc del dev "$vif" ingress
+ fatal "Failed to add plug qdisc to $ifb"
+ fi
+
+ #set ifb buffering limit in bytes. Its okay if this command fails
+ nl-qdisc-add --dev="$ifb" --parent root \
+ --update plug --limit=10000000 >/dev/null 2>&1 || true
+}
+
+teardown_netbuf() {
+ local vif=$1
+ local ifb=$2
+
+ if [ "$ifb" ]; then
+ do_without_error ip link set dev "$ifb" down
+ do_without_error nl-qdisc-delete --dev="$ifb" --parent root plug
>/dev/null 2>&1
+ xenstore-rm -t "$XENBUS_PATH/ifb" 2>/dev/null || true
+ fi
+ do_without_error tc qdisc del dev "$vif" ingress
+ xenstore-rm -t "$XENBUS_PATH/hotplug-status" 2>/dev/null || true
+ xenstore-rm -t "$XENBUS_PATH/hotplug-error" 2>/dev/null || true
+}
+
+xs_write_failed() {
+ local vif=$1
+ local ifb=$2
+ teardown_netbuf "$vifname" "$IFB"
+ fatal "failed to write ifb name to xenstore"
+}
+
+case "$command" in
+ setup)
+ check_libnl_tools
+ check_modules
+
+ claim_lock "pickifb"
+ setup_ifb
+ redirect_vif_traffic "$vifname" "$IFB"
+ add_plug_qdisc "$vifname" "$IFB"
+ release_lock "pickifb"
+
+ #not using xenstore_write that automatically exits on error
+ #because we need to cleanup
+ _xenstore_write "$XENBUS_PATH/ifb" "$IFB" || xs_write_failed
"$vifname" "$IFB"
+ success
+ ;;
+ teardown)
+ teardown_netbuf "$vifname" "$IFB"
+ ;;
+esac
+
+log debug "Successful remus-netbuf-setup $command for $vifname, ifb $IFB."
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index e3eca6e..687a2a9 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -748,6 +748,23 @@ int libxl_domain_remus_start(libxl_ctx *ctx,
libxl_domain_remus_info *info,
remus_state->dss = dss;
remus_state->egc = egc;
+ /* Setup network buffering */
+ if (info->netbuf) {
+ if (!libxl__netbuffer_enabled(gc)) {
+ LOG(ERROR, "Remus: No support for network buffering");
+ goto out;
+ }
+
+ if (info->netbufscript) {
+ remus_state->netbufscript =
+ libxl__strdup(gc, info->netbufscript);
+ } else {
+ remus_state->netbufscript =
+ GCSPRINTF("%s/remus-netbuf-setup",
+ libxl__xen_script_dir_path());
+ }
+ }
+
/* Point of no return */
libxl__domain_suspend(egc, dss);
return AO_INPROGRESS;
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index b2c3015..62f7dd4 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -410,6 +410,19 @@
#define LIBXL_HAVE_DRIVER_DOMAIN_CREATION 1
/*
+ * LIBXL_HAVE_REMUS_NETBUF 1
+ *
+ * If this is defined, then the libxl_domain_remus_info structure will
+ * have a boolean field (netbuf) and a string field (netbufscript).
+ *
+ * netbuf, if true, indicates that network buffering should be enabled.
+ *
+ * netbufscript, if set, indicates the path to the hotplug script to
+ * setup or teardown network buffers.
+ */
+#define LIBXL_HAVE_REMUS_NETBUF 1
+
+/*
* LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP
*
* If this is defined:
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 14094aa..b72643b 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2458,6 +2458,8 @@ typedef struct libxl__logdirty_switch {
} libxl__logdirty_switch;
typedef struct libxl__remus_state {
+ /* Script to setup/teardown network buffers */
+ const char *netbufscript;
libxl__domain_suspend_state *dss;
libxl__egc *egc;
diff --git a/tools/libxl/libxl_netbuffer.c b/tools/libxl/libxl_netbuffer.c
index 8e23d75..a5f2b9a 100644
--- a/tools/libxl/libxl_netbuffer.c
+++ b/tools/libxl/libxl_netbuffer.c
@@ -16,12 +16,415 @@
#include "libxl_osdeps.h" /* must come before any other headers */
#include "libxl_internal.h"
+#include "libxl_remus_device.h"
+
+#include <netlink/cache.h>
+#include <netlink/socket.h>
+#include <netlink/attr.h>
+#include <netlink/route/link.h>
+#include <netlink/route/route.h>
+#include <netlink/route/qdisc.h>
+#include <netlink/route/qdisc/plug.h>
+
+typedef struct libxl__remus_netbuf_state {
+ struct nl_sock *nlsock;
+ struct nl_cache *qdisc_cache;
+
+ const char *netbufscript;
+ uint32_t domid;
+ libxl__ao *ao;
+} libxl__remus_netbuf_state;
+
+typedef struct libxl__remus_device_nic {
+ libxl__remus_device remus_dev;
+ const char *vif;
+ const char *ifb;
+ struct rtnl_qdisc *qdisc;
+
+ void *saved_opaque;
+ void (*saved_finish_cb)(void *opaque, int status);
+} libxl__remus_device_nic;
int libxl__netbuffer_enabled(libxl__gc *gc)
{
return 1;
}
+/* If the device has a vifname, then use that instead of
+ * the vifX.Y format.
+ */
+static const char *get_vifname(libxl__remus_device_nic *remus_nic,
+ const libxl_device_nic *nic)
+{
+ libxl__remus_netbuf_state *netbuf_state =
+ remus_nic->remus_dev.dev_type->data;
+ const char *vifname = NULL;
+ const char *path;
+ int rc;
+
+ STATE_AO_GC(netbuf_state->ao);
+
+ /* Convenience aliases */
+ const uint32_t domid = netbuf_state->domid;
+
+ path = libxl__sprintf(gc, "%s/backend/vif/%d/%d/vifname",
+ libxl__xs_get_dompath(gc, 0), domid, nic->devid);
+ rc = libxl__xs_read_checked(gc, XBT_NULL, path, &vifname);
+ if (!rc && !vifname) {
+ /* use the default name */
+ vifname = libxl__device_nic_devname(gc, domid,
+ nic->devid,
+ nic->nictype);
+ }
+
+ return vifname;
+}
+
+static void free_qdisc(libxl__remus_device_nic *remus_nic)
+{
+ /* free qdiscs */
+ if (remus_nic->qdisc == NULL)
+ return;
+
+ nl_object_put((struct nl_object *)(remus_nic->qdisc));
+ remus_nic->qdisc = NULL;
+}
+
+static int init_qdisc(libxl__remus_netbuf_state *netbuf_state,
+ libxl__remus_device_nic *remus_nic)
+{
+ int ret, ifindex;
+ struct rtnl_link *ifb = NULL;
+ struct rtnl_qdisc *qdisc = NULL;
+
+ STATE_AO_GC(netbuf_state->ao);
+
+ /* Now that we have brought up IFB device with plug qdisc for
+ * this vif, so we need to refill the qdisc cache.
+ */
+ ret = nl_cache_refill(netbuf_state->nlsock, netbuf_state->qdisc_cache);
+ if (ret < 0) {
+ LOG(ERROR, "cannot refill qdisc cache");
+ goto out;
+ }
+
+ /* get a handle to the IFB interface */
+ ifb = NULL;
+ ret = rtnl_link_get_kernel(netbuf_state->nlsock, 0,
+ remus_nic->ifb, &ifb);
+ if (ret) {
+ LOG(ERROR, "cannot obtain handle for %s: %s", remus_nic->ifb,
+ nl_geterror(ret));
+ ret = REMUS_FAIL;
+ goto out;
+ }
+
+ ret = REMUS_FAIL;
+ ifindex = rtnl_link_get_ifindex(ifb);
+ if (!ifindex) {
+ LOG(ERROR, "interface %s has no index", remus_nic->ifb);
+ goto out;
+ }
+
+ /* Get a reference to the root qdisc installed on the IFB, by
+ * querying the qdisc list we obtained earlier. The netbufscript
+ * sets up the plug qdisc as the root qdisc, so we don't have to
+ * search the entire qdisc tree on the IFB dev.
+
+ * There is no need to explicitly free this qdisc as its just a
+ * reference from the qdisc cache we allocated earlier.
+ */
+ qdisc = rtnl_qdisc_get_by_parent(netbuf_state->qdisc_cache, ifindex,
+ TC_H_ROOT);
+
+ if (qdisc) {
+ const char *tc_kind = rtnl_tc_get_kind(TC_CAST(qdisc));
+ /* Sanity check: Ensure that the root qdisc is a plug qdisc. */
+ if (!tc_kind || strcmp(tc_kind, "plug")) {
+ nl_object_put((struct nl_object *)qdisc);
+ LOG(ERROR, "plug qdisc is not installed on %s", remus_nic->ifb);
+ goto out;
+ }
+ remus_nic->qdisc = qdisc;
+ ret = REMUS_OK;
+ } else {
+ LOG(ERROR, "Cannot get qdisc handle from ifb %s", remus_nic->ifb);
+ }
+
+out:
+ if (ifb)
+ rtnl_link_put(ifb);
+
+ return ret;
+}
+
+/*
+ * In return, the script writes the name of IFB device (during setup) to be
+ * used for output buffering into XENBUS_PATH/ifb
+ */
+static void netbuf_setup_script_cb(void *opaque, int status)
+{
+ libxl__remus_device_nic *remus_nic = opaque;
+ libxl__remus_netbuf_state *netbuf_state =
+ remus_nic->remus_dev.dev_type->data;
+ const char *out_path_base, *hotplug_error = NULL;
+ int rc;
+
+ /* Convenience aliases */
+ const uint32_t domid = netbuf_state->domid;
+ const int devid = remus_nic->remus_dev.dev_id;
+ const char *const vif = remus_nic->vif;
+ const char **const ifb = &remus_nic->ifb;
+
+ STATE_AO_GC(netbuf_state->ao);
+
+ if (status) {
+ rc = REMUS_FAIL;
+ goto out;
+ }
+
+ out_path_base = GCSPRINTF("%s/remus/netbuf/%d",
+ libxl__xs_libxl_path(gc, domid), devid);
+
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/hotplug-error", out_path_base),
+ &hotplug_error);
+ if (rc) {
+ rc = REMUS_FAIL;
+ goto out;
+ }
+
+ if (hotplug_error) {
+ LOG(ERROR, "netbuf script %s setup failed for vif %s: %s",
+ netbuf_state->netbufscript, vif, hotplug_error);
+ rc = REMUS_FAIL;
+ goto out;
+ }
+
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/remus/netbuf/%d/ifb",
+ libxl__xs_libxl_path(gc, domid),
+ devid),
+ ifb);
+ if (rc) {
+ rc = REMUS_FAIL;
+ goto out;
+ }
+
+ if (!(*ifb)) {
+ LOG(ERROR, "Cannot get ifb dev name for domain %u dev %s",
+ domid, vif);
+ rc = REMUS_FAIL;
+ goto out;
+ }
+
+ LOG(DEBUG, "%s will buffer packets from vif %s", *ifb, vif);
+ rc = init_qdisc(netbuf_state, remus_nic);
+
+out:
+ remus_nic->saved_finish_cb(remus_nic->saved_opaque, rc);
+}
+
+static void netbuf_teardown_script_cb(void *opaque, int status)
+{
+ int rc;
+ libxl__remus_device_nic *remus_nic = opaque;
+
+ if (status)
+ rc = REMUS_FAIL;
+ else
+ rc = REMUS_OK;
+
+ free_qdisc(remus_nic);
+
+ remus_nic->saved_finish_cb(remus_nic->saved_opaque, rc);
+}
+
+/* the script needs the following env & args
+ * $vifname
+ * $XENBUS_PATH (/libxl/<domid>/remus/netbuf/<devid>/)
+ * $IFB (for teardown)
+ * setup/teardown as command line arg.
+ */
+static void setup_async_exec(libxl_async_exec *async_exec, char *op,
+ libxl__remus_device_nic *remus_nic)
+{
+ int arraysize, nr = 0;
+ char **env = NULL, **args = NULL;
+ libxl__remus_netbuf_state *netbuf_state =
+ remus_nic->remus_dev.dev_type->data;
+ STATE_AO_GC(netbuf_state->ao);
+
+ /* Convenience aliases */
+ char *const script = libxl__strdup(gc, netbuf_state->netbufscript);
+ const uint32_t domid = netbuf_state->domid;
+ const int dev_id = remus_nic->remus_dev.dev_id;
+ const char *const vif = remus_nic->vif;
+ const char *const ifb = remus_nic->ifb;
+
+ arraysize = 7;
+ GCNEW_ARRAY(env, arraysize);
+ env[nr++] = "vifname";
+ env[nr++] = libxl__strdup(gc, vif);
+ env[nr++] = "XENBUS_PATH";
+ env[nr++] = GCSPRINTF("%s/remus/netbuf/%d",
+ libxl__xs_libxl_path(gc, domid), dev_id);
+ if (!strcmp(op, "teardown") && ifb) {
+ env[nr++] = "IFB";
+ env[nr++] = libxl__strdup(gc, ifb);
+ }
+ env[nr++] = NULL;
+ assert(nr <= arraysize);
+
+ arraysize = 3; nr = 0;
+ GCNEW_ARRAY(args, arraysize);
+ args[nr++] = script;
+ args[nr++] = op;
+ args[nr++] = NULL;
+ assert(nr == arraysize);
+
+ async_exec->env = env;
+ async_exec->args = args;
+ async_exec->timeout = LIBXL_HOTPLUG_TIMEOUT;
+
+ async_exec->stdinfd = -1;
+ async_exec->stdoutfd = -1;
+ async_exec->stderrfd = -1;
+ async_exec->allow_fail = false;
+
+ remus_nic->saved_opaque = async_exec->opaque;
+ remus_nic->saved_finish_cb = async_exec->finish_cb;
+ async_exec->opaque = remus_nic;
+ if (!strcmp(op, "teardown"))
+ async_exec->finish_cb = netbuf_teardown_script_cb;
+ else
+ async_exec->finish_cb = netbuf_setup_script_cb;
+}
+
+static int nic_init(libxl__remus_device_type *self,
+ libxl__remus_state *remus_state)
+{
+ int ret;
+ libxl__remus_netbuf_state *netbuf_state;
+
+ STATE_AO_GC(remus_state->dss->ao);
+
+ if (!remus_state->netbufscript)
+ return REMUS_OK;
+
+ GCNEW(netbuf_state);
+ self->data = netbuf_state;
+
+ netbuf_state->nlsock = nl_socket_alloc();
+ if (!netbuf_state->nlsock) {
+ LOG(ERROR, "cannot allocate nl socket");
+ return REMUS_FAIL;
+ }
+
+ ret = nl_connect(netbuf_state->nlsock, NETLINK_ROUTE);
+ if (ret) {
+ LOG(ERROR, "failed to open netlink socket: %s",
+ nl_geterror(ret));
+ return REMUS_FAIL;
+ }
+
+ /* get list of all qdiscs installed on network devs. */
+ ret = rtnl_qdisc_alloc_cache(netbuf_state->nlsock,
+ &netbuf_state->qdisc_cache);
+ if (ret) {
+ LOG(ERROR, "failed to allocate qdisc cache: %s",
+ nl_geterror(ret));
+ return REMUS_FAIL;
+ }
+
+ netbuf_state->domid = remus_state->dss->domid;
+ netbuf_state->netbufscript = remus_state->netbufscript;
+ netbuf_state->ao = remus_state->dss->ao;
+
+ return REMUS_OK;
+}
+
+static void nic_destroy(libxl__remus_device_type *self)
+{
+ libxl__remus_netbuf_state *netbuf_state = self->data;
+
+ if (!self->data)
+ return;
+
+ /* free qdisc cache */
+ if (netbuf_state->qdisc_cache) {
+ nl_cache_clear(netbuf_state->qdisc_cache);
+ nl_cache_free(netbuf_state->qdisc_cache);
+ netbuf_state->qdisc_cache = NULL;
+ }
+
+ /* close & free nlsock */
+ if (netbuf_state->nlsock) {
+ nl_close(netbuf_state->nlsock);
+ nl_socket_free(netbuf_state->nlsock);
+ netbuf_state->nlsock = NULL;
+ }
+}
+
+static int nic_match(const libxl__remus_device_type *self,
+ const void *libxl_device, int device_type,
+ libxl_async_exec *async_exec)
+{
+ if (device_type == REMUS_NIC)
+ return REMUS_OK;
+
+ return REMUS_NOT_SUPPORT;
+}
+
+static int nic_setup(libxl__remus_device *remus_dev,
+ libxl_async_exec *async_exec)
+{
+ libxl__remus_device_nic *remus_nic =
+ CONTAINER_OF(remus_dev, *remus_nic, remus_dev);
+ libxl__remus_netbuf_state *netbuf_state = remus_dev->dev_type->data;
+ const libxl_device_nic *nic = remus_nic->remus_dev.libxl_device;
+
+ STATE_AO_GC(netbuf_state->ao);
+
+ remus_nic->vif = get_vifname(remus_nic, nic);
+
+ setup_async_exec(async_exec, "setup", remus_nic);
+ if (libxl_async_exec_script(gc, async_exec))
+ return REMUS_FAIL;
+
+ return REMUS_INPROGRESS;
+}
+
+/* Note: This function will be called in the same gc context as
+ * libxl__remus_netbuf_setup, created during the libxl_domain_remus_start
+ * API call.
+ */
+static int nic_teardown(libxl__remus_device *remus_dev,
+ libxl_async_exec *async_exec)
+{
+ libxl__remus_device_nic *remus_nic =
+ CONTAINER_OF(remus_dev, *remus_nic, remus_dev);
+ libxl__remus_netbuf_state *netbuf_state = remus_dev->dev_type->data;
+
+ STATE_AO_GC(netbuf_state->ao);
+
+ setup_async_exec(async_exec, "teardown", remus_nic);
+
+ if (libxl_async_exec_script(gc, async_exec))
+ return REMUS_FAIL;
+
+ return REMUS_INPROGRESS;
+}
+
+libxl__remus_device_type remus_device_nic = {
+ .init = nic_init,
+ .destroy = nic_destroy,
+ .match = nic_match,
+ .setup = nic_setup,
+ .teardown = nic_teardown,
+ .size = sizeof(libxl__remus_device_nic),
+};
+
/*
* Local variables:
* mode: C
diff --git a/tools/libxl/libxl_nonetbuffer.c b/tools/libxl/libxl_nonetbuffer.c
index 6aa4bf1..4ee24e1 100644
--- a/tools/libxl/libxl_nonetbuffer.c
+++ b/tools/libxl/libxl_nonetbuffer.c
@@ -22,6 +22,29 @@ int libxl__netbuffer_enabled(libxl__gc *gc)
return 0;
}
+static int nic_match(const void *libxl_device, int devcie_type,
+ libxl_async_exec *async_exec)
+{
+ return REMUS_NOT_SUPPORT;
+}
+
+static int nic_init(libxl__remus_device_type *self,
+ libxl__remus_state *remus_state)
+{
+ return REMUS_OK;
+}
+
+static void nic_destroy(libxl__remus_device_type *self)
+{
+ return;
+}
+
+libxl__remus_device_type remus_nic = {
+ .init = nic_init,
+ .destroy = nic_destroy,
+ .match = nic_match,
+};
+
/*
* Local variables:
* mode: C
diff --git a/tools/libxl/libxl_remus_device.c b/tools/libxl/libxl_remus_device.c
index bfe6080..1564bd1 100644
--- a/tools/libxl/libxl_remus_device.c
+++ b/tools/libxl/libxl_remus_device.c
@@ -37,6 +37,7 @@ typedef struct libxl__remus_device_state {
} libxl__remus_device_state;
static libxl__remus_device_type *device_types[] = {
+ &remus_device_nic,
};
int libxl__remus_device_postsuspend(libxl__remus_state *remus_state)
@@ -111,6 +112,16 @@ static void libxl__remus_teardown_cleanup(libxl__egc *egc,
int i;
libxl__remus_device_type *dev_type;
+ /* Convenience aliases */
+ libxl__remus_device_state *dev_state = dss->remus_state->device_state;
+
+ /* clean nic */
+ for (i = 0; i < dev_state->num_nics; i++)
+ libxl_device_nic_dispose(&dev_state->nics[i]);
+ free(dev_state->nics);
+ dev_state->nics = NULL;
+ dev_state->num_nics = 0;
+
/* clean device_types */
for (i = 0; i < ARRAY_SIZE(device_types); i++) {
dev_type = device_types[i];
@@ -313,7 +324,7 @@ static void dev_match_script_cb(void *opaque, int status)
void libxl__remus_device_setup(libxl__egc *egc,
libxl__domain_suspend_state *dss)
{
- int i, rc;
+ int i, rc, num_devices;
libxl__remus_device_state *dev_state = NULL;
libxl__remus_device_type *dev_type;
@@ -333,7 +344,14 @@ void libxl__remus_device_setup(libxl__egc *egc,
}
}
- /* TBD: Remus setup - i.e. attach qdisc, enable disk buffering, etc */
+ /* nic */
+ if (dss->remus_state->netbufscript) {
+ dev_state->nics = libxl_device_nic_list(CTX, dss->domid, &num_devices);
+ dev_state->num_nics = num_devices;
+ dev_state->num_devices += num_devices;
+ }
+
+ /* TBD: enable disk buffering */
GCNEW_ARRAY(dev_state->dev, dev_state->num_devices);
diff --git a/tools/libxl/libxl_remus_device.h b/tools/libxl/libxl_remus_device.h
index d8d16ff..30b368d 100644
--- a/tools/libxl/libxl_remus_device.h
+++ b/tools/libxl/libxl_remus_device.h
@@ -94,4 +94,6 @@ struct libxl__remus_device {
const libxl__remus_device_type *dev_type;
};
+extern libxl__remus_device_type remus_device_nic;
+
#endif
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 612645c..cb3d926 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -563,6 +563,8 @@ libxl_domain_remus_info = Struct("domain_remus_info",[
("interval", integer),
("blackhole", bool),
("compression", bool),
+ ("netbuf", bool),
+ ("netbufscript", string),
])
libxl_event_type = Enumeration("event_type", [
--
1.8.3.2
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |