1.1 --- a/.hgtags	Tue Apr 11 13:55:47 2006 -0600
     1.2 +++ b/.hgtags	Tue Apr 11 18:54:18 2006 -0600
     1.3 @@ -14,3 +14,4 @@ 30c521db4c71960b0cf1d9c9e1b658e77b535a3e
     1.4  3d330e41f41ce1bc118c02346e18949ad5d67f6b split-1.1
     1.5  c8fdb0caa77b429cf47f9707926e83947778cb48 RELEASE-3.0.0
     1.6  af0573e9e5258db0a9d28aa954dd302ddd2c2d23 3.0.2-rc
     1.7 +d0d3fef37685be264a7f52201f8ef44c030daad3 3.0.2-branched

     2.1 --- a/Config.mk	Tue Apr 11 13:55:47 2006 -0600
     2.2 +++ b/Config.mk	Tue Apr 11 18:54:18 2006 -0600
     2.3 @@ -24,6 +24,7 @@ OBJCOPY    = $(CROSS_COMPILE)objcopy
     2.4  OBJDUMP    = $(CROSS_COMPILE)objdump
     2.5  
     2.6  DISTDIR     ?= $(XEN_ROOT)/dist
     2.7 +DESTDIR     ?= /
     2.8  
     2.9  INSTALL      = install
    2.10  INSTALL_DIR  = $(INSTALL) -d -m0755

     3.1 --- a/Makefile	Tue Apr 11 13:55:47 2006 -0600
     3.2 +++ b/Makefile	Tue Apr 11 18:54:18 2006 -0600
     3.3 @@ -14,6 +14,7 @@ export XEN_TARGET_ARCH SUBARCH XEN_SYSTY
     3.4  endif
     3.5  
     3.6  # Default target must appear before any include lines
     3.7 +.PHONY: all
     3.8  all: dist
     3.9  
    3.10  XEN_ROOT=$(CURDIR)
    3.11 @@ -24,12 +25,11 @@ ifeq ($(XEN_TARGET_X86_PAE),y)
    3.12  export pae=y
    3.13  endif
    3.14  
    3.15 -.PHONY:	all dist install xen kernels tools dev-docs docs world clean
    3.16 -.PHONY:	mkpatches mrproper kbuild kdelete kclean
    3.17 -
    3.18  # build and install everything into the standard system directories
    3.19 +.PHONY: install
    3.20  install: install-xen install-kernels install-tools install-docs
    3.21  
    3.22 +.PHONY: build
    3.23  build: kernels
    3.24  	$(MAKE) -C xen build
    3.25  	$(MAKE) -C tools build
    3.26 @@ -38,10 +38,12 @@ build: kernels
    3.27  # The test target is for unit tests that can run without an installation.  Of
    3.28  # course, many tests require a machine running Xen itself, and these are
    3.29  # handled elsewhere.
    3.30 +.PHONY: test
    3.31  test:
    3.32  	$(MAKE) -C tools/python test
    3.33  
    3.34  # build and install everything into local dist directory
    3.35 +.PHONY: dist
    3.36  dist: DESTDIR=$(DISTDIR)/install
    3.37  dist: dist-xen dist-kernels dist-tools dist-docs
    3.38  	$(INSTALL_DIR) $(DISTDIR)/check
    3.39 @@ -54,79 +56,83 @@ dist-%: install-%
    3.40  	@: # do nothing
    3.41  
    3.42  # Legacy dist targets
    3.43 +.PHONY: xen tools kernels docs
    3.44  xen: dist-xen
    3.45  tools: dist-tools
    3.46  kernels: dist-kernels
    3.47  docs: dist-docs
    3.48  
    3.49 +.PHONY: prep-kernels
    3.50  prep-kernels:
    3.51  	for i in $(XKERNELS) ; do $(MAKE) $$i-prep || exit 1; done
    3.52  
    3.53 +.PHONY: install-xen
    3.54  install-xen:
    3.55  	$(MAKE) -C xen install
    3.56  
    3.57 +.PHONY: install-tools
    3.58  install-tools:
    3.59  	$(MAKE) -C tools install
    3.60  
    3.61 +.PHONY: install-kernels
    3.62  install-kernels:
    3.63  	for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
    3.64  
    3.65 +.PHONY: install-docs
    3.66  install-docs:
    3.67  	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
    3.68  
    3.69 +.PHONY: dev-docs
    3.70  dev-docs:
    3.71  	$(MAKE) -C docs dev-docs
    3.72  
    3.73  # Build all the various kernels and modules
    3.74 +.PHONY: kbuild
    3.75  kbuild: kernels
    3.76  
    3.77  # Delete the kernel build trees entirely
    3.78 +.PHONY: kdelete
    3.79  kdelete:
    3.80  	for i in $(XKERNELS) ; do $(MAKE) $$i-delete ; done
    3.81  
    3.82  # Clean the kernel build trees
    3.83 +.PHONY: kclean
    3.84  kclean:
    3.85  	for i in $(XKERNELS) ; do $(MAKE) $$i-clean ; done
    3.86  
    3.87  # Make patches from kernel sparse trees
    3.88 +.PHONY: mkpatches
    3.89  mkpatches:
    3.90  	for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-xen.patch; done
    3.91  
    3.92  # build xen, the tools, and a domain 0 plus unprivileged linux-xen images,
    3.93  # and place them in the install directory. 'make install' should then
    3.94  # copy them to the normal system directories
    3.95 +.PHONY: world
    3.96  world: 
    3.97  	$(MAKE) clean
    3.98  	$(MAKE) kdelete
    3.99  	$(MAKE) dist
   3.100  
   3.101  # clean doesn't do a kclean
   3.102 +.PHONY: clean
   3.103  clean:: 
   3.104  	$(MAKE) -C xen clean
   3.105  	$(MAKE) -C tools clean
   3.106  	$(MAKE) -C docs clean
   3.107  
   3.108  # clean, but blow away kernel build tree plus tarballs
   3.109 +.PHONY: distclean
   3.110  distclean: clean
   3.111  	rm -rf dist patches/tmp
   3.112  	for i in $(ALLKERNELS) ; do $(MAKE) $$i-delete ; done
   3.113  	for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-mrproper ; done
   3.114  
   3.115  # Linux name for GNU distclean
   3.116 +.PHONY: mrproper
   3.117  mrproper: distclean
   3.118  
   3.119 -install-logging: LOGGING=logging-0.4.9.2
   3.120 -install-logging:
   3.121 -	[ -f $(LOGGING).tar.gz ] || wget http://www.red-dove.com/$(LOGGING).tar.gz
   3.122 -	tar -zxf $(LOGGING).tar.gz
   3.123 -	cd $(LOGGING) && python setup.py install
   3.124 -
   3.125 -# handy target to upgrade iptables (use rpm or apt-get in preference)
   3.126 -install-iptables:
   3.127 -	wget http://www.netfilter.org/files/iptables-1.2.11.tar.bz2
   3.128 -	tar -jxf iptables-1.2.11.tar.bz2
   3.129 -	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
   3.130 -
   3.131 +.PHONY: help
   3.132  help:
   3.133  	@echo 'Installation targets:'
   3.134  	@echo '  install          - build and install everything'
   3.135 @@ -147,25 +153,28 @@ help:
   3.136  	@echo '  dev-docs         - build developer-only documentation'
   3.137  	@echo ''
   3.138  	@echo 'Cleaning targets:'
   3.139 -	@echo '  clean            - clean the Xen, tools and docs (but not'
   3.140 -	@echo '                     guest kernel) trees'
   3.141 -	@echo '  distclean        - clean plus delete kernel tarballs and kernel'
   3.142 -	@echo '                     build trees'
   3.143 +	@echo '  clean            - clean the Xen, tools and docs (but not guest kernel trees)'
   3.144 +	@echo '  distclean        - clean plus delete kernel build trees and'
   3.145 +	@echo '                     local downloaded files'
   3.146  	@echo '  kdelete          - delete guest kernel build trees'
   3.147  	@echo '  kclean           - clean guest kernel build trees'
   3.148  	@echo ''
   3.149 -	@echo 'Dependency installation targets:'
   3.150 -	@echo '  install-logging  - install the Python Logging package'
   3.151 -	@echo '  install-iptables - install iptables tools'
   3.152 -	@echo ''
   3.153  	@echo 'Miscellaneous targets:'
   3.154  	@echo '  prep-kernels     - prepares kernel directories, does not build'
   3.155  	@echo '  mkpatches        - make patches against vanilla kernels from'
   3.156  	@echo '                     sparse trees'
   3.157 -	@echo '  uninstall        - attempt to remove installed Xen tools (use'
   3.158 -	@echo '                     with extreme care!)'
   3.159 +	@echo '  uninstall        - attempt to remove installed Xen tools'
   3.160 +	@echo '                     (use with extreme care!)'
   3.161 +	@echo
   3.162 +	@echo 'Environment:'
   3.163 +	@echo '  XEN_PYTHON_NATIVE_INSTALL=y'
   3.164 +	@echo '                   - native python install or dist'
   3.165 +	@echo '                     install into prefix/lib/python<VERSION>'
   3.166 +	@echo '                     instead of <PREFIX>/lib/python'
   3.167 +	@echo '                     true if set to non-empty value, false otherwise'
   3.168  
   3.169  # Use this target with extreme care!
   3.170 +.PHONY: uninstall
   3.171  uninstall: D=$(DESTDIR)
   3.172  uninstall:
   3.173  	[ -d $(D)/etc/xen ] && mv -f $(D)/etc/xen $(D)/etc/xen.old-`date +%s` || true
   3.174 @@ -199,5 +208,6 @@ uninstall:
   3.175  	rm -rf $(D)/usr/share/man/man8/xen*
   3.176  
   3.177  # Legacy targets for compatibility
   3.178 +.PHONY: linux26
   3.179  linux26:
   3.180  	$(MAKE) 'KERNELS=linux-2.6*' kernels

     4.1 --- a/README	Tue Apr 11 13:55:47 2006 -0600
     4.2 +++ b/README	Tue Apr 11 18:54:18 2006 -0600
     4.3 @@ -1,158 +1,176 @@
     4.4 -################################
     4.5 - __  __            _____  ___  
     4.6 - \ \/ /___ _ __   |___ / / _ \ 
     4.7 -  \  // _ \ '_ \    |_ \| | | |
     4.8 -  /  \  __/ | | |  ___) | |_| |
     4.9 - /_/\_\___|_| |_| |____(_)___/ 
    4.10 -
    4.11 -################################
    4.12 -
    4.13 -http://www.xensource.com/xen/about.html
    4.14 -
    4.15 -What is Xen?
    4.16 -============
    4.17 -
    4.18 -Xen is a Virtual Machine Monitor (VMM) originally developed by the
    4.19 -Systems Research Group of the University of Cambridge Computer
    4.20 -Laboratory, as part of the UK-EPSRC funded XenoServers project.  Xen
    4.21 -is freely-distributable Open Source software, released under the GNU
    4.22 -GPL. Since its initial public release, Xen has grown a large
    4.23 -development community, spearheaded by XenSource Inc, a company created
    4.24 -by the original Xen development team to build enterprise products
    4.25 -around Xen.
    4.26 -
    4.27 -The 3.0 release offers excellent performance, hardware support and
    4.28 -enterprise-grade features such as x86_32-PAE, x86_64, SMP guests and
    4.29 -live relocation of VMs. This install tree contains source for a Linux
    4.30 -2.6 guest; ports to Linux 2.4, NetBSD, FreeBSD and Solaris will follow
    4.31 -later (and are already available for previous Xen releases).
    4.32 -
    4.33 -This file contains some quick-start instructions to install Xen on
    4.34 -your system. For full documentation, see the Xen User Manual. If this
    4.35 -is a pre-built release then you can find the manual at:
    4.36 - dist/install/usr/share/doc/xen/pdf/user.pdf
    4.37 -If you have a source release, then 'make -C docs' will build the
    4.38 -manual at docs/pdf/user.pdf.
    4.39 -
    4.40 -Quick-Start Guide - Pre-Built Binary Release
    4.41 -============================================
    4.42 -
    4.43 -[NB. Unless noted otherwise, all the following steps should be
    4.44 -performed with root privileges.]
    4.45 -
    4.46 -1. Install the binary distribution onto your filesystem:
    4.47 -
    4.48 -    # sh ./install.sh
    4.49 -
    4.50 -   Among other things, this will install Xen and Xen-ready Linux
    4.51 -   kernel files in /boot, kernel modules and Python packages in /lib,
    4.52 -   and various control tools in standard 'bin' directories.
    4.53 -
    4.54 -2. Configure your bootloader to boot Xen and an initial Linux virtual
    4.55 -   machine. Note that Xen currently only works with GRUB and pxelinux
    4.56 -   derived boot loaders: less common alternatives such as LILO are
    4.57 -   *not* supported. You can most likely find your GRUB menu file at
    4.58 -   /boot/grub/menu.lst: edit this file to include an entry like the
    4.59 -   following:
    4.60 -
    4.61 -    title Xen 3.0 / XenLinux 2.6
    4.62 -       kernel /boot/xen-3.0.gz console=vga
    4.63 -       module /boot/vmlinuz-2.6-xen root=<root-dev> ro console=tty0
    4.64 -       module /boot/initrd-2.6-xen.img
    4.65 -
    4.66 -   NB: Not all kernel configs need an initial ram disk (initrd), but
    4.67 -   if you do specify one you'll need to use the 'module' grub directive
    4.68 -   rather than 'initrd'.
    4.69 -
    4.70 -   The linux command line takes all the usual options, such as
    4.71 -   root=<root-dev> to specify your usual root partition (e.g.,
    4.72 -   /dev/hda1).  
    4.73 -
    4.74 -   The Xen command line takes a number of optional arguments described
    4.75 -   in the manual. The most common is 'dom0_mem=xxxM' which sets the
    4.76 -   amount of memory to allocate for use by your initial virtual
    4.77 -   machine (known as domain 0). Note that Xen itself reserves about
    4.78 -   32MB memory for internal use, which is not available for allocation
    4.79 -   to virtual machines.  
    4.80 -
    4.81 -3. Reboot your system and select the "Xen 3.0 / XenLinux 2.6" menu
    4.82 -   option. After booting Xen, Linux will start and your initialisation
    4.83 -   scripts should execute in the usual way.
    4.84 -
    4.85 -Quick-Start Guide - Source Release
    4.86 -==================================
    4.87 -
    4.88 -First, there are a number of prerequisites for building a Xen source
    4.89 -release. Make sure you have all the following installed, either by
    4.90 -visiting the project webpage or installing a pre-built package
    4.91 -provided by your Linux distributor:
    4.92 -    * GCC (preferably v3.2.x or v3.3.x; older versions are unsupported) 
    4.93 -    * GNU Make
    4.94 -    * GNU Binutils
    4.95 -    * Development install of zlib (e.g., zlib-dev)
    4.96 -    * Development install of Python v2.3 or later (e.g., python-dev)
    4.97 -    * bridge-utils package (/sbin/brctl)
    4.98 -    * iproute package (/sbin/ip)
    4.99 -    * hotplug or udev
   4.100 -
   4.101 -[NB. Unless noted otherwise, all the following steps should be
   4.102 -performed with root privileges.]
   4.103 -
   4.104 -1. Download and untar the source tarball file. This will be a
   4.105 -   file named xen-unstable-src.tgz, or xen-$version-src.tgz.
   4.106 -   You can also pull the current version from the SCMS
   4.107 -   that is being used (Bitkeeper, scheduled to change shortly).
   4.108 -
   4.109 -    # tar xzf xen-unstable-src.tgz
   4.110 -
   4.111 -   Assuming you are using the unstable tree, this will
   4.112 -   untar into xen-unstable. The rest of the instructions
   4.113 -   use the unstable tree as an example, substitute the
   4.114 -   version for unstable.
   4.115 -
   4.116 -2. cd to xen-unstable (or whatever you sensibly rename it to).
   4.117 -   The Linux, netbsd and freebsd kernel source trees are in
   4.118 -   the $os-$version-xen-sparse directories.
   4.119 -
   4.120 -On Linux:
   4.121 -
   4.122 -3. For the very first build, or if you want to destroy existing
   4.123 -   .configs and build trees, perform the following steps:
   4.124 -
   4.125 -    # make KERNELS=linux-2.6-xen world
   4.126 -    # make install
   4.127 -
   4.128 -   It will create and install into the dist/ directory which is the
   4.129 -   default install location. It will build the xen binary (xen.gz),
   4.130 -   and a linux kernel and modules that can be used in both dom0 and an
   4.131 -   unprivileged guest kernel (vmlinuz-2.6.x-xen), the tools and the
   4.132 -   documentation.
   4.133 -
   4.134 -   If you don't specify KERNELS= on the make command line it will
   4.135 -   default to building two kernels, vmlinuz-2.6.x-xen0 and
   4.136 -   vmlinuz-2.6.x-xenU. These are smaller builds with just selected
   4.137 -   modules, intended primarilly for developers that don't like to wait
   4.138 -   for a -xen kernel to build. The -xenU kernel is particularly small
   4.139 -   as it does not contain any physical device drivers, and hence is
   4.140 -   only useful for guest domains.
   4.141 -
   4.142 -   If you want to build an x86_32 PAE capable xen and kernel to work
   4.143 -   on machines with >= 4GB of memory, use XEN_TARGET_X86_PAE=y on the
   4.144 -   make command line.
   4.145 -
   4.146 -4. To rebuild an existing tree without modifying the config:
   4.147 -    # make dist
   4.148 -
   4.149 -   This will build and install xen, kernels, tools, and
   4.150 -   docs into the local dist/ directory.
   4.151 -
   4.152 -5. To rebuild a kernel with a modified config:
   4.153 -
   4.154 -    # make linux-2.6-xen-config CONFIGMODE=menuconfig     (or xconfig)
   4.155 -    # make linux-2.6-xen-build
   4.156 -    # make linux-2.6-xen-install
   4.157 -
   4.158 -   Depending on your config, you may need to use 'mkinitrd' to create
   4.159 -   an initial ram disk, just like a native system e.g. 
   4.160 -    # depmod 2.6.12.6-xen
   4.161 -    # mkinitrd -v -f --with=aacraid --with=sd_mod --with=scsi_mod initrd-2.6.12.6-xen.img 2.6.12.6-xen
   4.162 +################################
   4.163 + __  __            _____  ___  
   4.164 + \ \/ /___ _ __   |___ / / _ \ 
   4.165 +  \  // _ \ '_ \    |_ \| | | |
   4.166 +  /  \  __/ | | |  ___) | |_| |
   4.167 + /_/\_\___|_| |_| |____(_)___/ 
   4.168 +
   4.169 +################################
   4.170 +
   4.171 +http://www.xensource.com/xen/about.html
   4.172 +
   4.173 +What is Xen?
   4.174 +============
   4.175 +
   4.176 +Xen is a Virtual Machine Monitor (VMM) originally developed by the
   4.177 +Systems Research Group of the University of Cambridge Computer
   4.178 +Laboratory, as part of the UK-EPSRC funded XenoServers project.  Xen
   4.179 +is freely-distributable Open Source software, released under the GNU
   4.180 +GPL. Since its initial public release, Xen has grown a large
   4.181 +development community, spearheaded by XenSource Inc, a company created
   4.182 +by the original Xen development team to build enterprise products
   4.183 +around Xen.
   4.184 +
   4.185 +The 3.0 release offers excellent performance, hardware support and
   4.186 +enterprise-grade features such as x86_32-PAE, x86_64, SMP guests and
   4.187 +live relocation of VMs. This install tree contains source for a Linux
   4.188 +2.6 guest; ports to Linux 2.4, NetBSD, FreeBSD and Solaris will follow
   4.189 +later (and are already available for previous Xen releases).
   4.190 +
   4.191 +This file contains some quick-start instructions to install Xen on
   4.192 +your system. For full documentation, see the Xen User Manual. If this
   4.193 +is a pre-built release then you can find the manual at:
   4.194 + dist/install/usr/share/doc/xen/pdf/user.pdf
   4.195 +If you have a source release, then 'make -C docs' will build the
   4.196 +manual at docs/pdf/user.pdf.
   4.197 +
   4.198 +Quick-Start Guide - Pre-Built Binary Release
   4.199 +============================================
   4.200 +
   4.201 +[NB. Unless noted otherwise, all the following steps should be
   4.202 +performed with root privileges.]
   4.203 +
   4.204 +1. Install the binary distribution onto your filesystem:
   4.205 +
   4.206 +    # sh ./install.sh
   4.207 +
   4.208 +   Among other things, this will install Xen and Xen-ready Linux
   4.209 +   kernel files in /boot, kernel modules and Python packages in /lib,
   4.210 +   and various control tools in standard 'bin' directories.
   4.211 +
   4.212 +2. Configure your bootloader to boot Xen and an initial Linux virtual
   4.213 +   machine. Note that Xen currently only works with GRUB and pxelinux
   4.214 +   derived boot loaders: less common alternatives such as LILO are
   4.215 +   *not* supported. You can most likely find your GRUB menu file at
   4.216 +   /boot/grub/menu.lst: edit this file to include an entry like the
   4.217 +   following:
   4.218 +
   4.219 +    title Xen 3.0 / XenLinux 2.6
   4.220 +       kernel /boot/xen-3.0.gz console=vga
   4.221 +       module /boot/vmlinuz-2.6-xen root=<root-dev> ro console=tty0
   4.222 +       module /boot/initrd-2.6-xen.img
   4.223 +
   4.224 +   NB: Not all kernel configs need an initial ram disk (initrd), but
   4.225 +   if you do specify one you'll need to use the 'module' grub directive
   4.226 +   rather than 'initrd'.
   4.227 +
   4.228 +   The linux command line takes all the usual options, such as
   4.229 +   root=<root-dev> to specify your usual root partition (e.g.,
   4.230 +   /dev/hda1).  
   4.231 +
   4.232 +   The Xen command line takes a number of optional arguments described
   4.233 +   in the manual. The most common is 'dom0_mem=xxxM' which sets the
   4.234 +   amount of memory to allocate for use by your initial virtual
   4.235 +   machine (known as domain 0). Note that Xen itself reserves about
   4.236 +   32MB memory for internal use, which is not available for allocation
   4.237 +   to virtual machines.  
   4.238 +
   4.239 +3. Reboot your system and select the "Xen 3.0 / XenLinux 2.6" menu
   4.240 +   option. After booting Xen, Linux will start and your initialisation
   4.241 +   scripts should execute in the usual way.
   4.242 +
   4.243 +Quick-Start Guide - Source Release
   4.244 +==================================
   4.245 +
   4.246 +First, there are a number of prerequisites for building a Xen source
   4.247 +release. Make sure you have all the following installed, either by
   4.248 +visiting the project webpage or installing a pre-built package
   4.249 +provided by your Linux distributor:
   4.250 +    * GCC (preferably v3.2.x or v3.3.x; older versions are unsupported) 
   4.251 +    * GNU Make
   4.252 +    * GNU Binutils
   4.253 +    * Development install of zlib (e.g., zlib-dev)
   4.254 +    * Development install of Python v2.3 or later (e.g., python-dev)
   4.255 +    * bridge-utils package (/sbin/brctl)
   4.256 +    * iproute package (/sbin/ip)
   4.257 +    * hotplug or udev
   4.258 +
   4.259 +[NB. Unless noted otherwise, all the following steps should be
   4.260 +performed with root privileges.]
   4.261 +
   4.262 +1. Download and untar the source tarball file. This will be a
   4.263 +   file named xen-unstable-src.tgz, or xen-$version-src.tgz.
   4.264 +   You can also pull the current version from the SCMS
   4.265 +   that is being used (Bitkeeper, scheduled to change shortly).
   4.266 +
   4.267 +    # tar xzf xen-unstable-src.tgz
   4.268 +
   4.269 +   Assuming you are using the unstable tree, this will
   4.270 +   untar into xen-unstable. The rest of the instructions
   4.271 +   use the unstable tree as an example, substitute the
   4.272 +   version for unstable.
   4.273 +
   4.274 +2. cd to xen-unstable (or whatever you sensibly rename it to).
   4.275 +   The Linux, netbsd and freebsd kernel source trees are in
   4.276 +   the $os-$version-xen-sparse directories.
   4.277 +
   4.278 +On Linux:
   4.279 +
   4.280 +3. For the very first build, or if you want to destroy existing
   4.281 +   .configs and build trees, perform the following steps:
   4.282 +
   4.283 +    # make world
   4.284 +    # make install
   4.285 +
   4.286 +   This will create and install onto the local machine. It will build 
   4.287 +   the xen binary (xen.gz), and a linux kernel and modules that can be
   4.288 +   used in both dom0 and an unprivileged guest kernel (vmlinuz-2.6.x-xen),
   4.289 +   the tools and the documentation.
   4.290 +
   4.291 +   You can override the destination for make install by setting DESTDIR 
   4.292 +   to some value.
   4.293 +
   4.294 +   The make command line defaults to building the kernel vmlinuz-2.6.x-xen. 
   4.295 +   You can override this default by specifying KERNELS=kernelname. For 
   4.296 +   example, you can make two kernels - linux-2.6-xen0 
   4.297 +   and linux-2.6-xenU - which are smaller builds containing only selected 
   4.298 +   modules, intended primarily for developers that don't like to wait 
   4.299 +   for a full -xen kernel to build. The -xenU kernel is particularly small,
   4.300 +   as it does not contain any physical device drivers, and hence is
   4.301 +   only useful for guest domains.
   4.302 +
   4.303 +   To make these two kernels, simply specify
   4.304 +
   4.305 +   KERNELS="linux-2.6-xen0 linux-2.6-xenU"
   4.306 +
   4.307 +   in the make command line.
   4.308 +
   4.309 +   If you want to build an x86_32 PAE capable xen and kernel to work
   4.310 +   on machines with >= 4GB of memory, use XEN_TARGET_X86_PAE=y on the
   4.311 +   make command line.
   4.312 +
   4.313 +4. To rebuild an existing tree without modifying the config:
   4.314 +    # make dist
   4.315 +
   4.316 +   This will build and install xen, kernels, tools, and
   4.317 +   docs into the local dist/ directory. 
   4.318 +
   4.319 +   You can override the destination for make install by setting DISTDIR 
   4.320 +   to some value.
   4.321 +
   4.322 +   make install and make dist differ in that make install does the 
   4.323 +   right things for your local machine (installing the appropriate 
   4.324 +   version of hotplug or udev scripts, for example), but make dist 
   4.325 +   includes all versions of those scripts, so that you can copy the dist 
   4.326 +   directory to another machine and install from that distribution.
   4.327 +
   4.328 +5. To rebuild a kernel with a modified config:
   4.329 +
   4.330 +    # make linux-2.6-xen-config CONFIGMODE=menuconfig     (or xconfig)
   4.331 +    # make linux-2.6-xen-build
   4.332 +    # make linux-2.6-xen-install
   4.333 +
   4.334 +   Depending on your config, you may need to use 'mkinitrd' to create
   4.335 +   an initial ram disk, just like a native system e.g. 
   4.336 +    # depmod 2.6.16-xen
   4.337 +    # mkinitrd -v -f --with=aacraid --with=sd_mod --with=scsi_mod initrd-2.6.16-xen.img 2.6.16-xen

     5.1 --- a/buildconfigs/Rules.mk	Tue Apr 11 13:55:47 2006 -0600
     5.2 +++ b/buildconfigs/Rules.mk	Tue Apr 11 18:54:18 2006 -0600
     5.3 @@ -6,8 +6,6 @@ export DESTDIR
     5.4  ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
     5.5  ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
     5.6  
     5.7 -.PHONY:	mkpatches mrproper
     5.8 -
     5.9  # Setup pristine search path
    5.10  PRISTINE_SRC_PATH	?= .:..
    5.11  vpath pristine-% $(PRISTINE_SRC_PATH)
    5.12 @@ -40,29 +38,6 @@ patch-%.bz2:
    5.13  	@echo "Cannot find $(@F) in path $(LINUX_SRC_PATH)"
    5.14  	wget $(KERNEL_REPO)/pub/linux/kernel/v$(_LINUX_VDIR)/$(_LINUX_XDIR)/$(@F) -O./$@
    5.15  
    5.16 -# Expand NetBSD release to NetBSD version
    5.17 -NETBSD_RELEASE  ?= 2.0
    5.18 -NETBSD_VER      ?= $(patsubst netbsd-%-xen-sparse,%,$(wildcard netbsd-$(NETBSD_RELEASE)*-xen-sparse))
    5.19 -NETBSD_CVSSNAP  ?= 20050309
    5.20 -
    5.21 -# Setup NetBSD search path
    5.22 -NETBSD_SRC_PATH	?= .:..
    5.23 -vpath netbsd-%.tar.bz2 $(NETBSD_SRC_PATH)
    5.24 -
    5.25 -# download a pristine NetBSD tarball if there isn't one in NETBSD_SRC_PATH
    5.26 -netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
    5.27 -	@echo "Cannot find $@ in path $(NETBSD_SRC_PATH)"
    5.28 -	wget http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/$@ -O./$@
    5.29 -
    5.30 -netbsd-%.tar.bz2: netbsd-%-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
    5.31 -	ln -fs $< $@
    5.32 -
    5.33 -ifeq ($(OS),linux)
    5.34 -OS_VER = $(LINUX_VER)
    5.35 -else
    5.36 -OS_VER = $(NETBSD_VER)
    5.37 -endif
    5.38 -
    5.39  pristine-%: pristine-%/.valid-pristine
    5.40  	@true
    5.41  
    5.42 @@ -84,6 +59,7 @@ ifneq ($(PATCHDIRS),)
    5.43  $(patsubst patches/%,patches/%/.makedep,$(PATCHDIRS)): patches/%/.makedep: 
    5.44  	@echo 'ref-$*/.valid-ref: $$(wildcard patches/$*/*.patch)' >$@
    5.45  
    5.46 +.PHONY: clean
    5.47  clean::
    5.48  	rm -f patches/*/.makedep
    5.49  
    5.50 @@ -124,27 +100,21 @@ linux-2.6-xen.patch: ref-linux-$(LINUX_V
    5.51  	rm -rf tmp-$@
    5.52  	cp -al $(<D) tmp-$@
    5.53  	( cd linux-2.6-xen-sparse && ./mkbuildtree ../tmp-$@ )	
    5.54 -	diff -Nurp $(<D) tmp-$@ > $@ || true
    5.55 +	diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true
    5.56  	rm -rf tmp-$@
    5.57  
    5.58  %-xen.patch: ref-%/.valid-ref
    5.59  	rm -rf tmp-$@
    5.60  	cp -al $(<D) tmp-$@
    5.61  	( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )	
    5.62 -	diff -Nurp $(<D) tmp-$@ > $@ || true
    5.63 +	diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true
    5.64  	rm -rf tmp-$@
    5.65  
    5.66 -%-mrproper: %-mrproper-extra
    5.67 +%-mrproper:
    5.68  	rm -rf pristine-$(*)* ref-$(*)* $*.tar.bz2
    5.69  	rm -rf $*-xen.patch
    5.70  
    5.71 -netbsd-%-mrproper-extra:
    5.72 -	rm -rf netbsd-$*-tools netbsd-$*-tools.tar.bz2
    5.73 -	rm -f netbsd-$*-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
    5.74 -
    5.75 -%-mrproper-extra:
    5.76 -	@: # do nothing
    5.77 -
    5.78 +.PHONY: config-update-pae
    5.79  config-update-pae:
    5.80  ifeq ($(XEN_TARGET_X86_PAE),y)
    5.81  	sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)

     6.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Tue Apr 11 13:55:47 2006 -0600
     6.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Tue Apr 11 18:54:18 2006 -0600
     6.3 @@ -95,6 +95,7 @@ CONFIG_ARCH_XEN=y
     6.4  CONFIG_XEN_PRIVILEGED_GUEST=y
     6.5  CONFIG_XEN_BLKDEV_GRANT=y
     6.6  CONFIG_XEN_BLKDEV_FRONTEND=y
     6.7 +CONFIG_XEN_BACKEND=y
     6.8  CONFIG_XEN_BLKDEV_BACKEND=y
     6.9  CONFIG_XEN_SYSFS=y
    6.10  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

     7.1 --- a/buildconfigs/linux-defconfig_xen0_x86_32	Tue Apr 11 13:55:47 2006 -0600
     7.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_32	Tue Apr 11 18:54:18 2006 -0600
     7.3 @@ -1,7 +1,7 @@
     7.4  #
     7.5  # Automatically generated make config: don't edit
     7.6 -# Linux kernel version: 2.6.16-rc3-xen0
     7.7 -# Thu Feb 16 22:52:42 2006
     7.8 +# Linux kernel version: 2.6.16-xen0
     7.9 +# Sat Apr  8 11:34:07 2006
    7.10  #
    7.11  CONFIG_X86_32=y
    7.12  CONFIG_SEMAPHORE_SLEEPERS=y
    7.13 @@ -208,7 +208,6 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
    7.14  CONFIG_ACPI_EC=y
    7.15  CONFIG_ACPI_POWER=y
    7.16  CONFIG_ACPI_SYSTEM=y
    7.17 -# CONFIG_X86_PM_TIMER is not set
    7.18  # CONFIG_ACPI_CONTAINER is not set
    7.19  
    7.20  #
    7.21 @@ -392,7 +391,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
    7.22  #
    7.23  # Plug and Play support
    7.24  #
    7.25 -# CONFIG_PNP is not set
    7.26 +CONFIG_PNP=y
    7.27 +CONFIG_PNP_DEBUG=y
    7.28 +
    7.29 +#
    7.30 +# Protocols
    7.31 +#
    7.32 +CONFIG_PNPACPI=y
    7.33  
    7.34  #
    7.35  # Block devices
    7.36 @@ -440,6 +445,7 @@ CONFIG_BLK_DEV_IDECD=y
    7.37  #
    7.38  CONFIG_IDE_GENERIC=y
    7.39  # CONFIG_BLK_DEV_CMD640 is not set
    7.40 +# CONFIG_BLK_DEV_IDEPNP is not set
    7.41  CONFIG_BLK_DEV_IDEPCI=y
    7.42  # CONFIG_IDEPCI_SHARE_IRQ is not set
    7.43  # CONFIG_BLK_DEV_OFFBOARD is not set
    7.44 @@ -623,6 +629,7 @@ CONFIG_NETDEVICES=y
    7.45  # CONFIG_BONDING is not set
    7.46  # CONFIG_EQUALIZER is not set
    7.47  CONFIG_TUN=y
    7.48 +# CONFIG_NET_SB1000 is not set
    7.49  
    7.50  #
    7.51  # ARCnet devices
    7.52 @@ -1064,11 +1071,7 @@ CONFIG_USB_MON=y
    7.53  # CONFIG_INFINIBAND is not set
    7.54  
    7.55  #
    7.56 -# SN Devices
    7.57 -#
    7.58 -
    7.59 -#
    7.60 -# EDAC - error detection and reporting (RAS)
    7.61 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
    7.62  #
    7.63  # CONFIG_EDAC is not set
    7.64  
    7.65 @@ -1231,6 +1234,7 @@ CONFIG_NLS_ISO8859_1=y
    7.66  #
    7.67  # Instrumentation Support
    7.68  #
    7.69 +# CONFIG_PROFILING is not set
    7.70  # CONFIG_KPROBES is not set
    7.71  
    7.72  #
    7.73 @@ -1305,13 +1309,14 @@ CONFIG_CRYPTO_CRC32C=m
    7.74  #
    7.75  # CONFIG_CRYPTO_DEV_PADLOCK is not set
    7.76  CONFIG_XEN=y
    7.77 -CONFIG_NO_IDLE_HZ=y
    7.78 +CONFIG_XEN_INTERFACE_VERSION=0x00030101
    7.79  
    7.80  #
    7.81  # XEN
    7.82  #
    7.83  CONFIG_XEN_PRIVILEGED_GUEST=y
    7.84  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    7.85 +CONFIG_XEN_BACKEND=y
    7.86  CONFIG_XEN_PCIDEV_BACKEND=y
    7.87  # CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
    7.88  CONFIG_XEN_PCIDEV_BACKEND_PASS=y
    7.89 @@ -1331,6 +1336,7 @@ CONFIG_XEN_DISABLE_SERIAL=y
    7.90  CONFIG_XEN_SYSFS=y
    7.91  CONFIG_HAVE_ARCH_ALLOC_SKB=y
    7.92  CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    7.93 +CONFIG_NO_IDLE_HZ=y
    7.94  
    7.95  #
    7.96  # Library routines
    7.97 @@ -1343,4 +1349,6 @@ CONFIG_ZLIB_INFLATE=y
    7.98  CONFIG_GENERIC_HARDIRQS=y
    7.99  CONFIG_GENERIC_IRQ_PROBE=y
   7.100  CONFIG_X86_BIOS_REBOOT=y
   7.101 +CONFIG_X86_NO_TSS=y
   7.102 +CONFIG_X86_NO_IDT=y
   7.103  CONFIG_KTIME_SCALAR=y

     8.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64	Tue Apr 11 13:55:47 2006 -0600
     8.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64	Tue Apr 11 18:54:18 2006 -0600
     8.3 @@ -327,7 +327,13 @@ CONFIG_STANDALONE=y
     8.4  #
     8.5  # Plug and Play support
     8.6  #
     8.7 -# CONFIG_PNP is not set
     8.8 +CONFIG_PNP=y
     8.9 +CONFIG_PNP_DEBUG=y
    8.10 +
    8.11 +#
    8.12 +# Protocols
    8.13 +#
    8.14 +CONFIG_PNPACPI=y
    8.15  
    8.16  #
    8.17  # Block devices
    8.18 @@ -375,6 +381,7 @@ CONFIG_BLK_DEV_IDECD=y
    8.19  #
    8.20  CONFIG_IDE_GENERIC=y
    8.21  # CONFIG_BLK_DEV_CMD640 is not set
    8.22 +# CONFIG_BLK_DEV_IDEPNP is not set
    8.23  CONFIG_BLK_DEV_IDEPCI=y
    8.24  # CONFIG_IDEPCI_SHARE_IRQ is not set
    8.25  # CONFIG_BLK_DEV_OFFBOARD is not set
    8.26 @@ -559,6 +566,7 @@ CONFIG_NETDEVICES=y
    8.27  # CONFIG_BONDING is not set
    8.28  # CONFIG_EQUALIZER is not set
    8.29  CONFIG_TUN=y
    8.30 +# CONFIG_NET_SB1000 is not set
    8.31  
    8.32  #
    8.33  # ARCnet devices
    8.34 @@ -1183,6 +1191,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
    8.35  # CONFIG_DEBUG_SPINLOCK is not set
    8.36  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    8.37  # CONFIG_DEBUG_KOBJECT is not set
    8.38 +# CONFIG_DEBUG_INFO is not set
    8.39  # CONFIG_DEBUG_FS is not set
    8.40  # CONFIG_DEBUG_VM is not set
    8.41  CONFIG_FRAME_POINTER=y
    8.42 @@ -1237,6 +1246,7 @@ CONFIG_NO_IDLE_HZ=y
    8.43  #
    8.44  CONFIG_XEN_PRIVILEGED_GUEST=y
    8.45  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    8.46 +CONFIG_XEN_BACKEND=y
    8.47  CONFIG_XEN_PCIDEV_BACKEND=y
    8.48  # CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
    8.49  CONFIG_XEN_PCIDEV_BACKEND_PASS=y

     9.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Tue Apr 11 13:55:47 2006 -0600
     9.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Tue Apr 11 18:54:18 2006 -0600
     9.3 @@ -92,6 +92,7 @@ CONFIG_ARCH_XEN=y
     9.4  CONFIG_XEN_PRIVILEGED_GUEST=y
     9.5  CONFIG_XEN_BLKDEV_GRANT=y
     9.6  CONFIG_XEN_BLKDEV_FRONTEND=y
     9.7 +CONFIG_XEN_BACKEND=y
     9.8  CONFIG_XEN_BLKDEV_BACKEND=y
     9.9  CONFIG_XEN_SYSFS=y
    9.10  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

    10.1 --- a/buildconfigs/linux-defconfig_xenU_x86_32	Tue Apr 11 13:55:47 2006 -0600
    10.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_32	Tue Apr 11 18:54:18 2006 -0600
    10.3 @@ -779,6 +779,7 @@ CONFIG_NLS_ISO8859_1=y
    10.4  #
    10.5  # Instrumentation Support
    10.6  #
    10.7 +# CONFIG_PROFILING is not set
    10.8  # CONFIG_KPROBES is not set
    10.9  
   10.10  #
   10.11 @@ -858,13 +859,9 @@ CONFIG_NO_IDLE_HZ=y
   10.12  #
   10.13  # CONFIG_XEN_PRIVILEGED_GUEST is not set
   10.14  CONFIG_XEN_UNPRIVILEGED_GUEST=y
   10.15 -# CONFIG_XEN_PCIDEV_BACKEND is not set
   10.16 -# CONFIG_XEN_BLKDEV_BACKEND is not set
   10.17 -# CONFIG_XEN_NETDEV_BACKEND is not set
   10.18 -# CONFIG_XEN_TPMDEV_BACKEND is not set
   10.19 +# CONFIG_XEN_BACKEND is not set
   10.20  CONFIG_XEN_BLKDEV_FRONTEND=y
   10.21  CONFIG_XEN_NETDEV_FRONTEND=y
   10.22 -# CONFIG_XEN_BLKDEV_TAP is not set
   10.23  # CONFIG_XEN_TPMDEV_FRONTEND is not set
   10.24  CONFIG_XEN_SCRUB_PAGES=y
   10.25  CONFIG_XEN_DISABLE_SERIAL=y

    11.1 --- a/buildconfigs/linux-defconfig_xenU_x86_64	Tue Apr 11 13:55:47 2006 -0600
    11.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_64	Tue Apr 11 18:54:18 2006 -0600
    11.3 @@ -1080,6 +1080,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
    11.4  # CONFIG_DEBUG_SPINLOCK is not set
    11.5  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
    11.6  # CONFIG_DEBUG_KOBJECT is not set
    11.7 +# CONFIG_DEBUG_INFO is not set
    11.8  # CONFIG_DEBUG_FS is not set
    11.9  # CONFIG_DEBUG_VM is not set
   11.10  CONFIG_FRAME_POINTER=y
   11.11 @@ -1134,13 +1135,9 @@ CONFIG_NO_IDLE_HZ=y
   11.12  #
   11.13  # CONFIG_XEN_PRIVILEGED_GUEST is not set
   11.14  CONFIG_XEN_UNPRIVILEGED_GUEST=y
   11.15 -# CONFIG_XEN_PCIDEV_BACKEND is not set
   11.16 -# CONFIG_XEN_BLKDEV_BACKEND is not set
   11.17 -# CONFIG_XEN_NETDEV_BACKEND is not set
   11.18 -# CONFIG_XEN_TPMDEV_BACKEND is not set
   11.19 +# CONFIG_XEN_BACKEND is not set
   11.20  CONFIG_XEN_BLKDEV_FRONTEND=y
   11.21  CONFIG_XEN_NETDEV_FRONTEND=y
   11.22 -# CONFIG_XEN_BLKDEV_TAP is not set
   11.23  # CONFIG_XEN_TPMDEV_FRONTEND is not set
   11.24  CONFIG_XEN_SCRUB_PAGES=y
   11.25  CONFIG_XEN_DISABLE_SERIAL=y

    12.1 --- a/buildconfigs/linux-defconfig_xen_ia64	Tue Apr 11 13:55:47 2006 -0600
    12.2 +++ b/buildconfigs/linux-defconfig_xen_ia64	Tue Apr 11 18:54:18 2006 -0600
    12.3 @@ -95,6 +95,7 @@ CONFIG_ARCH_XEN=y
    12.4  CONFIG_XEN_PRIVILEGED_GUEST=y
    12.5  CONFIG_XEN_BLKDEV_GRANT=y
    12.6  CONFIG_XEN_BLKDEV_FRONTEND=y
    12.7 +CONFIG_XEN_BACKEND=y
    12.8  CONFIG_XEN_BLKDEV_BACKEND=y
    12.9  CONFIG_XEN_SYSFS=y
   12.10  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

    13.1 --- a/buildconfigs/linux-defconfig_xen_x86_32	Tue Apr 11 13:55:47 2006 -0600
    13.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32	Tue Apr 11 18:54:18 2006 -0600
    13.3 @@ -292,11 +292,11 @@ CONFIG_NET=y
    13.4  # Networking options
    13.5  #
    13.6  # CONFIG_NETDEBUG is not set
    13.7 -CONFIG_PACKET=m
    13.8 +CONFIG_PACKET=y
    13.9  CONFIG_PACKET_MMAP=y
   13.10 -CONFIG_UNIX=m
   13.11 +CONFIG_UNIX=y
   13.12  CONFIG_XFRM=y
   13.13 -CONFIG_XFRM_USER=m
   13.14 +CONFIG_XFRM_USER=y
   13.15  CONFIG_NET_KEY=m
   13.16  CONFIG_INET=y
   13.17  CONFIG_IP_MULTICAST=y
   13.18 @@ -912,12 +912,12 @@ CONFIG_PARPORT_1284=y
   13.19  # Plug and Play support
   13.20  #
   13.21  CONFIG_PNP=y
   13.22 -# CONFIG_PNP_DEBUG is not set
   13.23 +CONFIG_PNP_DEBUG=y
   13.24  
   13.25  #
   13.26  # Protocols
   13.27  #
   13.28 -# CONFIG_PNPACPI is not set
   13.29 +CONFIG_PNPACPI=y
   13.30  
   13.31  #
   13.32  # Block devices
   13.33 @@ -2892,6 +2892,7 @@ CONFIG_NLS_UTF8=m
   13.34  #
   13.35  # Instrumentation Support
   13.36  #
   13.37 +# CONFIG_PROFILING is not set
   13.38  # CONFIG_KPROBES is not set
   13.39  
   13.40  #
   13.41 @@ -2978,6 +2979,7 @@ CONFIG_NO_IDLE_HZ=y
   13.42  #
   13.43  CONFIG_XEN_PRIVILEGED_GUEST=y
   13.44  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
   13.45 +CONFIG_XEN_BACKEND=y
   13.46  CONFIG_XEN_PCIDEV_BACKEND=y
   13.47  # CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
   13.48  CONFIG_XEN_PCIDEV_BACKEND_PASS=y

    14.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Tue Apr 11 13:55:47 2006 -0600
    14.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Tue Apr 11 18:54:18 2006 -0600
    14.3 @@ -776,7 +776,13 @@ CONFIG_PARPORT_1284=y
    14.4  #
    14.5  # Plug and Play support
    14.6  #
    14.7 -# CONFIG_PNP is not set
    14.8 +CONFIG_PNP=y
    14.9 +CONFIG_PNP_DEBUG=y
   14.10 +
   14.11 +#
   14.12 +# Protocols
   14.13 +#
   14.14 +CONFIG_PNPACPI=y
   14.15  
   14.16  #
   14.17  # Block devices
   14.18 @@ -857,6 +863,7 @@ CONFIG_BLK_DEV_IDESCSI=m
   14.19  CONFIG_IDE_GENERIC=y
   14.20  CONFIG_BLK_DEV_CMD640=y
   14.21  CONFIG_BLK_DEV_CMD640_ENHANCED=y
   14.22 +CONFIG_BLK_DEV_IDEPNP=y
   14.23  CONFIG_BLK_DEV_IDEPCI=y
   14.24  CONFIG_IDEPCI_SHARE_IRQ=y
   14.25  # CONFIG_BLK_DEV_OFFBOARD is not set
   14.26 @@ -1088,6 +1095,7 @@ CONFIG_DUMMY=m
   14.27  CONFIG_BONDING=m
   14.28  CONFIG_EQUALIZER=m
   14.29  CONFIG_TUN=m
   14.30 +CONFIG_NET_SB1000=m
   14.31  
   14.32  #
   14.33  # ARCnet devices
   14.34 @@ -2587,6 +2595,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
   14.35  # CONFIG_DEBUG_SPINLOCK is not set
   14.36  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   14.37  # CONFIG_DEBUG_KOBJECT is not set
   14.38 +# CONFIG_DEBUG_INFO is not set
   14.39  # CONFIG_DEBUG_FS is not set
   14.40  # CONFIG_DEBUG_VM is not set
   14.41  # CONFIG_FRAME_POINTER is not set
   14.42 @@ -2647,6 +2656,7 @@ CONFIG_NO_IDLE_HZ=y
   14.43  #
   14.44  CONFIG_XEN_PRIVILEGED_GUEST=y
   14.45  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
   14.46 +CONFIG_XEN_BACKEND=y
   14.47  CONFIG_XEN_PCIDEV_BACKEND=y
   14.48  # CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
   14.49  CONFIG_XEN_PCIDEV_BACKEND_PASS=y

    15.1 --- a/buildconfigs/mk.linux-2.6-xen	Tue Apr 11 13:55:47 2006 -0600
    15.2 +++ b/buildconfigs/mk.linux-2.6-xen	Tue Apr 11 18:54:18 2006 -0600
    15.3 @@ -1,19 +1,15 @@
    15.4 -
    15.5 -OS           = linux
    15.6 -
    15.7  LINUX_SERIES = 2.6
    15.8  LINUX_VER    = 2.6.16
    15.9  LINUX_SRCS = linux-2.6.16.tar.bz2
   15.10  
   15.11  EXTRAVERSION ?= xen
   15.12  
   15.13 -LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
   15.14 +LINUX_DIR    = linux-$(LINUX_VER)-$(EXTRAVERSION)
   15.15  
   15.16  include buildconfigs/Rules.mk
   15.17  
   15.18 -.PHONY: build clean delete
   15.19 -
   15.20  # The real action starts here!
   15.21 +.PHONY: build
   15.22  build: $(LINUX_DIR)/include/linux/autoconf.h
   15.23  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
   15.24  	    $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) modules ; \
   15.25 @@ -22,7 +18,7 @@ build: $(LINUX_DIR)/include/linux/autoco
   15.26  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) vmlinuz
   15.27  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
   15.28  
   15.29 -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
   15.30 +$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
   15.31  	rm -rf $(LINUX_DIR)
   15.32  	cp -al $(<D) $(LINUX_DIR)
   15.33  	# Apply arch-xen patches
   15.34 @@ -42,14 +38,18 @@ build: $(LINUX_DIR)/include/linux/autoco
   15.35  	  rm -f Makefile ; mv Mk.tmp Makefile )
   15.36  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig
   15.37  
   15.38 +.PHONY: prep
   15.39  prep: $(LINUX_DIR)/include/linux/autoconf.h
   15.40  
   15.41 +.PHONY: config
   15.42  config: CONFIGMODE = menuconfig
   15.43  config: $(LINUX_DIR)/include/linux/autoconf.h
   15.44  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) $(CONFIGMODE)
   15.45  
   15.46 +.PHONY: clean
   15.47  clean::
   15.48  	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) clean
   15.49  
   15.50 +.PHONY: delete
   15.51  delete: 
   15.52 -	rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR) 
   15.53 +	rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) 

    16.1 --- a/docs/Makefile	Tue Apr 11 13:55:47 2006 -0600
    16.2 +++ b/docs/Makefile	Tue Apr 11 18:54:18 2006 -0600
    16.3 @@ -26,22 +26,28 @@ DOC_HTML	:= $(patsubst src/%.tex,html/%/
    16.4  
    16.5  GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
    16.6  
    16.7 -.PHONY:	all build dev-docs python-dev-docs ps pdf html clean install
    16.8 +.PHONY: all
    16.9 +all: build
   16.10  
   16.11 -all: build
   16.12 +.PHONY: build
   16.13  build: ps pdf html man-pages
   16.14  	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
   16.15  
   16.16 +.PHONY: dev-docs
   16.17  dev-docs: python-dev-docs
   16.18  
   16.19 +.PHONY: ps
   16.20  ps: $(DOC_PS)
   16.21  
   16.22 +.PHONY: pdf
   16.23  pdf: $(DOC_PDF)
   16.24  
   16.25 +.PHONY: html
   16.26  html:
   16.27  	@if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \
   16.28  	$(MAKE) $(DOC_HTML); fi
   16.29  
   16.30 +.PHONY: python-dev-docs
   16.31  python-dev-docs:
   16.32  	@mkdir -v -p api/tools/python
   16.33  	@if which $(DOXYGEN) 1>/dev/null 2>/dev/null; then         \
   16.34 @@ -50,6 +56,7 @@ python-dev-docs:
   16.35  	$(MAKE) -C api/tools/python/latex ; else                   \
   16.36          echo "Doxygen not installed; skipping python-dev-docs."; fi
   16.37  
   16.38 +.PHONY: man-pages
   16.39  man-pages:
   16.40  	@if which $(POD2MAN) 1>/dev/null 2>/dev/null; then \
   16.41  	$(MAKE) $(DOC_MAN1) $(DOC_MAN5); fi
   16.42 @@ -64,6 +71,7 @@ man5/%.5: man/%.pod.5 Makefile
   16.43  	$(POD2MAN) --release=$(VERSION) --name=`echo $@ | sed 's/^man5.//'| \
   16.44  		sed 's/.5//'` -s 5 -c "Xen" $< $@
   16.45  
   16.46 +.PHONY: clean
   16.47  clean:
   16.48  	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
   16.49  	rm -rf *.ilg *.log *.ind *.toc *.bak core
   16.50 @@ -72,6 +80,7 @@ clean:
   16.51  	rm -rf man5
   16.52  	rm -rf man1
   16.53  
   16.54 +.PHONY: install
   16.55  install: all
   16.56  	rm -rf $(DESTDIR)$(pkgdocdir)
   16.57  	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)

    17.1 --- a/docs/man/xm.pod.1	Tue Apr 11 13:55:47 2006 -0600
    17.2 +++ b/docs/man/xm.pod.1	Tue Apr 11 18:54:18 2006 -0600
    17.3 @@ -360,7 +360,7 @@ your Linux Kernel sources.
    17.4  Moves a domain out of the paused state.  This will allow a previously
    17.5  paused domain to now be eligible for scheduling by the Xen hypervisor.
    17.6  
    17.7 -=item B<set-vcpus> I<domain-id> I<vcpu-count>
    17.8 +=item B<vcpu-set> I<domain-id> I<vcpu-count>
    17.9  
   17.10  Enables the I<vcpu-count> virtual CPUs for the domain in question.
   17.11  Like mem-set, this command can only allocate up to the maximum virtual
   17.12 @@ -370,8 +370,8 @@ If the I<vcpu-count> is smaller than the
   17.13  VCPUs, the highest number VCPUs will be hotplug removed.  This may be
   17.14  important for pinning purposes.
   17.15  
   17.16 -Attempting to set-vcpus to a number larger than the initially
   17.17 -configured VCPU count is an error.  Trying to set-vcpus to < 1 will be
   17.18 +Attempting to set the VCPUs to a number larger than the initially
   17.19 +configured VCPU count is an error.  Trying to set VCPUs to < 1 will be
   17.20  quietly ignored.
   17.21  
   17.22  =item B<vcpu-list> I<[domain-id]>

    18.1 --- a/docs/src/user.tex	Tue Apr 11 13:55:47 2006 -0600
    18.2 +++ b/docs/src/user.tex	Tue Apr 11 18:54:18 2006 -0600
    18.3 @@ -2052,7 +2052,7 @@ dev86 & The dev86 package provides an as
    18.4  
    18.5  If the dev86 package is not available on the x86\_64 distribution, you can install the i386 version of it. The dev86 rpm package for various distributions can be found at {\scriptsize {\tt http://www.rpmfind.net/linux/rpm2html/search.php?query=dev86\&submit=Search}} \\
    18.6  
    18.7 -LibVNCServer & The unmodified guest's VGA display, keyboard, and mouse are virtualized using the vncserver library provided by this package. You can get the sources of libvncserver from {\small {\tt http://sourceforge.net/projects/libvncserver}}. Build and install the sources on the build system to get the libvncserver library. The 0.8pre version of libvncserver is currently working well with Xen.\\
    18.8 +LibVNCServer & The unmodified guest's VGA display, keyboard, and mouse can be virtualized by the vncserver library. You can get the sources of libvncserver from {\small {\tt http://sourceforge.net/projects/libvncserver}}. Build and install the sources on the build system to get the libvncserver library. There is a significant performance degradation in 0.8 version. The current sources in the CVS tree have fixed this degradation. So it is highly recommended to download the latest CVS sources and install them.\\
    18.9  
   18.10  SDL-devel, SDL & Simple DirectMedia Layer (SDL) is another way of virtualizing the unmodified guest console. It provides an X window for the guest console. 
   18.11  
   18.12 @@ -2077,6 +2077,8 @@ acpi & Enable VMX guest ACPI, default=0 
   18.13  
   18.14  apic & Enable VMX guest APIC, default=0 (disabled)\\
   18.15  
   18.16 +pae & Enable VMX guest PAE, default=0 (disabled)\\
   18.17 +
   18.18  vif     & Optionally defines MAC address and/or bridge for the network interfaces. Random MACs are assigned if not given. {\small {\tt type=ioemu}} means ioemu is used to virtualize the VMX NIC. If no type is specified, vbd is used, as with paravirtualized guests.\\
   18.19  
   18.20  disk & Defines the disk devices you want the domain to have access to, and what you want them accessible as. If using a physical device as the VMX guest's disk, each disk entry is of the form 
   18.21 @@ -2229,6 +2231,30 @@ Simply follow the usual method of creati
   18.22  
   18.23  In the default configuration, VNC is on and SDL is off. Therefore VNC windows will open when VMX guests are created. If you want to use SDL to create VMX guests, set {\small {\tt sdl=1}} in your VMX configuration file. You can also turn off VNC by setting {\small {\tt vnc=0}}.
   18.24   
   18.25 +\subsection{Use mouse in VNC window}
   18.26 +The default PS/2 mouse will not work properly in VMX by a VNC window. Summagraphics mouse emulation does work in this environment. A Summagraphics mouse can be enabled by reconfiguring 2 services:
   18.27 +
   18.28 +{\small {\tt 1. General Purpose Mouse (GPM). The GPM daemon is configured in different ways in different Linux distributions. On a Redhat distribution, this is accomplished by changing the file `/etc/sysconfig/mouse' to have the following:\\
   18.29 +MOUSETYPE="summa"\\
   18.30 +XMOUSETYPE="SUMMA"\\
   18.31 +DEVICE=/dev/ttyS0\\
   18.32 +\\
   18.33 +2. X11. For all Linux distributions, change the Mouse0 stanza in `/etc/X11/xorg.conf' to:\\
   18.34 +Section "InputDevice"\\
   18.35 +Identifier "Mouse0"\\
   18.36 +Driver "summa"\\
   18.37 +Option "Device" "/dev/ttyS0"\\
   18.38 +Option "InputFashion" "Tablet"\\
   18.39 +Option "Mode" "Absolute"\\
   18.40 +Option "Name" "EasyPen"\\
   18.41 +Option "Compatible" "True"\\
   18.42 +Option "Protocol" "Auto"\\
   18.43 +Option "SendCoreEvents" "on"\\
   18.44 +Option "Vendor" "GENIUS"\\
   18.45 +EndSection}}
   18.46 +
   18.47 +If the Summagraphics mouse isn't the default mouse, you can manually kill 'gpm' and restart it with the command "gpm -m /dev/ttyS0 -t summa". Note that Summagraphics mouse makes no sense in an SDL window and is therefore not available in this environment.
   18.48 +
   18.49  \subsection{Destroy VMX guests}
   18.50  VMX guests can be destroyed in the same way as can paravirtualized guests. We recommend that you type the command 
   18.51  

    19.1 --- a/extras/mini-os/Makefile	Tue Apr 11 13:55:47 2006 -0600
    19.2 +++ b/extras/mini-os/Makefile	Tue Apr 11 18:54:18 2006 -0600
    19.3 @@ -37,8 +37,10 @@ OBJS += $(patsubst %.c,%.o,$(wildcard co
    19.4  HDRS := $(wildcard include/*.h)
    19.5  HDRS += $(wildcard include/xen/*.h)
    19.6  
    19.7 +.PHONY: default
    19.8  default: $(TARGET)
    19.9  
   19.10 +.PHONY: links
   19.11  links:
   19.12  	[ -e include/xen ] || ln -sf ../../../xen/include/public include/xen
   19.13  
   19.14 @@ -46,6 +48,7 @@ links:
   19.15  	$(LD) -N -T minios-$(TARGET_ARCH).lds $(OBJS) -o $@.elf
   19.16  	gzip -f -9 -c $@.elf >$@.gz
   19.17  
   19.18 +.PHONY: clean
   19.19  clean:
   19.20  	find . -type f -name '*.o' | xargs rm -f
   19.21  	rm -f *.o *~ core $(TARGET).elf $(TARGET).raw $(TARGET) $(TARGET).gz

    20.1 --- a/extras/mini-os/traps.c	Tue Apr 11 13:55:47 2006 -0600
    20.2 +++ b/extras/mini-os/traps.c	Tue Apr 11 18:54:18 2006 -0600
    20.3 @@ -4,6 +4,7 @@
    20.4  #include <hypervisor.h>
    20.5  #include <mm.h>
    20.6  #include <lib.h>
    20.7 +#include <sched.h>
    20.8  
    20.9  /*
   20.10   * These are assembler stubs in entry.S.
   20.11 @@ -31,6 +32,8 @@ void machine_check(void);
   20.12  
   20.13  void dump_regs(struct pt_regs *regs)
   20.14  {
   20.15 +    printk("Thread: %s\n", current->name);
   20.16 +#ifdef __i386__    
   20.17      printk("EIP: %x, EFLAGS %x.\n", regs->eip, regs->eflags);
   20.18      printk("EBX: %08x ECX: %08x EDX: %08x\n",
   20.19  	   regs->ebx, regs->ecx, regs->edx);
   20.20 @@ -40,9 +43,22 @@ void dump_regs(struct pt_regs *regs)
   20.21  	   regs->xds, regs->xes, regs->orig_eax, regs->eip);
   20.22      printk("CS: %04x EFLAGS: %08x esp: %08x ss: %04x\n",
   20.23  	   regs->xcs, regs->eflags, regs->esp, regs->xss);
   20.24 -
   20.25 -}	
   20.26 -
   20.27 +#else
   20.28 +    printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
   20.29 +    printk("\nRSP: %04lx:%016lx  EFLAGS: %08lx\n", 
   20.30 +           regs->ss, regs->rsp, regs->eflags);
   20.31 +    printk("RAX: %016lx RBX: %016lx RCX: %016lx\n",
   20.32 +           regs->rax, regs->rbx, regs->rcx);
   20.33 +    printk("RDX: %016lx RSI: %016lx RDI: %016lx\n",
   20.34 +           regs->rdx, regs->rsi, regs->rdi); 
   20.35 +    printk("RBP: %016lx R08: %016lx R09: %016lx\n",
   20.36 +           regs->rbp, regs->r8, regs->r9); 
   20.37 +    printk("R10: %016lx R11: %016lx R12: %016lx\n",
   20.38 +           regs->r10, regs->r11, regs->r12); 
   20.39 +    printk("R13: %016lx R14: %016lx R15: %016lx\n",
   20.40 +           regs->r13, regs->r14, regs->r15); 
   20.41 +#endif
   20.42 +}
   20.43  
   20.44  static void do_trap(int trapnr, char *str, struct pt_regs * regs, unsigned long error_code)
   20.45  {
   20.46 @@ -110,36 +126,17 @@ void do_page_fault(struct pt_regs *regs,
   20.47      printk("Page fault at linear address %p, regs %p, code %lx\n", addr, regs,
   20.48  	   error_code);
   20.49      dump_regs(regs);
   20.50 -#ifdef __x86_64__
   20.51 -    /* FIXME: _PAGE_PSE */
   20.52 -    {
   20.53 -        unsigned long *tab = (unsigned long *)start_info.pt_base;
   20.54 -        unsigned long page;
   20.55 -    
   20.56 -        printk("Pagetable walk from %p:\n", tab);
   20.57 -        
   20.58 -        page = tab[l4_table_offset(addr)];
   20.59 -        tab = to_virt(mfn_to_pfn(pte_to_mfn(page)) << PAGE_SHIFT);
   20.60 -        printk(" L4 = %p (%p)\n", page, tab);
   20.61 -
   20.62 -        page = tab[l3_table_offset(addr)];
   20.63 -        tab = to_virt(mfn_to_pfn(pte_to_mfn(page)) << PAGE_SHIFT);
   20.64 -        printk("  L3 = %p (%p)\n", page, tab);
   20.65 -        
   20.66 -        page = tab[l2_table_offset(addr)];
   20.67 -        tab =  to_virt(mfn_to_pfn(pte_to_mfn(page)) << PAGE_SHIFT);
   20.68 -        printk("   L2 = %p (%p)\n", page, tab);
   20.69 -        
   20.70 -        page = tab[l1_table_offset(addr)];
   20.71 -        printk("    L1 = %p\n", page);
   20.72 -    }
   20.73 -#endif
   20.74 +    page_walk(addr);
   20.75      do_exit();
   20.76  }
   20.77  
   20.78  void do_general_protection(struct pt_regs *regs, long error_code)
   20.79  {
   20.80 -    printk("GPF %p, error_code=%lx\n", regs, error_code);
   20.81 +#ifdef __i386__
   20.82 +    printk("GPF eip: %p, error_code=%lx\n", regs->eip, error_code);
   20.83 +#else    
   20.84 +    printk("GPF rip: %p, error_code=%lx\n", regs->rip, error_code);
   20.85 +#endif
   20.86      dump_regs(regs);
   20.87      do_exit();
   20.88  }

    21.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Tue Apr 11 13:55:47 2006 -0600
    21.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Tue Apr 11 18:54:18 2006 -0600
    21.3 @@ -1116,9 +1116,7 @@ source "fs/Kconfig"
    21.4  menu "Instrumentation Support"
    21.5  	depends on EXPERIMENTAL
    21.6  
    21.7 -if !X86_XEN
    21.8  source "arch/i386/oprofile/Kconfig"
    21.9 -endif
   21.10  
   21.11  config KPROBES
   21.12  	bool "Kprobes (EXPERIMENTAL)"

    22.1 --- a/linux-2.6-xen-sparse/arch/i386/Makefile	Tue Apr 11 13:55:47 2006 -0600
    22.2 +++ b/linux-2.6-xen-sparse/arch/i386/Makefile	Tue Apr 11 18:54:18 2006 -0600
    22.3 @@ -45,6 +45,11 @@ CFLAGS				+= $(shell if [ $(call cc-vers
    22.4  
    22.5  CFLAGS += $(cflags-y)
    22.6  
    22.7 +cppflags-$(CONFIG_XEN) += \
    22.8 +	-D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
    22.9 +
   22.10 +CPPFLAGS += $(cppflags-y)
   22.11 +
   22.12  # Default subarch .c files
   22.13  mcore-y  := mach-default
   22.14  
   22.15 @@ -107,7 +112,7 @@ boot := arch/i386/boot
   22.16  	zdisk bzdisk fdimage fdimage144 fdimage288 install
   22.17  
   22.18  ifdef CONFIG_XEN
   22.19 -CPPFLAGS        := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE)
   22.20 +CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
   22.21  head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o
   22.22  boot := arch/i386/boot-xen
   22.23  .PHONY: vmlinuz
   22.24 @@ -157,3 +162,4 @@ define archhelp
   22.25  endef
   22.26  
   22.27  CLEAN_FILES += arch/$(ARCH)/boot/fdimage arch/$(ARCH)/boot/mtools.conf
   22.28 +CLEAN_FILES += vmlinuz vmlinux-stripped

    23.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S	Tue Apr 11 13:55:47 2006 -0600
    23.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S	Tue Apr 11 18:54:18 2006 -0600
    23.3 @@ -65,7 +65,6 @@ ES		= 0x20
    23.4  ORIG_EAX	= 0x24
    23.5  EIP		= 0x28
    23.6  CS		= 0x2C
    23.7 -EVENT_MASK	= 0x2E
    23.8  EFLAGS		= 0x30
    23.9  OLDESP		= 0x34
   23.10  OLDSS		= 0x38
   23.11 @@ -290,14 +289,14 @@ restore_all:
   23.12  restore_nocheck:
   23.13  #else
   23.14  restore_nocheck:
   23.15 -	testl $(VM_MASK|NMI_MASK), EFLAGS(%esp)
   23.16 +	movl EFLAGS(%esp), %eax
   23.17 +	testl $(VM_MASK|NMI_MASK), %eax
   23.18  	jnz hypervisor_iret
   23.19 -	movb EVENT_MASK(%esp), %al
   23.20 -	notb %al			# %al == ~saved_mask
   23.21 +	shr $9, %eax			# EAX[0] == IRET_EFLAGS.IF
   23.22  	GET_VCPU_INFO
   23.23  	andb evtchn_upcall_mask(%esi),%al
   23.24 -	andb $1,%al			# %al == mask & ~saved_mask
   23.25 -	jnz restore_all_enable_events	#     != 0 => reenable event delivery
   23.26 +	andb $1,%al			# EAX[0] == IRET_EFLAGS.IF & event_mask
   23.27 +	jnz restore_all_enable_events	#        != 0 => enable event delivery
   23.28  #endif
   23.29  	RESTORE_REGS
   23.30  	addl $4, %esp
   23.31 @@ -462,7 +461,7 @@ vector=0
   23.32  ENTRY(irq_entries_start)
   23.33  .rept NR_IRQS
   23.34  	ALIGN
   23.35 -1:	pushl 0x80000000+$vector
   23.36 +1:	pushl $~(vector)
   23.37  	jmp common_interrupt
   23.38  .data
   23.39  	.long 1b
   23.40 @@ -479,7 +478,7 @@ common_interrupt:
   23.41  
   23.42  #define BUILD_INTERRUPT(name, nr)	\
   23.43  ENTRY(name)				\
   23.44 -	pushl 0x80000000+$nr;		\
   23.45 +	pushl $~(nr);			\
   23.46  	SAVE_ALL			\
   23.47  	movl %esp,%eax;			\
   23.48  	call smp_/**/name;		\
   23.49 @@ -555,14 +554,9 @@ scrit:	/**** START OF CRITICAL REGION **
   23.50  	RESTORE_REGS
   23.51  	addl $4, %esp
   23.52  1:	iret
   23.53 -.section .fixup,"ax"
   23.54 -2:	pushl $0
   23.55 -	pushl $do_iret_error
   23.56 -	jmp error_code
   23.57 -.previous
   23.58  .section __ex_table,"a"
   23.59  	.align 4
   23.60 -	.long 1b,2b
   23.61 +	.long 1b,iret_exc
   23.62  .previous
   23.63  14:	__DISABLE_INTERRUPTS
   23.64  	jmp  11b
   23.65 @@ -614,30 +608,51 @@ critical_fixup_table:
   23.66  	.byte 0x00,0x00			# jmp  11b
   23.67  
   23.68  # Hypervisor uses this for application faults while it executes.
   23.69 +# We get here for two reasons:
   23.70 +#  1. Fault while reloading DS, ES, FS or GS
   23.71 +#  2. Fault while executing IRET
   23.72 +# Category 1 we fix up by reattempting the load, and zeroing the segment
   23.73 +# register if the load fails.
   23.74 +# Category 2 we fix up by jumping to do_iret_error. We cannot use the
   23.75 +# normal Linux return path in this case because if we use the IRET hypercall
   23.76 +# to pop the stack frame we end up in an infinite loop of failsafe callbacks.
   23.77 +# We distinguish between categories by maintaining a status value in EAX.
   23.78  ENTRY(failsafe_callback)
   23.79 -1:	popl %ds
   23.80 -2:	popl %es
   23.81 -3:	popl %fs
   23.82 -4:	popl %gs
   23.83 -	subl $4,%esp
   23.84 +	pushl %eax
   23.85 +	movl $1,%eax
   23.86 +1:	mov 4(%esp),%ds
   23.87 +2:	mov 8(%esp),%es
   23.88 +3:	mov 12(%esp),%fs
   23.89 +4:	mov 16(%esp),%gs
   23.90 +	testl %eax,%eax
   23.91 +	popl %eax
   23.92 +	jz 5f
   23.93 +	addl $16,%esp		# EAX != 0 => Category 2 (Bad IRET)
   23.94 +	jmp iret_exc
   23.95 +5:	addl $16,%esp		# EAX == 0 => Category 1 (Bad segment)
   23.96 +	pushl $0
   23.97  	SAVE_ALL
   23.98 -	jmp  ret_from_exception
   23.99 -.section .fixup,"ax";	\
  23.100 -6:	movl $0,(%esp);	\
  23.101 -	jmp 1b;		\
  23.102 -7:	movl $0,(%esp);	\
  23.103 -	jmp 2b;		\
  23.104 -8:	movl $0,(%esp);	\
  23.105 -	jmp 3b;		\
  23.106 -9:	movl $0,(%esp);	\
  23.107 -	jmp 4b;		\
  23.108 -.previous;		\
  23.109 -.section __ex_table,"a";\
  23.110 -	.align 4;	\
  23.111 -	.long 1b,6b;	\
  23.112 -	.long 2b,7b;	\
  23.113 -	.long 3b,8b;	\
  23.114 -	.long 4b,9b;	\
  23.115 +	jmp ret_from_exception
  23.116 +.section .fixup,"ax";		\
  23.117 +6:	xorl %eax,%eax;		\
  23.118 +	movl %eax,4(%esp);	\
  23.119 +	jmp 1b;			\
  23.120 +7:	xorl %eax,%eax;		\
  23.121 +	movl %eax,8(%esp);	\
  23.122 +	jmp 2b;			\
  23.123 +8:	xorl %eax,%eax;		\
  23.124 +	movl %eax,12(%esp);	\
  23.125 +	jmp 3b;			\
  23.126 +9:	xorl %eax,%eax;		\
  23.127 +	movl %eax,16(%esp);	\
  23.128 +	jmp 4b;			\
  23.129 +.previous;			\
  23.130 +.section __ex_table,"a";	\
  23.131 +	.align 4;		\
  23.132 +	.long 1b,6b;		\
  23.133 +	.long 2b,7b;		\
  23.134 +	.long 3b,8b;		\
  23.135 +	.long 4b,9b;		\
  23.136  .previous
  23.137  #endif
  23.138  

    24.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/irq-xen.c	Tue Apr 11 13:55:47 2006 -0600
    24.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/irq-xen.c	Tue Apr 11 18:54:18 2006 -0600
    24.3 @@ -54,7 +54,7 @@ static union irq_ctx *softirq_ctx[NR_CPU
    24.4  fastcall unsigned int do_IRQ(struct pt_regs *regs)
    24.5  {	
    24.6  	/* high bit used in ret_from_ code */
    24.7 -	int irq = regs->orig_eax & __IRQ_MASK(BITS_PER_LONG - 1);
    24.8 +	int irq = ~regs->orig_eax;
    24.9  #ifdef CONFIG_4KSTACKS
   24.10  	union irq_ctx *curctx, *irqctx;
   24.11  	u32 *isp;

    25.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c	Tue Apr 11 13:55:47 2006 -0600
    25.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/pci-dma-xen.c	Tue Apr 11 18:54:18 2006 -0600
    25.3 @@ -69,7 +69,7 @@ dma_map_sg(struct device *hwdev, struct 
    25.4  	} else {
    25.5  		for (i = 0; i < nents; i++ ) {
    25.6  			sg[i].dma_address =
    25.7 -				page_to_phys(sg[i].page) + sg[i].offset;
    25.8 +				page_to_bus(sg[i].page) + sg[i].offset;
    25.9  			sg[i].dma_length  = sg[i].length;
   25.10  			BUG_ON(!sg[i].page);
   25.11  			IOMMU_BUG_ON(address_needs_mapping(
   25.12 @@ -105,7 +105,7 @@ dma_map_page(struct device *dev, struct 
   25.13  		dma_addr = swiotlb_map_page(
   25.14  			dev, page, offset, size, direction);
   25.15  	} else {
   25.16 -		dma_addr = page_to_phys(page) + offset;
   25.17 +		dma_addr = page_to_bus(page) + offset;
   25.18  		IOMMU_BUG_ON(address_needs_mapping(dev, dma_addr));
   25.19  	}
   25.20  

    26.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c	Tue Apr 11 13:55:47 2006 -0600
    26.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c	Tue Apr 11 18:54:18 2006 -0600
    26.3 @@ -114,7 +114,7 @@ void xen_idle(void)
    26.4  		smp_mb__after_clear_bit();
    26.5  		stop_hz_timer();
    26.6  		/* Blocking includes an implicit local_irq_enable(). */
    26.7 -		HYPERVISOR_sched_op(SCHEDOP_block, 0);
    26.8 +		HYPERVISOR_block();
    26.9  		start_hz_timer();
   26.10  		set_thread_flag(TIF_POLLING_NRFLAG);
   26.11  	}

    27.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/quirks-xen.c	Tue Apr 11 13:55:47 2006 -0600
    27.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/quirks-xen.c	Tue Apr 11 18:54:18 2006 -0600
    27.3 @@ -5,7 +5,7 @@
    27.4  #include <linux/pci.h>
    27.5  #include <linux/irq.h>
    27.6  
    27.7 -#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
    27.8 +#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_SMP) || defined(CONFIG_XEN)) && defined(CONFIG_PCI)
    27.9  
   27.10  static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
   27.11  {

    28.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Tue Apr 11 13:55:47 2006 -0600
    28.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Tue Apr 11 18:54:18 2006 -0600
    28.3 @@ -1317,6 +1317,11 @@ void __init setup_bootmem_allocator(void
    28.4  		}
    28.5  	}
    28.6  #endif
    28.7 +#ifdef CONFIG_KEXEC
    28.8 +	if (crashk_res.start != crashk_res.end)
    28.9 +		reserve_bootmem(crashk_res.start,
   28.10 +			crashk_res.end - crashk_res.start + 1);
   28.11 +#endif
   28.12  
   28.13  	if (!xen_feature(XENFEAT_auto_translated_physmap))
   28.14  		phys_to_machine_mapping =
   28.15 @@ -1436,11 +1441,6 @@ legacy_init_iomem_resources(struct resou
   28.16  		}
   28.17  	}
   28.18  #endif
   28.19 -#ifdef CONFIG_KEXEC
   28.20 -	if (crashk_res.start != crashk_res.end)
   28.21 -		reserve_bootmem(crashk_res.start,
   28.22 -			crashk_res.end - crashk_res.start + 1);
   28.23 -#endif
   28.24  }
   28.25  
   28.26  /*
   28.27 @@ -1633,9 +1633,9 @@ void __init setup_arch(char **cmdline_p)
   28.28  	physdev_op_t op;
   28.29  	unsigned long max_low_pfn;
   28.30  
   28.31 -	/* Force a quick death if the kernel panics. */
   28.32 +	/* Force a quick death if the kernel panics (not domain 0). */
   28.33  	extern int panic_timeout;
   28.34 -	if (panic_timeout == 0)
   28.35 +	if (!panic_timeout && !(xen_start_info->flags & SIF_INITDOMAIN))
   28.36  		panic_timeout = 1;
   28.37  
   28.38  	/* Register a call for panic conditions. */
   28.39 @@ -1848,10 +1848,6 @@ void __init setup_arch(char **cmdline_p)
   28.40  		get_smp_config();
   28.41  #endif
   28.42  
   28.43 -	/* XXX Disable irqdebug until we have a way to avoid interrupt
   28.44 -	 * conflicts. */
   28.45 -	noirqdebug_setup("");
   28.46 -
   28.47  	register_memory();
   28.48  
   28.49  	if (xen_start_info->flags & SIF_INITDOMAIN) {
   28.50 @@ -1877,7 +1873,7 @@ void __init setup_arch(char **cmdline_p)
   28.51  static int
   28.52  xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
   28.53  {
   28.54 -	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_crash);
   28.55 +	HYPERVISOR_shutdown(SHUTDOWN_crash);
   28.56  	/* we're never actually going to get here... */
   28.57  	return NOTIFY_DONE;
   28.58  }

    29.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c	Tue Apr 11 13:55:47 2006 -0600
    29.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/swiotlb.c	Tue Apr 11 18:54:18 2006 -0600
    29.3 @@ -32,7 +32,7 @@ EXPORT_SYMBOL(swiotlb);
    29.4  
    29.5  #define OFFSET(val,align) ((unsigned long)((val) & ( (align) - 1)))
    29.6  
    29.7 -#define SG_ENT_PHYS_ADDRESS(sg)	(page_to_phys((sg)->page) + (sg)->offset)
    29.8 +#define SG_ENT_PHYS_ADDRESS(sg)	(page_to_bus((sg)->page) + (sg)->offset)
    29.9  
   29.10  /*
   29.11   * Maximum allowable number of contiguous slabs to map,
   29.12 @@ -607,7 +607,7 @@ swiotlb_map_page(struct device *hwdev, s
   29.13  	dma_addr_t dev_addr;
   29.14  	char *map;
   29.15  
   29.16 -	dev_addr = page_to_phys(page) + offset;
   29.17 +	dev_addr = page_to_bus(page) + offset;
   29.18  	if (address_needs_mapping(hwdev, dev_addr)) {
   29.19  		buffer.page   = page;
   29.20  		buffer.offset = offset;

    30.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c	Tue Apr 11 13:55:47 2006 -0600
    30.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c	Tue Apr 11 18:54:18 2006 -0600
    30.3 @@ -177,6 +177,32 @@ int touch_pte_range(struct mm_struct *mm
    30.4  
    30.5  EXPORT_SYMBOL(touch_pte_range);
    30.6  
    30.7 +void *vm_map_xen_pages (unsigned long maddr, int vm_size, pgprot_t prot)
    30.8 +{
    30.9 +	int error;
   30.10 +       
   30.11 +	struct vm_struct *vma;
   30.12 +	vma = get_vm_area (vm_size, VM_IOREMAP);
   30.13 +      
   30.14 +	if (vma == NULL) {
   30.15 +		printk ("ioremap.c,vm_map_xen_pages(): "
   30.16 +			"Failed to get VMA area\n");
   30.17 +		return NULL;
   30.18 +	}
   30.19 +
   30.20 +	error = direct_kernel_remap_pfn_range((unsigned long) vma->addr,
   30.21 +					      maddr >> PAGE_SHIFT, vm_size,
   30.22 +					      prot, DOMID_SELF );
   30.23 +	if (error == 0) {
   30.24 +		return vma->addr;
   30.25 +	} else {
   30.26 +		printk ("ioremap.c,vm_map_xen_pages(): "
   30.27 +			"Failed to map xen shared pages into kernel space\n");
   30.28 +		return NULL;
   30.29 +	}
   30.30 +}
   30.31 +EXPORT_SYMBOL(vm_map_xen_pages);
   30.32 +
   30.33  /*
   30.34   * Does @address reside within a non-highmem page that is local to this virtual
   30.35   * machine (i.e., not an I/O page, nor a memory page belonging to another VM).

    31.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.2 +++ b/linux-2.6-xen-sparse/arch/i386/oprofile/Makefile	Tue Apr 11 18:54:18 2006 -0600
    31.3 @@ -0,0 +1,16 @@
    31.4 +obj-$(CONFIG_OPROFILE) += oprofile.o
    31.5 +
    31.6 +DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
    31.7 +		oprof.o cpu_buffer.o buffer_sync.o \
    31.8 +		event_buffer.o oprofile_files.o \
    31.9 +		oprofilefs.o oprofile_stats.o  \
   31.10 +		timer_int.o )
   31.11 +
   31.12 +ifdef CONFIG_XEN
   31.13 +oprofile-y				:= $(DRIVER_OBJS) xenoprof.o
   31.14 +else 
   31.15 +oprofile-y				:= $(DRIVER_OBJS) init.o backtrace.o
   31.16 +oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_athlon.o \
   31.17 +					   op_model_ppro.o op_model_p4.o
   31.18 +oprofile-$(CONFIG_X86_IO_APIC)		+= nmi_timer_int.o
   31.19 +endif

    32.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.2 +++ b/linux-2.6-xen-sparse/arch/i386/oprofile/xenoprof.c	Tue Apr 11 18:54:18 2006 -0600
    32.3 @@ -0,0 +1,395 @@
    32.4 +/**
    32.5 + * @file xenoprof.c
    32.6 + *
    32.7 + * @remark Copyright 2002 OProfile authors
    32.8 + * @remark Read the file COPYING
    32.9 + *
   32.10 + * @author John Levon <levon@movementarian.org>
   32.11 + *
   32.12 + * Modified by Aravind Menon and Jose Renato Santos for Xen
   32.13 + * These modifications are:
   32.14 + * Copyright (C) 2005 Hewlett-Packard Co.
   32.15 + */
   32.16 +
   32.17 +#include <linux/init.h>
   32.18 +#include <linux/notifier.h>
   32.19 +#include <linux/smp.h>
   32.20 +#include <linux/oprofile.h>
   32.21 +#include <linux/sysdev.h>
   32.22 +#include <linux/slab.h>
   32.23 +#include <linux/interrupt.h>
   32.24 +#include <linux/vmalloc.h>
   32.25 +#include <asm/nmi.h>
   32.26 +#include <asm/msr.h>
   32.27 +#include <asm/apic.h>
   32.28 +#include <asm/pgtable.h>
   32.29 +#include <xen/evtchn.h>
   32.30 +#include "op_counter.h"
   32.31 +
   32.32 +#include <xen/interface/xen.h>
   32.33 +#include <xen/interface/xenoprof.h>
   32.34 +
   32.35 +static int xenoprof_start(void);
   32.36 +static void xenoprof_stop(void);
   32.37 +
   32.38 +void * vm_map_xen_pages(unsigned long maddr, int vm_size, pgprot_t prot);
   32.39 +
   32.40 +static int xenoprof_enabled = 0;
   32.41 +static int num_events = 0;
   32.42 +static int is_primary = 0;
   32.43 +
   32.44 +/* sample buffers shared with Xen */
   32.45 +xenoprof_buf_t * xenoprof_buf[MAX_VIRT_CPUS];
   32.46 +/* Shared buffer area */
   32.47 +char * shared_buffer;
   32.48 +/* Number of buffers in shared area (one per VCPU) */
   32.49 +int nbuf;
   32.50 +/* Mappings of VIRQ_XENOPROF to irq number (per cpu) */
   32.51 +int ovf_irq[NR_CPUS];
   32.52 +/* cpu model type string - copied from Xen memory space on XENOPROF_init command */
   32.53 +char cpu_type[XENOPROF_CPU_TYPE_SIZE];
   32.54 +
   32.55 +#ifdef CONFIG_PM
   32.56 +
   32.57 +static int xenoprof_suspend(struct sys_device * dev, pm_message_t state)
   32.58 +{
   32.59 +	if (xenoprof_enabled == 1)
   32.60 +		xenoprof_stop();
   32.61 +	return 0;
   32.62 +}
   32.63 +
   32.64 +
   32.65 +static int xenoprof_resume(struct sys_device * dev)
   32.66 +{
   32.67 +	if (xenoprof_enabled == 1)
   32.68 +		xenoprof_start();
   32.69 +	return 0;
   32.70 +}
   32.71 +
   32.72 +
   32.73 +static struct sysdev_class oprofile_sysclass = {
   32.74 +	set_kset_name("oprofile"),
   32.75 +	.resume		= xenoprof_resume,
   32.76 +	.suspend	= xenoprof_suspend
   32.77 +};
   32.78 +
   32.79 +
   32.80 +static struct sys_device device_oprofile = {
   32.81 +	.id	= 0,
   32.82 +	.cls	= &oprofile_sysclass,
   32.83 +};
   32.84 +
   32.85 +
   32.86 +static int __init init_driverfs(void)
   32.87 +{
   32.88 +	int error;
   32.89 +	if (!(error = sysdev_class_register(&oprofile_sysclass)))
   32.90 +		error = sysdev_register(&device_oprofile);
   32.91 +	return error;
   32.92 +}
   32.93 +
   32.94 +
   32.95 +static void __exit exit_driverfs(void)
   32.96 +{
   32.97 +	sysdev_unregister(&device_oprofile);
   32.98 +	sysdev_class_unregister(&oprofile_sysclass);
   32.99 +}
  32.100 +
  32.101 +#else
  32.102 +#define init_driverfs() do { } while (0)
  32.103 +#define exit_driverfs() do { } while (0)
  32.104 +#endif /* CONFIG_PM */
  32.105 +
  32.106 +unsigned long long oprofile_samples = 0;
  32.107 +
  32.108 +static irqreturn_t 
  32.109 +xenoprof_ovf_interrupt(int irq, void * dev_id, struct pt_regs * regs)
  32.110 +{
  32.111 +	int head, tail, size;
  32.112 +	xenoprof_buf_t * buf;
  32.113 +	int cpu;
  32.114 +
  32.115 +	cpu = smp_processor_id();
  32.116 +	buf = xenoprof_buf[cpu];
  32.117 +
  32.118 +	head = buf->event_head;
  32.119 +	tail = buf->event_tail;
  32.120 +	size = buf->event_size;
  32.121 +
  32.122 +	if (tail > head) {
  32.123 +		while (tail < size) {
  32.124 +			oprofile_add_pc(buf->event_log[tail].eip,
  32.125 +					buf->event_log[tail].mode,
  32.126 +					buf->event_log[tail].event);
  32.127 +			oprofile_samples++;
  32.128 +			tail++;
  32.129 +		}
  32.130 +		tail = 0;
  32.131 +	}
  32.132 +	while (tail < head) {
  32.133 +		oprofile_add_pc(buf->event_log[tail].eip,
  32.134 +				buf->event_log[tail].mode,
  32.135 +				buf->event_log[tail].event);
  32.136 +		oprofile_samples++;
  32.137 +		tail++;
  32.138 +	}
  32.139 +
  32.140 +	buf->event_tail = tail;
  32.141 +
  32.142 +	return IRQ_HANDLED;
  32.143 +}
  32.144 +
  32.145 +
  32.146 +static void unbind_virq_cpu(void * info)
  32.147 +{
  32.148 +	int cpu = smp_processor_id();
  32.149 +	if (ovf_irq[cpu] >= 0) {
  32.150 +		unbind_from_irqhandler(ovf_irq[cpu], NULL);
  32.151 +		ovf_irq[cpu] = -1;
  32.152 +	}
  32.153 +}
  32.154 +
  32.155 +
  32.156 +static void unbind_virq(void)
  32.157 +{
  32.158 +	on_each_cpu(unbind_virq_cpu, NULL, 0, 1);
  32.159 +}
  32.160 +
  32.161 +
  32.162 +int bind_virq_error;
  32.163 +
  32.164 +static void bind_virq_cpu(void * info)
  32.165 +{
  32.166 +	int result;
  32.167 +	int cpu = smp_processor_id();
  32.168 +
  32.169 +	result = bind_virq_to_irqhandler(VIRQ_XENOPROF,
  32.170 +					 cpu,
  32.171 +					 xenoprof_ovf_interrupt,
  32.172 +					 SA_INTERRUPT,
  32.173 +					 "xenoprof",
  32.174 +					 NULL);
  32.175 +
  32.176 +	if (result<0) {
  32.177 +		bind_virq_error = result;
  32.178 +		printk("xenoprof.c: binding VIRQ_XENOPROF to IRQ failed on CPU "
  32.179 +		       "%d\n", cpu);
  32.180 +	} else {
  32.181 +		ovf_irq[cpu] = result;
  32.182 +	}
  32.183 +}
  32.184 +
  32.185 +
  32.186 +static int bind_virq(void)
  32.187 +{
  32.188 +	bind_virq_error = 0;
  32.189 +	on_each_cpu(bind_virq_cpu, NULL, 0, 1);
  32.190 +	if (bind_virq_error) {
  32.191 +		unbind_virq();
  32.192 +		return bind_virq_error;
  32.193 +	} else {
  32.194 +		return 0;
  32.195 +	}
  32.196 +}
  32.197 +
  32.198 +
  32.199 +static int xenoprof_setup(void)
  32.200 +{
  32.201 +	int ret;
  32.202 +
  32.203 +	ret = bind_virq();
  32.204 +	if (ret)
  32.205 +		return ret;
  32.206 +
  32.207 +	if (is_primary) {
  32.208 +		ret = HYPERVISOR_xenoprof_op(XENOPROF_reserve_counters,
  32.209 +					     (unsigned long)NULL,
  32.210 +					     (unsigned long)NULL);
  32.211 +		if (ret)
  32.212 +			goto err;
  32.213 +
  32.214 +		ret = HYPERVISOR_xenoprof_op(XENOPROF_setup_events,
  32.215 +					     (unsigned long)&counter_config,
  32.216 +					     (unsigned long)num_events);
  32.217 +		if (ret)
  32.218 +			goto err;
  32.219 +	}
  32.220 +
  32.221 +	ret = HYPERVISOR_xenoprof_op(XENOPROF_enable_virq,
  32.222 +				     (unsigned long)NULL,
  32.223 +				     (unsigned long)NULL);
  32.224 +	if (ret)
  32.225 +		goto err;
  32.226 +
  32.227 +	xenoprof_enabled = 1;
  32.228 +	return 0;
  32.229 + err:
  32.230 +	unbind_virq();
  32.231 +	return ret;
  32.232 +}
  32.233 +
  32.234 +
  32.235 +static void xenoprof_shutdown(void)
  32.236 +{
  32.237 +	xenoprof_enabled = 0;
  32.238 +
  32.239 +	HYPERVISOR_xenoprof_op(XENOPROF_disable_virq,
  32.240 +			       (unsigned long)NULL,
  32.241 +			       (unsigned long)NULL);
  32.242 +
  32.243 +	if (is_primary) {
  32.244 +		HYPERVISOR_xenoprof_op(XENOPROF_release_counters,
  32.245 +				       (unsigned long)NULL,
  32.246 +				       (unsigned long)NULL);
  32.247 +	}
  32.248 +
  32.249 +	unbind_virq();
  32.250 +}
  32.251 +
  32.252 +
  32.253 +static int xenoprof_start(void)
  32.254 +{
  32.255 +	int ret = 0;
  32.256 +
  32.257 +	if (is_primary)
  32.258 +		ret = HYPERVISOR_xenoprof_op(XENOPROF_start,
  32.259 +					     (unsigned long)NULL,
  32.260 +					     (unsigned long)NULL);
  32.261 +	return ret;
  32.262 +}
  32.263 +
  32.264 +
  32.265 +static void xenoprof_stop(void)
  32.266 +{
  32.267 +	if (is_primary)
  32.268 +		HYPERVISOR_xenoprof_op(XENOPROF_stop,
  32.269 +				       (unsigned long)NULL,
  32.270 +				       (unsigned long)NULL);
  32.271 +}
  32.272 +
  32.273 +
  32.274 +static int xenoprof_set_active(int * active_domains,
  32.275 +			  unsigned int adomains)
  32.276 +{
  32.277 +	int ret = 0;
  32.278 +	if (is_primary)
  32.279 +		ret = HYPERVISOR_xenoprof_op(XENOPROF_set_active,
  32.280 +					     (unsigned long)active_domains,
  32.281 +					     (unsigned long)adomains);
  32.282 +	return ret;
  32.283 +}
  32.284 +
  32.285 +
  32.286 +struct op_counter_config counter_config[OP_MAX_COUNTER];
  32.287 +
  32.288 +static int xenoprof_create_files(struct super_block * sb, struct dentry * root)
  32.289 +{
  32.290 +	unsigned int i;
  32.291 +
  32.292 +	for (i = 0; i < num_events; ++i) {
  32.293 +		struct dentry * dir;
  32.294 +		char buf[2];
  32.295 + 
  32.296 +		snprintf(buf, 2, "%d", i);
  32.297 +		dir = oprofilefs_mkdir(sb, root, buf);
  32.298 +		oprofilefs_create_ulong(sb, dir, "enabled",
  32.299 +					&counter_config[i].enabled);
  32.300 +		oprofilefs_create_ulong(sb, dir, "event",
  32.301 +					&counter_config[i].event);
  32.302 +		oprofilefs_create_ulong(sb, dir, "count",
  32.303 +					&counter_config[i].count);
  32.304 +		oprofilefs_create_ulong(sb, dir, "unit_mask",
  32.305 +					&counter_config[i].unit_mask);
  32.306 +		oprofilefs_create_ulong(sb, dir, "kernel",
  32.307 +					&counter_config[i].kernel);
  32.308 +		oprofilefs_create_ulong(sb, dir, "user",
  32.309 +					&counter_config[i].user);
  32.310 +	}
  32.311 +
  32.312 +	return 0;
  32.313 +}
  32.314 +
  32.315 +
  32.316 +struct oprofile_operations xenoprof_ops = {
  32.317 +	.create_files 	= xenoprof_create_files,
  32.318 +	.set_active	= xenoprof_set_active,
  32.319 +	.setup 		= xenoprof_setup,
  32.320 +	.shutdown	= xenoprof_shutdown,
  32.321 +	.start		= xenoprof_start,
  32.322 +	.stop		= xenoprof_stop
  32.323 +};
  32.324 +
  32.325 +
  32.326 +/* in order to get driverfs right */
  32.327 +static int using_xenoprof;
  32.328 +
  32.329 +int __init oprofile_arch_init(struct oprofile_operations * ops)
  32.330 +{
  32.331 +	xenoprof_init_result_t result;
  32.332 +	xenoprof_buf_t * buf;
  32.333 +	int max_samples = 16;
  32.334 +	int vm_size;
  32.335 +	int npages;
  32.336 +	int i;
  32.337 +
  32.338 +	int ret = HYPERVISOR_xenoprof_op(XENOPROF_init,
  32.339 +					 (unsigned long)max_samples,
  32.340 +					 (unsigned long)&result);
  32.341 +
  32.342 +	if (!ret) {
  32.343 +		pgprot_t prot = __pgprot(_KERNPG_TABLE);
  32.344 +
  32.345 +		num_events = result.num_events;
  32.346 +		is_primary = result.is_primary;
  32.347 +		nbuf = result.nbuf;
  32.348 +
  32.349 +		npages = (result.bufsize * nbuf - 1) / PAGE_SIZE + 1;
  32.350 +		vm_size = npages * PAGE_SIZE;
  32.351 +
  32.352 +		shared_buffer = (char *) vm_map_xen_pages(result.buf_maddr,
  32.353 +							  vm_size, prot);
  32.354 +		if (!shared_buffer) {
  32.355 +			ret = -ENOMEM;
  32.356 +			goto out;
  32.357 +		}
  32.358 +
  32.359 +		for (i=0; i< nbuf; i++) {
  32.360 +			buf = (xenoprof_buf_t*) 
  32.361 +				&shared_buffer[i * result.bufsize];
  32.362 +			BUG_ON(buf->vcpu_id >= MAX_VIRT_CPUS);
  32.363 +			xenoprof_buf[buf->vcpu_id] = buf;
  32.364 +		}
  32.365 +
  32.366 +		/*  cpu_type is detected by Xen */
  32.367 +		cpu_type[XENOPROF_CPU_TYPE_SIZE-1] = 0;
  32.368 +		strncpy(cpu_type, result.cpu_type, XENOPROF_CPU_TYPE_SIZE - 1);
  32.369 +		xenoprof_ops.cpu_type = cpu_type;
  32.370 +
  32.371 +		init_driverfs();
  32.372 +		using_xenoprof = 1;
  32.373 +		*ops = xenoprof_ops;
  32.374 +
  32.375 +		for (i=0; i<NR_CPUS; i++)
  32.376 +			ovf_irq[i] = -1;
  32.377 +	}
  32.378 + out:
  32.379 +	printk(KERN_INFO "oprofile_arch_init: ret %d, events %d, "
  32.380 +	       "is_primary %d\n", ret, num_events, is_primary);
  32.381 +	return ret;
  32.382 +}
  32.383 +
  32.384 +
  32.385 +void __exit oprofile_arch_exit(void)
  32.386 +{
  32.387 +	if (using_xenoprof)
  32.388 +		exit_driverfs();
  32.389 +
  32.390 +	if (shared_buffer) {
  32.391 +		vunmap(shared_buffer);
  32.392 +		shared_buffer = NULL;
  32.393 +	}
  32.394 +	if (is_primary)
  32.395 +		HYPERVISOR_xenoprof_op(XENOPROF_shutdown,
  32.396 +				       (unsigned long)NULL,
  32.397 +				       (unsigned long)NULL);
  32.398 +}

    33.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Tue Apr 11 13:55:47 2006 -0600
    33.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Tue Apr 11 18:54:18 2006 -0600
    33.3 @@ -79,8 +79,13 @@ config XEN_BLKDEV_FRONTEND
    33.4  	bool
    33.5  	default y
    33.6  
    33.7 +config XEN_BACKEND
    33.8 +	depends on XEN
    33.9 +	bool
   33.10 +	default y
   33.11 +
   33.12  config XEN_BLKDEV_BACKEND
   33.13 -	depends on XEN
   33.14 +	depends on XEN && XEN_BACKEND
   33.15  	bool
   33.16  	default y
   33.17  
   33.18 @@ -91,6 +96,11 @@ config XEN_SYSFS
   33.19  	help
   33.20  		Xen hypervisor attributes will show up under /sys/hypervisor/.
   33.21  
   33.22 +config XEN_INTERFACE_VERSION
   33.23 +	hex
   33.24 +	depends on XEN
   33.25 +	default 0x00030101
   33.26 +
   33.27  config SCHED_NO_NO_OMIT_FRAME_POINTER
   33.28  	bool
   33.29  	default y

    34.1 --- a/linux-2.6-xen-sparse/arch/ia64/Makefile	Tue Apr 11 13:55:47 2006 -0600
    34.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Makefile	Tue Apr 11 18:54:18 2006 -0600
    34.3 @@ -42,6 +42,12 @@ ifeq ($(call cc-version),0304)
    34.4  endif
    34.5  
    34.6  CFLAGS += $(cflags-y)
    34.7 +
    34.8 +cppflags-$(CONFIG_XEN) += \
    34.9 +	-D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
   34.10 +
   34.11 +CPPFLAGS += $(cppflags-y)
   34.12 +
   34.13  head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
   34.14  
   34.15  libs-y				+= arch/ia64/lib/

    35.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile	Tue Apr 11 13:55:47 2006 -0600
    35.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile	Tue Apr 11 18:54:18 2006 -0600
    35.3 @@ -10,7 +10,7 @@ CPPFLAGS_vmlinux.lds += -U$(XENARCH)
    35.4  	@ln -fsn $(srctree)/arch/$(XENARCH)/kernel/vmlinux.lds.S $@
    35.5  
    35.6  
    35.7 -obj-y   := gnttab.o
    35.8 +obj-y   := gnttab.o features.o
    35.9  obj-$(CONFIG_PROC_FS) += xen_proc.o
   35.10  
   35.11  ifeq ($(ARCH),ia64)

    36.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Makefile	Tue Apr 11 13:55:47 2006 -0600
    36.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Makefile	Tue Apr 11 18:54:18 2006 -0600
    36.3 @@ -31,6 +31,10 @@ cflags-$(CONFIG_MK8) += $(call cc-option
    36.4  cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
    36.5  CFLAGS += $(cflags-y)
    36.6  
    36.7 +cppflags-$(CONFIG_XEN) += \
    36.8 +	-D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
    36.9 +CPPFLAGS += $(cppflags-y)
   36.10 +
   36.11  CFLAGS += -m64
   36.12  CFLAGS += -mno-red-zone
   36.13  CFLAGS += -mcmodel=kernel
   36.14 @@ -71,7 +75,7 @@ boot := arch/x86_64/boot
   36.15  	fdimage fdimage144 fdimage288 archclean
   36.16  
   36.17  ifdef CONFIG_XEN
   36.18 -CPPFLAGS := -D__KERNEL__ -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(LINUXINCLUDE)
   36.19 +CPPFLAGS := -Iinclude$(if $(KBUILD_SRC),2)/asm/mach-xen $(CPPFLAGS)
   36.20  head-y := arch/x86_64/kernel/head-xen.o arch/x86_64/kernel/head64-xen.o arch/x86_64/kernel/init_task.o
   36.21  LDFLAGS_vmlinux := -e _start
   36.22  boot := arch/i386/boot-xen

    37.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Tue Apr 11 13:55:47 2006 -0600
    37.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Tue Apr 11 18:54:18 2006 -0600
    37.3 @@ -520,13 +520,13 @@ retint_check:
    37.4  	CFI_REMEMBER_STATE
    37.5  	jnz  retint_careful
    37.6  retint_restore_args:
    37.7 -        movb EVENT_MASK-REST_SKIP(%rsp), %al
    37.8 -        notb %al			# %al == ~saved_mask
    37.9 -        XEN_GET_VCPU_INFO(%rsi)
   37.10 -        andb evtchn_upcall_mask(%rsi),%al
   37.11 -	andb $1,%al			# %al == mask & ~saved_mask
   37.12 -	jnz restore_all_enable_events	# != 0 => reenable event delivery      
   37.13 -        XEN_PUT_VCPU_INFO(%rsi)
   37.14 +	movl EFLAGS-REST_SKIP(%rsp), %eax
   37.15 +	shr $9, %eax			# EAX[0] == IRET_EFLAGS.IF
   37.16 +	XEN_GET_VCPU_INFO(%rsi)
   37.17 +	andb evtchn_upcall_mask(%rsi),%al
   37.18 +	andb $1,%al			# EAX[0] == IRET_EFLAGS.IF & event_mask
   37.19 +	jnz restore_all_enable_events	#        != 0 => enable event delivery
   37.20 +	XEN_PUT_VCPU_INFO(%rsi)
   37.21  		
   37.22  	RESTORE_ARGS 0,8,0
   37.23  	HYPERVISOR_IRET 0
   37.24 @@ -584,7 +584,7 @@ retint_kernel:
   37.25   */		
   37.26  	.macro apicinterrupt num,func
   37.27  	INTR_FRAME
   37.28 -	pushq 0x8000000000000000+$\num
   37.29 +	pushq $~(\num)
   37.30  	CFI_ADJUST_CFA_OFFSET 8
   37.31  	interrupt \func
   37.32  	jmp error_entry
   37.33 @@ -803,12 +803,11 @@ ENTRY(hypervisor_callback)
   37.34  # So, on entry to the handler we detect whether we interrupted an
   37.35  # existing activation in its critical region -- if so, we pop the current
   37.36  # activation and restart the handler using the previous one.
   37.37 -ENTRY(do_hypervisor_callback)   # do_hyperviosr_callback(struct *pt_regs)
   37.38 +ENTRY(do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
   37.39  # Since we don't modify %rdi, evtchn_do_upall(struct *pt_regs) will
   37.40  # see the correct pointer to the pt_regs
   37.41  	movq %rdi, %rsp            # we don't return, adjust the stack frame
   37.42 -11:	movb $0, EVENT_MASK(%rdi)
   37.43 -	movq %gs:pda_irqstackptr,%rax
   37.44 +11:	movq %gs:pda_irqstackptr,%rax
   37.45  	incl %gs:pda_irqcount
   37.46  	cmovzq %rax,%rsp
   37.47  	pushq %rdi
   37.48 @@ -853,15 +852,44 @@ ecrit:  /**** END OF CRITICAL REGION ***
   37.49  # When the kernel is interrupted in the critical section, the kernel 
   37.50  # will do IRET in that case, and everything will be restored at that point, 
   37.51  # i.e. it just resumes from the next instruction interrupted with the same context. 
   37.52 -	
   37.53 +
   37.54  # Hypervisor uses this for application faults while it executes.
   37.55 -# Unlike i386 there is no need to reload the saved segment selectors:
   37.56 -# Xen already reloaded all valid ones and zeroed the others.
   37.57 +# We get here for two reasons:
   37.58 +#  1. Fault while reloading DS, ES, FS or GS
   37.59 +#  2. Fault while executing IRET
   37.60 +# Category 1 we do not need to fix up as Xen has already reloaded all segment
   37.61 +# registers that could be reloaded and zeroed the others.
   37.62 +# Category 2 we fix up by killing the current process. We cannot use the
   37.63 +# normal Linux return path in this case because if we use the IRET hypercall
   37.64 +# to pop the stack frame we end up in an infinite loop of failsafe callbacks.
   37.65 +# We distinguish between categories by comparing each saved segment register
   37.66 +# with its current contents: any discrepancy means we in category 1.
   37.67  ENTRY(failsafe_callback)
   37.68 -	addq $0x30,%rsp /* skip %rcx,%r11,%ds,%es,%fs,%gs */
   37.69 +	movw %ds,%cx
   37.70 +	cmpw %cx,0x10(%rsp)
   37.71 +	jne 1f
   37.72 +	movw %es,%cx
   37.73 +	cmpw %cx,0x18(%rsp)
   37.74 +	jne 1f
   37.75 +	movw %fs,%cx
   37.76 +	cmpw %cx,0x20(%rsp)
   37.77 +	jne 1f
   37.78 +	movw %gs,%cx
   37.79 +	cmpw %cx,0x28(%rsp)
   37.80 +	jne 1f
   37.81 +	/* All segments match their saved values => Category 2 (Bad IRET). */
   37.82 +	movq (%rsp),%rcx
   37.83 +	movq 8(%rsp),%r11
   37.84 +	addq $0x30,%rsp
   37.85 +	movq $-9999,%rdi	/* better code? */
   37.86 +	jmp do_exit			
   37.87 +1:	/* Segment mismatch => Category 1 (Bad segment). Retry the IRET. */
   37.88 +	movq (%rsp),%rcx
   37.89 +	movq 8(%rsp),%r11
   37.90 +	addq $0x30,%rsp
   37.91 +	pushq $0
   37.92  	SAVE_ALL
   37.93 -	jmp  error_exit
   37.94 - 
   37.95 +	jmp error_exit
   37.96  #if 0	      
   37.97          .section __ex_table,"a"
   37.98          .align 8

    38.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/irq-xen.c	Tue Apr 11 13:55:47 2006 -0600
    38.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/irq-xen.c	Tue Apr 11 18:54:18 2006 -0600
    38.3 @@ -97,7 +97,7 @@ skip:
    38.4  asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
    38.5  {	
    38.6  	/* high bit used in ret_from_ code  */
    38.7 -        int irq = regs->orig_rax & __IRQ_MASK(BITS_PER_LONG - 1);
    38.8 +	unsigned irq = ~regs->orig_rax;
    38.9  
   38.10  	exit_idle();
   38.11  	irq_enter();

    39.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c	Tue Apr 11 13:55:47 2006 -0600
    39.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c	Tue Apr 11 18:54:18 2006 -0600
    39.3 @@ -131,7 +131,7 @@ void xen_idle(void)
    39.4  		smp_mb__after_clear_bit();
    39.5  		stop_hz_timer();
    39.6  		/* Blocking includes an implicit local_irq_enable(). */
    39.7 -		HYPERVISOR_sched_op(SCHEDOP_block, 0);
    39.8 +		HYPERVISOR_block();
    39.9  		start_hz_timer();
   39.10  		set_thread_flag(TIF_POLLING_NRFLAG);
   39.11  	}

    40.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Apr 11 13:55:47 2006 -0600
    40.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Apr 11 18:54:18 2006 -0600
    40.3 @@ -999,7 +999,7 @@ void __init setup_arch(char **cmdline_p)
    40.4  static int
    40.5  xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
    40.6  {
    40.7 -	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_crash);
    40.8 +	HYPERVISOR_shutdown(SHUTDOWN_crash);
    40.9  	/* we're never actually going to get here... */
   40.10  	return NOTIFY_DONE;
   40.11  }

    41.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/xen_entry.S	Tue Apr 11 13:55:47 2006 -0600
    41.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/xen_entry.S	Tue Apr 11 18:54:18 2006 -0600
    41.3 @@ -2,7 +2,7 @@
    41.4   * Copied from arch/xen/i386/kernel/entry.S
    41.5   */                        
    41.6  /* Offsets into shared_info_t. */                
    41.7 -#define evtchn_upcall_pending		0
    41.8 +#define evtchn_upcall_pending		/* 0 */
    41.9  #define evtchn_upcall_mask		1
   41.10  
   41.11  #define sizeof_vcpu_shift		6
   41.12 @@ -35,7 +35,6 @@
   41.13      				XEN_PUT_VCPU_INFO(reg)
   41.14  #define XEN_TEST_PENDING(reg)	testb $0xFF,evtchn_upcall_pending(reg)
   41.15  
   41.16 -EVENT_MASK      = (CS+4)
   41.17  VGCF_IN_SYSCALL = (1<<8)
   41.18          
   41.19  	

    42.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile	Tue Apr 11 18:54:18 2006 -0600
    42.3 @@ -0,0 +1,22 @@
    42.4 +#
    42.5 +# oprofile for x86-64.
    42.6 +# Just reuse the one from i386. 
    42.7 +#
    42.8 +
    42.9 +obj-$(CONFIG_OPROFILE) += oprofile.o
   42.10 + 
   42.11 +DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
   42.12 +	oprof.o cpu_buffer.o buffer_sync.o \
   42.13 +	event_buffer.o oprofile_files.o \
   42.14 +	oprofilefs.o oprofile_stats.o \
   42.15 +	timer_int.o )
   42.16 +
   42.17 +ifdef CONFIG_XEN
   42.18 +OPROFILE-y := xenoprof.o
   42.19 +else
   42.20 +OPROFILE-y := init.o backtrace.o
   42.21 +OPROFILE-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_p4.o \
   42.22 +				     op_model_ppro.o
   42.23 +OPROFILE-$(CONFIG_X86_IO_APIC)    += nmi_timer_int.o 
   42.24 +endif
   42.25 +oprofile-y = $(DRIVER_OBJS) $(addprefix ../../i386/oprofile/, $(OPROFILE-y))

    43.1 --- a/linux-2.6-xen-sparse/drivers/xen/Kconfig	Tue Apr 11 13:55:47 2006 -0600
    43.2 +++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig	Tue Apr 11 18:54:18 2006 -0600
    43.3 @@ -10,12 +10,11 @@ config XEN
    43.4  	help
    43.5  	  This is the Linux Xen port.
    43.6  
    43.7 -config NO_IDLE_HZ
    43.8 -	bool
    43.9 -	depends on XEN
   43.10 -	default y
   43.11 +if XEN
   43.12 +config XEN_INTERFACE_VERSION
   43.13 +	hex
   43.14 +	default 0x00030101
   43.15  
   43.16 -if XEN
   43.17  menu "XEN"
   43.18  
   43.19  config XEN_PRIVILEGED_GUEST
   43.20 @@ -29,9 +28,16 @@ config XEN_UNPRIVILEGED_GUEST
   43.21  	bool
   43.22  	default !XEN_PRIVILEGED_GUEST
   43.23  
   43.24 +config XEN_BACKEND
   43.25 +        tristate "Backend driver support"
   43.26 +        default y
   43.27 +        help
   43.28 +          Support for backend device drivers that provide I/O services
   43.29 +          to other virtual machines.
   43.30 +
   43.31  config XEN_PCIDEV_BACKEND
   43.32  	tristate "PCI device backend driver"
   43.33 -	depends PCI
   43.34 +	depends on PCI && XEN_BACKEND
   43.35  	default XEN_PRIVILEGED_GUEST
   43.36  	help
   43.37  	  The PCI device backend driver allows the kernel to export arbitrary
   43.38 @@ -71,6 +77,7 @@ config XEN_PCIDEV_BE_DEBUG
   43.39  
   43.40  config XEN_BLKDEV_BACKEND
   43.41  	tristate "Block-device backend driver"
   43.42 +        depends on XEN_BACKEND
   43.43  	default y
   43.44  	help
   43.45  	  The block-device backend driver allows the kernel to export its
   43.46 @@ -92,6 +99,7 @@ config XEN_BLKDEV_TAP_BE
   43.47  
   43.48  config XEN_NETDEV_BACKEND
   43.49  	tristate "Network-device backend driver"
   43.50 +        depends on XEN_BACKEND
   43.51  	default y
   43.52  	help
   43.53  	  The network-device backend driver allows the kernel to export its
   43.54 @@ -121,6 +129,7 @@ config XEN_NETDEV_LOOPBACK
   43.55  
   43.56  config XEN_TPMDEV_BACKEND
   43.57  	tristate "TPM-device backend driver"
   43.58 +        depends on XEN_BACKEND
   43.59  	default n
   43.60  	help
   43.61  	  The TPM-device backend driver
   43.62 @@ -156,6 +165,7 @@ config XEN_NETDEV_FRONTEND
   43.63  
   43.64  config XEN_BLKDEV_TAP
   43.65  	tristate "Block device tap driver"
   43.66 +        depends on XEN_BACKEND
   43.67  	default n
   43.68  	help
   43.69  	  This driver allows a VM to interact on block device channels
   43.70 @@ -191,7 +201,6 @@ config XEN_DISABLE_SERIAL
   43.71  
   43.72  config XEN_SYSFS
   43.73  	tristate "Export Xen attributes in sysfs"
   43.74 -	depends on XEN
   43.75  	depends on SYSFS
   43.76  	default y
   43.77  	help
   43.78 @@ -207,4 +216,8 @@ config HAVE_ARCH_DEV_ALLOC_SKB
   43.79  	bool
   43.80  	default y
   43.81  
   43.82 +config NO_IDLE_HZ
   43.83 +	bool
   43.84 +	default y
   43.85 +
   43.86  endif

    44.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue Apr 11 13:55:47 2006 -0600
    44.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue Apr 11 18:54:18 2006 -0600
    44.3 @@ -215,52 +215,26 @@ static void print_stats(blkif_t *blkif)
    44.4  
    44.5  int blkif_schedule(void *arg)
    44.6  {
    44.7 -	blkif_t          *blkif = arg;
    44.8 +	blkif_t *blkif = arg;
    44.9  
   44.10  	blkif_get(blkif);
   44.11 +
   44.12  	if (debug_lvl)
   44.13  		printk(KERN_DEBUG "%s: started\n", current->comm);
   44.14 -	for (;;) {
   44.15 -		if (kthread_should_stop()) {
   44.16 -			/* asked to quit? */
   44.17 -			if (!atomic_read(&blkif->io_pending))
   44.18 -				break;
   44.19 -			if (debug_lvl)
   44.20 -				printk(KERN_DEBUG "%s: I/O pending, "
   44.21 -				       "delaying exit\n", current->comm);
   44.22 -		}
   44.23  
   44.24 -		if (!atomic_read(&blkif->io_pending)) {
   44.25 -			/* Wait for work to do. */
   44.26 -			wait_event_interruptible(
   44.27 -				blkif->wq,
   44.28 -				(atomic_read(&blkif->io_pending) ||
   44.29 -				 kthread_should_stop()));
   44.30 -		} else if (list_empty(&pending_free)) {
   44.31 -			/* Wait for pending_req becoming available. */
   44.32 -			wait_event_interruptible(
   44.33 -				pending_free_wq,
   44.34 -				!list_empty(&pending_free));
   44.35 -		}
   44.36 +	while (!kthread_should_stop()) {
   44.37 +		wait_event_interruptible(
   44.38 +			blkif->wq,
   44.39 +			blkif->waiting_reqs || kthread_should_stop());
   44.40 +		wait_event_interruptible(
   44.41 +			pending_free_wq,
   44.42 +			!list_empty(&pending_free) || kthread_should_stop());
   44.43  
   44.44 -		if (blkif->status != CONNECTED) {
   44.45 -			/* make sure we are connected */
   44.46 -			if (debug_lvl)
   44.47 -				printk(KERN_DEBUG "%s: not connected "
   44.48 -				       "(%d pending)\n",
   44.49 -				       current->comm,
   44.50 -				       atomic_read(&blkif->io_pending));
   44.51 -			wait_event_interruptible(
   44.52 -				blkif->wq,
   44.53 -				(blkif->status == CONNECTED ||
   44.54 -				 kthread_should_stop()));
   44.55 -			continue;
   44.56 -		}
   44.57 +		blkif->waiting_reqs = 0;
   44.58 +		smp_mb(); /* clear flag *before* checking for work */
   44.59  
   44.60 -		/* Schedule I/O */
   44.61 -		atomic_set(&blkif->io_pending, 0);
   44.62  		if (do_block_io_op(blkif))
   44.63 -			atomic_inc(&blkif->io_pending);
   44.64 +			blkif->waiting_reqs = 1;
   44.65  		unplug_queue(blkif);
   44.66  
   44.67  		if (log_stats && time_after(jiffies, blkif->st_print))
   44.68 @@ -271,8 +245,10 @@ int blkif_schedule(void *arg)
   44.69  		print_stats(blkif);
   44.70  	if (debug_lvl)
   44.71  		printk(KERN_DEBUG "%s: exiting\n", current->comm);
   44.72 +
   44.73  	blkif->xenblkd = NULL;
   44.74  	blkif_put(blkif);
   44.75 +
   44.76  	return 0;
   44.77  }
   44.78  
   44.79 @@ -311,12 +287,15 @@ static int end_block_io_op(struct bio *b
   44.80   * NOTIFICATION FROM GUEST OS.
   44.81   */
   44.82  
   44.83 +static void blkif_notify_work(blkif_t *blkif)
   44.84 +{
   44.85 +	blkif->waiting_reqs = 1;
   44.86 +	wake_up(&blkif->wq);
   44.87 +}
   44.88 +
   44.89  irqreturn_t blkif_be_int(int irq, void *dev_id, struct pt_regs *regs)
   44.90  {
   44.91 -	blkif_t *blkif = dev_id;
   44.92 -
   44.93 -	atomic_inc(&blkif->io_pending);
   44.94 -	wake_up(&blkif->wq);
   44.95 +	blkif_notify_work(dev_id);
   44.96  	return IRQ_HANDLED;
   44.97  }
   44.98  
   44.99 @@ -536,10 +515,8 @@ static void make_response(blkif_t *blkif
  44.100  	}
  44.101  	spin_unlock_irqrestore(&blkif->blk_ring_lock, flags);
  44.102  
  44.103 -	if (more_to_do) {
  44.104 -		atomic_inc(&blkif->io_pending);
  44.105 -		wake_up(&blkif->wq);
  44.106 -	}
  44.107 +	if (more_to_do)
  44.108 +		blkif_notify_work(blkif);
  44.109  	if (notify)
  44.110  		notify_remote_via_irq(blkif->irq);
  44.111  }

    45.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Tue Apr 11 13:55:47 2006 -0600
    45.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Tue Apr 11 18:54:18 2006 -0600
    45.3 @@ -72,7 +72,6 @@ typedef struct blkif_st {
    45.4  	/* Back pointer to the backend_info. */
    45.5  	struct backend_info *be; 
    45.6  	/* Private fields. */
    45.7 -	enum { DISCONNECTED, CONNECTED } status;
    45.8  #ifdef CONFIG_XEN_BLKDEV_TAP_BE
    45.9  	/* Is this a blktap frontend */
   45.10  	unsigned int     is_blktap;
   45.11 @@ -82,7 +81,7 @@ typedef struct blkif_st {
   45.12  
   45.13  	wait_queue_head_t   wq;
   45.14  	struct task_struct  *xenblkd;
   45.15 -	atomic_t            io_pending;
   45.16 +	unsigned int        waiting_reqs;
   45.17  	request_queue_t     *plug;
   45.18  
   45.19  	/* statistics */
   45.20 @@ -133,8 +132,6 @@ void blkif_xenbus_init(void);
   45.21  irqreturn_t blkif_be_int(int irq, void *dev_id, struct pt_regs *regs);
   45.22  int blkif_schedule(void *arg);
   45.23  
   45.24 -void update_blkif_status(blkif_t *blkif); 
   45.25 -
   45.26  #endif /* __BLKIF__BACKEND__COMMON_H__ */
   45.27  
   45.28  /*

    46.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Tue Apr 11 13:55:47 2006 -0600
    46.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Tue Apr 11 18:54:18 2006 -0600
    46.3 @@ -45,7 +45,6 @@ blkif_t *alloc_blkif(domid_t domid)
    46.4  
    46.5  	memset(blkif, 0, sizeof(*blkif));
    46.6  	blkif->domid = domid;
    46.7 -	blkif->status = DISCONNECTED;
    46.8  	spin_lock_init(&blkif->blk_ring_lock);
    46.9  	atomic_set(&blkif->refcnt, 1);
   46.10  	init_waitqueue_head(&blkif->wq);
   46.11 @@ -138,9 +137,6 @@ int blkif_map(blkif_t *blkif, unsigned l
   46.12  	blkif->irq = bind_evtchn_to_irqhandler(
   46.13  		blkif->evtchn, blkif_be_int, 0, "blkif-backend", blkif);
   46.14  
   46.15 -	/* We're potentially connected now */
   46.16 -	update_blkif_status(blkif); 
   46.17 -
   46.18  	return 0;
   46.19  }
   46.20  

    47.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Tue Apr 11 13:55:47 2006 -0600
    47.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Tue Apr 11 18:54:18 2006 -0600
    47.3 @@ -17,7 +17,6 @@
    47.4      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    47.5  */
    47.6  
    47.7 -
    47.8  #include <stdarg.h>
    47.9  #include <linux/module.h>
   47.10  #include <linux/kthread.h>
   47.11 @@ -25,36 +24,52 @@
   47.12  #include "common.h"
   47.13  
   47.14  #undef DPRINTK
   47.15 -#define DPRINTK(fmt, args...) \
   47.16 -    pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
   47.17 -
   47.18 +#define DPRINTK(fmt, args...)				\
   47.19 +	pr_debug("blkback/xenbus (%s:%d) " fmt ".\n",	\
   47.20 +		 __FUNCTION__, __LINE__, ##args)
   47.21  
   47.22  struct backend_info
   47.23  {
   47.24  	struct xenbus_device *dev;
   47.25  	blkif_t *blkif;
   47.26  	struct xenbus_watch backend_watch;
   47.27 -
   47.28  	unsigned major;
   47.29  	unsigned minor;
   47.30  	char *mode;
   47.31  };
   47.32  
   47.33 -
   47.34 -static void maybe_connect(struct backend_info *);
   47.35  static void connect(struct backend_info *);
   47.36  static int connect_ring(struct backend_info *);
   47.37  static void backend_changed(struct xenbus_watch *, const char **,
   47.38  			    unsigned int);
   47.39  
   47.40  
   47.41 -void update_blkif_status(blkif_t *blkif)
   47.42 +static void update_blkif_status(blkif_t *blkif)
   47.43  { 
   47.44 -	if(blkif->irq && blkif->vbd.bdev) {
   47.45 -		blkif->status = CONNECTED; 
   47.46 -		(void)blkif_be_int(0, blkif, NULL); 
   47.47 +	int err;
   47.48 +
   47.49 +	/* Not ready to connect? */
   47.50 +	if (!blkif->irq || !blkif->vbd.bdev)
   47.51 +		return;
   47.52 +
   47.53 +	/* Already connected? */
   47.54 +	if (blkif->be->dev->state == XenbusStateConnected)
   47.55 +		return;
   47.56 +
   47.57 +	/* Attempt to connect: exit if we fail to. */
   47.58 +	connect(blkif->be);
   47.59 +	if (blkif->be->dev->state != XenbusStateConnected)
   47.60 +		return;
   47.61 +
   47.62 +	blkif->xenblkd = kthread_run(blkif_schedule, blkif,
   47.63 +				     "xvd %d %02x:%02x",
   47.64 +				     blkif->domid,
   47.65 +				     blkif->be->major, blkif->be->minor);
   47.66 +	if (IS_ERR(blkif->xenblkd)) {
   47.67 +		err = PTR_ERR(blkif->xenblkd);
   47.68 +		blkif->xenblkd = NULL;
   47.69 +		xenbus_dev_error(blkif->be->dev, err, "start xenblkd");
   47.70  	}
   47.71 -	maybe_connect(blkif->be); 
   47.72  }
   47.73  
   47.74  
   47.75 @@ -91,7 +106,6 @@ static int blkback_remove(struct xenbus_
   47.76  		be->backend_watch.node = NULL;
   47.77  	}
   47.78  	if (be->blkif) {
   47.79 -		be->blkif->status = DISCONNECTED; 
   47.80  		if (be->blkif->xenblkd)
   47.81  			kthread_stop(be->blkif->xenblkd);
   47.82  		blkif_put(be->blkif);
   47.83 @@ -142,7 +156,7 @@ static int blkback_probe(struct xenbus_d
   47.84  	if (err)
   47.85  		goto fail;
   47.86  
   47.87 -	err = xenbus_switch_state(dev, XBT_NULL, XenbusStateInitWait);
   47.88 +	err = xenbus_switch_state(dev, XenbusStateInitWait);
   47.89  	if (err)
   47.90  		goto fail;
   47.91  
   47.92 @@ -185,8 +199,8 @@ static void backend_changed(struct xenbu
   47.93  		return;
   47.94  	}
   47.95  
   47.96 -	if (be->major && be->minor &&
   47.97 -	    (be->major != major || be->minor != minor)) {
   47.98 +	if ((be->major || be->minor) &&
   47.99 +	    ((be->major != major) || (be->minor != minor))) {
  47.100  		printk(KERN_WARNING
  47.101  		       "blkback: changing physical device (from %x:%x to "
  47.102  		       "%x:%x) not supported.\n", be->major, be->minor,
  47.103 @@ -220,17 +234,6 @@ static void backend_changed(struct xenbu
  47.104  			return;
  47.105  		}
  47.106  
  47.107 -		be->blkif->xenblkd = kthread_run(blkif_schedule, be->blkif,
  47.108 -						 "xvd %d %02x:%02x",
  47.109 -						 be->blkif->domid,
  47.110 -						 be->major, be->minor);
  47.111 -		if (IS_ERR(be->blkif->xenblkd)) {
  47.112 -			err = PTR_ERR(be->blkif->xenblkd);
  47.113 -			be->blkif->xenblkd = NULL;
  47.114 -			xenbus_dev_error(dev, err, "start xenblkd");
  47.115 -			return;
  47.116 -		}
  47.117 -
  47.118  		device_create_file(&dev->dev, &dev_attr_physical_device);
  47.119  		device_create_file(&dev->dev, &dev_attr_mode);
  47.120  
  47.121 @@ -253,19 +256,24 @@ static void frontend_changed(struct xenb
  47.122  
  47.123  	switch (frontend_state) {
  47.124  	case XenbusStateInitialising:
  47.125 -	case XenbusStateConnected:
  47.126  		break;
  47.127  
  47.128  	case XenbusStateInitialised:
  47.129 +	case XenbusStateConnected:
  47.130 +		/* Ensure we connect even when two watches fire in 
  47.131 +		   close successsion and we miss the intermediate value 
  47.132 +		   of frontend_state. */
  47.133 +		if (dev->state == XenbusStateConnected)
  47.134 +			break;
  47.135 +
  47.136  		err = connect_ring(be);
  47.137 -		if (err) {
  47.138 -			return;
  47.139 -		}
  47.140 -		update_blkif_status(be->blkif); 
  47.141 +		if (err)
  47.142 +			break;
  47.143 +		update_blkif_status(be->blkif);
  47.144  		break;
  47.145  
  47.146  	case XenbusStateClosing:
  47.147 -		xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
  47.148 +		xenbus_switch_state(dev, XenbusStateClosing);
  47.149  		break;
  47.150  
  47.151  	case XenbusStateClosed:
  47.152 @@ -285,14 +293,6 @@ static void frontend_changed(struct xenb
  47.153  /* ** Connection ** */
  47.154  
  47.155  
  47.156 -static void maybe_connect(struct backend_info *be)
  47.157 -{
  47.158 -	if ((be->major != 0 || be->minor != 0) &&
  47.159 -	    be->blkif->status == CONNECTED)
  47.160 -		connect(be);
  47.161 -}
  47.162 -
  47.163 -
  47.164  /**
  47.165   * Write the physical details regarding the block device to the store, and
  47.166   * switch to Connected state.
  47.167 @@ -338,15 +338,17 @@ again:
  47.168  		goto abort;
  47.169  	}
  47.170  
  47.171 -	err = xenbus_switch_state(dev, xbt, XenbusStateConnected);
  47.172 -	if (err)
  47.173 -		goto abort;
  47.174 -
  47.175  	err = xenbus_transaction_end(xbt, 0);
  47.176  	if (err == -EAGAIN)
  47.177  		goto again;
  47.178  	if (err)
  47.179  		xenbus_dev_fatal(dev, err, "ending transaction");
  47.180 +
  47.181 +	err = xenbus_switch_state(dev, XenbusStateConnected);
  47.182 +	if (err)
  47.183 +		xenbus_dev_fatal(dev, err, "switching to Connected state",
  47.184 +				 dev->nodename);
  47.185 +
  47.186  	return;
  47.187   abort:
  47.188  	xenbus_transaction_end(xbt, 1);

    48.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Tue Apr 11 13:55:47 2006 -0600
    48.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Tue Apr 11 18:54:18 2006 -0600
    48.3 @@ -176,10 +176,6 @@ again:
    48.4  		goto abort_transaction;
    48.5  	}
    48.6  
    48.7 -	err = xenbus_switch_state(dev, xbt, XenbusStateInitialised);
    48.8 -	if (err)
    48.9 -		goto abort_transaction;
   48.10 -
   48.11  	err = xenbus_transaction_end(xbt, 0);
   48.12  	if (err) {
   48.13  		if (err == -EAGAIN)
   48.14 @@ -188,6 +184,8 @@ again:
   48.15  		goto destroy_blkring;
   48.16  	}
   48.17  
   48.18 +	xenbus_switch_state(dev, XenbusStateInitialised);
   48.19 +
   48.20  	return 0;
   48.21  
   48.22   abort_transaction:
   48.23 @@ -324,7 +322,7 @@ static void connect(struct blkfront_info
   48.24  		return;
   48.25  	}
   48.26  
   48.27 -	(void)xenbus_switch_state(info->xbdev, XBT_NULL, XenbusStateConnected);
   48.28 +	(void)xenbus_switch_state(info->xbdev, XenbusStateConnected);
   48.29  
   48.30  	/* Kick pending requests. */
   48.31  	spin_lock_irq(&blkif_io_lock);
   48.32 @@ -349,7 +347,7 @@ static void blkfront_closing(struct xenb
   48.33  
   48.34  	xlvbd_del(info);
   48.35  
   48.36 -	xenbus_switch_state(dev, XBT_NULL, XenbusStateClosed);
   48.37 +	xenbus_switch_state(dev, XenbusStateClosed);
   48.38  }
   48.39  
   48.40  
   48.41 @@ -755,7 +753,7 @@ static void blkif_recover(struct blkfron
   48.42  
   48.43  	kfree(copy);
   48.44  
   48.45 -	(void)xenbus_switch_state(info->xbdev, XBT_NULL, XenbusStateConnected);
   48.46 +	(void)xenbus_switch_state(info->xbdev, XenbusStateConnected);
   48.47  
   48.48  	/* Now safe for us to use the shared ring */
   48.49  	spin_lock_irq(&blkif_io_lock);

    49.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c	Tue Apr 11 13:55:47 2006 -0600
    49.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c	Tue Apr 11 18:54:18 2006 -0600
    49.3 @@ -170,9 +170,9 @@ static inline void exit_idle(void) {}
    49.4  #include <asm/idle.h>
    49.5  #define IRQ_REG orig_rax
    49.6  #endif
    49.7 -#define do_IRQ(irq, regs) do {					\
    49.8 -	(regs)->IRQ_REG = (irq) | (1UL << (BITS_PER_LONG - 1));	\
    49.9 -	do_IRQ((regs));						\
   49.10 +#define do_IRQ(irq, regs) do {		\
   49.11 +	(regs)->IRQ_REG = ~(irq);	\
   49.12 +	do_IRQ((regs));			\
   49.13  } while (0)
   49.14  #endif
   49.15  

    50.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Tue Apr 11 13:55:47 2006 -0600
    50.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Tue Apr 11 18:54:18 2006 -0600
    50.3 @@ -395,6 +395,9 @@ gnttab_resume(void)
    50.4  	setup.frame_list = frames;
    50.5  
    50.6  	rc = HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1);
    50.7 +	if (rc == -ENOSYS)
    50.8 +		return -ENOSYS;
    50.9 +
   50.10  	BUG_ON(rc || setup.status);
   50.11  
   50.12  #ifndef __ia64__
   50.13 @@ -436,7 +439,8 @@ gnttab_init(void)
   50.14  	if (xen_init() < 0)
   50.15  		return -ENODEV;
   50.16  
   50.17 -	BUG_ON(gnttab_resume());
   50.18 +	if (gnttab_resume() < 0)
   50.19 +		return -ENODEV;
   50.20  
   50.21  	for (i = NR_RESERVED_ENTRIES; i < NR_GRANT_ENTRIES; i++)
   50.22  		gnttab_list[i] = i + 1;

    51.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/reboot.c	Tue Apr 11 13:55:47 2006 -0600
    51.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/reboot.c	Tue Apr 11 18:54:18 2006 -0600
    51.3 @@ -15,6 +15,7 @@
    51.4  #include <xen/xenbus.h>
    51.5  #include <linux/cpu.h>
    51.6  #include <linux/kthread.h>
    51.7 +#include <xen/gnttab.h>
    51.8  #include <xen/xencons.h>
    51.9  
   51.10  #if defined(__i386__) || defined(__x86_64__)
   51.11 @@ -41,7 +42,7 @@ void machine_emergency_restart(void)
   51.12  {
   51.13  	/* We really want to get pending console data out before we die. */
   51.14  	xencons_force_flush();
   51.15 -	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_reboot);
   51.16 +	HYPERVISOR_shutdown(SHUTDOWN_reboot);
   51.17  }
   51.18  
   51.19  void machine_restart(char * __unused)
   51.20 @@ -58,7 +59,11 @@ void machine_power_off(void)
   51.21  {
   51.22  	/* We really want to get pending console data out before we die. */
   51.23  	xencons_force_flush();
   51.24 -	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_poweroff);
   51.25 +#if defined(__i386__) || defined(__x86_64__)
   51.26 +	if (pm_power_off)
   51.27 +		pm_power_off();
   51.28 +#endif
   51.29 +	HYPERVISOR_shutdown(SHUTDOWN_poweroff);
   51.30  }
   51.31  
   51.32  int reboot_thru_bios = 0;	/* for dmi_scan.c */
   51.33 @@ -76,31 +81,41 @@ static int shutting_down = SHUTDOWN_INVA
   51.34  static void __shutdown_handler(void *unused);
   51.35  static DECLARE_WORK(shutdown_work, __shutdown_handler, NULL);
   51.36  
   51.37 -#ifndef CONFIG_HOTPLUG_CPU
   51.38 -#define cpu_down(x) (-EOPNOTSUPP)
   51.39 -#define cpu_up(x) (-EOPNOTSUPP)
   51.40 +#ifdef CONFIG_SMP
   51.41 +int  smp_suspend(void);
   51.42 +void smp_resume(void);
   51.43 +#else
   51.44 +#define smp_suspend()	(0)
   51.45 +#define smp_resume()	((void)0)
   51.46  #endif
   51.47  
   51.48 +/* Ensure we run on the idle task page tables so that we will
   51.49 +   switch page tables before running user space. This is needed
   51.50 +   on architectures with separate kernel and user page tables
   51.51 +   because the user page table pointer is not saved/restored. */
   51.52 +static void switch_idle_mm(void)
   51.53 +{
   51.54 +	struct mm_struct *mm = current->active_mm;
   51.55 +
   51.56 +	if (mm == &init_mm)
   51.57 +		return;
   51.58 +
   51.59 +	atomic_inc(&init_mm.mm_count);
   51.60 +	switch_mm(mm, &init_mm, current);
   51.61 +	current->active_mm = &init_mm;
   51.62 +	mmdrop(mm);
   51.63 +}
   51.64  
   51.65  static int __do_suspend(void *ignore)
   51.66  {
   51.67 -	int i, j, k, fpp;
   51.68 +	int i, j, k, fpp, err;
   51.69  
   51.70  	extern unsigned long max_pfn;
   51.71  	extern unsigned long *pfn_to_mfn_frame_list_list;
   51.72  	extern unsigned long *pfn_to_mfn_frame_list[];
   51.73  
   51.74 -	extern int gnttab_suspend(void);
   51.75 -	extern int gnttab_resume(void);
   51.76  	extern void time_resume(void);
   51.77  
   51.78 -#ifdef CONFIG_SMP
   51.79 -	cpumask_t prev_online_cpus;
   51.80 -	int vcpu_prepare(int vcpu);
   51.81 -#endif
   51.82 -
   51.83 -	int err = 0;
   51.84 -
   51.85  	BUG_ON(smp_processor_id() != 0);
   51.86  	BUG_ON(in_interrupt());
   51.87  
   51.88 @@ -110,50 +125,21 @@ static int __do_suspend(void *ignore)
   51.89  		return -EOPNOTSUPP;
   51.90  	}
   51.91  
   51.92 -#if defined(CONFIG_SMP) && !defined(CONFIG_HOTPLUG_CPU)
   51.93 -	if (num_online_cpus() > 1) {
   51.94 -		printk(KERN_WARNING "Can't suspend SMP guests "
   51.95 -		       "without CONFIG_HOTPLUG_CPU\n");
   51.96 -		return -EOPNOTSUPP;
   51.97 -	}
   51.98 -#endif
   51.99 +	err = smp_suspend();
  51.100 +	if (err)
  51.101 +		return err;
  51.102  
  51.103  	xenbus_suspend();
  51.104  
  51.105 -	lock_cpu_hotplug();
  51.106 -#ifdef CONFIG_SMP
  51.107 -	/*
  51.108 -	 * Take all other CPUs offline. We hold the hotplug mutex to
  51.109 -	 * avoid other processes bringing up CPUs under our feet.
  51.110 -	 */
  51.111 -	cpus_clear(prev_online_cpus);
  51.112 -	while (num_online_cpus() > 1) {
  51.113 -		for_each_online_cpu(i) {
  51.114 -			if (i == 0)
  51.115 -				continue;
  51.116 -			unlock_cpu_hotplug();
  51.117 -			err = cpu_down(i);
  51.118 -			lock_cpu_hotplug();
  51.119 -			if (err != 0) {
  51.120 -				printk(KERN_CRIT "Failed to take all CPUs "
  51.121 -				       "down: %d.\n", err);
  51.122 -				goto out_reenable_cpus;
  51.123 -			}
  51.124 -			cpu_set(i, prev_online_cpus);
  51.125 -		}
  51.126 -	}
  51.127 -#endif
  51.128 -
  51.129  	preempt_disable();
  51.130  
  51.131  #ifdef __i386__
  51.132  	kmem_cache_shrink(pgd_cache);
  51.133 +#endif
  51.134  	mm_pin_all();
  51.135 -#endif
  51.136  
  51.137  	__cli();
  51.138  	preempt_enable();
  51.139 -	unlock_cpu_hotplug();
  51.140  
  51.141  	gnttab_suspend();
  51.142  
  51.143 @@ -199,34 +185,15 @@ static int __do_suspend(void *ignore)
  51.144  
  51.145  	time_resume();
  51.146  
  51.147 +	switch_idle_mm();
  51.148 +
  51.149  	__sti();
  51.150  
  51.151  	xencons_resume();
  51.152  
  51.153 -#ifdef CONFIG_SMP
  51.154 -	for_each_cpu(i)
  51.155 -		vcpu_prepare(i);
  51.156 -
  51.157 -#endif
  51.158 -
  51.159 -	/*
  51.160 -	 * Only resume xenbus /after/ we've prepared our VCPUs; otherwise
  51.161 -	 * the VCPU hotplug callback can race with our vcpu_prepare
  51.162 -	 */
  51.163  	xenbus_resume();
  51.164  
  51.165 -#ifdef CONFIG_SMP
  51.166 - out_reenable_cpus:
  51.167 -	for_each_cpu_mask(i, prev_online_cpus) {
  51.168 -		j = cpu_up(i);
  51.169 -		if ((j != 0) && !cpu_online(i)) {
  51.170 -			printk(KERN_CRIT "Failed to bring cpu "
  51.171 -			       "%d back up (%d).\n",
  51.172 -			       i, j);
  51.173 -			err = j;
  51.174 -		}
  51.175 -	}
  51.176 -#endif
  51.177 +	smp_resume();
  51.178  
  51.179  	return err;
  51.180  }
  51.181 @@ -334,7 +301,6 @@ static void shutdown_handler(struct xenb
  51.182  	kfree(str);
  51.183  }
  51.184  
  51.185 -#ifdef CONFIG_MAGIC_SYSRQ
  51.186  static void sysrq_handler(struct xenbus_watch *watch, const char **vec,
  51.187  			  unsigned int len)
  51.188  {
  51.189 @@ -360,45 +326,35 @@ static void sysrq_handler(struct xenbus_
  51.190  	if (err == -EAGAIN)
  51.191  		goto again;
  51.192  
  51.193 -	if (sysrq_key != '\0') {
  51.194 +#ifdef CONFIG_MAGIC_SYSRQ
  51.195 +	if (sysrq_key != '\0')
  51.196  		handle_sysrq(sysrq_key, NULL, NULL);
  51.197 -	}
  51.198 +#endif
  51.199  }
  51.200 -#endif
  51.201  
  51.202  static struct xenbus_watch shutdown_watch = {
  51.203  	.node = "control/shutdown",
  51.204  	.callback = shutdown_handler
  51.205  };
  51.206  
  51.207 -#ifdef CONFIG_MAGIC_SYSRQ
  51.208  static struct xenbus_watch sysrq_watch = {
  51.209  	.node ="control/sysrq",
  51.210  	.callback = sysrq_handler
  51.211  };
  51.212 -#endif
  51.213  
  51.214  static int setup_shutdown_watcher(struct notifier_block *notifier,
  51.215                                    unsigned long event,
  51.216                                    void *data)
  51.217  {
  51.218 -	int err1 = 0;
  51.219 -#ifdef CONFIG_MAGIC_SYSRQ
  51.220 -	int err2 = 0;
  51.221 -#endif
  51.222 +	int err;
  51.223  
  51.224 -	err1 = register_xenbus_watch(&shutdown_watch);
  51.225 -#ifdef CONFIG_MAGIC_SYSRQ
  51.226 -	err2 = register_xenbus_watch(&sysrq_watch);
  51.227 -#endif
  51.228 -
  51.229 -	if (err1)
  51.230 +	err = register_xenbus_watch(&shutdown_watch);
  51.231 +	if (err)
  51.232  		printk(KERN_ERR "Failed to set shutdown watcher\n");
  51.233  
  51.234 -#ifdef CONFIG_MAGIC_SYSRQ
  51.235 -	if (err2)
  51.236 +	err = register_xenbus_watch(&sysrq_watch);
  51.237 +	if (err)
  51.238  		printk(KERN_ERR "Failed to set sysrq watcher\n");
  51.239 -#endif
  51.240  
  51.241  	return NOTIFY_DONE;
  51.242  }

    52.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Tue Apr 11 13:55:47 2006 -0600
    52.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Tue Apr 11 18:54:18 2006 -0600
    52.3 @@ -79,6 +79,15 @@ EXPORT_SYMBOL(x86_cpu_to_apicid);
    52.4  unsigned int maxcpus = NR_CPUS;
    52.5  #endif
    52.6  
    52.7 +/*
    52.8 + * Set of CPUs that remote admin software will allow us to bring online.
    52.9 + * Notified to us via xenbus.
   52.10 + */
   52.11 +static cpumask_t xenbus_allowed_cpumask;
   52.12 +
   52.13 +/* Set of CPUs that local admin will allow us to bring online. */
   52.14 +static cpumask_t local_allowed_cpumask = CPU_MASK_ALL;
   52.15 +
   52.16  void __init prefill_possible_map(void)
   52.17  {
   52.18  	int i, rc;
   52.19 @@ -146,7 +155,7 @@ static void cpu_bringup(void)
   52.20  	cpu_idle();
   52.21  }
   52.22  
   52.23 -void vcpu_prepare(int vcpu)
   52.24 +static void vcpu_prepare(int vcpu)
   52.25  {
   52.26  	vcpu_guest_context_t ctxt;
   52.27  	struct task_struct *idle = idle_task(vcpu);
   52.28 @@ -278,6 +287,8 @@ void __init smp_prepare_cpus(unsigned in
   52.29  		vcpu_prepare(cpu);
   52.30  	}
   52.31  
   52.32 +	xenbus_allowed_cpumask = cpu_present_map;
   52.33 +
   52.34  	/* Currently, Xen gives no dynamic NUMA/HT info. */
   52.35  	for (cpu = 1; cpu < NR_CPUS; cpu++) {
   52.36  		cpu_sibling_map[cpu] = cpumask_of_cpu(cpu);
   52.37 @@ -301,6 +312,15 @@ void __devinit smp_prepare_boot_cpu(void
   52.38  	cpu_online_map   = cpumask_of_cpu(0);
   52.39  }
   52.40  
   52.41 +static int local_cpu_hotplug_request(void)
   52.42 +{
   52.43 +	/*
   52.44 +	 * We assume a CPU hotplug request comes from local admin if it is made
   52.45 +	 * via a userspace process (i.e., one with a real mm_struct).
   52.46 +	 */
   52.47 +	return (current->mm != NULL);
   52.48 +}
   52.49 +
   52.50  #ifdef CONFIG_HOTPLUG_CPU
   52.51  
   52.52  /*
   52.53 @@ -331,8 +351,10 @@ static void vcpu_hotplug(unsigned int cp
   52.54  	}
   52.55  
   52.56  	if (strcmp(state, "online") == 0) {
   52.57 +		cpu_set(cpu, xenbus_allowed_cpumask);
   52.58  		(void)cpu_up(cpu);
   52.59  	} else if (strcmp(state, "offline") == 0) {
   52.60 +		cpu_clear(cpu, xenbus_allowed_cpumask);
   52.61  		(void)cpu_down(cpu);
   52.62  	} else {
   52.63  		printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n",
   52.64 @@ -353,6 +375,22 @@ static void handle_vcpu_hotplug_event(
   52.65  	}
   52.66  }
   52.67  
   52.68 +static int smpboot_cpu_notify(struct notifier_block *notifier,
   52.69 +			      unsigned long action, void *hcpu)
   52.70 +{
   52.71 +	int cpu = (long)hcpu;
   52.72 +
   52.73 +	/*
   52.74 +	 * We do this in a callback notifier rather than __cpu_disable()
   52.75 +	 * because local_cpu_hotplug_request() does not work in the latter
   52.76 +	 * as it's always executed from within a stopmachine kthread.
   52.77 +	 */
   52.78 +	if ((action == CPU_DOWN_PREPARE) && local_cpu_hotplug_request())
   52.79 +		cpu_clear(cpu, local_allowed_cpumask);
   52.80 +
   52.81 +	return NOTIFY_OK;
   52.82 +}
   52.83 +
   52.84  static int setup_cpu_watcher(struct notifier_block *notifier,
   52.85  			      unsigned long event, void *data)
   52.86  {
   52.87 @@ -360,7 +398,8 @@ static int setup_cpu_watcher(struct noti
   52.88  
   52.89  	static struct xenbus_watch cpu_watch = {
   52.90  		.node = "cpu",
   52.91 -		.callback = handle_vcpu_hotplug_event };
   52.92 +		.callback = handle_vcpu_hotplug_event,
   52.93 +		.flags = XBWF_new_thread };
   52.94  	(void)register_xenbus_watch(&cpu_watch);
   52.95  
   52.96  	if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
   52.97 @@ -375,14 +414,62 @@ static int setup_cpu_watcher(struct noti
   52.98  
   52.99  static int __init setup_vcpu_hotplug_event(void)
  52.100  {
  52.101 +	static struct notifier_block hotplug_cpu = {
  52.102 +		.notifier_call = smpboot_cpu_notify };
  52.103  	static struct notifier_block xsn_cpu = {
  52.104  		.notifier_call = setup_cpu_watcher };
  52.105 +
  52.106 +	register_cpu_notifier(&hotplug_cpu);
  52.107  	register_xenstore_notifier(&xsn_cpu);
  52.108 +
  52.109  	return 0;
  52.110  }
  52.111  
  52.112  arch_initcall(setup_vcpu_hotplug_event);
  52.113  
  52.114 +int smp_suspend(void)
  52.115 +{
  52.116 +	int i, err;
  52.117 +
  52.118 +	lock_cpu_hotplug();
  52.119 +
  52.120 +	/*
  52.121 +	 * Take all other CPUs offline. We hold the hotplug mutex to
  52.122 +	 * avoid other processes bringing up CPUs under our feet.
  52.123 +	 */
  52.124 +	while (num_online_cpus() > 1) {
  52.125 +		unlock_cpu_hotplug();
  52.126 +		for_each_online_cpu(i) {
  52.127 +			if (i == 0)
  52.128 +				continue;
  52.129 +			err = cpu_down(i);
  52.130 +			if (err) {
  52.131 +				printk(KERN_CRIT "Failed to take all CPUs "
  52.132 +				       "down: %d.\n", err);
  52.133 +				for_each_cpu(i)
  52.134 +					vcpu_hotplug(i);
  52.135 +				return err;
  52.136 +			}
  52.137 +		}
  52.138 +		lock_cpu_hotplug();
  52.139 +	}
  52.140 +
  52.141 +	return 0;
  52.142 +}
  52.143 +
  52.144 +void smp_resume(void)
  52.145 +{
  52.146 +	int i;
  52.147 +
  52.148 +	for_each_cpu(i)
  52.149 +		vcpu_prepare(i);
  52.150 +
  52.151 +	unlock_cpu_hotplug();
  52.152 +
  52.153 +	for_each_cpu(i)
  52.154 +		vcpu_hotplug(i);
  52.155 +}
  52.156 +
  52.157  int __cpu_disable(void)
  52.158  {
  52.159  	cpumask_t map = cpu_online_map;
  52.160 @@ -415,6 +502,20 @@ void __cpu_die(unsigned int cpu)
  52.161  
  52.162  #else /* !CONFIG_HOTPLUG_CPU */
  52.163  
  52.164 +int smp_suspend(void)
  52.165 +{
  52.166 +	if (num_online_cpus() > 1) {
  52.167 +		printk(KERN_WARNING "Can't suspend SMP guests "
  52.168 +		       "without CONFIG_HOTPLUG_CPU\n");
  52.169 +		return -EOPNOTSUPP;
  52.170 +	}
  52.171 +	return 0;
  52.172 +}
  52.173 +
  52.174 +void smp_resume(void)
  52.175 +{
  52.176 +}
  52.177 +
  52.178  int __cpu_disable(void)
  52.179  {
  52.180  	return -ENOSYS;
  52.181 @@ -429,6 +530,20 @@ void __cpu_die(unsigned int cpu)
  52.182  
  52.183  int __devinit __cpu_up(unsigned int cpu)
  52.184  {
  52.185 +	int rc;
  52.186 +
  52.187 +	if (local_cpu_hotplug_request()) {
  52.188 +		cpu_set(cpu, local_allowed_cpumask);
  52.189 +		if (!cpu_isset(cpu, xenbus_allowed_cpumask)) {
  52.190 +			printk("%s: attempt to bring up CPU %u disallowed by "
  52.191 +			       "remote admin.\n", __FUNCTION__, cpu);
  52.192 +			return -EBUSY;
  52.193 +		}
  52.194 +	} else if (!cpu_isset(cpu, local_allowed_cpumask) ||
  52.195 +		   !cpu_isset(cpu, xenbus_allowed_cpumask)) {
  52.196 +		return -EBUSY;
  52.197 +	}
  52.198 +
  52.199  #ifdef CONFIG_SMP_ALTERNATIVES
  52.200  	if (num_online_cpus() == 1)
  52.201  		prepare_for_smp();
  52.202 @@ -436,7 +551,9 @@ int __devinit __cpu_up(unsigned int cpu)
  52.203  
  52.204  	xen_smp_intr_init(cpu);
  52.205  	cpu_set(cpu, cpu_online_map);
  52.206 -	if (HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL) != 0)
  52.207 +
  52.208 +	rc = HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL);
  52.209 +	if (rc != 0)
  52.210  		BUG();
  52.211  
  52.212  	return 0;

    53.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Tue Apr 11 13:55:47 2006 -0600
    53.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Tue Apr 11 18:54:18 2006 -0600
    53.3 @@ -97,7 +97,6 @@ typedef struct netif_st {
    53.4  #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE)
    53.5  #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE)
    53.6  
    53.7 -void netif_creditlimit(netif_t *netif);
    53.8  void netif_disconnect(netif_t *netif);
    53.9  
   53.10  netif_t *alloc_netif(domid_t domid, unsigned int handle, u8 be_mac[ETH_ALEN]);

    54.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Tue Apr 11 13:55:47 2006 -0600
    54.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Tue Apr 11 18:54:18 2006 -0600
    54.3 @@ -31,6 +31,7 @@
    54.4   */
    54.5  
    54.6  #include "common.h"
    54.7 +#include <linux/ethtool.h>
    54.8  #include <linux/rtnetlink.h>
    54.9  
   54.10  static void __netif_up(netif_t *netif)
   54.11 @@ -71,6 +72,12 @@ static int net_close(struct net_device *
   54.12  	return 0;
   54.13  }
   54.14  
   54.15 +static struct ethtool_ops network_ethtool_ops =
   54.16 +{
   54.17 +	.get_tx_csum = ethtool_op_get_tx_csum,
   54.18 +	.set_tx_csum = ethtool_op_set_tx_csum,
   54.19 +};
   54.20 +
   54.21  netif_t *alloc_netif(domid_t domid, unsigned int handle, u8 be_mac[ETH_ALEN])
   54.22  {
   54.23  	int err = 0, i;
   54.24 @@ -101,7 +108,9 @@ netif_t *alloc_netif(domid_t domid, unsi
   54.25  	dev->get_stats       = netif_be_get_stats;
   54.26  	dev->open            = net_open;
   54.27  	dev->stop            = net_close;
   54.28 -	dev->features        = NETIF_F_NO_CSUM;
   54.29 +	dev->features        = NETIF_F_IP_CSUM;
   54.30 +
   54.31 +	SET_ETHTOOL_OPS(dev, &network_ethtool_ops);
   54.32  
   54.33  	/* Disable queuing. */
   54.34  	dev->tx_queue_len = 0;
   54.35 @@ -293,25 +302,6 @@ void free_netif(netif_t *netif)
   54.36  	schedule_work(&netif->free_work);
   54.37  }
   54.38  
   54.39 -void netif_creditlimit(netif_t *netif)
   54.40 -{
   54.41 -#if 0
   54.42 -	/* Set the credit limit (reset remaining credit to new limit). */
   54.43 -	netif->credit_bytes     = creditlimit->credit_bytes;
   54.44 -	netif->remaining_credit = creditlimit->credit_bytes;
   54.45 -	netif->credit_usec      = creditlimit->period_usec;
   54.46 -
   54.47 -	if (netif->status == CONNECTED) {
   54.48 -		/*
   54.49 -		 * Schedule work so that any packets waiting under previous
   54.50 -		 * credit limit are dealt with (acts as a replenishment point).
   54.51 -		 */
   54.52 -		netif->credit_timeout.expires = jiffies;
   54.53 -		netif_schedule_work(netif);
   54.54 -	}
   54.55 -#endif
   54.56 -}
   54.57 -
   54.58  void netif_disconnect(netif_t *netif)
   54.59  {
   54.60  	switch (netif->status) {

    55.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c	Tue Apr 11 13:55:47 2006 -0600
    55.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c	Tue Apr 11 18:54:18 2006 -0600
    55.3 @@ -100,10 +100,10 @@ static int loopback_start_xmit(struct sk
    55.4  		/* Defer checksum calculation. */
    55.5  		skb->proto_csum_blank = 1;
    55.6  		/* Must be a local packet: assert its integrity. */
    55.7 -		skb->proto_csum_valid = 1;
    55.8 +		skb->proto_data_valid = 1;
    55.9  	}
   55.10  
   55.11 -	skb->ip_summed = skb->proto_csum_valid ?
   55.12 +	skb->ip_summed = skb->proto_data_valid ?
   55.13  		CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
   55.14  
   55.15  	skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
   55.16 @@ -121,6 +121,12 @@ static struct net_device_stats *loopback
   55.17  	return &np->stats;
   55.18  }
   55.19  
   55.20 +static struct ethtool_ops network_ethtool_ops =
   55.21 +{
   55.22 +	.get_tx_csum = ethtool_op_get_tx_csum,
   55.23 +	.set_tx_csum = ethtool_op_set_tx_csum,
   55.24 +};
   55.25 +
   55.26  static void loopback_construct(struct net_device *dev, struct net_device *lo)
   55.27  {
   55.28  	struct net_private *np = netdev_priv(dev);
   55.29 @@ -134,7 +140,11 @@ static void loopback_construct(struct ne
   55.30  
   55.31  	dev->tx_queue_len    = 0;
   55.32  
   55.33 -	dev->features        = NETIF_F_HIGHDMA | NETIF_F_LLTX;
   55.34 +	dev->features        = (NETIF_F_HIGHDMA |
   55.35 +				NETIF_F_LLTX |
   55.36 +				NETIF_F_IP_CSUM);
   55.37 +
   55.38 +	SET_ETHTOOL_OPS(dev, &network_ethtool_ops);
   55.39  
   55.40  	/*
   55.41  	 * We do not set a jumbo MTU on the interface. Otherwise the network
   55.42 @@ -147,12 +157,6 @@ static void loopback_construct(struct ne
   55.43  	/*dev->mtu             = 16*1024;*/
   55.44  }
   55.45  
   55.46 -static struct ethtool_ops network_ethtool_ops =
   55.47 -{
   55.48 -	.get_tx_csum = ethtool_op_get_tx_csum,
   55.49 -	.set_tx_csum = ethtool_op_set_tx_csum,
   55.50 -};
   55.51 -
   55.52  static int __init make_loopback(int i)
   55.53  {
   55.54  	struct net_device *dev1, *dev2;
   55.55 @@ -172,11 +176,6 @@ static int __init make_loopback(int i)
   55.56  	loopback_construct(dev1, dev2);
   55.57  	loopback_construct(dev2, dev1);
   55.58  
   55.59 -	dev1->features |= NETIF_F_NO_CSUM;
   55.60 -	dev2->features |= NETIF_F_IP_CSUM;
   55.61 -
   55.62 -	SET_ETHTOOL_OPS(dev2, &network_ethtool_ops);
   55.63 -
   55.64  	/*
   55.65  	 * Initialise a dummy MAC address for the 'dummy backend' interface. We
   55.66  	 * choose the numerically largest non-broadcast address to prevent the

    56.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Tue Apr 11 13:55:47 2006 -0600
    56.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Tue Apr 11 18:54:18 2006 -0600
    56.3 @@ -171,7 +171,7 @@ int netif_be_start_xmit(struct sk_buff *
    56.4  				     skb->len + hlen);
    56.5  		BUG_ON(ret);
    56.6  		nskb->dev = skb->dev;
    56.7 -		nskb->proto_csum_valid = skb->proto_csum_valid;
    56.8 +		nskb->proto_data_valid = skb->proto_data_valid;
    56.9  		dev_kfree_skb(skb);
   56.10  		skb = nskb;
   56.11  	}
   56.12 @@ -213,7 +213,7 @@ static void net_rx_action(unsigned long 
   56.13  {
   56.14  	netif_t *netif = NULL; 
   56.15  	s8 status;
   56.16 -	u16 size, id, irq;
   56.17 +	u16 size, id, irq, flags;
   56.18  	multicall_entry_t *mcl;
   56.19  	mmu_update_t *mmu;
   56.20  	gnttab_transfer_t *gop;
   56.21 @@ -301,9 +301,6 @@ static void net_rx_action(unsigned long 
   56.22  		netif   = netdev_priv(skb->dev);
   56.23  		size    = skb->tail - skb->data;
   56.24  
   56.25 -		/* Rederive the machine addresses. */
   56.26 -		new_mfn = mcl->args[1] >> PAGE_SHIFT;
   56.27 -		old_mfn = gop->mfn;
   56.28  		atomic_set(&(skb_shinfo(skb)->dataref), 1);
   56.29  		skb_shinfo(skb)->nr_frags = 0;
   56.30  		skb_shinfo(skb)->frag_list = NULL;
   56.31 @@ -328,10 +325,14 @@ static void net_rx_action(unsigned long 
   56.32  		}
   56.33  		irq = netif->irq;
   56.34  		id = RING_GET_REQUEST(&netif->rx, netif->rx.rsp_prod_pvt)->id;
   56.35 +		flags = 0;
   56.36 +		if (skb->ip_summed == CHECKSUM_HW) /* local packet? */
   56.37 +			flags |= NETRXF_csum_blank | NETRXF_data_validated;
   56.38 +		else if (skb->proto_data_valid) /* remote but checksummed? */
   56.39 +			flags |= NETRXF_data_validated;
   56.40  		if (make_rx_response(netif, id, status,
   56.41  				     (unsigned long)skb->data & ~PAGE_MASK,
   56.42 -				     size, skb->proto_csum_valid ?
   56.43 -				     NETRXF_data_validated : 0) &&
   56.44 +				     size, flags) &&
   56.45  		    (rx_notify[irq] == 0)) {
   56.46  			rx_notify[irq] = 1;
   56.47  			notify_list[notify_nr++] = irq;
   56.48 @@ -655,11 +656,16 @@ static void net_tx_action(unsigned long 
   56.49  		skb->protocol = eth_type_trans(skb, skb->dev);
   56.50  
   56.51  		/*
   56.52 -                 * No checking needed on localhost, but remember the field is
   56.53 -                 * blank. 
   56.54 -                 */
   56.55 -		skb->ip_summed        = CHECKSUM_UNNECESSARY;
   56.56 -		skb->proto_csum_valid = 1;
   56.57 +		 * Old frontends do not assert data_validated but we
   56.58 +		 * can infer it from csum_blank so test both flags.
   56.59 +		 */
   56.60 +		if (txreq.flags & (NETTXF_data_validated|NETTXF_csum_blank)) {
   56.61 +			skb->ip_summed = CHECKSUM_UNNECESSARY;
   56.62 +			skb->proto_data_valid = 1;
   56.63 +		} else {
   56.64 +			skb->ip_summed = CHECKSUM_NONE;
   56.65 +			skb->proto_data_valid = 0;
   56.66 +		}
   56.67  		skb->proto_csum_blank = !!(txreq.flags & NETTXF_csum_blank);
   56.68  
   56.69  		netif->stats.rx_bytes += txreq.size;

    57.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c	Tue Apr 11 13:55:47 2006 -0600
    57.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c	Tue Apr 11 18:54:18 2006 -0600
    57.3 @@ -92,7 +92,7 @@ static int netback_probe(struct xenbus_d
    57.4  	if (err)
    57.5  		goto fail;
    57.6  
    57.7 -	err = xenbus_switch_state(dev, XBT_NULL, XenbusStateInitWait);
    57.8 +	err = xenbus_switch_state(dev, XenbusStateInitWait);
    57.9  	if (err) {
   57.10  		goto fail;
   57.11  	}
   57.12 @@ -209,7 +209,7 @@ static void frontend_changed(struct xenb
   57.13  		break;
   57.14  
   57.15  	case XenbusStateClosing:
   57.16 -		xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
   57.17 +		xenbus_switch_state(dev, XenbusStateClosing);
   57.18  		break;
   57.19  
   57.20  	case XenbusStateClosed:
   57.21 @@ -233,9 +233,44 @@ static void frontend_changed(struct xenb
   57.22  
   57.23  static void maybe_connect(struct backend_info *be)
   57.24  {
   57.25 -	if (be->netif != NULL && be->frontend_state == XenbusStateConnected) {
   57.26 +	if (be->netif && (be->frontend_state == XenbusStateConnected))
   57.27  		connect(be);
   57.28 -	}
   57.29 +}
   57.30 +
   57.31 +static void xen_net_read_rate(struct xenbus_device *dev,
   57.32 +			      unsigned long *bytes, unsigned long *usec)
   57.33 +{
   57.34 +	char *s, *e;
   57.35 +	unsigned long b, u;
   57.36 +	char *ratestr;
   57.37 +
   57.38 +	/* Default to unlimited bandwidth. */
   57.39 +	*bytes = ~0UL;
   57.40 +	*usec = 0;
   57.41 +
   57.42 +	ratestr = xenbus_read(XBT_NULL, dev->nodename, "rate", NULL);
   57.43 +	if (IS_ERR(ratestr))
   57.44 +		return;
   57.45 +
   57.46 +	s = ratestr;
   57.47 +	b = simple_strtoul(s, &e, 10);
   57.48 +	if ((s == e) || (*e != ','))
   57.49 +		goto fail;
   57.50 +
   57.51 +	s = e + 1;
   57.52 +	u = simple_strtoul(s, &e, 10);
   57.53 +	if ((s == e) || (*e != '\0'))
   57.54 +		goto fail;
   57.55 +
   57.56 +	*bytes = b;
   57.57 +	*usec = u;
   57.58 +
   57.59 +	kfree(ratestr);
   57.60 +	return;
   57.61 +
   57.62 + fail:
   57.63 +	WPRINTK("Failed to parse network rate limit. Traffic unlimited.\n");
   57.64 +	kfree(ratestr);
   57.65  }
   57.66  
   57.67  
   57.68 @@ -254,7 +289,11 @@ static void connect(struct backend_info 
   57.69  		return;
   57.70  	}
   57.71  
   57.72 -	xenbus_switch_state(dev, XBT_NULL, XenbusStateConnected);
   57.73 +	xen_net_read_rate(dev, &be->netif->credit_bytes,
   57.74 +			  &be->netif->credit_usec);
   57.75 +	be->netif->remaining_credit = be->netif->credit_bytes;
   57.76 +
   57.77 +	xenbus_switch_state(dev, XenbusStateConnected);
   57.78  }
   57.79  
   57.80  

    58.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Tue Apr 11 13:55:47 2006 -0600
    58.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Tue Apr 11 18:54:18 2006 -0600
    58.3 @@ -300,13 +300,6 @@ again:
    58.4  		goto abort_transaction;
    58.5  	}
    58.6  
    58.7 -	err = xenbus_printf(xbt, dev->nodename,
    58.8 -			    "state", "%d", XenbusStateConnected);
    58.9 -	if (err) {
   58.10 -		message = "writing frontend XenbusStateConnected";
   58.11 -		goto abort_transaction;
   58.12 -	}
   58.13 -
   58.14  	err = xenbus_transaction_end(xbt, 0);
   58.15  	if (err) {
   58.16  		if (err == -EAGAIN)
   58.17 @@ -315,6 +308,8 @@ again:
   58.18  		goto destroy_ring;
   58.19  	}
   58.20  
   58.21 +	xenbus_switch_state(dev, XenbusStateConnected);
   58.22 +
   58.23  	return 0;
   58.24  
   58.25   abort_transaction:
   58.26 @@ -696,7 +691,12 @@ static int network_start_xmit(struct sk_
   58.27  	tx->gref = np->grant_tx_ref[id] = ref;
   58.28  	tx->offset = (unsigned long)skb->data & ~PAGE_MASK;
   58.29  	tx->size = skb->len;
   58.30 -	tx->flags = (skb->ip_summed == CHECKSUM_HW) ? NETTXF_csum_blank : 0;
   58.31 +
   58.32 +	tx->flags = 0;
   58.33 +	if (skb->ip_summed == CHECKSUM_HW) /* local packet? */
   58.34 +		tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
   58.35 +	if (skb->proto_data_valid) /* remote but checksummed? */
   58.36 +		tx->flags |= NETTXF_data_validated;
   58.37  
   58.38  	np->tx.req_prod_pvt = i + 1;
   58.39  	RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&np->tx, notify);
   58.40 @@ -811,8 +811,18 @@ static int netif_poll(struct net_device 
   58.41  		skb->len  = rx->status;
   58.42  		skb->tail = skb->data + skb->len;
   58.43  
   58.44 -		if (rx->flags & NETRXF_data_validated)
   58.45 +		/*
   58.46 +		 * Old backends do not assert data_validated but we
   58.47 +		 * can infer it from csum_blank so test both flags.
   58.48 +		 */
   58.49 +		if (rx->flags & (NETRXF_data_validated|NETRXF_csum_blank)) {
   58.50  			skb->ip_summed = CHECKSUM_UNNECESSARY;
   58.51 +			skb->proto_data_valid = 1;
   58.52 +		} else {
   58.53 +			skb->ip_summed = CHECKSUM_NONE;
   58.54 +			skb->proto_data_valid = 0;
   58.55 +		}
   58.56 +		skb->proto_csum_blank = !!(rx->flags & NETRXF_csum_blank);
   58.57  
   58.58  		np->stats.rx_packets++;
   58.59  		np->stats.rx_bytes += rx->status;
   58.60 @@ -978,8 +988,8 @@ static void network_connect(struct net_d
   58.61  	 * the RX ring because some of our pages are currently flipped out
   58.62  	 * so we can't just free the RX skbs.
   58.63  	 * NB2. Freelist index entries are always going to be less than
   58.64 -	 *  __PAGE_OFFSET, whereas pointers to skbs will always be equal or
   58.65 -	 * greater than __PAGE_OFFSET: we use this property to distinguish
   58.66 +	 *  PAGE_OFFSET, whereas pointers to skbs will always be equal or
   58.67 +	 * greater than PAGE_OFFSET: we use this property to distinguish
   58.68  	 * them.
   58.69  	 */
   58.70  
   58.71 @@ -990,7 +1000,7 @@ static void network_connect(struct net_d
   58.72  	 * interface has been down.
   58.73  	 */
   58.74  	for (requeue_idx = 0, i = 1; i <= NET_TX_RING_SIZE; i++) {
   58.75 -		if ((unsigned long)np->tx_skbs[i] < __PAGE_OFFSET)
   58.76 +		if ((unsigned long)np->tx_skbs[i] < PAGE_OFFSET)
   58.77  			continue;
   58.78  
   58.79  		skb = np->tx_skbs[i];
   58.80 @@ -1006,8 +1016,11 @@ static void network_connect(struct net_d
   58.81  		tx->gref = np->grant_tx_ref[i];
   58.82  		tx->offset = (unsigned long)skb->data & ~PAGE_MASK;
   58.83  		tx->size = skb->len;
   58.84 -		tx->flags = (skb->ip_summed == CHECKSUM_HW) ?
   58.85 -			NETTXF_csum_blank : 0;
   58.86 +		tx->flags = 0;
   58.87 +		if (skb->ip_summed == CHECKSUM_HW) /* local packet? */
   58.88 +			tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
   58.89 +		if (skb->proto_data_valid) /* remote but checksummed? */
   58.90 +			tx->flags |= NETTXF_data_validated;
   58.91  
   58.92  		np->stats.tx_bytes += skb->len;
   58.93  		np->stats.tx_packets++;
   58.94 @@ -1018,7 +1031,7 @@ static void network_connect(struct net_d
   58.95  
   58.96  	/* Rebuild the RX buffer freelist and the RX ring itself. */
   58.97  	for (requeue_idx = 0, i = 1; i <= NET_RX_RING_SIZE; i++) {
   58.98 -		if ((unsigned long)np->rx_skbs[i] < __PAGE_OFFSET)
   58.99 +		if ((unsigned long)np->rx_skbs[i] < PAGE_OFFSET)
  58.100  			continue;
  58.101  		gnttab_grant_foreign_transfer_ref(
  58.102  			np->grant_rx_ref[i], np->xbdev->otherend_id,
  58.103 @@ -1216,7 +1229,7 @@ static void netfront_closing(struct xenb
  58.104  
  58.105  	close_netdev(info);
  58.106  
  58.107 -	xenbus_switch_state(dev, XBT_NULL, XenbusStateClosed);
  58.108 +	xenbus_switch_state(dev, XenbusStateClosed);
  58.109  }
  58.110  
  58.111  

    59.1 --- a/linux-2.6-xen-sparse/drivers/xen/pciback/conf_space.c	Tue Apr 11 13:55:47 2006 -0600
    59.2 +++ b/linux-2.6-xen-sparse/drivers/xen/pciback/conf_space.c	Tue Apr 11 18:54:18 2006 -0600
    59.3 @@ -106,7 +106,7 @@ static inline int valid_request(int offs
    59.4  }
    59.5  
    59.6  static inline u32 merge_value(u32 val, u32 new_val, u32 new_val_mask,
    59.7 -			      u32 offset)
    59.8 +			      int offset)
    59.9  {
   59.10  	if (offset >= 0) {
   59.11  		new_val_mask <<= (offset * 8);
   59.12 @@ -180,7 +180,8 @@ int pciback_config_read(struct pci_dev *
   59.13  
   59.14  		if ((req_start >= field_start && req_start < field_end)
   59.15  		    || (req_end > field_start && req_end <= field_end)) {
   59.16 -			err = conf_space_read(dev, cfg_entry, offset, &tmp_val);
   59.17 +			err = conf_space_read(dev, cfg_entry, field_start,
   59.18 +					      &tmp_val);
   59.19  			if (err)
   59.20  				goto out;
   59.21  
   59.22 @@ -228,14 +229,16 @@ int pciback_config_write(struct pci_dev 
   59.23  		    || (req_end > field_start && req_end <= field_end)) {
   59.24  			tmp_val = 0;
   59.25  
   59.26 -			err = pciback_config_read(dev, offset, size, &tmp_val);
   59.27 +			err = pciback_config_read(dev, field_start,
   59.28 +						  field->size, &tmp_val);
   59.29  			if (err)
   59.30  				break;
   59.31  
   59.32  			tmp_val = merge_value(tmp_val, value, get_mask(size),
   59.33 -					      field_start - req_start);
   59.34 +					      req_start - field_start);
   59.35  
   59.36 -			err = conf_space_write(dev, cfg_entry, offset, tmp_val);
   59.37 +			err = conf_space_write(dev, cfg_entry, field_start,
   59.38 +					       tmp_val);
   59.39  			handled = 1;
   59.40  		}
   59.41  	}

    60.1 --- a/linux-2.6-xen-sparse/drivers/xen/pciback/xenbus.c	Tue Apr 11 13:55:47 2006 -0600
    60.2 +++ b/linux-2.6-xen-sparse/drivers/xen/pciback/xenbus.c	Tue Apr 11 18:54:18 2006 -0600
    60.3 @@ -16,7 +16,7 @@ static struct pciback_device *alloc_pdev
    60.4  {
    60.5  	struct pciback_device *pdev;
    60.6  
    60.7 -	pdev = kmalloc(sizeof(struct pciback_device), GFP_KERNEL);
    60.8 +	pdev = kzalloc(sizeof(struct pciback_device), GFP_KERNEL);
    60.9  	if (pdev == NULL)
   60.10  		goto out;
   60.11  	dev_dbg(&xdev->dev, "allocated pdev @ 0x%p\n", pdev);
   60.12 @@ -137,7 +137,7 @@ static int pciback_attach(struct pciback
   60.13  
   60.14  	dev_dbg(&pdev->xdev->dev, "Connecting...\n");
   60.15  
   60.16 -	err = xenbus_switch_state(pdev->xdev, XBT_NULL, XenbusStateConnected);
   60.17 +	err = xenbus_switch_state(pdev->xdev, XenbusStateConnected);
   60.18  	if (err)
   60.19  		xenbus_dev_fatal(pdev->xdev, err,
   60.20  				 "Error switching to connected state!");
   60.21 @@ -165,7 +165,7 @@ static void pciback_frontend_changed(str
   60.22  		break;
   60.23  
   60.24  	case XenbusStateClosing:
   60.25 -		xenbus_switch_state(xdev, XBT_NULL, XenbusStateClosing);
   60.26 +		xenbus_switch_state(xdev, XenbusStateClosing);
   60.27  		break;
   60.28  
   60.29  	case XenbusStateClosed:
   60.30 @@ -341,7 +341,7 @@ static int pciback_setup_backend(struct 
   60.31  		goto out;
   60.32  	}
   60.33  
   60.34 -	err = xenbus_switch_state(pdev->xdev, XBT_NULL, XenbusStateInitialised);
   60.35 +	err = xenbus_switch_state(pdev->xdev, XenbusStateInitialised);
   60.36  	if (err)
   60.37  		xenbus_dev_fatal(pdev->xdev, err,
   60.38  				 "Error switching to initialised state!");
   60.39 @@ -386,7 +386,7 @@ static int pciback_xenbus_probe(struct x
   60.40  	}
   60.41  
   60.42  	/* wait for xend to configure us */
   60.43 -	err = xenbus_switch_state(dev, XBT_NULL, XenbusStateInitWait);
   60.44 +	err = xenbus_switch_state(dev, XenbusStateInitWait);
   60.45  	if (err)
   60.46  		goto out;
   60.47  

    61.1 --- a/linux-2.6-xen-sparse/drivers/xen/pcifront/xenbus.c	Tue Apr 11 13:55:47 2006 -0600
    61.2 +++ b/linux-2.6-xen-sparse/drivers/xen/pcifront/xenbus.c	Tue Apr 11 18:54:18 2006 -0600
    61.3 @@ -96,10 +96,6 @@ static int pcifront_publish_info(struct 
    61.4  	if (!err)
    61.5  		err = xenbus_printf(trans, pdev->xdev->nodename,
    61.6  				    "magic", XEN_PCI_MAGIC);
    61.7 -	if (!err)
    61.8 -		err =
    61.9 -		    xenbus_switch_state(pdev->xdev, trans,
   61.10 -					XenbusStateInitialised);
   61.11  
   61.12  	if (err) {
   61.13  		xenbus_transaction_end(trans, 1);
   61.14 @@ -118,6 +114,8 @@ static int pcifront_publish_info(struct 
   61.15  		}
   61.16  	}
   61.17  
   61.18 +	xenbus_switch_state(pdev->xdev, XenbusStateInitialised);
   61.19 +
   61.20  	dev_dbg(&pdev->xdev->dev, "publishing successful!\n");
   61.21  
   61.22        out:
   61.23 @@ -186,7 +184,7 @@ static int pcifront_try_connect(struct p
   61.24  		}
   61.25  	}
   61.26  
   61.27 -	err = xenbus_switch_state(pdev->xdev, XBT_NULL, XenbusStateConnected);
   61.28 +	err = xenbus_switch_state(pdev->xdev, XenbusStateConnected);
   61.29  	if (err)
   61.30  		goto out;
   61.31  
   61.32 @@ -205,8 +203,7 @@ static int pcifront_try_disconnect(struc
   61.33  	prev_state = xenbus_read_driver_state(pdev->xdev->nodename);
   61.34  
   61.35  	if (prev_state < XenbusStateClosing)
   61.36 -		err = xenbus_switch_state(pdev->xdev, XBT_NULL,
   61.37 -					XenbusStateClosing);
   61.38 +		err = xenbus_switch_state(pdev->xdev, XenbusStateClosing);
   61.39  
   61.40  	if (!err && prev_state == XenbusStateConnected)
   61.41  		pcifront_disconnect(pdev);

    62.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Tue Apr 11 13:55:47 2006 -0600
    62.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Tue Apr 11 18:54:18 2006 -0600
    62.3 @@ -277,6 +277,7 @@ static int __init privcmd_init(void)
    62.4  	set_bit(__HYPERVISOR_mmu_update,       hypercall_permission_map);
    62.5  	set_bit(__HYPERVISOR_mmuext_op,        hypercall_permission_map);
    62.6  	set_bit(__HYPERVISOR_xen_version,      hypercall_permission_map);
    62.7 +	set_bit(__HYPERVISOR_sched_op,         hypercall_permission_map);
    62.8  
    62.9  	privcmd_intf = create_xen_proc_entry("privcmd", 0400);
   62.10  	if (privcmd_intf != NULL)

    63.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Tue Apr 11 13:55:47 2006 -0600
    63.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Tue Apr 11 18:54:18 2006 -0600
    63.3 @@ -55,6 +55,7 @@ static int tpmback_remove(struct xenbus_
    63.4  		be->backend_watch.node = NULL;
    63.5  	}
    63.6  	if (be->tpmif) {
    63.7 +		vtpm_release_packets(be->tpmif, 0);
    63.8  		tpmif_put(be->tpmif);
    63.9  		be->tpmif = NULL;
   63.10  	}
   63.11 @@ -87,7 +88,7 @@ static int tpmback_probe(struct xenbus_d
   63.12  		goto fail;
   63.13  	}
   63.14  
   63.15 -	err = xenbus_switch_state(dev, XBT_NULL, XenbusStateInitWait);
   63.16 +	err = xenbus_switch_state(dev, XenbusStateInitWait);
   63.17  	if (err) {
   63.18  		goto fail;
   63.19  	}
   63.20 @@ -175,7 +176,7 @@ static void frontend_changed(struct xenb
   63.21  		break;
   63.22  
   63.23  	case XenbusStateClosing:
   63.24 -		xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
   63.25 +		xenbus_switch_state(dev, XenbusStateClosing);
   63.26  		break;
   63.27  
   63.28  	case XenbusStateClosed:
   63.29 @@ -247,18 +248,15 @@ again:
   63.30  		goto abort;
   63.31  	}
   63.32  
   63.33 -	err = xenbus_switch_state(dev, xbt, XenbusStateConnected);
   63.34 -	if (err)
   63.35 -		goto abort;
   63.36 -
   63.37 -	be->tpmif->status = CONNECTED;
   63.38 -
   63.39  	err = xenbus_transaction_end(xbt, 0);
   63.40  	if (err == -EAGAIN)
   63.41  		goto again;
   63.42 -	if (err) {
   63.43 +	if (err)
   63.44  		xenbus_dev_fatal(be->dev, err, "end of transaction");
   63.45 -	}
   63.46 +
   63.47 +	err = xenbus_switch_state(dev, XenbusStateConnected);
   63.48 +	if (!err)
   63.49 +		be->tpmif->status = CONNECTED;
   63.50  	return;
   63.51  abort:
   63.52  	xenbus_transaction_end(xbt, 1);

    64.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Tue Apr 11 13:55:47 2006 -0600
    64.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Tue Apr 11 18:54:18 2006 -0600
    64.3 @@ -65,14 +65,18 @@ static irqreturn_t tpmif_int(int irq,
    64.4                               void *tpm_priv,
    64.5                               struct pt_regs *ptregs);
    64.6  static void tpmif_rx_action(unsigned long unused);
    64.7 -static void tpmif_connect(struct tpm_private *tp, domid_t domid);
    64.8 +static int tpmif_connect(struct xenbus_device *dev,
    64.9 +                         struct tpm_private *tp,
   64.10 +                         domid_t domid);
   64.11  static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0);
   64.12 -static int tpm_allocate_buffers(struct tpm_private *tp);
   64.13 +static int tpmif_allocate_tx_buffers(struct tpm_private *tp);
   64.14 +static void tpmif_free_tx_buffers(struct tpm_private *tp);
   64.15  static void tpmif_set_connected_state(struct tpm_private *tp,
   64.16                                        u8 newstate);
   64.17  static int tpm_xmit(struct tpm_private *tp,
   64.18                      const u8 * buf, size_t count, int userbuffer,
   64.19                      void *remember);
   64.20 +static void destroy_tpmring(struct tpm_private *tp);
   64.21  
   64.22  #define DPRINTK(fmt, args...) \
   64.23      pr_debug("xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__, ##args)
   64.24 @@ -81,6 +85,8 @@ static int tpm_xmit(struct tpm_private *
   64.25  #define WPRINTK(fmt, args...) \
   64.26      printk(KERN_WARNING "xen_tpm_fr: " fmt, ##args)
   64.27  
   64.28 +#define GRANT_INVALID_REF	0
   64.29 +
   64.30  
   64.31  static inline int
   64.32  tx_buffer_copy(struct tx_buffer *txb, const u8 * src, int len,
   64.33 @@ -119,6 +125,14 @@ static inline struct tx_buffer *tx_buffe
   64.34  }
   64.35  
   64.36  
   64.37 +static inline void tx_buffer_free(struct tx_buffer *txb)
   64.38 +{
   64.39 +	if (txb) {
   64.40 +		free_page((long)txb->data);
   64.41 +		kfree(txb);
   64.42 +	}
   64.43 +}
   64.44 +
   64.45  /**************************************************************
   64.46   Utility function for the tpm_private structure
   64.47  **************************************************************/
   64.48 @@ -128,23 +142,29 @@ static inline void tpm_private_init(stru
   64.49  	init_waitqueue_head(&tp->wait_q);
   64.50  }
   64.51  
   64.52 +static inline void tpm_private_free(void)
   64.53 +{
   64.54 +	tpmif_free_tx_buffers(my_priv);
   64.55 +	kfree(my_priv);
   64.56 +	my_priv = NULL;
   64.57 +}
   64.58 +
   64.59  static struct tpm_private *tpm_private_get(void)
   64.60  {
   64.61 +	int err;
   64.62  	if (!my_priv) {
   64.63  		my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL);
   64.64  		if (my_priv) {
   64.65  			tpm_private_init(my_priv);
   64.66 +			err = tpmif_allocate_tx_buffers(my_priv);
   64.67 +			if (err < 0) {
   64.68 +				tpm_private_free();
   64.69 +			}
   64.70  		}
   64.71  	}
   64.72  	return my_priv;
   64.73  }
   64.74  
   64.75 -static inline void tpm_private_free(void)
   64.76 -{
   64.77 -	kfree(my_priv);
   64.78 -	my_priv = NULL;
   64.79 -}
   64.80 -
   64.81  /**************************************************************
   64.82  
   64.83   The interface to let the tpm plugin register its callback
   64.84 @@ -233,6 +253,8 @@ static int setup_tpmring(struct xenbus_d
   64.85  	tpmif_tx_interface_t *sring;
   64.86  	int err;
   64.87  
   64.88 +	tp->ring_ref = GRANT_INVALID_REF;
   64.89 +
   64.90  	sring = (void *)__get_free_page(GFP_KERNEL);
   64.91  	if (!sring) {
   64.92  		xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring");
   64.93 @@ -240,8 +262,6 @@ static int setup_tpmring(struct xenbus_d
   64.94  	}
   64.95  	tp->tx = sring;
   64.96  
   64.97 -	tpm_allocate_buffers(tp);
   64.98 -
   64.99  	err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx));
  64.100  	if (err < 0) {
  64.101  		free_page((unsigned long)sring);
  64.102 @@ -251,14 +271,13 @@ static int setup_tpmring(struct xenbus_d
  64.103  	}
  64.104  	tp->ring_ref = err;
  64.105  
  64.106 -	err = xenbus_alloc_evtchn(dev, &tp->evtchn);
  64.107 +	err = tpmif_connect(dev, tp, dev->otherend_id);
  64.108  	if (err)
  64.109  		goto fail;
  64.110  
  64.111 -	tpmif_connect(tp, dev->otherend_id);
  64.112 -
  64.113  	return 0;
  64.114  fail:
  64.115 +	destroy_tpmring(tp);
  64.116  	return err;
  64.117  }
  64.118  
  64.119 @@ -266,14 +285,17 @@ fail:
  64.120  static void destroy_tpmring(struct tpm_private *tp)
  64.121  {
  64.122  	tpmif_set_connected_state(tp, 0);
  64.123 -	if (tp->tx != NULL) {
  64.124 +
  64.125 +	if (tp->ring_ref != GRANT_INVALID_REF) {
  64.126  		gnttab_end_foreign_access(tp->ring_ref, 0,
  64.127  					  (unsigned long)tp->tx);
  64.128 +		tp->ring_ref = GRANT_INVALID_REF;
  64.129  		tp->tx = NULL;
  64.130  	}
  64.131  
  64.132  	if (tp->irq)
  64.133 -		unbind_from_irqhandler(tp->irq, NULL);
  64.134 +		unbind_from_irqhandler(tp->irq, tp);
  64.135 +
  64.136  	tp->evtchn = tp->irq = 0;
  64.137  }
  64.138  
  64.139 @@ -377,6 +399,9 @@ static int tpmfront_probe(struct xenbus_
  64.140  	int handle;
  64.141  	struct tpm_private *tp = tpm_private_get();
  64.142  
  64.143 +	if (!tp)
  64.144 +		return -ENOMEM;
  64.145 +
  64.146  	err = xenbus_scanf(XBT_NULL, dev->nodename,
  64.147  	                   "handle", "%i", &handle);
  64.148  	if (XENBUS_EXIST_ERR(err))
  64.149 @@ -402,15 +427,14 @@ static int tpmfront_probe(struct xenbus_
  64.150  
  64.151  static int tpmfront_remove(struct xenbus_device *dev)
  64.152  {
  64.153 -	struct tpm_private *tp = dev->data;
  64.154 +	struct tpm_private *tp = (struct tpm_private *)dev->data;
  64.155  	destroy_tpmring(tp);
  64.156  	return 0;
  64.157  }
  64.158  
  64.159 -static int
  64.160 -tpmfront_suspend(struct xenbus_device *dev)
  64.161 +static int tpmfront_suspend(struct xenbus_device *dev)
  64.162  {
  64.163 -	struct tpm_private *tp = dev->data;
  64.164 +	struct tpm_private *tp = (struct tpm_private *)dev->data;
  64.165  	u32 ctr;
  64.166  
  64.167  	/* lock, so no app can send */
  64.168 @@ -437,29 +461,35 @@ tpmfront_suspend(struct xenbus_device *d
  64.169  	return 0;
  64.170  }
  64.171  
  64.172 -static int
  64.173 -tpmfront_resume(struct xenbus_device *dev)
  64.174 +static int tpmfront_resume(struct xenbus_device *dev)
  64.175  {
  64.176 -	struct tpm_private *tp = dev->data;
  64.177 +	struct tpm_private *tp = (struct tpm_private *)dev->data;
  64.178 +	destroy_tpmring(tp);
  64.179  	return talk_to_backend(dev, tp);
  64.180  }
  64.181  
  64.182 -static void
  64.183 -tpmif_connect(struct tpm_private *tp, domid_t domid)
  64.184 +static int tpmif_connect(struct xenbus_device *dev,
  64.185 +                         struct tpm_private *tp,
  64.186 +                         domid_t domid)
  64.187  {
  64.188  	int err;
  64.189  
  64.190  	tp->backend_id = domid;
  64.191  
  64.192 +	err = xenbus_alloc_evtchn(dev, &tp->evtchn);
  64.193 +	if (err)
  64.194 +		return err;
  64.195 +
  64.196  	err = bind_evtchn_to_irqhandler(tp->evtchn,
  64.197  					tpmif_int, SA_SAMPLE_RANDOM, "tpmif",
  64.198  					tp);
  64.199  	if (err <= 0) {
  64.200  		WPRINTK("bind_evtchn_to_irqhandler failed (err=%d)\n", err);
  64.201 -		return;
  64.202 +		return err;
  64.203  	}
  64.204  
  64.205  	tp->irq = err;
  64.206 +	return 0;
  64.207  }
  64.208  
  64.209  static struct xenbus_device_id tpmfront_ids[] = {
  64.210 @@ -488,19 +518,30 @@ static void __exit exit_tpm_xenbus(void)
  64.211  	xenbus_unregister_driver(&tpmfront);
  64.212  }
  64.213  
  64.214 -
  64.215 -static int
  64.216 -tpm_allocate_buffers(struct tpm_private *tp)
  64.217 +static int tpmif_allocate_tx_buffers(struct tpm_private *tp)
  64.218  {
  64.219  	unsigned int i;
  64.220  
  64.221 -	for (i = 0; i < TPMIF_TX_RING_SIZE; i++)
  64.222 +	for (i = 0; i < TPMIF_TX_RING_SIZE; i++) {
  64.223  		tp->tx_buffers[i] = tx_buffer_alloc();
  64.224 -	return 1;
  64.225 +		if (!tp->tx_buffers[i]) {
  64.226 +			tpmif_free_tx_buffers(tp);
  64.227 +			return -ENOMEM;
  64.228 +		}
  64.229 +	}
  64.230 +	return 0;
  64.231  }
  64.232  
  64.233 -static void
  64.234 -tpmif_rx_action(unsigned long priv)
  64.235 +static void tpmif_free_tx_buffers(struct tpm_private *tp)
  64.236 +{
  64.237 +	unsigned int i;
  64.238 +
  64.239 +	for (i = 0; i < TPMIF_TX_RING_SIZE; i++) {
  64.240 +		tx_buffer_free(tp->tx_buffers[i]);
  64.241 +	}
  64.242 +}
  64.243 +
  64.244 +static void tpmif_rx_action(unsigned long priv)
  64.245  {
  64.246  	struct tpm_private *tp = (struct tpm_private *)priv;
  64.247  
  64.248 @@ -545,8 +586,7 @@ exit:
  64.249  }
  64.250  
  64.251  
  64.252 -static irqreturn_t
  64.253 -tpmif_int(int irq, void *tpm_priv, struct pt_regs *ptregs)
  64.254 +static irqreturn_t tpmif_int(int irq, void *tpm_priv, struct pt_regs *ptregs)
  64.255  {
  64.256  	struct tpm_private *tp = tpm_priv;
  64.257  	unsigned long flags;
  64.258 @@ -560,10 +600,9 @@ tpmif_int(int irq, void *tpm_priv, struc
  64.259  }
  64.260  
  64.261  
  64.262 -static int
  64.263 -tpm_xmit(struct tpm_private *tp,
  64.264 -         const u8 * buf, size_t count, int isuserbuffer,
  64.265 -         void *remember)
  64.266 +static int tpm_xmit(struct tpm_private *tp,
  64.267 +                    const u8 * buf, size_t count, int isuserbuffer,
  64.268 +                    void *remember)
  64.269  {
  64.270  	tpmif_tx_request_t *tx;
  64.271  	TPMIF_RING_IDX i;
  64.272 @@ -693,8 +732,7 @@ static void tpmif_set_connected_state(st
  64.273   * =================================================================
  64.274   */
  64.275  
  64.276 -static int __init
  64.277 -tpmif_init(void)
  64.278 +static int __init tpmif_init(void)
  64.279  {
  64.280  	IPRINTK("Initialising the vTPM driver.\n");
  64.281  	if ( gnttab_alloc_grant_references ( TPMIF_TX_RING_SIZE,
  64.282 @@ -709,8 +747,7 @@ tpmif_init(void)
  64.283  
  64.284  module_init(tpmif_init);
  64.285  
  64.286 -static void __exit
  64.287 -tpmif_exit(void)
  64.288 +static void __exit tpmif_exit(void)
  64.289  {
  64.290  	exit_tpm_xenbus();
  64.291  	gnttab_free_grant_references(gref_head);

    65.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Tue Apr 11 13:55:47 2006 -0600
    65.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile	Tue Apr 11 18:54:18 2006 -0600
    65.3 @@ -1,4 +1,8 @@
    65.4  obj-y	+= xenbus.o
    65.5 +obj-$(CONFIG_XEN_BACKEND) += xenbus_be.o
    65.6 +
    65.7 +xenbus_be-objs =
    65.8 +xenbus_be-objs += xenbus_backend_client.o
    65.9  
   65.10  xenbus-objs =
   65.11  xenbus-objs += xenbus_client.o

    66.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    66.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_backend_client.c	Tue Apr 11 18:54:18 2006 -0600
    66.3 @@ -0,0 +1,173 @@
    66.4 +/******************************************************************************
    66.5 + * Backend-client-facing interface for the Xenbus driver.  In other words, the
    66.6 + * interface between the Xenbus and the device-specific code in the backend
    66.7 + * driver.
    66.8 + *
    66.9 + * Copyright (C) 2005-2006 XenSource Ltd
   66.10 + * 
   66.11 + * This program is free software; you can redistribute it and/or
   66.12 + * modify it under the terms of the GNU General Public License version 2
   66.13 + * as published by the Free Software Foundation; or, when distributed
   66.14 + * separately from the Linux kernel or incorporated into other
   66.15 + * software packages, subject to the following license:
   66.16 + * 
   66.17 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   66.18 + * of this source file (the "Software"), to deal in the Software without
   66.19 + * restriction, including without limitation the rights to use, copy, modify,
   66.20 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   66.21 + * and to permit persons to whom the Software is furnished to do so, subject to
   66.22 + * the following conditions:
   66.23 + * 
   66.24 + * The above copyright notice and this permission notice shall be included in
   66.25 + * all copies or substantial portions of the Software.
   66.26 + * 
   66.27 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   66.28 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   66.29 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   66.30 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   66.31 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   66.32 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   66.33 + * IN THE SOFTWARE.
   66.34 + */
   66.35 +
   66.36 +#include <xen/gnttab.h>
   66.37 +#include <xen/xenbus.h>
   66.38 +#include <xen/driver_util.h>
   66.39 +
   66.40 +/* Based on Rusty Russell's skeleton driver's map_page */
   66.41 +int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
   66.42 +{
   66.43 +	struct gnttab_map_grant_ref op = {
   66.44 +		.flags = GNTMAP_host_map,
   66.45 +		.ref   = gnt_ref,
   66.46 +		.dom   = dev->otherend_id,
   66.47 +	};
   66.48 +	struct vm_struct *area;
   66.49 +
   66.50 +	*vaddr = NULL;
   66.51 +
   66.52 +	area = alloc_vm_area(PAGE_SIZE);
   66.53 +	if (!area)
   66.54 +		return -ENOMEM;
   66.55 +
   66.56 +	op.host_addr = (unsigned long)area->addr;
   66.57 +
   66.58 +	lock_vm_area(area);
   66.59 +	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1));
   66.60 +	unlock_vm_area(area);
   66.61 +
   66.62 +	if (op.status != GNTST_okay) {
   66.63 +		free_vm_area(area);
   66.64 +		xenbus_dev_fatal(dev, op.status,
   66.65 +				 "mapping in shared page %d from domain %d",
   66.66 +				 gnt_ref, dev->otherend_id);
   66.67 +		return op.status;
   66.68 +	}
   66.69 +
   66.70 +	/* Stuff the handle in an unused field */
   66.71 +	area->phys_addr = (unsigned long)op.handle;
   66.72 +
   66.73 +	*vaddr = area->addr;
   66.74 +	return 0;
   66.75 +}
   66.76 +EXPORT_SYMBOL_GPL(xenbus_map_ring_valloc);
   66.77 +
   66.78 +
   66.79 +int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
   66.80 +		   grant_handle_t *handle, void *vaddr)
   66.81 +{
   66.82 +	struct gnttab_map_grant_ref op = {
   66.83 +		.host_addr = (unsigned long)vaddr,
   66.84 +		.flags     = GNTMAP_host_map,
   66.85 +		.ref       = gnt_ref,
   66.86 +		.dom       = dev->otherend_id,
   66.87 +	};
   66.88 +
   66.89 +	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1));
   66.90 +
   66.91 +	if (op.status != GNTST_okay) {
   66.92 +		xenbus_dev_fatal(dev, op.status,
   66.93 +				 "mapping in shared page %d from domain %d",
   66.94 +				 gnt_ref, dev->otherend_id);
   66.95 +	} else
   66.96 +		*handle = op.handle;
   66.97 +
   66.98 +	return op.status;
   66.99 +}
  66.100 +EXPORT_SYMBOL_GPL(xenbus_map_ring);
  66.101 +
  66.102 +
  66.103 +/* Based on Rusty Russell's skeleton driver's unmap_page */
  66.104 +int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr)
  66.105 +{
  66.106 +	struct vm_struct *area;
  66.107 +	struct gnttab_unmap_grant_ref op = {
  66.108 +		.host_addr = (unsigned long)vaddr,
  66.109 +	};
  66.110 +
  66.111 +	/* It'd be nice if linux/vmalloc.h provided a find_vm_area(void *addr)
  66.112 +	 * method so that we don't have to muck with vmalloc internals here.
  66.113 +	 * We could force the user to hang on to their struct vm_struct from
  66.114 +	 * xenbus_map_ring_valloc, but these 6 lines considerably simplify
  66.115 +	 * this API.
  66.116 +	 */
  66.117 +	read_lock(&vmlist_lock);
  66.118 +	for (area = vmlist; area != NULL; area = area->next) {
  66.119 +		if (area->addr == vaddr)
  66.120 +			break;
  66.121 +	}
  66.122 +	read_unlock(&vmlist_lock);
  66.123 +
  66.124 +	if (!area) {
  66.125 +		xenbus_dev_error(dev, -ENOENT,
  66.126 +				 "can't find mapped virtual address %p", vaddr);
  66.127 +		return GNTST_bad_virt_addr;
  66.128 +	}
  66.129 +
  66.130 +	op.handle = (grant_handle_t)area->phys_addr;
  66.131 +
  66.132 +	lock_vm_area(area);
  66.133 +	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1));
  66.134 +	unlock_vm_area(area);
  66.135 +
  66.136 +	if (op.status == GNTST_okay)
  66.137 +		free_vm_area(area);
  66.138 +	else
  66.139 +		xenbus_dev_error(dev, op.status,
  66.140 +				 "unmapping page at handle %d error %d",
  66.141 +				 (int16_t)area->phys_addr, op.status);
  66.142 +
  66.143 +	return op.status;
  66.144 +}
  66.145 +EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree);
  66.146 +
  66.147 +
  66.148 +int xenbus_unmap_ring(struct xenbus_device *dev,
  66.149 +		     grant_handle_t handle, void *vaddr)
  66.150 +{
  66.151 +	struct gnttab_unmap_grant_ref op = {
  66.152 +		.host_addr = (unsigned long)vaddr,
  66.153 +		.handle    = handle,
  66.154 +	};
  66.155 +
  66.156 +	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1));
  66.157 +
  66.158 +	if (op.status != GNTST_okay)
  66.159 +		xenbus_dev_error(dev, op.status,
  66.160 +				 "unmapping page at handle %d error %d",
  66.161 +				 handle, op.status);
  66.162 +
  66.163 +	return op.status;
  66.164 +}
  66.165 +EXPORT_SYMBOL_GPL(xenbus_unmap_ring);
  66.166 +
  66.167 +
  66.168 +/*
  66.169 + * Local variables:
  66.170 + *  c-file-style: "linux"
  66.171 + *  indent-tabs-mode: t
  66.172 + *  c-indent-level: 8
  66.173 + *  c-basic-offset: 8
  66.174 + *  tab-width: 8
  66.175 + * End:
  66.176 + */

    67.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c	Tue Apr 11 13:55:47 2006 -0600
    67.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c	Tue Apr 11 18:54:18 2006 -0600
    67.3 @@ -84,9 +84,7 @@ int xenbus_watch_path2(struct xenbus_dev
    67.4  EXPORT_SYMBOL_GPL(xenbus_watch_path2);
    67.5  
    67.6  
    67.7 -int xenbus_switch_state(struct xenbus_device *dev,
    67.8 -			xenbus_transaction_t xbt,
    67.9 -			XenbusState state)
   67.10 +int xenbus_switch_state(struct xenbus_device *dev, XenbusState state)
   67.11  {
   67.12  	/* We check whether the state is currently set to the given value, and
   67.13  	   if not, then the state is set.  We don't want to unconditionally
   67.14 @@ -94,6 +92,12 @@ int xenbus_switch_state(struct xenbus_de
   67.15  	   unnecessarily.  Furthermore, if the node has gone, we don't write
   67.16  	   to it, as the device will be tearing down, and we don't want to
   67.17  	   resurrect that directory.
   67.18 +
   67.19 +	   Note that, because of this cached value of our state, this function
   67.20 +	   will not work inside a Xenstore transaction (something it was
   67.21 +	   trying to in the past) because dev->state would not get reset if
   67.22 +	   the transaction was aborted.
   67.23 +
   67.24  	 */
   67.25  
   67.26  	int current_state;
   67.27 @@ -102,12 +106,12 @@ int xenbus_switch_state(struct xenbus_de
   67.28  	if (state == dev->state)
   67.29  		return 0;
   67.30  
   67.31 -	err = xenbus_scanf(xbt, dev->nodename, "state", "%d",
   67.32 -			       &current_state);
   67.33 +	err = xenbus_scanf(XBT_NULL, dev->nodename, "state", "%d",
   67.34 +			   &current_state);
   67.35  	if (err != 1)
   67.36  		return 0;
   67.37  
   67.38 -	err = xenbus_printf(xbt, dev->nodename, "state", "%d", state);
   67.39 +	err = xenbus_printf(XBT_NULL, dev->nodename, "state", "%d", state);
   67.40  	if (err) {
   67.41  		if (state != XenbusStateClosing) /* Avoid looping */
   67.42  			xenbus_dev_fatal(dev, err, "writing new state");
   67.43 @@ -193,7 +197,7 @@ void xenbus_dev_fatal(struct xenbus_devi
   67.44  	_dev_error(dev, err, fmt, ap);
   67.45  	va_end(ap);
   67.46  
   67.47 -	xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
   67.48 +	xenbus_switch_state(dev, XenbusStateClosing);
   67.49  }
   67.50  EXPORT_SYMBOL_GPL(xenbus_dev_fatal);
   67.51  
   67.52 @@ -257,134 +261,6 @@ int xenbus_free_evtchn(struct xenbus_dev
   67.53  }
   67.54  
   67.55  
   67.56 -/* Based on Rusty Russell's skeleton driver's map_page */
   67.57 -int xenbus_map_ring_valloc(struct xenbus_device *dev, int gnt_ref, void **vaddr)
   67.58 -{
   67.59 -	struct gnttab_map_grant_ref op = {
   67.60 -		.flags = GNTMAP_host_map,
   67.61 -		.ref   = gnt_ref,
   67.62 -		.dom   = dev->otherend_id,
   67.63 -	};
   67.64 -	struct vm_struct *area;
   67.65 -
   67.66 -	*vaddr = NULL;
   67.67 -
   67.68 -	area = alloc_vm_area(PAGE_SIZE);
   67.69 -	if (!area)
   67.70 -		return -ENOMEM;
   67.71 -
   67.72 -	op.host_addr = (unsigned long)area->addr;
   67.73 -
   67.74 -	lock_vm_area(area);
   67.75 -	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1));
   67.76 -	unlock_vm_area(area);
   67.77 -
   67.78 -	if (op.status != GNTST_okay) {
   67.79 -		free_vm_area(area);
   67.80 -		xenbus_dev_fatal(dev, op.status,
   67.81 -				 "mapping in shared page %d from domain %d",
   67.82 -				 gnt_ref, dev->otherend_id);
   67.83 -		return op.status;
   67.84 -	}
   67.85 -
   67.86 -	/* Stuff the handle in an unused field */
   67.87 -	area->phys_addr = (unsigned long)op.handle;
   67.88 -
   67.89 -	*vaddr = area->addr;
   67.90 -	return 0;
   67.91 -}
   67.92 -EXPORT_SYMBOL_GPL(xenbus_map_ring_valloc);
   67.93 -
   67.94 -
   67.95 -int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
   67.96 -		   grant_handle_t *handle, void *vaddr)
   67.97 -{
   67.98 -	struct gnttab_map_grant_ref op = {
   67.99 -		.host_addr = (unsigned long)vaddr,
  67.100 -		.flags     = GNTMAP_host_map,
  67.101 -		.ref       = gnt_ref,
  67.102 -		.dom       = dev->otherend_id,
  67.103 -	};
  67.104 -
  67.105 -	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1));
  67.106 -
  67.107 -	if (op.status != GNTST_okay) {
  67.108 -		xenbus_dev_fatal(dev, op.status,
  67.109 -				 "mapping in shared page %d from domain %d",
  67.110 -				 gnt_ref, dev->otherend_id);
  67.111 -	} else
  67.112 -		*handle = op.handle;
  67.113 -
  67.114 -	return op.status;
  67.115 -}
  67.116 -EXPORT_SYMBOL_GPL(xenbus_map_ring);
  67.117 -
  67.118 -
  67.119 -/* Based on Rusty Russell's skeleton driver's unmap_page */
  67.120 -int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr)
  67.121 -{
  67.122 -	struct vm_struct *area;
  67.123 -	struct gnttab_unmap_grant_ref op = {
  67.124 -		.host_addr = (unsigned long)vaddr,
  67.125 -	};
  67.126 -
  67.127 -	/* It'd be nice if linux/vmalloc.h provided a find_vm_area(void *addr)
  67.128 -	 * method so that we don't have to muck with vmalloc internals here.
  67.129 -	 * We could force the user to hang on to their struct vm_struct from
  67.130 -	 * xenbus_map_ring_valloc, but these 6 lines considerably simplify
  67.131 -	 * this API.
  67.132 -	 */
  67.133 -	read_lock(&vmlist_lock);
  67.134 -	for (area = vmlist; area != NULL; area = area->next) {
  67.135 -		if (area->addr == vaddr)
  67.136 -			break;
  67.137 -	}
  67.138 -	read_unlock(&vmlist_lock);
  67.139 -
  67.140 -	if (!area) {
  67.141 -		xenbus_dev_error(dev, -ENOENT,
  67.142 -				 "can't find mapped virtual address %p", vaddr);
  67.143 -		return GNTST_bad_virt_addr;
  67.144 -	}
  67.145 -
  67.146 -	op.handle = (grant_handle_t)area->phys_addr;
  67.147 -
  67.148 -	lock_vm_area(area);
  67.149 -	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1));
  67.150 -	unlock_vm_area(area);
  67.151 -
  67.152 -	if (op.status == GNTST_okay)
  67.153 -		free_vm_area(area);
  67.154 -	else
  67.155 -		xenbus_dev_error(dev, op.status,
  67.156 -				 "unmapping page at handle %d error %d",
  67.157 -				 (int16_t)area->phys_addr, op.status);
  67.158 -
  67.159 -	return op.status;
  67.160 -}
  67.161 -EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree);
  67.162 -
  67.163 -
  67.164 -int xenbus_unmap_ring(struct xenbus_device *dev,
  67.165 -		     grant_handle_t handle, void *vaddr)
  67.166 -{
  67.167 -	struct gnttab_unmap_grant_ref op = {
  67.168 -		.host_addr = (unsigned long)vaddr,
  67.169 -		.handle    = handle,
  67.170 -	};
  67.171 -
  67.172 -	BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1));
  67.173 -
  67.174 -	if (op.status != GNTST_okay)
  67.175 -		xenbus_dev_error(dev, op.status,
  67.176 -				 "unmapping page at handle %d error %d",
  67.177 -				 handle, op.status);
  67.178 -
  67.179 -	return op.status;
  67.180 -}
  67.181 -EXPORT_SYMBOL_GPL(xenbus_unmap_ring);
  67.182 -
  67.183 -
  67.184  XenbusState xenbus_read_driver_state(const char *path)
  67.185  {
  67.186  	XenbusState result;

    68.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Tue Apr 11 13:55:47 2006 -0600
    68.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Tue Apr 11 18:54:18 2006 -0600
    68.3 @@ -3,7 +3,7 @@
    68.4   *
    68.5   * Copyright (C) 2005 Rusty Russell, IBM Corporation
    68.6   * Copyright (C) 2005 Mike Wray, Hewlett-Packard
    68.7 - * Copyright (C) 2005 XenSource Ltd
    68.8 + * Copyright (C) 2005, 2006 XenSource Ltd
    68.9   * 
   68.10   * This program is free software; you can redistribute it and/or
   68.11   * modify it under the terms of the GNU General Public License version 2
   68.12 @@ -49,6 +49,7 @@
   68.13  #include <xen/xenbus.h>
   68.14  #include <xen/xen_proc.h>
   68.15  #include <xen/evtchn.h>
   68.16 +#include <xen/features.h>
   68.17  
   68.18  #include "xenbus_comms.h"
   68.19  
   68.20 @@ -364,7 +365,7 @@ static int xenbus_dev_probe(struct devic
   68.21  	return 0;
   68.22  fail:
   68.23  	xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename);
   68.24 -	xenbus_switch_state(dev, XBT_NULL, XenbusStateClosed);
   68.25 +	xenbus_switch_state(dev, XenbusStateClosed);
   68.26  	return -ENODEV;
   68.27  }
   68.28  
   68.29 @@ -381,7 +382,7 @@ static int xenbus_dev_remove(struct devi
   68.30  	if (drv->remove)
   68.31  		drv->remove(dev);
   68.32  
   68.33 -	xenbus_switch_state(dev, XBT_NULL, XenbusStateClosed);
   68.34 +	xenbus_switch_state(dev, XenbusStateClosed);
   68.35  	return 0;
   68.36  }
   68.37  
   68.38 @@ -882,7 +883,7 @@ static int all_devices_ready_(struct dev
   68.39  	int *result = data;
   68.40  
   68.41  	if (xendev->state != XenbusStateConnected) {
   68.42 -		result = 0;
   68.43 +		*result = 0;
   68.44  		return 1;
   68.45  	}
   68.46  
   68.47 @@ -901,8 +902,6 @@ static int all_devices_ready(void)
   68.48  
   68.49  void xenbus_probe(void *unused)
   68.50  {
   68.51 -	int i;
   68.52 -
   68.53  	BUG_ON((xenstored_ready <= 0));
   68.54  
   68.55  	/* Enumerate devices in xenstore. */
   68.56 @@ -915,28 +914,6 @@ void xenbus_probe(void *unused)
   68.57  
   68.58  	/* Notify others that xenstore is up */
   68.59  	notifier_call_chain(&xenstore_chain, 0, NULL);
   68.60 -
   68.61 -	/* On a 10 second timeout, waiting for all devices currently
   68.62 -	   configured.  We need to do this to guarantee that the filesystems
   68.63 -	   and / or network devices needed for boot are available, before we
   68.64 -	   can allow the boot to proceed.
   68.65 -
   68.66 -	   A possible improvement here would be to have the tools add a
   68.67 -	   per-device flag to the store entry, indicating whether it is needed
   68.68 -	   at boot time.  This would allow people who knew what they were
   68.69 -	   doing to accelerate their boot slightly, but of course needs tools
   68.70 -	   or manual intervention to set up those flags correctly.
   68.71 -	 */
   68.72 -	for (i = 0; i < 10 * HZ; i++) {
   68.73 -		if (all_devices_ready())
   68.74 -			return;
   68.75 -
   68.76 -		set_current_state(TASK_INTERRUPTIBLE);
   68.77 -		schedule_timeout(1);
   68.78 -	}
   68.79 -
   68.80 -	printk(KERN_WARNING
   68.81 -	       "XENBUS: Timeout connecting to devices!\n");
   68.82  }
   68.83  
   68.84  
   68.85 @@ -983,6 +960,7 @@ static int xsd_port_read(char *page, cha
   68.86  static int __init xenbus_probe_init(void)
   68.87  {
   68.88  	int err = 0, dom0;
   68.89 +	unsigned long page = 0;
   68.90  
   68.91  	DPRINTK("");
   68.92  
   68.93 @@ -991,11 +969,9 @@ static int __init xenbus_probe_init(void
   68.94  		return -ENODEV;
   68.95  	}
   68.96  
   68.97 -	/* Register ourselves with the kernel bus & device subsystems */
   68.98 +	/* Register ourselves with the kernel bus subsystem */
   68.99  	bus_register(&xenbus_frontend.bus);
  68.100  	bus_register(&xenbus_backend.bus);
  68.101 -	device_register(&xenbus_frontend.dev);
  68.102 -	device_register(&xenbus_backend.dev);
  68.103  
  68.104  	/*
  68.105  	 * Domain0 doesn't have a store_evtchn or store_mfn yet.
  68.106 @@ -1003,11 +979,7 @@ static int __init xenbus_probe_init(void
  68.107  	dom0 = (xen_start_info->store_evtchn == 0);
  68.108  
  68.109  	if (dom0) {
  68.110 -
  68.111 -		unsigned long page;
  68.112  		evtchn_op_t op = { 0 };
  68.113 -		int ret;
  68.114 -
  68.115  
  68.116  		/* Allocate page. */
  68.117  		page = get_zeroed_page(GFP_KERNEL);
  68.118 @@ -1023,8 +995,10 @@ static int __init xenbus_probe_init(void
  68.119  		op.u.alloc_unbound.dom        = DOMID_SELF;
  68.120  		op.u.alloc_unbound.remote_dom = 0;
  68.121  
  68.122 -		ret = HYPERVISOR_event_channel_op(&op);
  68.123 -		BUG_ON(ret);
  68.124 +		err = HYPERVISOR_event_channel_op(&op);
  68.125 +		if (err == -ENOSYS)
  68.126 +			goto err;
  68.127 +		BUG_ON(err);
  68.128  		xen_start_info->store_evtchn = op.u.alloc_unbound.port;
  68.129  
  68.130  		/* And finally publish the above info in /proc/xen */
  68.131 @@ -1047,17 +1021,65 @@ static int __init xenbus_probe_init(void
  68.132  	if (err) {
  68.133  		printk(KERN_WARNING
  68.134  		       "XENBUS: Error initializing xenstore comms: %i\n", err);
  68.135 -		return err;
  68.136 +		goto err;
  68.137  	}
  68.138  
  68.139 +	/* Register ourselves with the kernel device subsystem */
  68.140 +	device_register(&xenbus_frontend.dev);
  68.141 +	device_register(&xenbus_backend.dev);
  68.142 +
  68.143  	if (!dom0)
  68.144  		xenbus_probe(NULL);
  68.145  
  68.146  	return 0;
  68.147 +
  68.148 + err:
  68.149 +	if (page)
  68.150 +		free_page(page);
  68.151 +
  68.152 +	/*
  68.153 +         * Do not unregister the xenbus front/backend buses here. The
  68.154 +         * buses must exist because front/backend drivers will use
  68.155 +         * them when they are registered.
  68.156 +         */
  68.157 +
  68.158 +	return err;
  68.159  }
  68.160  
  68.161  postcore_initcall(xenbus_probe_init);
  68.162  
  68.163 +
  68.164 +/*
  68.165 + * On a 10 second timeout, wait for all devices currently configured.  We need
  68.166 + * to do this to guarantee that the filesystems and / or network devices
  68.167 + * needed for boot are available, before we can allow the boot to proceed.
  68.168 + *
  68.169 + * This needs to be on a late_initcall, to happen after the frontend device
  68.170 + * drivers have been initialised, but before the root fs is mounted.
  68.171 + *
  68.172 + * A possible improvement here would be to have the tools add a per-device
  68.173 + * flag to the store entry, indicating whether it is needed at boot time.
  68.174 + * This would allow people who knew what they were doing to accelerate their
  68.175 + * boot slightly, but of course needs tools or manual intervention to set up
  68.176 + * those flags correctly.
  68.177 + */
  68.178 +static int __init wait_for_devices(void)
  68.179 +{
  68.180 +	unsigned long timeout = jiffies + 10*HZ;
  68.181 +
  68.182 +	while (time_before(jiffies, timeout)) {
  68.183 +		if (all_devices_ready())
  68.184 +			return 0;
  68.185 +		schedule_timeout_interruptible(HZ/10);
  68.186 +	}
  68.187 +
  68.188 +	printk(KERN_WARNING "XENBUS: Timeout connecting to devices!\n");
  68.189 +	return 0;
  68.190 +}
  68.191 +
  68.192 +late_initcall(wait_for_devices);
  68.193 +
  68.194 +
  68.195  /*
  68.196   * Local variables:
  68.197   *  c-file-style: "linux"

    69.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Apr 11 13:55:47 2006 -0600
    69.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Apr 11 18:54:18 2006 -0600
    69.3 @@ -685,6 +685,24 @@ void xs_resume(void)
    69.4  	up_write(&xs_state.suspend_mutex);
    69.5  }
    69.6  
    69.7 +static int xenwatch_handle_callback(void *data)
    69.8 +{
    69.9 +	struct xs_stored_msg *msg = data;
   69.10 +
   69.11 +	msg->u.watch.handle->callback(msg->u.watch.handle,
   69.12 +				      (const char **)msg->u.watch.vec,
   69.13 +				      msg->u.watch.vec_size);
   69.14 +
   69.15 +	kfree(msg->u.watch.vec);
   69.16 +	kfree(msg);
   69.17 +
   69.18 +	/* Kill this kthread if we were spawned just for this callback. */
   69.19 +	if (current->pid != xenwatch_pid)
   69.20 +		do_exit(0);
   69.21 +
   69.22 +	return 0;
   69.23 +}
   69.24 +
   69.25  static int xenwatch_thread(void *unused)
   69.26  {
   69.27  	struct list_head *ent;
   69.28 @@ -707,12 +725,11 @@ static int xenwatch_thread(void *unused)
   69.29  
   69.30  		if (ent != &watch_events) {
   69.31  			msg = list_entry(ent, struct xs_stored_msg, list);
   69.32 -			msg->u.watch.handle->callback(
   69.33 -				msg->u.watch.handle,
   69.34 -				(const char **)msg->u.watch.vec,
   69.35 -				msg->u.watch.vec_size);
   69.36 -			kfree(msg->u.watch.vec);
   69.37 -			kfree(msg);
   69.38 +			if (msg->u.watch.handle->flags & XBWF_new_thread)
   69.39 +				kthread_run(xenwatch_handle_callback,
   69.40 +					    msg, "xenwatch_cb");
   69.41 +			else
   69.42 +				xenwatch_handle_callback(msg);
   69.43  		}
   69.44  
   69.45  		mutex_unlock(&xenwatch_mutex);

    70.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h	Tue Apr 11 13:55:47 2006 -0600
    70.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h	Tue Apr 11 18:54:18 2006 -0600
    70.3 @@ -33,10 +33,9 @@
    70.4  #ifndef __HYPERCALL_H__
    70.5  #define __HYPERCALL_H__
    70.6  
    70.7 -#include <xen/interface/xen.h>
    70.8 -#include <xen/interface/sched.h>
    70.9 -#include <xen/interface/nmi.h>
   70.10 -#include <linux/errno.h>
   70.11 +#ifndef __HYPERVISOR_H__
   70.12 +# error "please don't include this file directly"
   70.13 +#endif
   70.14  
   70.15  #define __STR(x) #x
   70.16  #define STR(x) __STR(x)
   70.17 @@ -167,35 +166,17 @@ HYPERVISOR_fpu_taskswitch(
   70.18  }
   70.19  
   70.20  static inline int
   70.21 -HYPERVISOR_sched_op(
   70.22 +HYPERVISOR_sched_op_compat(
   70.23  	int cmd, unsigned long arg)
   70.24  {
   70.25 -	return _hypercall2(int, sched_op, cmd, arg);
   70.26 -}
   70.27 -
   70.28 -static inline int
   70.29 -HYPERVISOR_sched_op_new(
   70.30 -	int cmd, void *arg)
   70.31 -{
   70.32 -	return _hypercall2(int, sched_op_new, cmd, arg);
   70.33 +	return _hypercall2(int, sched_op_compat, cmd, arg);
   70.34  }
   70.35  
   70.36  static inline int
   70.37 -HYPERVISOR_poll(
   70.38 -	evtchn_port_t *ports, unsigned int nr_ports, u64 timeout)
   70.39 +HYPERVISOR_sched_op(
   70.40 +	int cmd, void *arg)
   70.41  {
   70.42 -	struct sched_poll sched_poll = {
   70.43 -		.ports = ports,
   70.44 -		.nr_ports = nr_ports,
   70.45 -		.timeout = jiffies_to_st(timeout)
   70.46 -	};
   70.47 -
   70.48 -	int rc = HYPERVISOR_sched_op_new(SCHEDOP_poll, &sched_poll);
   70.49 -
   70.50 -	if (rc == -ENOSYS)
   70.51 -		rc = HYPERVISOR_sched_op(SCHEDOP_yield, 0);
   70.52 -
   70.53 -	return rc;
   70.54 +	return _hypercall2(int, sched_op, cmd, arg);
   70.55  }
   70.56  
   70.57  static inline long
   70.58 @@ -327,8 +308,18 @@ static inline int
   70.59  HYPERVISOR_suspend(
   70.60  	unsigned long srec)
   70.61  {
   70.62 -	return _hypercall3(int, sched_op, SCHEDOP_shutdown,
   70.63 -			   SHUTDOWN_suspend, srec);
   70.64 +	struct sched_shutdown sched_shutdown = {
   70.65 +		.reason = SHUTDOWN_suspend
   70.66 +	};
   70.67 +
   70.68 +	int rc = _hypercall3(int, sched_op, SCHEDOP_shutdown,
   70.69 +			     &sched_shutdown, srec);
   70.70 +
   70.71 +	if (rc == -ENOSYS)
   70.72 +		rc = _hypercall3(int, sched_op_compat, SCHEDOP_shutdown,
   70.73 +				 SHUTDOWN_suspend, srec);
   70.74 +
   70.75 +	return rc;
   70.76  }
   70.77  
   70.78  static inline int
   70.79 @@ -338,6 +329,21 @@ HYPERVISOR_nmi_op(
   70.80  	return _hypercall2(int, nmi_op, op, arg);
   70.81  }
   70.82  
   70.83 +static inline int
   70.84 +HYPERVISOR_callback_op(
   70.85 +	int cmd, void *arg)
   70.86 +{
   70.87 +	return _hypercall2(int, callback_op, cmd, arg);
   70.88 +}
   70.89 +
   70.90 +static inline int
   70.91 +HYPERVISOR_xenoprof_op(
   70.92 +	int op, unsigned long arg1, unsigned long arg2)
   70.93 +{
   70.94 +	return _hypercall3(int, xenoprof_op, op, arg1, arg2);
   70.95 +}
   70.96 +
   70.97 +
   70.98  #endif /* __HYPERCALL_H__ */
   70.99  
  70.100  /*