From patchwork Sun Jan 29 07:53:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rshriram@cs.ubc.ca X-Patchwork-Id: 138433 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 89DDAB6EEE for ; Sun, 29 Jan 2012 19:01:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751611Ab2A2IBS (ORCPT ); Sun, 29 Jan 2012 03:01:18 -0500 Received: from [198.162.52.240] ([198.162.52.240]:36437 "EHLO athos.nss.cs.ubc.ca" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751418Ab2A2IBR (ORCPT ); Sun, 29 Jan 2012 03:01:17 -0500 X-Greylist: delayed 435 seconds by postgrey-1.27 at vger.kernel.org; Sun, 29 Jan 2012 03:01:17 EST Received: from athos.nss.cs.ubc.ca (localhost [127.0.0.1]) by athos.nss.cs.ubc.ca (8.14.3/8.14.3/Debian-9.1ubuntu1) with ESMTP id q0T7runq029313; Sat, 28 Jan 2012 23:53:56 -0800 Received: (from root@localhost) by athos.nss.cs.ubc.ca (8.14.3/8.14.3/Submit) id q0T7ruNY029310; Sat, 28 Jan 2012 23:53:56 -0800 From: Shriram Rajagopalan To: jhs@mojatatu.com, netdev@vger.kernel.org Cc: Shriram Rajagopalan , Brendan Cully Subject: [PATCH V2] net/sched: sch_plug - Queue traffic until an explicit release command Date: Sat, 28 Jan 2012 23:53:39 -0800 Message-Id: <1327823619-29274-1-git-send-email-rshriram@cs.ubc.ca> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This qdisc can be used to implement output buffering, an essential functionality required for consistent recovery in checkpoint based fault tolerance systems. The qdisc supports two operations - plug and unplug. When the qdisc receives a plug command via netlink request, packets arriving henceforth are buffered until a corresponding unplug command is received. Its intention is to support speculative execution by allowing generated network traffic to be rolled back. It is used to provide network protection for domUs in the Remus high availability project, available as part of Xen. This module is generic enough to be used by any other system that wishes to add speculative execution and output buffering to its applications. This module was originally available in the linux 2.6.32 PV-OPS tree, used as dom0 for Xen. For more information, please refer to http://nss.cs.ubc.ca/remus/ and http://wiki.xensource.com/xenwiki/Remus Changes since previous version: * Removed the hardcoded queue size * Removed special code to deal with fragmented skbs. Signed-off-by: Brendan Cully Signed-off-by: Shriram Rajagopalan [shriram - ported the code from older 2.6.32 to current tree] --- include/linux/pkt_sched.h | 16 +++++ net/sched/Kconfig | 19 +++++ net/sched/Makefile | 1 + net/sched/sch_plug.c | 161 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 197 insertions(+), 0 deletions(-) create mode 100644 net/sched/sch_plug.c diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 0d5b793..14ad024 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -127,6 +127,22 @@ struct tc_multiq_qopt { __u16 max_bands; /* Maximum number of queues */ }; +/* PLUG section */ + +#define TCQ_PLUG_BUFFER 0 +#define TCQ_PLUG_RELEASE 1 +#define TCQ_PLUG_LIMIT 2 +struct tc_plug_qopt { + /* TCQ_PLUG_BUFFER: Inset a plug into the queue and + * buffer any incoming packets + * TCQ_PLUG_RELEASE: Dequeue packets from queue head + * to beginning of the next plug. + * TCQ_PLUG_LIMIT: Increase/decrease queue size + */ + int action; + __u32 limit; +}; + /* TBF section */ struct tc_tbf_qopt { diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 2590e91..d763112 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -260,6 +260,25 @@ config NET_SCH_INGRESS To compile this code as a module, choose M here: the module will be called sch_ingress. +config NET_SCH_PLUG + tristate "Plug network traffic until release (PLUG)" + ---help--- + Say Y here if you are using this kernel for Xen dom0 and + want to protect Xen guests with Remus. + + This queueing discipline is controlled by netlink. When it receives an + enqueue command it inserts a plug into the outbound queue that causes + following packets to enqueue until a dequeue command arrives over + netlink, releasing packets up to the plug for delivery. + + This module provides "output buffering" functionality in the Remus HA + project. It enables speculative execution of virtual machines by allowing + the generated network output to be rolled back if needed. For more + information, please refer to http://wiki.xensource.com/xenwiki/Remus + + To compile this code as a module, choose M here: the + module will be called sch_plug. + comment "Classification" config NET_CLS diff --git a/net/sched/Makefile b/net/sched/Makefile index dc5889c..8cdf4e2 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_NET_SCH_MULTIQ) += sch_multiq.o obj-$(CONFIG_NET_SCH_ATM) += sch_atm.o obj-$(CONFIG_NET_SCH_NETEM) += sch_netem.o obj-$(CONFIG_NET_SCH_DRR) += sch_drr.o +obj-$(CONFIG_NET_SCH_PLUG) += sch_plug.o obj-$(CONFIG_NET_SCH_MQPRIO) += sch_mqprio.o obj-$(CONFIG_NET_SCH_CHOKE) += sch_choke.o obj-$(CONFIG_NET_SCH_QFQ) += sch_qfq.o diff --git a/net/sched/sch_plug.c b/net/sched/sch_plug.c new file mode 100644 index 0000000..d194cd2 --- /dev/null +++ b/net/sched/sch_plug.c @@ -0,0 +1,161 @@ +/* + * sch_plug.c Queue traffic until an explicit release command + * + * 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; either version + * 2 of the License, or (at your option) any later version. + * + * The operation of the buffer is as follows: + * When a checkpoint begins, a plug is inserted into the + * network queue by a netlink request (it operates by storing + * a pointer to the next packet which arrives and blocking dequeue + * when that packet is at the head of the queue). + * When a checkpoint completes (the backup acknowledges receipt), + * currently-queued packets are released. + * So it supports two operations, plug and unplug. + */ + +#include +#include +#include +#include +#include +#include +#include + +struct plug_sched_data { + u32 limit; + /* + * stop points to the first packet which should not be + * delivered. If it is NULL, plug_enqueue will set it to the + * next packet it sees. + * + * release is the last packet in the fifo that can be + * released. + */ + struct sk_buff *stop, *release; +}; + +static int plug_enqueue(struct sk_buff *skb, struct Qdisc *sch) +{ + struct plug_sched_data *q = qdisc_priv(sch); + + if (likely(sch->qstats.backlog + skb->len <= q->limit)) { + if (!q->stop) + q->stop = skb; + return qdisc_enqueue_tail(skb, sch); + } + printk(KERN_WARNING "queue reported full: %u,%u (limit=%u)\n", + sch->qstats.backlog, skb->len, q->limit); + + return qdisc_reshape_fail(skb, sch); +} + +/* dequeue doesn't actually dequeue until the release command is + * received. */ +static struct sk_buff *plug_dequeue(struct Qdisc *sch) +{ + struct plug_sched_data *q = qdisc_priv(sch); + struct sk_buff *peek; + + if (qdisc_is_throttled(sch)) + return NULL; + + peek = (struct sk_buff *)((sch->q).next); + + if (peek == q->release) { + /* + * This is the tail of the last round. Release it and + * block the queue + */ + qdisc_throttled(sch); + return NULL; + } + + return qdisc_dequeue_head(sch); +} + +static int plug_init(struct Qdisc *sch, struct nlattr *opt) +{ + struct plug_sched_data *q = qdisc_priv(sch); + + if (opt == NULL) { + u32 pkt_limit = qdisc_dev(sch)->tx_queue_len ? : 1; + q->limit = pkt_limit * psched_mtu(qdisc_dev(sch)); + } else { + struct tc_plug_qopt *ctl = nla_data(opt); + + if (nla_len(opt) < sizeof(*ctl)) + return -EINVAL; + + q->limit = ctl->limit; + } + + printk(KERN_DEBUG "sch_plug queue loaded with limit %u\n", q->limit); + qdisc_throttled(sch); + return 0; +} + +/* Receives 3 types of messages: + * TCQ_PLUG_BUFFER: Inset a plug into the queue and + * buffer any incoming packets + * TCQ_PLUG_RELEASE: Dequeue packets from queue head + * to beginning of the next plug. + * TCQ_PLUG_LIMIT: Increase/decrease queue size + */ +static int plug_change(struct Qdisc *sch, struct nlattr *opt) +{ + struct plug_sched_data *q = qdisc_priv(sch); + struct tc_plug_qopt *msg; + + if (opt == NULL) + return -EINVAL; + + msg = nla_data(opt); + if (nla_len(opt) < sizeof(*msg)) + return -EINVAL; + + if (msg->action == TCQ_PLUG_BUFFER) { + /* reset stop, so that we can start buffering + * from the next incoming packet. + */ + q->stop = NULL; + } else if (msg->action == TCQ_PLUG_RELEASE) { + /* Dequeue from queue head until the stop pointer */ + q->release = q->stop; + qdisc_unthrottled(sch); + netif_schedule_queue(sch->dev_queue); + } else if (msg->action == TCQ_PLUG_LIMIT) { + /* Limit is supplied in bytes */ + q->limit = msg->limit; + } else { + return -EINVAL; + } + + return 0; +} + +struct Qdisc_ops plug_qdisc_ops = { + .id = "plug", + .priv_size = sizeof(struct plug_sched_data), + .enqueue = plug_enqueue, + .dequeue = plug_dequeue, + .peek = qdisc_peek_head, + .init = plug_init, + .change = plug_change, + .owner = THIS_MODULE, +}; + +static int __init plug_module_init(void) +{ + return register_qdisc(&plug_qdisc_ops); +} + +static void __exit plug_module_exit(void) +{ + unregister_qdisc(&plug_qdisc_ops); +} +module_init(plug_module_init) +module_exit(plug_module_exit) +MODULE_LICENSE("GPL");