From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: Re: [rfc/patch] use hvc for xen console Date: Tue, 13 Feb 2007 17:13:55 +0100 Message-ID: <45D1E3C3.9060603@suse.de> References: <45D1949E.1000809@suse.de> <45D19516.4080109@suse.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010008080706000803090201" Return-path: In-Reply-To: <45D19516.4080109@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.osdl.org Errors-To: virtualization-bounces@lists.osdl.org To: Gerd Hoffmann Cc: Virtualization Mailing List , Xen devel list List-Id: virtualization@lists.linuxfoundation.org This is a multi-part message in MIME format. --------------010008080706000803090201 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Gerd Hoffmann wrote: > Gerd Hoffmann wrote: >> Hi, >> >> Here is a patch (on top of the paravirt patch queue) which makes xen > > Oops, forgot the patch here is it ... New version of the patch, drops the dependency on xencons_ring.c, drops a bunch of glue code, features a irq-driven console. cheers, Gerd -- Gerd Hoffmann --------------010008080706000803090201 Content-Type: text/plain; name="hvc" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="hvc" --- arch/i386/Kconfig.debug | 24 +++---- arch/i386/xen/Kconfig | 1 arch/i386/xen/events.c | 3 drivers/char/hvc_console.c | 4 + drivers/xen/console/Makefile | 3 drivers/xen/console/hvc_xen.c | 135 ++++++++++++++++++++++++++++++++++++++++++ include/xen/events.h | 1 7 files changed, 157 insertions(+), 14 deletions(-) Index: paravirt-2.6.20-hg749/arch/i386/Kconfig.debug =================================================================== --- paravirt-2.6.20-hg749.orig/arch/i386/Kconfig.debug +++ paravirt-2.6.20-hg749/arch/i386/Kconfig.debug @@ -6,18 +6,18 @@ config TRACE_IRQFLAGS_SUPPORT source "lib/Kconfig.debug" -config EARLY_PRINTK - bool "Early printk" if EMBEDDED && DEBUG_KERNEL - default y - help - Write kernel log output directly into the VGA buffer or to a serial - port. - - This is useful for kernel debugging when your machine crashes very - early before the console code is initialized. For normal operation - it is not recommended because it looks ugly and doesn't cooperate - with klogd/syslogd or the X server. You should normally N here, - unless you want to debug such a crash. +#config EARLY_PRINTK +# bool "Early printk" if EMBEDDED && DEBUG_KERNEL +# default y +# help +# Write kernel log output directly into the VGA buffer or to a serial +# port. +# +# This is useful for kernel debugging when your machine crashes very +# early before the console code is initialized. For normal operation +# it is not recommended because it looks ugly and doesn't cooperate +# with klogd/syslogd or the X server. You should normally N here, +# unless you want to debug such a crash. config DEBUG_STACKOVERFLOW bool "Check for stack overflows" Index: paravirt-2.6.20-hg749/arch/i386/xen/Kconfig =================================================================== --- paravirt-2.6.20-hg749.orig/arch/i386/xen/Kconfig +++ paravirt-2.6.20-hg749/arch/i386/xen/Kconfig @@ -5,6 +5,7 @@ config XEN bool "Enable support for Xen hypervisor" depends PARAVIRT + select HVC_DRIVER default y help This is the Linux Xen port. Index: paravirt-2.6.20-hg749/drivers/char/hvc_console.c =================================================================== --- paravirt-2.6.20-hg749.orig/drivers/char/hvc_console.c +++ paravirt-2.6.20-hg749/drivers/char/hvc_console.c @@ -49,6 +49,10 @@ #define TIMEOUT (10) +#ifndef NO_IRQ +#define NO_IRQ 0 +#endif + /* * Wait this long per iteration while trying to push buffered data to the * hypervisor before allowing the tty to complete a close operation. Index: paravirt-2.6.20-hg749/drivers/xen/console/Makefile =================================================================== --- paravirt-2.6.20-hg749.orig/drivers/xen/console/Makefile +++ paravirt-2.6.20-hg749/drivers/xen/console/Makefile @@ -1,2 +1,3 @@ -obj-y := console.o xencons_ring.o +#obj-y := console.o xencons_ring.o +obj-y := hvc_xen.o Index: paravirt-2.6.20-hg749/drivers/xen/console/hvc_xen.c =================================================================== --- /dev/null +++ paravirt-2.6.20-hg749/drivers/xen/console/hvc_xen.c @@ -0,0 +1,135 @@ +/* + * xen console driver interface to hvc_console.c + * + * (c) 2007 Gerd Hoffmann + * + * 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. + * + * 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 + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "../../char/hvc_console.h" + +#define HVC_COOKIE 0x58656e /* "Xen" in hex */ + +static struct hvc_struct *hvc; +static int xencons_irq; + +/* ------------------------------------------------------------------ */ + +static inline struct xencons_interface *xencons_interface(void) +{ + return mfn_to_virt(xen_start_info->console.domU.mfn); +} + +static inline void notify_daemon(void) +{ + /* Use evtchn: this is called early, before irq is set up. */ + notify_remote_via_evtchn(xen_start_info->console.domU.evtchn); +} + +static int write_console(uint32_t vtermno, const char *data, int len) +{ + struct xencons_interface *intf = xencons_interface(); + XENCONS_RING_IDX cons, prod; + int sent = 0; + + cons = intf->out_cons; + prod = intf->out_prod; + mb(); + BUG_ON((prod - cons) > sizeof(intf->out)); + + while ((sent < len) && ((prod - cons) < sizeof(intf->out))) + intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++]; + + wmb(); + intf->out_prod = prod; + + notify_daemon(); + return sent; +} + +static int read_console(uint32_t vtermno, char *buf, int len) +{ + struct xencons_interface *intf = xencons_interface(); + XENCONS_RING_IDX cons, prod; + int recv = 0; + + cons = intf->in_cons; + prod = intf->in_prod; + mb(); + BUG_ON((prod - cons) > sizeof(intf->in)); + + while (cons != prod && recv < len) + buf[recv++] = intf->in[MASK_XENCONS_IDX(cons++,intf->in)]; + + mb(); + intf->in_cons = cons; + + notify_daemon(); + return recv; +} + +static struct hv_ops hvc_ops = { + .get_chars = read_console, + .put_chars = write_console, +}; + +static int __init xen_init(void) +{ + struct hvc_struct *hp; + + if (!is_running_on_xen()) + return 0; + + xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn); + if (xencons_irq < 0) + xencons_irq = 0 /* NO_IRQ */; + hp = hvc_alloc(HVC_COOKIE, xencons_irq, &hvc_ops, 256); + if (IS_ERR(hp)) + return PTR_ERR(hp); + + hvc = hp; + return 0; +} + +static void __exit xen_fini(void) +{ + if (hvc) + hvc_remove(hvc); +} + +static int xen_cons_init(void) +{ + if (!is_running_on_xen()) + return 0; + + hvc_instantiate(HVC_COOKIE, 0, &hvc_ops); + return 0; +} + +module_init(xen_init); +module_exit(xen_fini); +console_initcall(xen_cons_init); Index: paravirt-2.6.20-hg749/arch/i386/xen/events.c =================================================================== --- paravirt-2.6.20-hg749.orig/arch/i386/xen/events.c +++ paravirt-2.6.20-hg749/arch/i386/xen/events.c @@ -202,7 +202,7 @@ static int find_unbound_irq(void) return irq; } -static int bind_evtchn_to_irq(unsigned int evtchn) +int bind_evtchn_to_irq(unsigned int evtchn) { int irq; @@ -226,6 +226,7 @@ static int bind_evtchn_to_irq(unsigned i return irq; } +EXPORT_SYMBOL_GPL(bind_evtchn_to_irq); static int bind_virq_to_irq(unsigned int virq, unsigned int cpu) { Index: paravirt-2.6.20-hg749/include/xen/events.h =================================================================== --- paravirt-2.6.20-hg749.orig/include/xen/events.h +++ paravirt-2.6.20-hg749/include/xen/events.h @@ -5,6 +5,7 @@ #include #include +int bind_evtchn_to_irq(unsigned int evtchn); int bind_evtchn_to_irqhandler(unsigned int evtchn, irqreturn_t (*handler)(int, void *), unsigned long irqflags, const char *devname, --------------010008080706000803090201 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Virtualization mailing list Virtualization@lists.osdl.org https://lists.osdl.org/mailman/listinfo/virtualization --------------010008080706000803090201--