1.1 --- a/Config.mk	Fri Aug 19 10:18:53 2005 +0000
     1.2 +++ b/Config.mk	Fri Aug 19 10:50:15 2005 +0000
     1.3 @@ -35,3 +35,11 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES)
     1.4  
     1.5  # Choose the best mirror to download linux kernel
     1.6  KERNEL_REPO = http://www.kernel.org
     1.7 +
     1.8 +# ACM_USE_SECURITY_POLICY is set to security policy of Xen
     1.9 +# Supported models are:
    1.10 +#	ACM_NULL_POLICY (ACM will not be built with this policy)
    1.11 +#	ACM_CHINESE_WALL_POLICY
    1.12 +#	ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY
    1.13 +#	ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
    1.14 +ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLICY

     2.1 --- a/docs/misc/shype4xen_readme.txt	Fri Aug 19 10:18:53 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,588 +0,0 @@
     2.4 -Copyright: IBM Corporation (C)
     2.5 -20 June 2005
     2.6 -Author: Reiner Sailer
     2.7 -
     2.8 -This document is a very short introduction into the sHype access control 
     2.9 -security architecture implementation and how it is perceived by users. It 
    2.10 -is a very preliminary draft  for the courageous ones to get "their feet wet" 
    2.11 -and to be able to give feedback (via the xen-devel/xense-devel mailing lists).
    2.12 -
    2.13 -Install:
    2.14 -
    2.15 -cd into xeno-unstable.bk 
    2.16 -(use --dry-run option if you want to test the patch only)
    2.17 -patch -p1 -g0 < *tools.diff
    2.18 -patch -p1 -g0 < *xen.diff
    2.19 -
    2.20 -(no rejects, probably some line offsets)
    2.21 -
    2.22 -make uninstall; make mrproper; make; ./install.sh should install the default 
    2.23 -sHype into Xen (rebuild your initrd images if necessary). Reboot.
    2.24 -
    2.25 -Debug output: there are two triggers for debug output:
    2.26 -a) General sHype debug:
    2.27 -    xeno-unstable.bk/xen/include/public/acm.h
    2.28 -    undefine ACM_DEBUG to switch this debug off
    2.29 -
    2.30 -b) sHype enforcement hook trace: This prints a small trace for each enforcement 
    2.31 -hook that is executed. The trigger is in
    2.32 -    xeno-unstable.bk/xen/include/acm/acm_hooks.h
    2.33 -    undefine ACM_TRACE_MODE to switch this debug off
    2.34 -
    2.35 -1. The default NULL policy
    2.36 -***************************
    2.37 -When you apply the patches and startup xen, you should at first not notice any 
    2.38 -difference because the default policy is the "NULL" policy, which as the name 
    2.39 -implies does not enforce anything.
    2.40 -
    2.41 -To display the currently enforced policy, use the policy tool under xeno-
    2.42 -unstable.bk/tools/policy: policy_tool getpolicy. You should see output like the 
    2.43 -one below.
    2.44 -
    2.45 -[root@laptop policy]#./policy_tool getpolicy
    2.46 -
    2.47 -Policy dump:
    2.48 -============
    2.49 -Magic     = 1debc.
    2.50 -PolVer    = aaaa0000.
    2.51 -Len       = 14.
    2.52 -Primary   = NULL policy (c=0, off=14).
    2.53 -Secondary = NULL policy (c=0, off=14).
    2.54 -No primary policy (NULL).
    2.55 -No secondary policy (NULL).
    2.56 -
    2.57 -Policy dump End.
    2.58 -
    2.59 -Since this is a dump of a binary policy, it's not pretty. The important parts 
    2.60 -are the "Primary" and "Secondary" policy fields set to "NULL policy". sHype 
    2.61 -currently allows to set two independent policies; thus the two SSID-REF parts 
    2.62 -shown in 'xm list'. Right here: primary policy only means this policy is 
    2.63 -checked first, the secondary policy is checked if the primary results in 
    2.64 -"permitted access". The result of the combined policy is "permitted" if both 
    2.65 -policies return permitted (NULL policy always returns permitted). The result is 
    2.66 -"denied" if at least one of the policies returns "denied". Look into xeno-
    2.67 -unstable.bk/xen/include/acm/acm_hooks.h for the general hook structure 
    2.68 -integrating the policy decisions (if you like, you won't need it for the rest 
    2.69 -of the Readme file).
    2.70 -
    2.71 -2. Setting Chinese Wall and Simple Type Enforcement policies:
    2.72 -*************************************************************
    2.73 -
    2.74 -We'll get fast to the point. However, in order to understand what we are doing, 
    2.75 -we must at least understand the purpose of the policies that we are going to 
    2.76 -enforce. The two policies presented here are just examples and the 
    2.77 -implementation encourages adding new policies easily.
    2.78 -
    2.79 -2.1. Chinese Wall policy: "decides whether a domain can be started based on 
    2.80 -this domain's ssidref and the ssidrefs of the currently running domains". 
    2.81 -Generally, the Chinese wall policy allows specifying certain types (or classes 
    2.82 -or categories, whatever the preferred word) that conflict; we usually assign a 
    2.83 -type to a workload and the set of types of those workloads running in a domain 
    2.84 -make up the type set for this domain.  Each domain is assigned a set of types 
    2.85 -through its SSID-REF (we register Chinese Wall as primary policy, so the 
    2.86 -ssidref used for determining the Chinese Wall types is the one annotated with 
    2.87 -"p:" in xm list) since each SSID-REF points at a set of types. We'll see how 
    2.88 -SSIDREFs are represented in Xen later when we will look at the policy. (A good 
    2.89 -read for Chinese Wall is: Brewer/Nash The Chinese Wall Security Policy 1989.)
    2.90 -
    2.91 -So let's assume the Chinese Wall policy we are running distinguishes 10 types: 
    2.92 -t0 ... t9. Let us assume further that each SSID-REF points to a set that 
    2.93 -includes exactly one type (attached to domains that run workloads of a single 
    2.94 -type). SSID-REF 0 points to {t0}, ssidref 1 points to {t1} ... 9 points to 
    2.95 -{t9}. [This is actually the example policy we are going to push into xen later]
    2.96 -
    2.97 -Now the Chinese Wall policy allows you to define "Conflict type sets" and it 
    2.98 -guarantees that of any conflict set at most one type is "running" at any time. 
    2.99 -As an example, we have defined 2 conflict set: {t2, t3} and {t0, t5, t6}. 
   2.100 -Specifying these conflict sets, sHype ensures that at most one type of each set 
   2.101 -is running (either t2 or t3 but not both; either t0 or t5 or t6 but not 
   2.102 -multiple of them).
   2.103 -
   2.104 -The effect is that administrators can define which workload types cannot run 
   2.105 -simultaneously on a single Xen system. This is useful to limit the covert 
   2.106 -timing channels between such payloads or to ensure that payloads don't 
   2.107 -interfere with each other through existing resource dependencies.
   2.108 -
   2.109 -2.2. Simple Type Enforcement (ste) policy: "decides whether two domains can 
   2.110 -share data, e.g., setup event channels or grant tables to each other, based on 
   2.111 -the two domains' ssidref. This, as the name says, is a simple policy. Think of 
   2.112 -each type as of a single color. Each domain has one or more colors, i.e., the 
   2.113 -domains ssid for the ste policy points to a set that has set one or multiple 
   2.114 -types. Let us assume in our example policy we differentiate 5 colors (types) 
   2.115 -and define 5 different ssids referenced by ssidref=0..4. Each ssid shall have 
   2.116 -exactly one type set, i.e., describes a uni-color. Only ssid(0) has all types 
   2.117 -set, i.e., has all defined colors.
   2.118 -
   2.119 -Sharing is enforced by the ste policy by requiring that two domains that want 
   2.120 -to establish an event channel or grant pages to each other must have a common 
   2.121 -color. Currently all domains communicate through DOM0 by default; i.e., Domain0 
   2.122 -will necessarily have all colors to be able to create domains (thus, we will 
   2.123 -assign ssidref(0) to Domain0 in our example below.
   2.124 -
   2.125 -More complex mandatory access control policies governing sharing will follow; 
   2.126 -such policies are more sophisticated than the "color" scheme above by allowing 
   2.127 -more flexible (and complex :_) access control decisions than "share a color" or 
   2.128 -"don't share a color" and will be able to express finer-grained policies.
   2.129 -
   2.130 -
   2.131 -2.3 Binary Policy:
   2.132 -In the future, we will have a policy tool that takes as input a more humane 
   2.133 -policy description, using types such as development, home-banking, donated-
   2.134 -Grid, CorpA-Payload ... and translates the respective policy into what we see 
   2.135 -today as the binary policy using 1s and 0s and sets of them. For now, we must 
   2.136 -live with the binary policy when working with sHype.
   2.137 -
   2.138 -    
   2.139 -2.4 Exemplary use of a real sHype policy on Xen. To activate a real policy, 
   2.140 -edit the file (yes, this will soon be a compile option):
   2.141 -  xeno-unstable.bk/xen/include/public/acm.h
   2.142 -  Change: #define ACM_USE_SECURITY_POLICY ACM_NULL_POLICY
   2.143 -   To : #define ACM_USE_SECURITY_POLICY ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
   2.144 -   cd xeno-unstable.bk
   2.145 -   make mrproper
   2.146 -   make uninstall (manually remove /etc/xen.old if necessary)
   2.147 -   make
   2.148 -   ./install.sh      (recreate your kernel initrd's if necessary)
   2.149 -   Reboot into new xen.gz
   2.150 -     
   2.151 -After booting, check out 'xm dmesg'; should show somewhere in the middle:
   2.152 -
   2.153 -(XEN) acm_init: Enforcing Primary CHINESE WALL policy, Secondary SIMPLE TYPE 
   2.154 -ENFORCEMENT policy.
   2.155 -
   2.156 -Even though you can activate those policies in any combination and also 
   2.157 -independently, the policy tool currently only supports setting the policy for 
   2.158 -the above combination.
   2.159 -
   2.160 -Now look at the minimal startup policy with:
   2.161 -                xeno-unstable.bk/tools/policytool getpolicy
   2.162 -
   2.163 -You should see something like:
   2.164 -
   2.165 -[root@laptop policy]# ./policy_tool getpolicy
   2.166 -
   2.167 -Policy dump:
   2.168 -============
   2.169 -Magic     = 1debc.
   2.170 -PolVer    = aaaa0000.
   2.171 -Len       = 36.
   2.172 -Primary   = CHINESE WALL policy (c=1, off=14).
   2.173 -Secondary = SIMPLE TYPE ENFORCEMENT policy (c=2, off=2c).
   2.174 -
   2.175 -
   2.176 -Chinese Wall policy:
   2.177 -====================
   2.178 -Max Types     = 1.
   2.179 -Max Ssidrefs  = 1.
   2.180 -Max ConfSets  = 1.
   2.181 -Ssidrefs Off  = 10.
   2.182 -Conflicts Off = 12.
   2.183 -Runing T. Off = 14.
   2.184 -C. Agg. Off   = 16.
   2.185 -
   2.186 -SSID To CHWALL-Type matrix:
   2.187 -
   2.188 -   ssidref 0:  00 
   2.189 -
   2.190 -Confict Sets:
   2.191 -
   2.192 -   c-set 0:    00 
   2.193 -
   2.194 -Running
   2.195 -Types:         00 
   2.196 -
   2.197 -Conflict
   2.198 -Aggregate Set: 00 
   2.199 -
   2.200 -
   2.201 -Simple Type Enforcement policy:
   2.202 -===============================
   2.203 -Max Types     = 1.
   2.204 -Max Ssidrefs  = 1.
   2.205 -Ssidrefs Off  = 8.
   2.206 -
   2.207 -SSID To STE-Type matrix:
   2.208 -
   2.209 -   ssidref 0: 01 
   2.210 -
   2.211 -
   2.212 -Policy dump End.
   2.213 -
   2.214 -This is a minimal policy (of little use), except it will disable starting any 
   2.215 -domain that does not have ssidref set to 0x0. The Chinese Wall policy has 
   2.216 -nothing to enforce and the ste policy only knows one type, which is set for the 
   2.217 -only defined ssidref.
   2.218 -
   2.219 -The item that defines the ssidref in a domain configuration is:
   2.220 -
   2.221 -ssidref = 0x12345678
   2.222 -
   2.223 -Where ssidref is interpreted as a 32bit number, where the lower 16bits become 
   2.224 -the ssidref for the primary policy and the higher 16bits become the ssidref for 
   2.225 -the secondary policy. sHype currently supports two policies but this is an 
   2.226 -implementation decision and can be extended if necessary.
   2.227 -
   2.228 -This reference defines the security information of a domain. The meaning of the 
   2.229 -SSID-REF depends on the policy, so we explain it when we explain the real 
   2.230 -policies.
   2.231 -
   2.232 -
   2.233 -Setting a new Security Policy:
   2.234 -******************************
   2.235 -The policy tool with all its current limitations has one usable example policy 
   2.236 -compiled-in. Please try at this time to use the setpolicy command:
   2.237 -       xeno-unstable.bk/tools/policy/policy_tool setpolicy
   2.238 -
   2.239 -You should see a dump of the policy you are setting. It should say at the very 
   2.240 -end: 
   2.241 -
   2.242 -Policy successfully set.
   2.243 -
   2.244 -Now try to dump the currently enforced policy, which is the policy we have just 
   2.245 -set and the dynamic security state information of this policy 
   2.246 -(<<< ... some additional explanations)
   2.247 -
   2.248 -[root@laptop policy]# ./policy_tool getpolicy
   2.249 -
   2.250 -Policy dump:
   2.251 -============
   2.252 -Magic     = 1debc.
   2.253 -PolVer    = aaaa0000.
   2.254 -Len       = 112.
   2.255 -Primary   = CHINESE WALL policy (c=1, off=14).
   2.256 -Secondary = SIMPLE TYPE ENFORCEMENT policy (c=2, off=d8).
   2.257 -
   2.258 -
   2.259 -Chinese Wall policy:
   2.260 -====================
   2.261 -Max Types     = a.
   2.262 -Max Ssidrefs  = 5.
   2.263 -Max ConfSets  = 2.
   2.264 -Ssidrefs Off  = 10.
   2.265 -Conflicts Off = 74.
   2.266 -Runing T. Off = 9c.
   2.267 -C. Agg. Off   = b0.
   2.268 -
   2.269 -SSID To CHWALL-Type matrix:
   2.270 -
   2.271 -   ssidref 0:  01 00 00 00 00 00 00 00 00 00  <<< type0 is set for ssidref0
   2.272 -   ssidref 1:  00 01 00 00 00 00 00 00 00 00 
   2.273 -   ssidref 2:  00 00 01 00 00 00 00 00 00 00 
   2.274 -   ssidref 3:  00 00 00 01 00 00 00 00 00 00 
   2.275 -   ssidref 4:  00 00 00 00 01 00 00 00 00 00  <<< type4 is set for ssidref4
   2.276 -                                              <<< types 5-9 are unused
   2.277 -Confict Sets:
   2.278 -
   2.279 -   c-set 0:    00 00 01 01 00 00 00 00 00 00  <<< type2 and type3 never run together
   2.280 -   c-set 1:    01 00 00 00 00 01 01 00 00 00  <<< only one of types 0, 5 or 6 
   2.281 -                                              <<<   can run simultaneously
   2.282 -Running
   2.283 -Types:         01 00 00 00 00 00 00 00 00 00  <<< ref-count for types of running domains
   2.284 -
   2.285 -Conflict
   2.286 -Aggregate Set: 00 00 00 00 00 01 01 00 00 00  <<< aggregated set of types that                  
   2.287 -                                              <<< cannot run because they 
   2.288 -                                              <<< are in conflict set 1 and
   2.289 -                                              <<< (domain 0 is running w t0)
   2.290 -                                             
   2.291 -
   2.292 -Simple Type Enforcement policy:
   2.293 -===============================
   2.294 -Max Types     = 5.
   2.295 -Max Ssidrefs  = 5.
   2.296 -Ssidrefs Off  = 8.
   2.297 -
   2.298 -SSID To STE-Type matrix:
   2.299 -
   2.300 -   ssidref 0: 01 01 01 01 01                  <<< ssidref0 points to a set that                  
   2.301 -                                              <<< has all types set (colors)
   2.302 -   ssidref 1: 00 01 00 00 00                  <<< ssidref1 has color1 set
   2.303 -   ssidref 2: 00 00 01 00 00                  <<< ...
   2.304 -   ssidref 3: 00 00 00 01 00 
   2.305 -   ssidref 4: 00 00 00 00 01 
   2.306 -
   2.307 -
   2.308 -Policy dump End.
   2.309 -
   2.310 -
   2.311 -This is a small example policy with which we will demonstrate the enforcement.
   2.312 -
   2.313 -Starting Domains with policy enforcement
   2.314 -========================================
   2.315 -Now let us play with this policy. 
   2.316 -
   2.317 -Define 3 or 4 domain configurations. I use the following config using a ramdisk 
   2.318 -only and about 8MBytes of memory for each DomU (test purposes):
   2.319 -
   2.320 -#-------configuration xmsec1-------------------------
   2.321 -kernel = "/boot/vmlinuz-2.6.11-xenU"
   2.322 -ramdisk="/boot/U1_ramdisk.img"
   2.323 -#security reference identifier
   2.324 -ssidref= 0x00010001
   2.325 -memory = 10
   2.326 -name = "xmsec1"
   2.327 -cpu = -1   # leave to Xen to pick
   2.328 -# Number of network interfaces. Default is 1.
   2.329 -nics=1
   2.330 -dhcp="dhcp"
   2.331 -#-----------------------------------------------------
   2.332 -
   2.333 -xmsec2 and xmsec3 look the same except for the name and the ssidref line. Use 
   2.334 -your domain config file and add "ssidref = 0x00010001" to the first (xmsec1),  
   2.335 -"ssidref= 0x00020002" to the second (call it xmsec2), and "ssidref=0x00030003"  
   2.336 -to the third (we will call this one xmsec3).
   2.337 -
   2.338 -First start xmsec1: xm create -c xmsec1 (succeeds)
   2.339 -
   2.340 -Then
   2.341 -[root@laptop policy]# xm list 
   2.342 -Name              Id  Mem(MB)  CPU  State  Time(s)  Console  
   2.343 -Domain-0           0      620   0  r----     42.3            s:00/p:00
   2.344 -xmnosec            1        9   0  -b---      0.3    9601    s:00/p:05
   2.345 -xmsec1             2        9   0  -b---      0.2    9602    s:01/p:01
   2.346 -
   2.347 -Shows a new domain xmsec1 running with primary (here: chinese wall) ssidref 1 
   2.348 -and secondary (here: simple type enforcement) ssidref 1. The ssidrefs are  
   2.349 -independent and can differ for a domain.
   2.350 -
   2.351 -[root@laptop policy]# ./policy_tool getpolicy
   2.352 -
   2.353 -Policy dump:
   2.354 -============
   2.355 -Magic     = 1debc.
   2.356 -PolVer    = aaaa0000.
   2.357 -Len       = 112.
   2.358 -Primary   = CHINESE WALL policy (c=1, off=14).
   2.359 -Secondary = SIMPLE TYPE ENFORCEMENT policy (c=2, off=d8).
   2.360 -
   2.361 -
   2.362 -Chinese Wall policy:
   2.363 -====================
   2.364 -Max Types     = a.
   2.365 -Max Ssidrefs  = 5.
   2.366 -Max ConfSets  = 2.
   2.367 -Ssidrefs Off  = 10.
   2.368 -Conflicts Off = 74.
   2.369 -Runing T. Off = 9c.
   2.370 -C. Agg. Off   = b0.
   2.371 -
   2.372 -SSID To CHWALL-Type matrix:
   2.373 -
   2.374 -   ssidref 0:  01 00 00 00 00 00 00 00 00 00
   2.375 -   ssidref 1:  00 01 00 00 00 00 00 00 00 00
   2.376 -   ssidref 2:  00 00 01 00 00 00 00 00 00 00
   2.377 -   ssidref 3:  00 00 00 01 00 00 00 00 00 00
   2.378 -   ssidref 4:  00 00 00 00 01 00 00 00 00 00
   2.379 -
   2.380 -Confict Sets:
   2.381 -
   2.382 -   c-set 0:    00 00 01 01 00 00 00 00 00 00
   2.383 -   c-set 1:    01 00 00 00 00 01 01 00 00 00   <<< t1 is not part of any c-set
   2.384 -
   2.385 -Running
   2.386 -Types:         01 01 00 00 00 00 00 00 00 00   <<< xmsec1 has ssidref 1->type1
   2.387 -                  ^^                           <<< ref-count at position 1 incr
   2.388 -Conflict
   2.389 -Aggregate Set: 00 00 00 00 00 01 01 00 00 00   <<< domain 1 was allowed to       
   2.390 -                                               <<< start since type 1 was not
   2.391 -                                               <<< in conflict with running 
   2.392 -                                               <<< types
   2.393 -                                            
   2.394 -Simple Type Enforcement policy:
   2.395 -===============================
   2.396 -Max Types     = 5.
   2.397 -Max Ssidrefs  = 5.
   2.398 -Ssidrefs Off  = 8.
   2.399 -
   2.400 -SSID To STE-Type matrix:
   2.401 -
   2.402 -   ssidref 0: 01 01 01 01 01           <<< the ste policy does not maintain; we
   2.403 -   ssidref 1: 00 01 00 00 00   <--     <<< see that domain xmsec1 has ste 
   2.404 -   ssidref 2: 00 00 01 00 00           <<< ssidref1->type1 and has this type in
   2.405 -   ssidref 3: 00 00 00 01 00           <<< common with dom0
   2.406 -   ssidref 4: 00 00 00 00 01
   2.407 -
   2.408 -
   2.409 -Policy dump End.
   2.410 -
   2.411 -Look at sHype output in xen dmesg:
   2.412 -
   2.413 -[root@laptop xen]# xm dmesg
   2.414 -.
   2.415 -.
   2.416 -[somewhere near the very end]
   2.417 -(XEN) chwall_init_domain_ssid: determined chwall_ssidref to 1.
   2.418 -(XEN) ste_init_domain_ssid.
   2.419 -(XEN) ste_init_domain_ssid: determined ste_ssidref to 1.
   2.420 -(XEN) acm_init_domain_ssid: Instantiated individual ssid for domain 0x01.
   2.421 -(XEN) chwall_post_domain_create.
   2.422 -(XEN) ste_pre_eventchannel_interdomain.
   2.423 -(XEN) ste_pre_eventchannel_interdomain: (evtchn 0 --> 1) common type #01.
   2.424 -(XEN) shype_authorize_domops.
   2.425 -(XEN) ste_pre_eventchannel_interdomain.
   2.426 -(XEN) ste_pre_eventchannel_interdomain: (evtchn 0 --> 1) common type #01.
   2.427 -(XEN) ste_pre_eventchannel_interdomain.
   2.428 -(XEN) ste_pre_eventchannel_interdomain: (evtchn 0 --> 1) common type #01.
   2.429 -
   2.430 -
   2.431 -You can see that the chinese wall policy does not complain and that the ste 
   2.432 -policy makes three access control decisions for three event-channels setup 
   2.433 -between domain 0 and the new domain 1. Each time, the two domains share the 
   2.434 -type1 and setting up the eventchannel is permitted.
   2.435 -
   2.436 -
   2.437 -Starting up a second domain xmsec2:
   2.438 -
   2.439 -[root@laptop xen]# xm create -c xmsec2
   2.440 -Using config file "xmsec2".
   2.441 -Started domain xmsec2, console on port 9602
   2.442 -************ REMOTE CONSOLE: CTRL-] TO QUIT ********
   2.443 -Linux version 2.6.11-xenU (root@laptop.home.org) (gcc version 3.4.2 20041017 
   2.444 -(Red Hat 3.4.2-6.fc3)) #1 Wed Mar 30 13:14:31 EST 2005
   2.445 -.
   2.446 -.
   2.447 -.
   2.448 -[root@laptop policy]# xm list
   2.449 -Name              Id  Mem(MB)  CPU  State  Time(s)  Console  
   2.450 -Domain-0           0      620   0  r----     71.7            s:00/p:00
   2.451 -xmsec1             1        9   0  -b---      0.3    9601    s:01/p:01
   2.452 -xmsec2             2        7   0  -b---      0.3    9602    s:02/p:02   << our domain runs both policies with ssidref 2
   2.453 -
   2.454 -
   2.455 -[root@laptop policy]# ./policy_tool getpolicy
   2.456 -
   2.457 -Policy dump:
   2.458 -============
   2.459 -Magic     = 1debc.
   2.460 -PolVer    = aaaa0000.
   2.461 -Len       = 112.
   2.462 -Primary   = CHINESE WALL policy (c=1, off=14).
   2.463 -Secondary = SIMPLE TYPE ENFORCEMENT policy (c=2, off=d8).
   2.464 -
   2.465 -
   2.466 -Chinese Wall policy:
   2.467 -====================
   2.468 -Max Types     = a.
   2.469 -Max Ssidrefs  = 5.
   2.470 -Max ConfSets  = 2.
   2.471 -Ssidrefs Off  = 10.
   2.472 -Conflicts Off = 74.
   2.473 -Runing T. Off = 9c.
   2.474 -C. Agg. Off   = b0.
   2.475 -
   2.476 -SSID To CHWALL-Type matrix:
   2.477 -
   2.478 -   ssidref 0:  01 00 00 00 00 00 00 00 00 00
   2.479 -   ssidref 1:  00 01 00 00 00 00 00 00 00 00
   2.480 -   ssidref 2:  00 00 01 00 00 00 00 00 00 00   <<< our domain has type 2 set
   2.481 -   ssidref 3:  00 00 00 01 00 00 00 00 00 00
   2.482 -   ssidref 4:  00 00 00 00 01 00 00 00 00 00
   2.483 -
   2.484 -Confict Sets:
   2.485 -
   2.486 -   c-set 0:    00 00 01 01 00 00 00 00 00 00   <<< t2 is in c-set0 with type 3
   2.487 -   c-set 1:    01 00 00 00 00 01 01 00 00 00
   2.488 -
   2.489 -Running
   2.490 -Types:         01 01 01 00 00 00 00 00 00 00   <<< t2 is running since the 
   2.491 -                     ^^                        <<< current aggregate conflict
   2.492 -                                               <<< set (see above) does not 
   2.493 -                                               <<< include type 2
   2.494 -Conflict
   2.495 -Aggregate Set: 00 00 00 01 00 01 01 00 00 00   <<< type 3 is added to the 
   2.496 -                                               <<< conflict aggregate
   2.497 -
   2.498 -
   2.499 -Simple Type Enforcement policy:
   2.500 -===============================
   2.501 -Max Types     = 5.
   2.502 -Max Ssidrefs  = 5.
   2.503 -Ssidrefs Off  = 8.
   2.504 -
   2.505 -SSID To STE-Type matrix:
   2.506 -
   2.507 -   ssidref 0: 01 01 01 01 01
   2.508 -   ssidref 1: 00 01 00 00 00
   2.509 -   ssidref 2: 00 00 01 00 00
   2.510 -   ssidref 3: 00 00 00 01 00
   2.511 -   ssidref 4: 00 00 00 00 01
   2.512 -
   2.513 -
   2.514 -Policy dump End.
   2.515 -
   2.516 -
   2.517 -The sHype xen dmesg output looks similar to the one above when starting the 
   2.518 -first domain.
   2.519 -
   2.520 -Now we start xmsec3 and it has ssidref3. Thus, it tries to run as type3 which 
   2.521 -conflicts with running type2 (from xmsec2). As expected, creating this domain 
   2.522 -fails for security policy enforcement reasons.
   2.523 -
   2.524 -[root@laptop xen]# xm create -c xmsec3
   2.525 -Using config file "xmsec3".
   2.526 -Error: Error creating domain: (22, 'Invalid argument')
   2.527 -[root@laptop xen]#
   2.528 -
   2.529 -[root@laptop xen]# xm dmesg
   2.530 -.
   2.531 -.
   2.532 -[somewhere near the very end]
   2.533 -(XEN) chwall_pre_domain_create.
   2.534 -(XEN) chwall_pre_domain_create: CHINESE WALL CONFLICT in type 03.
   2.535 -
   2.536 -xmsec3 ssidref3 points to type3, which is in the current conflict aggregate 
   2.537 -set. This domain cannot start until domain xmsec2 is destroyed, at which time 
   2.538 -the aggregate conflict set is reduced and type3 is excluded from it. Then, 
   2.539 -xmsec3 can start. Of course, afterwards, xmsec2 cannot be restarted. Try it.
   2.540 -
   2.541 -3. Policy tool
   2.542 -**************
   2.543 -toos/policy/policy_tool.c
   2.544 -
   2.545 -a) ./policy_tool getpolicy
   2.546 -      prints the currently enforced policy
   2.547 -      (see for example section 1.)
   2.548 -
   2.549 -b) ./policy_tool setpolicy
   2.550 -      sets a predefined and hardcoded security
   2.551 -      policy (the one described in section 2.)
   2.552 -
   2.553 -c) ./policy_tool dumpstats
   2.554 -      prints some status information about the caching
   2.555 -      of access control decisions (number of cache hits
   2.556 -      and number of policy evaluations for grant_table
   2.557 -      and event channels).
   2.558 -
   2.559 -d) ./policy_tool loadpolicy <binary_policy_file>
   2.560 -      sets the policy defined in the <binary_policy_file>
   2.561 -      please use the policy_processor that is posted to this
   2.562 -      mailing list to create such a binary policy from an XML
   2.563 -      policy description
   2.564 -
   2.565 -4. Policy interface:
   2.566 -********************
   2.567 -The Policy interface is working in "network-byte-order" (big endian). The reason for this
   2.568 -is that policy files/management should be portable and independent of the platforms.
   2.569 -
   2.570 -Our policy interface enables managers to create a single binary policy file in a trusted
   2.571 -environment and distributed it to multiple systems for enforcement.
   2.572 -
   2.573 -5. Booting with a binary policy:
   2.574 -********************************
   2.575 -The grub configuration file can be adapted to boot the hypervisor with an
   2.576 -already active policy. To do this, a binary policy file - this can be
   2.577 -the same file as used by the policy_tool - should be placed into the boot
   2.578 -partition. The following entry from the grub configuration file shows how
   2.579 -a binary policy can be added to the system during boot time. Note that the 
   2.580 -binary policy must be of the same type that the hypervisor was compiled 
   2.581 -for. The policy module line should also only be added as the last module
   2.582 -line if XEN was compiled with the access control module (ACM).
   2.583 -
   2.584 -title XEN0 3.0 Devel
   2.585 -	kernel /xen.gz dom0_mem=400000
   2.586 -	module /vmlinuz-2.6.12-xen0 root=/dev/hda2 ro console=tty0
   2.587 -	module /initrd-2.6.12-xen0.img
   2.588 -	module /xen_sample_policy.bin
   2.589 -
   2.590 -
   2.591 -====================end-of file=======================================

     3.1 --- a/docs/src/user.tex	Fri Aug 19 10:18:53 2005 +0000
     3.2 +++ b/docs/src/user.tex	Fri Aug 19 10:50:15 2005 +0000
     3.3 @@ -1763,7 +1763,7 @@ editing \path{grub.conf}.
     3.4   physical address in the memory map will be ignored. This parameter
     3.5   may be specified with a B, K, M or G suffix, representing bytes,
     3.6   kilobytes, megabytes and gigabytes respectively. The
     3.7 - default unit, if no suffix is specified, is bytes.
     3.8 + default unit, if no suffix is specified, is kilobytes.
     3.9  
    3.10  \item [dom0\_mem=xxx ] 
    3.11   Set the amount of memory to be allocated to domain0. In Xen 3.x the parameter

     4.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Fri Aug 19 10:18:53 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Fri Aug 19 10:50:15 2005 +0000
     4.3 @@ -541,7 +541,7 @@ CONFIG_IP_NF_MATCH_IPRANGE=m
     4.4  # CONFIG_IP_NF_MATCH_STATE is not set
     4.5  # CONFIG_IP_NF_MATCH_CONNTRACK is not set
     4.6  # CONFIG_IP_NF_MATCH_OWNER is not set
     4.7 -# CONFIG_IP_NF_MATCH_PHYSDEV is not set
     4.8 +CONFIG_IP_NF_MATCH_PHYSDEV=y
     4.9  # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
    4.10  # CONFIG_IP_NF_MATCH_REALM is not set
    4.11  # CONFIG_IP_NF_MATCH_SCTP is not set
    4.12 @@ -689,7 +689,7 @@ CONFIG_E1000=y
    4.13  # CONFIG_HAMACHI is not set
    4.14  # CONFIG_YELLOWFIN is not set
    4.15  # CONFIG_R8169 is not set
    4.16 -# CONFIG_SK98LIN is not set
    4.17 +CONFIG_SK98LIN=y
    4.18  # CONFIG_VIA_VELOCITY is not set
    4.19  CONFIG_TIGON3=y
    4.20  # CONFIG_BNX2 is not set

     5.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Fri Aug 19 10:18:53 2005 +0000
     5.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Fri Aug 19 10:50:15 2005 +0000
     5.3 @@ -480,7 +480,7 @@ CONFIG_IP_NF_MATCH_IPRANGE=m
     5.4  # CONFIG_IP_NF_MATCH_STATE is not set
     5.5  # CONFIG_IP_NF_MATCH_CONNTRACK is not set
     5.6  # CONFIG_IP_NF_MATCH_OWNER is not set
     5.7 -# CONFIG_IP_NF_MATCH_PHYSDEV is not set
     5.8 +CONFIG_IP_NF_MATCH_PHYSDEV=y
     5.9  # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
    5.10  # CONFIG_IP_NF_MATCH_REALM is not set
    5.11  # CONFIG_IP_NF_MATCH_SCTP is not set
    5.12 @@ -611,7 +611,7 @@ CONFIG_E1000=y
    5.13  # CONFIG_HAMACHI is not set
    5.14  # CONFIG_YELLOWFIN is not set
    5.15  # CONFIG_R8169 is not set
    5.16 -# CONFIG_SK98LIN is not set
    5.17 +CONFIG_SK98LIN=y
    5.18  # CONFIG_VIA_VELOCITY is not set
    5.19  CONFIG_TIGON3=y
    5.20  # CONFIG_BNX2 is not set

     6.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Fri Aug 19 10:18:53 2005 +0000
     6.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Fri Aug 19 10:50:15 2005 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  #
     6.5  # Automatically generated make config: don't edit
     6.6 -# Linux kernel version: 2.6.12.4-xenU
     6.7 -# Mon Aug 15 19:25:22 2005
     6.8 +# Linux kernel version: 2.6.12-xenU
     6.9 +# Thu Aug 18 11:15:14 2005
    6.10  #
    6.11  CONFIG_XEN=y
    6.12  CONFIG_ARCH_XEN=y
    6.13 @@ -270,7 +270,10 @@ CONFIG_IP_ROUTE_FWMARK=y
    6.14  CONFIG_IP_ROUTE_MULTIPATH=y
    6.15  # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
    6.16  CONFIG_IP_ROUTE_VERBOSE=y
    6.17 -# CONFIG_IP_PNP is not set
    6.18 +CONFIG_IP_PNP=y
    6.19 +CONFIG_IP_PNP_DHCP=y
    6.20 +CONFIG_IP_PNP_BOOTP=y
    6.21 +CONFIG_IP_PNP_RARP=y
    6.22  CONFIG_NET_IPIP=m
    6.23  CONFIG_NET_IPGRE=m
    6.24  CONFIG_NET_IPGRE_BROADCAST=y

     7.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/Makefile	Fri Aug 19 10:18:53 2005 +0000
     7.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/Makefile	Fri Aug 19 10:50:15 2005 +0000
     7.3 @@ -44,7 +44,7 @@ c-obj-$(CONFIG_HPET_TIMER) 	+= time_hpet
     7.4  c-obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
     7.5  c-obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
     7.6  c-obj-$(CONFIG_SMP_ALTERNATIVES)+= smpalts.o
     7.7 -c-obj-$(CONFIG_SWIOTLB)		+= swiotlb.o
     7.8 +obj-$(CONFIG_SWIOTLB)		+= swiotlb.o
     7.9  
    7.10  EXTRA_AFLAGS   := -traditional
    7.11  

     9.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/pci-dma.c	Fri Aug 19 10:18:53 2005 +0000
     9.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/pci-dma.c	Fri Aug 19 10:50:15 2005 +0000
     9.3 @@ -24,13 +24,14 @@ struct dma_coherent_mem {
     9.4  	unsigned long	*bitmap;
     9.5  };
     9.6  
     9.7 -static void iommu_bug(void)
     9.8 -{
     9.9 -	printk(KERN_ALERT "Fatal DMA error! Please use 'swiotlb=force'\n");
    9.10 -	BUG();
    9.11 -}
    9.12 -
    9.13 -#define IOMMU_BUG_ON(test) do { if (unlikely(test)) iommu_bug(); } while(0)
    9.14 +#define IOMMU_BUG_ON(test)				\
    9.15 +do {							\
    9.16 +	if (unlikely(test)) {				\
    9.17 +		printk(KERN_ALERT "Fatal DMA error! "	\
    9.18 +		       "Please use 'swiotlb=force'\n");	\
    9.19 +		BUG();					\
    9.20 +	}						\
    9.21 +} while (0)
    9.22  
    9.23  int
    9.24  dma_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,

    11.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smp.c	Fri Aug 19 10:18:53 2005 +0000
    11.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smp.c	Fri Aug 19 10:50:15 2005 +0000
    11.3 @@ -129,8 +129,6 @@ static inline int __prepare_ICR2 (unsign
    11.4  
    11.5  DECLARE_PER_CPU(int, ipi_to_evtchn[NR_IPIS]);
    11.6  
    11.7 -extern unsigned uber_debug;
    11.8 -
    11.9  static inline void __send_IPI_one(unsigned int cpu, int vector)
   11.10  {
   11.11  	unsigned int evtchn;
   11.12 @@ -144,9 +142,6 @@ static inline void __send_IPI_one(unsign
   11.13  		       synch_test_bit(evtchn, &s->evtchn_mask[0]))
   11.14  			;
   11.15  #endif
   11.16 -		if (uber_debug)
   11.17 -			printk("<0>Send ipi %d to %d evtchn %d.\n",
   11.18 -			       vector, cpu, evtchn);
   11.19  		notify_via_evtchn(evtchn);
   11.20  	} else
   11.21  		printk("send_IPI to unbound port %d/%d",
   11.22 @@ -605,7 +600,6 @@ irqreturn_t smp_call_function_interrupt(
   11.23  	void (*func) (void *info) = call_data->func;
   11.24  	void *info = call_data->info;
   11.25  	int wait = call_data->wait;
   11.26 -	extern unsigned uber_debug;
   11.27  
   11.28  	/*
   11.29  	 * Notify initiating CPU that I've grabbed the data and am
   11.30 @@ -617,9 +611,6 @@ irqreturn_t smp_call_function_interrupt(
   11.31  	 * At this point the info structure may be out of scope unless wait==1
   11.32  	 */
   11.33  	irq_enter();
   11.34 -	if (uber_debug && smp_processor_id())
   11.35 -		printk("<0>Processor %d calling %p.\n", smp_processor_id(),
   11.36 -		       func);
   11.37  	(*func)(info);
   11.38  	irq_exit();
   11.39  

    13.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/swiotlb.c	Fri Aug 19 10:18:53 2005 +0000
    13.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/swiotlb.c	Fri Aug 19 10:50:15 2005 +0000
    13.3 @@ -49,13 +49,14 @@ int swiotlb_force;
    13.4   * swiotlb_sync_single_*, to see if the memory was in fact allocated by this
    13.5   * API.
    13.6   */
    13.7 -static char *io_tlb_start, *io_tlb_end;
    13.8 +static char *iotlb_virt_start, *iotlb_virt_end;
    13.9 +static dma_addr_t iotlb_bus_start, iotlb_bus_end;
   13.10  
   13.11  /*
   13.12 - * The number of IO TLB blocks (in groups of 64) betweeen io_tlb_start and
   13.13 - * io_tlb_end.  This is command line adjustable via setup_io_tlb_npages.
   13.14 + * The number of IO TLB blocks (in groups of 64) betweeen iotlb_virt_start and
   13.15 + * iotlb_virt_end.  This is command line adjustable via setup_io_tlb_npages.
   13.16   */
   13.17 -static unsigned long io_tlb_nslabs;
   13.18 +static unsigned long iotlb_nslabs;
   13.19  
   13.20  /*
   13.21   * When the IOMMU overflows we return a fallback buffer. This sets the size.
   13.22 @@ -88,11 +89,11 @@ static DEFINE_SPINLOCK(io_tlb_lock);
   13.23  static int __init
   13.24  setup_io_tlb_npages(char *str)
   13.25  {
   13.26 +	/* Unlike ia64, the size is aperture in megabytes, not 'slabs'! */
   13.27  	if (isdigit(*str)) {
   13.28 -		io_tlb_nslabs = simple_strtoul(str, &str, 0) <<
   13.29 -			(PAGE_SHIFT - IO_TLB_SHIFT);
   13.30 -		/* avoid tail segment of size < IO_TLB_SEGSIZE */
   13.31 -		io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE);
   13.32 +		iotlb_nslabs = simple_strtoul(str, &str, 0) <<
   13.33 +			(20 - IO_TLB_SHIFT);
   13.34 +		iotlb_nslabs = ALIGN(iotlb_nslabs, IO_TLB_SEGSIZE);
   13.35  	}
   13.36  	if (*str == ',')
   13.37  		++str;
   13.38 @@ -114,45 +115,56 @@ setup_io_tlb_npages(char *str)
   13.39  void
   13.40  swiotlb_init_with_default_size (size_t default_size)
   13.41  {
   13.42 -	unsigned long i;
   13.43 +	unsigned long i, bytes;
   13.44  
   13.45 -	if (!io_tlb_nslabs) {
   13.46 -		io_tlb_nslabs = (default_size >> PAGE_SHIFT);
   13.47 -		io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE);
   13.48 +	if (!iotlb_nslabs) {
   13.49 +		iotlb_nslabs = (default_size >> IO_TLB_SHIFT);
   13.50 +		iotlb_nslabs = ALIGN(iotlb_nslabs, IO_TLB_SEGSIZE);
   13.51  	}
   13.52  
   13.53 +	bytes = iotlb_nslabs * (1UL << IO_TLB_SHIFT);
   13.54 +
   13.55  	/*
   13.56  	 * Get IO TLB memory from the low pages
   13.57  	 */
   13.58 -	io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs *
   13.59 -					       (1 << IO_TLB_SHIFT));
   13.60 -	if (!io_tlb_start)
   13.61 -		panic("Cannot allocate SWIOTLB buffer");
   13.62 +	iotlb_virt_start = alloc_bootmem_low_pages(bytes);
   13.63 +	if (!iotlb_virt_start)
   13.64 +		panic("Cannot allocate SWIOTLB buffer!\n"
   13.65 +		      "Use dom0_mem Xen boot parameter to reserve\n"
   13.66 +		      "some DMA memory (e.g., dom0_mem=-128M).\n");
   13.67  
   13.68 -	xen_create_contiguous_region(
   13.69 -		(unsigned long)io_tlb_start, 
   13.70 -		get_order(io_tlb_nslabs * (1 << IO_TLB_SHIFT)));
   13.71 +	for (i = 0; i < iotlb_nslabs; i += IO_TLB_SEGSIZE)
   13.72 +		xen_create_contiguous_region(
   13.73 +			(unsigned long)iotlb_virt_start + (i << IO_TLB_SHIFT),
   13.74 +			get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT));
   13.75  
   13.76 -	io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);
   13.77 +	iotlb_virt_end = iotlb_virt_start + bytes;
   13.78  
   13.79  	/*
   13.80  	 * Allocate and initialize the free list array.  This array is used
   13.81  	 * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE
   13.82 -	 * between io_tlb_start and io_tlb_end.
   13.83 +	 * between iotlb_virt_start and iotlb_virt_end.
   13.84  	 */
   13.85 -	io_tlb_list = alloc_bootmem(io_tlb_nslabs * sizeof(int));
   13.86 -	for (i = 0; i < io_tlb_nslabs; i++)
   13.87 +	io_tlb_list = alloc_bootmem(iotlb_nslabs * sizeof(int));
   13.88 +	for (i = 0; i < iotlb_nslabs; i++)
   13.89   		io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE);
   13.90  	io_tlb_index = 0;
   13.91  	io_tlb_orig_addr = alloc_bootmem(
   13.92 -		io_tlb_nslabs * sizeof(*io_tlb_orig_addr));
   13.93 +		iotlb_nslabs * sizeof(*io_tlb_orig_addr));
   13.94  
   13.95  	/*
   13.96  	 * Get the overflow emergency buffer
   13.97  	 */
   13.98  	io_tlb_overflow_buffer = alloc_bootmem_low(io_tlb_overflow);
   13.99 -	printk(KERN_INFO "Placing software IO TLB between 0x%lx - 0x%lx\n",
  13.100 -	       virt_to_bus(io_tlb_start), virt_to_bus(io_tlb_end-1));
  13.101 +	iotlb_bus_start = virt_to_bus(iotlb_virt_start);
  13.102 +	iotlb_bus_end   = iotlb_bus_start + bytes;
  13.103 +	printk(KERN_INFO "Software IO TLB enabled: \n"
  13.104 +	       " Aperture:     %lu megabytes\n"
  13.105 +	       " Bus range:    0x%016lx - 0x%016lx\n"
  13.106 +	       " Kernel range: 0x%016lx - 0x%016lx\n",
  13.107 +	       bytes >> 20,
  13.108 +	       (unsigned long)iotlb_bus_start, (unsigned long)iotlb_bus_end,
  13.109 +	       (unsigned long)iotlb_virt_start, (unsigned long)iotlb_virt_end);
  13.110  }
  13.111  
  13.112  void
  13.113 @@ -240,7 +252,7 @@ map_single(struct device *hwdev, struct 
  13.114  	{
  13.115  		wrap = index = ALIGN(io_tlb_index, stride);
  13.116  
  13.117 -		if (index >= io_tlb_nslabs)
  13.118 +		if (index >= iotlb_nslabs)
  13.119  			wrap = index = 0;
  13.120  
  13.121  		do {
  13.122 @@ -260,7 +272,7 @@ map_single(struct device *hwdev, struct 
  13.123  				      IO_TLB_SEGSIZE -1) && io_tlb_list[i];
  13.124  				     i--)
  13.125  					io_tlb_list[i] = ++count;
  13.126 -				dma_addr = io_tlb_start +
  13.127 +				dma_addr = iotlb_virt_start +
  13.128  					(index << IO_TLB_SHIFT);
  13.129  
  13.130  				/*
  13.131 @@ -268,13 +280,13 @@ map_single(struct device *hwdev, struct 
  13.132  				 * the next round.
  13.133  				 */
  13.134  				io_tlb_index = 
  13.135 -					((index + nslots) < io_tlb_nslabs
  13.136 +					((index + nslots) < iotlb_nslabs
  13.137  					 ? (index + nslots) : 0);
  13.138  
  13.139  				goto found;
  13.140  			}
  13.141  			index += stride;
  13.142 -			if (index >= io_tlb_nslabs)
  13.143 +			if (index >= iotlb_nslabs)
  13.144  				index = 0;
  13.145  		} while (index != wrap);
  13.146  
  13.147 @@ -304,7 +316,7 @@ unmap_single(struct device *hwdev, char 
  13.148  {
  13.149  	unsigned long flags;
  13.150  	int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
  13.151 -	int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
  13.152 +	int index = (dma_addr - iotlb_virt_start) >> IO_TLB_SHIFT;
  13.153  	struct phys_addr buffer = io_tlb_orig_addr[index];
  13.154  
  13.155  	/*
  13.156 @@ -345,7 +357,7 @@ unmap_single(struct device *hwdev, char 
  13.157  static void
  13.158  sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
  13.159  {
  13.160 -	int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
  13.161 +	int index = (dma_addr - iotlb_virt_start) >> IO_TLB_SHIFT;
  13.162  	struct phys_addr buffer = io_tlb_orig_addr[index];
  13.163  	BUG_ON((dir != DMA_FROM_DEVICE) && (dir != DMA_TO_DEVICE));
  13.164  	__sync_single(buffer, dma_addr, size, dir);
  13.165 @@ -431,11 +443,9 @@ void
  13.166  swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr, size_t size,
  13.167  		     int dir)
  13.168  {
  13.169 -	char *dma_addr = bus_to_virt(dev_addr);
  13.170 -
  13.171  	BUG_ON(dir == DMA_NONE);
  13.172 -	if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
  13.173 -		unmap_single(hwdev, dma_addr, size, dir);
  13.174 +	if ((dev_addr >= iotlb_bus_start) && (dev_addr < iotlb_bus_end))
  13.175 +		unmap_single(hwdev, bus_to_virt(dev_addr), size, dir);
  13.176  }
  13.177  
  13.178  /*
  13.179 @@ -452,22 +462,18 @@ void
  13.180  swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
  13.181  			    size_t size, int dir)
  13.182  {
  13.183 -	char *dma_addr = bus_to_virt(dev_addr);
  13.184 -
  13.185  	BUG_ON(dir == DMA_NONE);
  13.186 -	if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
  13.187 -		sync_single(hwdev, dma_addr, size, dir);
  13.188 +	if ((dev_addr >= iotlb_bus_start) && (dev_addr < iotlb_bus_end))
  13.189 +		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
  13.190  }
  13.191  
  13.192  void
  13.193  swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
  13.194  			       size_t size, int dir)
  13.195  {
  13.196 -	char *dma_addr = bus_to_virt(dev_addr);
  13.197 -
  13.198  	BUG_ON(dir == DMA_NONE);
  13.199 -	if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
  13.200 -		sync_single(hwdev, dma_addr, size, dir);
  13.201 +	if ((dev_addr >= iotlb_bus_start) && (dev_addr < iotlb_bus_end))
  13.202 +		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
  13.203  }
  13.204  
  13.205  /*
  13.206 @@ -603,11 +609,9 @@ void
  13.207  swiotlb_unmap_page(struct device *hwdev, dma_addr_t dma_address,
  13.208  		   size_t size, enum dma_data_direction direction)
  13.209  {
  13.210 -	char *dma_addr = bus_to_virt(dma_address);
  13.211 -
  13.212  	BUG_ON(direction == DMA_NONE);
  13.213 -	if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
  13.214 -		unmap_single(hwdev, dma_addr, size, direction);
  13.215 +	if ((dma_address >= iotlb_bus_start) && (dma_address < iotlb_bus_end))
  13.216 +		unmap_single(hwdev, bus_to_virt(dma_address), size, direction);
  13.217  }
  13.218  
  13.219  int

    16.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Fri Aug 19 10:18:53 2005 +0000
    16.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c	Fri Aug 19 10:50:15 2005 +0000
    16.3 @@ -59,124 +59,124 @@
    16.4  #ifndef CONFIG_XEN_SHADOW_MODE
    16.5  void xen_l1_entry_update(pte_t *ptr, pte_t val)
    16.6  {
    16.7 -    mmu_update_t u;
    16.8 -    u.ptr = virt_to_machine(ptr);
    16.9 -    u.val = pte_val_ma(val);
   16.10 -    BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.11 +	mmu_update_t u;
   16.12 +	u.ptr = virt_to_machine(ptr);
   16.13 +	u.val = pte_val_ma(val);
   16.14 +	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.15  }
   16.16  
   16.17  void xen_l2_entry_update(pmd_t *ptr, pmd_t val)
   16.18  {
   16.19 -    mmu_update_t u;
   16.20 -    u.ptr = virt_to_machine(ptr);
   16.21 -    u.val = pmd_val_ma(val);
   16.22 -    BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.23 +	mmu_update_t u;
   16.24 +	u.ptr = virt_to_machine(ptr);
   16.25 +	u.val = pmd_val_ma(val);
   16.26 +	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.27  }
   16.28  
   16.29  #ifdef CONFIG_X86_PAE
   16.30  void xen_l3_entry_update(pud_t *ptr, pud_t val)
   16.31  {
   16.32 -    mmu_update_t u;
   16.33 -    u.ptr = virt_to_machine(ptr);
   16.34 -    u.val = pud_val_ma(val);
   16.35 -    BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.36 +	mmu_update_t u;
   16.37 +	u.ptr = virt_to_machine(ptr);
   16.38 +	u.val = pud_val_ma(val);
   16.39 +	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.40  }
   16.41  #endif
   16.42  
   16.43  #ifdef CONFIG_X86_64
   16.44  void xen_l3_entry_update(pud_t *ptr, pud_t val)
   16.45  {
   16.46 -    mmu_update_t u;
   16.47 -    u.ptr = virt_to_machine(ptr);
   16.48 -    u.val = val.pud;
   16.49 -    BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.50 +	mmu_update_t u;
   16.51 +	u.ptr = virt_to_machine(ptr);
   16.52 +	u.val = val.pud;
   16.53 +	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.54  }
   16.55  
   16.56  void xen_l4_entry_update(pgd_t *ptr, pgd_t val)
   16.57  {
   16.58 -    mmu_update_t u;
   16.59 -    u.ptr = virt_to_machine(ptr);
   16.60 -    u.val = val.pgd;
   16.61 -    BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.62 +	mmu_update_t u;
   16.63 +	u.ptr = virt_to_machine(ptr);
   16.64 +	u.val = val.pgd;
   16.65 +	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.66  }
   16.67  #endif /* CONFIG_X86_64 */
   16.68  #endif /* CONFIG_XEN_SHADOW_MODE */
   16.69  
   16.70  void xen_machphys_update(unsigned long mfn, unsigned long pfn)
   16.71  {
   16.72 -    mmu_update_t u;
   16.73 -    u.ptr = (mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
   16.74 -    u.val = pfn;
   16.75 -    BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.76 +	mmu_update_t u;
   16.77 +	u.ptr = (mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
   16.78 +	u.val = pfn;
   16.79 +	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
   16.80  }
   16.81  
   16.82  void xen_pt_switch(unsigned long ptr)
   16.83  {
   16.84 -    struct mmuext_op op;
   16.85 -    op.cmd = MMUEXT_NEW_BASEPTR;
   16.86 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
   16.87 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
   16.88 +	struct mmuext_op op;
   16.89 +	op.cmd = MMUEXT_NEW_BASEPTR;
   16.90 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
   16.91 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
   16.92  }
   16.93  
   16.94  void xen_new_user_pt(unsigned long ptr)
   16.95  {
   16.96 -    struct mmuext_op op;
   16.97 -    op.cmd = MMUEXT_NEW_USER_BASEPTR;
   16.98 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
   16.99 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.100 +	struct mmuext_op op;
  16.101 +	op.cmd = MMUEXT_NEW_USER_BASEPTR;
  16.102 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.103 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.104  }
  16.105  
  16.106  void xen_tlb_flush(void)
  16.107  {
  16.108 -    struct mmuext_op op;
  16.109 -    op.cmd = MMUEXT_TLB_FLUSH_LOCAL;
  16.110 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.111 +	struct mmuext_op op;
  16.112 +	op.cmd = MMUEXT_TLB_FLUSH_LOCAL;
  16.113 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.114  }
  16.115  
  16.116  void xen_invlpg(unsigned long ptr)
  16.117  {
  16.118 -    struct mmuext_op op;
  16.119 -    op.cmd = MMUEXT_INVLPG_LOCAL;
  16.120 -    op.linear_addr = ptr & PAGE_MASK;
  16.121 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.122 +	struct mmuext_op op;
  16.123 +	op.cmd = MMUEXT_INVLPG_LOCAL;
  16.124 +	op.linear_addr = ptr & PAGE_MASK;
  16.125 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.126  }
  16.127  
  16.128  #ifdef CONFIG_SMP
  16.129  
  16.130  void xen_tlb_flush_all(void)
  16.131  {
  16.132 -    struct mmuext_op op;
  16.133 -    op.cmd = MMUEXT_TLB_FLUSH_ALL;
  16.134 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.135 +	struct mmuext_op op;
  16.136 +	op.cmd = MMUEXT_TLB_FLUSH_ALL;
  16.137 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.138  }
  16.139  
  16.140  void xen_tlb_flush_mask(cpumask_t *mask)
  16.141  {
  16.142 -    struct mmuext_op op;
  16.143 -    if ( cpus_empty(*mask) )
  16.144 -        return;
  16.145 -    op.cmd = MMUEXT_TLB_FLUSH_MULTI;
  16.146 -    op.vcpumask = mask->bits;
  16.147 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.148 +	struct mmuext_op op;
  16.149 +	if ( cpus_empty(*mask) )
  16.150 +		return;
  16.151 +	op.cmd = MMUEXT_TLB_FLUSH_MULTI;
  16.152 +	op.vcpumask = mask->bits;
  16.153 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.154  }
  16.155  
  16.156  void xen_invlpg_all(unsigned long ptr)
  16.157  {
  16.158 -    struct mmuext_op op;
  16.159 -    op.cmd = MMUEXT_INVLPG_ALL;
  16.160 -    op.linear_addr = ptr & PAGE_MASK;
  16.161 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.162 +	struct mmuext_op op;
  16.163 +	op.cmd = MMUEXT_INVLPG_ALL;
  16.164 +	op.linear_addr = ptr & PAGE_MASK;
  16.165 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.166  }
  16.167  
  16.168  void xen_invlpg_mask(cpumask_t *mask, unsigned long ptr)
  16.169  {
  16.170 -    struct mmuext_op op;
  16.171 -    if ( cpus_empty(*mask) )
  16.172 -        return;
  16.173 -    op.cmd = MMUEXT_INVLPG_MULTI;
  16.174 -    op.vcpumask = mask->bits;
  16.175 -    op.linear_addr = ptr & PAGE_MASK;
  16.176 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.177 +	struct mmuext_op op;
  16.178 +	if ( cpus_empty(*mask) )
  16.179 +		return;
  16.180 +	op.cmd = MMUEXT_INVLPG_MULTI;
  16.181 +	op.vcpumask = mask->bits;
  16.182 +	op.linear_addr = ptr & PAGE_MASK;
  16.183 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.184  }
  16.185  
  16.186  #endif /* CONFIG_SMP */
  16.187 @@ -184,221 +184,281 @@ void xen_invlpg_mask(cpumask_t *mask, un
  16.188  #ifndef CONFIG_XEN_SHADOW_MODE
  16.189  void xen_pgd_pin(unsigned long ptr)
  16.190  {
  16.191 -    struct mmuext_op op;
  16.192 +	struct mmuext_op op;
  16.193  #ifdef CONFIG_X86_64
  16.194 -    op.cmd = MMUEXT_PIN_L4_TABLE;
  16.195 +	op.cmd = MMUEXT_PIN_L4_TABLE;
  16.196  #elif defined(CONFIG_X86_PAE)
  16.197 -    op.cmd = MMUEXT_PIN_L3_TABLE;
  16.198 +	op.cmd = MMUEXT_PIN_L3_TABLE;
  16.199  #else
  16.200 -    op.cmd = MMUEXT_PIN_L2_TABLE;
  16.201 +	op.cmd = MMUEXT_PIN_L2_TABLE;
  16.202  #endif
  16.203 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.204 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.205 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.206 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.207  }
  16.208  
  16.209  void xen_pgd_unpin(unsigned long ptr)
  16.210  {
  16.211 -    struct mmuext_op op;
  16.212 -    op.cmd = MMUEXT_UNPIN_TABLE;
  16.213 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.214 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.215 +	struct mmuext_op op;
  16.216 +	op.cmd = MMUEXT_UNPIN_TABLE;
  16.217 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.218 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.219  }
  16.220  
  16.221  void xen_pte_pin(unsigned long ptr)
  16.222  {
  16.223 -    struct mmuext_op op;
  16.224 -    op.cmd = MMUEXT_PIN_L1_TABLE;
  16.225 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.226 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.227 +	struct mmuext_op op;
  16.228 +	op.cmd = MMUEXT_PIN_L1_TABLE;
  16.229 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.230 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.231  }
  16.232  
  16.233  void xen_pte_unpin(unsigned long ptr)
  16.234  {
  16.235 -    struct mmuext_op op;
  16.236 -    op.cmd = MMUEXT_UNPIN_TABLE;
  16.237 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.238 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.239 +	struct mmuext_op op;
  16.240 +	op.cmd = MMUEXT_UNPIN_TABLE;
  16.241 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.242 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.243  }
  16.244  
  16.245  #ifdef CONFIG_X86_64
  16.246  void xen_pud_pin(unsigned long ptr)
  16.247  {
  16.248 -    struct mmuext_op op;
  16.249 -    op.cmd = MMUEXT_PIN_L3_TABLE;
  16.250 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.251 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.252 +	struct mmuext_op op;
  16.253 +	op.cmd = MMUEXT_PIN_L3_TABLE;
  16.254 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.255 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.256  }
  16.257  
  16.258  void xen_pud_unpin(unsigned long ptr)
  16.259  {
  16.260 -    struct mmuext_op op;
  16.261 -    op.cmd = MMUEXT_UNPIN_TABLE;
  16.262 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.263 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.264 +	struct mmuext_op op;
  16.265 +	op.cmd = MMUEXT_UNPIN_TABLE;
  16.266 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.267 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.268  }
  16.269  
  16.270  void xen_pmd_pin(unsigned long ptr)
  16.271  {
  16.272 -    struct mmuext_op op;
  16.273 -    op.cmd = MMUEXT_PIN_L2_TABLE;
  16.274 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.275 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.276 +	struct mmuext_op op;
  16.277 +	op.cmd = MMUEXT_PIN_L2_TABLE;
  16.278 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.279 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.280  }
  16.281  
  16.282  void xen_pmd_unpin(unsigned long ptr)
  16.283  {
  16.284 -    struct mmuext_op op;
  16.285 -    op.cmd = MMUEXT_UNPIN_TABLE;
  16.286 -    op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.287 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.288 +	struct mmuext_op op;
  16.289 +	op.cmd = MMUEXT_UNPIN_TABLE;
  16.290 +	op.mfn = pfn_to_mfn(ptr >> PAGE_SHIFT);
  16.291 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.292  }
  16.293  #endif /* CONFIG_X86_64 */
  16.294  #endif /* CONFIG_XEN_SHADOW_MODE */
  16.295  
  16.296  void xen_set_ldt(unsigned long ptr, unsigned long len)
  16.297  {
  16.298 -    struct mmuext_op op;
  16.299 -    op.cmd = MMUEXT_SET_LDT;
  16.300 -    op.linear_addr = ptr;
  16.301 -    op.nr_ents = len;
  16.302 -    BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.303 +	struct mmuext_op op;
  16.304 +	op.cmd = MMUEXT_SET_LDT;
  16.305 +	op.linear_addr = ptr;
  16.306 +	op.nr_ents = len;
  16.307 +	BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
  16.308 +}
  16.309 +
  16.310 +/*
  16.311 + * Bitmap is indexed by page number. If bit is set, the page is part of a
  16.312 + * xen_create_contiguous_region() area of memory.
  16.313 + */
  16.314 +unsigned long *contiguous_bitmap;
  16.315 +
  16.316 +static void contiguous_bitmap_set(
  16.317 +	unsigned long first_page, unsigned long nr_pages)
  16.318 +{
  16.319 +	unsigned long start_off, end_off, curr_idx, end_idx;
  16.320 +
  16.321 +	curr_idx  = first_page / BITS_PER_LONG;
  16.322 +	start_off = first_page & (BITS_PER_LONG-1);
  16.323 +	end_idx   = (first_page + nr_pages) / BITS_PER_LONG;
  16.324 +	end_off   = (first_page + nr_pages) & (BITS_PER_LONG-1);
  16.325 +
  16.326 +	if (curr_idx == end_idx) {
  16.327 +		contiguous_bitmap[curr_idx] |=
  16.328 +			((1UL<<end_off)-1) & -(1UL<<start_off);
  16.329 +	} else {
  16.330 +		contiguous_bitmap[curr_idx] |= -(1UL<<start_off);
  16.331 +		while ( ++curr_idx < end_idx )
  16.332 +			contiguous_bitmap[curr_idx] = ~0UL;
  16.333 +		contiguous_bitmap[curr_idx] |= (1UL<<end_off)-1;
  16.334 +	}
  16.335 +}
  16.336 +
  16.337 +static void contiguous_bitmap_clear(
  16.338 +	unsigned long first_page, unsigned long nr_pages)
  16.339 +{
  16.340 +	unsigned long start_off, end_off, curr_idx, end_idx;
  16.341 +
  16.342 +	curr_idx  = first_page / BITS_PER_LONG;
  16.343 +	start_off = first_page & (BITS_PER_LONG-1);
  16.344 +	end_idx   = (first_page + nr_pages) / BITS_PER_LONG;
  16.345 +	end_off   = (first_page + nr_pages) & (BITS_PER_LONG-1);
  16.346 +
  16.347 +	if (curr_idx == end_idx) {
  16.348 +		contiguous_bitmap[curr_idx] &=
  16.349 +			-(1UL<<end_off) | ((1UL<<start_off)-1);
  16.350 +	} else {
  16.351 +		contiguous_bitmap[curr_idx] &= (1UL<<start_off)-1;
  16.352 +		while ( ++curr_idx != end_idx )
  16.353 +			contiguous_bitmap[curr_idx] = 0;
  16.354 +		contiguous_bitmap[curr_idx] &= -(1UL<<end_off);
  16.355 +	}
  16.356  }
  16.357  
  16.358  /* Ensure multi-page extents are contiguous in machine memory. */
  16.359  void xen_create_contiguous_region(unsigned long vstart, unsigned int order)
  16.360  {
  16.361 -    pgd_t         *pgd; 
  16.362 -    pud_t         *pud; 
  16.363 -    pmd_t         *pmd;
  16.364 -    pte_t         *pte;
  16.365 -    unsigned long  mfn, i, flags;
  16.366 +	pgd_t         *pgd; 
  16.367 +	pud_t         *pud; 
  16.368 +	pmd_t         *pmd;
  16.369 +	pte_t         *pte;
  16.370 +	unsigned long  mfn, i, flags;
  16.371  
  16.372 -    scrub_pages(vstart, 1 << order);
  16.373 +	scrub_pages(vstart, 1 << order);
  16.374  
  16.375 -    balloon_lock(flags);
  16.376 +	balloon_lock(flags);
  16.377  
  16.378 -    /* 1. Zap current PTEs, giving away the underlying pages. */
  16.379 -    for (i = 0; i < (1<<order); i++) {
  16.380 -        pgd = pgd_offset_k(vstart + (i*PAGE_SIZE));
  16.381 -        pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
  16.382 -        pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
  16.383 -        pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
  16.384 -        mfn = pte_mfn(*pte);
  16.385 -        BUG_ON(HYPERVISOR_update_va_mapping(
  16.386 -            vstart + (i*PAGE_SIZE), __pte_ma(0), 0));
  16.387 -        phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
  16.388 -            INVALID_P2M_ENTRY;
  16.389 -        BUG_ON(HYPERVISOR_dom_mem_op(
  16.390 -            MEMOP_decrease_reservation, &mfn, 1, 0) != 1);
  16.391 -    }
  16.392 +	/* 1. Zap current PTEs, giving away the underlying pages. */
  16.393 +	for (i = 0; i < (1<<order); i++) {
  16.394 +		pgd = pgd_offset_k(vstart + (i*PAGE_SIZE));
  16.395 +		pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
  16.396 +		pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
  16.397 +		pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
  16.398 +		mfn = pte_mfn(*pte);
  16.399 +		BUG_ON(HYPERVISOR_update_va_mapping(
  16.400 +			vstart + (i*PAGE_SIZE), __pte_ma(0), 0));
  16.401 +		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
  16.402 +			INVALID_P2M_ENTRY;
  16.403 +		BUG_ON(HYPERVISOR_dom_mem_op(
  16.404 +			MEMOP_decrease_reservation, &mfn, 1, 0) != 1);
  16.405 +	}
  16.406  
  16.407 -    /* 2. Get a new contiguous memory extent. */
  16.408 -    BUG_ON(HYPERVISOR_dom_mem_op(
  16.409 -	       MEMOP_increase_reservation, &mfn, 1, order | (32<<8)) != 1);
  16.410 +	/* 2. Get a new contiguous memory extent. */
  16.411 +	BUG_ON(HYPERVISOR_dom_mem_op(
  16.412 +		MEMOP_increase_reservation, &mfn, 1, order | (32<<8)) != 1);
  16.413  
  16.414 -    /* 3. Map the new extent in place of old pages. */
  16.415 -    for (i = 0; i < (1<<order); i++) {
  16.416 -        BUG_ON(HYPERVISOR_update_va_mapping(
  16.417 -            vstart + (i*PAGE_SIZE),
  16.418 -            __pte_ma(((mfn+i)<<PAGE_SHIFT)|__PAGE_KERNEL), 0));
  16.419 -        xen_machphys_update(mfn+i, (__pa(vstart)>>PAGE_SHIFT)+i);
  16.420 -        phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = mfn+i;
  16.421 -    }
  16.422 +	/* 3. Map the new extent in place of old pages. */
  16.423 +	for (i = 0; i < (1<<order); i++) {
  16.424 +		BUG_ON(HYPERVISOR_update_va_mapping(
  16.425 +			vstart + (i*PAGE_SIZE),
  16.426 +			pfn_pte_ma(mfn+i, PAGE_KERNEL), 0));
  16.427 +		xen_machphys_update(mfn+i, (__pa(vstart)>>PAGE_SHIFT)+i);
  16.428 +		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = mfn+i;
  16.429 +	}
  16.430  
  16.431 -    flush_tlb_all();
  16.432 +	flush_tlb_all();
  16.433  
  16.434 -    balloon_unlock(flags);
  16.435 +	contiguous_bitmap_set(__pa(vstart) >> PAGE_SHIFT, 1UL << order);
  16.436 +
  16.437 +	balloon_unlock(flags);
  16.438  }
  16.439  
  16.440  void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
  16.441  {
  16.442 -    pgd_t         *pgd; 
  16.443 -    pud_t         *pud; 
  16.444 -    pmd_t         *pmd;
  16.445 -    pte_t         *pte;
  16.446 -    unsigned long  mfn, i, flags;
  16.447 +	pgd_t         *pgd; 
  16.448 +	pud_t         *pud; 
  16.449 +	pmd_t         *pmd;
  16.450 +	pte_t         *pte;
  16.451 +	unsigned long  mfn, i, flags;
  16.452  
  16.453 -    scrub_pages(vstart, 1 << order);
  16.454 +	scrub_pages(vstart, 1 << order);
  16.455  
  16.456 -    balloon_lock(flags);
  16.457 +	balloon_lock(flags);
  16.458 +
  16.459 +	contiguous_bitmap_clear(__pa(vstart) >> PAGE_SHIFT, 1UL << order);
  16.460  
  16.461 -    /* 1. Zap current PTEs, giving away the underlying pages. */
  16.462 -    for (i = 0; i < (1<<order); i++) {
  16.463 -        pgd = pgd_offset_k(vstart + (i*PAGE_SIZE));
  16.464 -        pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
  16.465 -        pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
  16.466 -        pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
  16.467 -        mfn = pte_mfn(*pte);
  16.468 -        BUG_ON(HYPERVISOR_update_va_mapping(
  16.469 -            vstart + (i*PAGE_SIZE), __pte_ma(0), 0));
  16.470 -        phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
  16.471 -            INVALID_P2M_ENTRY;
  16.472 -        BUG_ON(HYPERVISOR_dom_mem_op(
  16.473 -            MEMOP_decrease_reservation, &mfn, 1, 0) != 1);
  16.474 -    }
  16.475 +	/* 1. Zap current PTEs, giving away the underlying pages. */
  16.476 +	for (i = 0; i < (1<<order); i++) {
  16.477 +		pgd = pgd_offset_k(vstart + (i*PAGE_SIZE));
  16.478 +		pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
  16.479 +		pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
  16.480 +		pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE)));
  16.481 +		mfn = pte_mfn(*pte);
  16.482 +		BUG_ON(HYPERVISOR_update_va_mapping(
  16.483 +			vstart + (i*PAGE_SIZE), __pte_ma(0), 0));
  16.484 +		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
  16.485 +			INVALID_P2M_ENTRY;
  16.486 +		BUG_ON(HYPERVISOR_dom_mem_op(
  16.487 +			MEMOP_decrease_reservation, &mfn, 1, 0) != 1);
  16.488 +	}
  16.489  
  16.490 -    /* 2. Map new pages in place of old pages. */
  16.491 -    for (i = 0; i < (1<<order); i++) {
  16.492 -        BUG_ON(HYPERVISOR_dom_mem_op(
  16.493 -            MEMOP_increase_reservation, &mfn, 1, 0) != 1);
  16.494 -        BUG_ON(HYPERVISOR_update_va_mapping(
  16.495 -            vstart + (i*PAGE_SIZE),
  16.496 -            __pte_ma((mfn<<PAGE_SHIFT)|__PAGE_KERNEL), 0));
  16.497 -        xen_machphys_update(mfn, (__pa(vstart)>>PAGE_SHIFT)+i);
  16.498 -        phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = mfn;
  16.499 -    }
  16.500 +	/* 2. Map new pages in place of old pages. */
  16.501 +	for (i = 0; i < (1<<order); i++) {
  16.502 +		BUG_ON(HYPERVISOR_dom_mem_op(
  16.503 +			MEMOP_increase_reservation, &mfn, 1, 0) != 1);
  16.504 +		BUG_ON(HYPERVISOR_update_va_mapping(
  16.505 +			vstart + (i*PAGE_SIZE),
  16.506 +			pfn_pte_ma(mfn, PAGE_KERNEL), 0));
  16.507 +		xen_machphys_update(mfn, (__pa(vstart)>>PAGE_SHIFT)+i);
  16.508 +		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = mfn;
  16.509 +	}
  16.510  
  16.511 -    flush_tlb_all();
  16.512 +	flush_tlb_all();
  16.513  
  16.514 -    balloon_unlock(flags);
  16.515 +	balloon_unlock(flags);
  16.516  }
  16.517  
  16.518  
  16.519  unsigned long allocate_empty_lowmem_region(unsigned long pages)
  16.520  {
  16.521 -    pgd_t         *pgd;
  16.522 -    pud_t         *pud; 
  16.523 -    pmd_t         *pmd;
  16.524 -    pte_t         *pte;
  16.525 -    unsigned long *pfn_array;
  16.526 -    unsigned long  vstart;
  16.527 -    unsigned long  i;
  16.528 -    unsigned int   order = get_order(pages*PAGE_SIZE);
  16.529 +	pgd_t         *pgd;
  16.530 +	pud_t         *pud; 
  16.531 +	pmd_t         *pmd;
  16.532 +	pte_t         *pte;
  16.533 +	unsigned long *pfn_array;
  16.534 +	unsigned long  vstart;
  16.535 +	unsigned long  i;
  16.536 +	unsigned int   order = get_order(pages*PAGE_SIZE);
  16.537  
  16.538 -    vstart = __get_free_pages(GFP_KERNEL, order);
  16.539 -    if ( vstart == 0 )
  16.540 -        return 0UL;
  16.541 +	vstart = __get_free_pages(GFP_KERNEL, order);
  16.542 +	if (vstart == 0)
  16.543 +		return 0UL;
  16.544  
  16.545 -    scrub_pages(vstart, 1 << order);
  16.546 +	scrub_pages(vstart, 1 << order);
  16.547  
  16.548 -    pfn_array = vmalloc((1<<order) * sizeof(*pfn_array));
  16.549 -    if ( pfn_array == NULL )
  16.550 -        BUG();
  16.551 +	pfn_array = vmalloc((1<<order) * sizeof(*pfn_array));
  16.552 +	BUG_ON(pfn_array == NULL);
  16.553  
  16.554 -    for ( i = 0; i < (1<<order); i++ )
  16.555 -    {
  16.556 -        pgd = pgd_offset_k(   (vstart + (i*PAGE_SIZE)));
  16.557 -        pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
  16.558 -        pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
  16.559 -        pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE))); 
  16.560 -        pfn_array[i] = pte_mfn(*pte);
  16.561 +	for (i = 0; i < (1<<order); i++) {
  16.562 +		pgd = pgd_offset_k(   (vstart + (i*PAGE_SIZE)));
  16.563 +		pud = pud_offset(pgd, (vstart + (i*PAGE_SIZE)));
  16.564 +		pmd = pmd_offset(pud, (vstart + (i*PAGE_SIZE)));
  16.565 +		pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE))); 
  16.566 +		pfn_array[i] = pte_mfn(*pte);
  16.567  #ifdef CONFIG_X86_64
  16.568 -        xen_l1_entry_update(pte, __pte(0));
  16.569 +		xen_l1_entry_update(pte, __pte(0));
  16.570  #else
  16.571 -        BUG_ON(HYPERVISOR_update_va_mapping(vstart + (i*PAGE_SIZE), 
  16.572 -					    __pte_ma(0), 0));
  16.573 +		BUG_ON(HYPERVISOR_update_va_mapping(vstart + (i*PAGE_SIZE), 
  16.574 +						    __pte_ma(0), 0));
  16.575  #endif
  16.576 -        phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
  16.577 -            INVALID_P2M_ENTRY;
  16.578 -    }
  16.579 +		phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] =
  16.580 +			INVALID_P2M_ENTRY;
  16.581 +	}
  16.582  
  16.583 -    flush_tlb_all();
  16.584 +	flush_tlb_all();
  16.585  
  16.586 -    balloon_put_pages(pfn_array, 1 << order);
  16.587 +	balloon_put_pages(pfn_array, 1 << order);
  16.588  
  16.589 -    vfree(pfn_array);
  16.590 +	vfree(pfn_array);
  16.591  
  16.592 -    return vstart;
  16.593 +	return vstart;
  16.594  }
  16.595  
  16.596  EXPORT_SYMBOL(allocate_empty_lowmem_region);
  16.597 +
  16.598 +/*
  16.599 + * Local variables:
  16.600 + *  c-file-style: "linux"
  16.601 + *  indent-tabs-mode: t
  16.602 + *  c-indent-level: 8
  16.603 + *  c-basic-offset: 8
  16.604 + *  tab-width: 8
  16.605 + * End:
  16.606 + */

    17.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c	Fri Aug 19 10:18:53 2005 +0000
    17.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c	Fri Aug 19 10:50:15 2005 +0000
    17.3 @@ -41,6 +41,8 @@
    17.4  #include <asm/sections.h>
    17.5  #include <asm-xen/hypervisor.h>
    17.6  
    17.7 +extern unsigned long *contiguous_bitmap;
    17.8 +
    17.9  #if defined(CONFIG_SWIOTLB)
   17.10  extern void swiotlb_init(void);
   17.11  int swiotlb;
   17.12 @@ -637,6 +639,11 @@ void __init mem_init(void)
   17.13  	int bad_ppro;
   17.14  	unsigned long pfn;
   17.15  
   17.16 +	contiguous_bitmap = alloc_bootmem_low_pages(
   17.17 +		(max_low_pfn + 2*BITS_PER_LONG) >> 3);
   17.18 +	BUG_ON(!contiguous_bitmap);
   17.19 +	memset(contiguous_bitmap, 0, (max_low_pfn + 2*BITS_PER_LONG) >> 3);
   17.20 +
   17.21  #if defined(CONFIG_SWIOTLB)
   17.22  	swiotlb_init();	
   17.23  #endif

    18.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c	Fri Aug 19 10:18:53 2005 +0000
    18.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c	Fri Aug 19 10:50:15 2005 +0000
    18.3 @@ -300,17 +300,17 @@ void __init bt_iounmap(void *addr, unsig
    18.4  
    18.5  
    18.6  static int direct_remap_area_pte_fn(pte_t *pte, 
    18.7 -                                    struct page *pte_page,
    18.8 -                                    unsigned long address, 
    18.9 -                                    void *data)
   18.10 +				    struct page *pte_page,
   18.11 +				    unsigned long address, 
   18.12 +				    void *data)
   18.13  {
   18.14 -        mmu_update_t **v = (mmu_update_t **)data;
   18.15 +	mmu_update_t **v = (mmu_update_t **)data;
   18.16  
   18.17 -        (*v)->ptr = (pfn_to_mfn(page_to_pfn(pte_page)) << PAGE_SHIFT)
   18.18 -                    | ((unsigned long)pte & ~PAGE_MASK);
   18.19 -        (*v)++;
   18.20 +	(*v)->ptr = ((physaddr_t)pfn_to_mfn(page_to_pfn(pte_page)) <<
   18.21 +		     PAGE_SHIFT) | ((unsigned long)pte & ~PAGE_MASK);
   18.22 +	(*v)++;
   18.23  
   18.24 -        return 0;
   18.25 +	return 0;
   18.26  }
   18.27  
   18.28  int direct_remap_area_pages(struct mm_struct *mm,
   18.29 @@ -397,6 +397,16 @@ int touch_pte_range(struct mm_struct *mm
   18.30  	}
   18.31  
   18.32  	return generic_page_range(mm, address, size, f, NULL);
   18.33 -}                 
   18.34 +} 
   18.35  
   18.36  EXPORT_SYMBOL(touch_pte_range);
   18.37 +
   18.38 +/*
   18.39 + * Local variables:
   18.40 + *  c-file-style: "linux"
   18.41 + *  indent-tabs-mode: t
   18.42 + *  c-indent-level: 8
   18.43 + *  c-basic-offset: 8
   18.44 + *  tab-width: 8
   18.45 + * End:
   18.46 + */

    19.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Fri Aug 19 10:18:53 2005 +0000
    19.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Fri Aug 19 10:50:15 2005 +0000
    19.3 @@ -124,8 +124,6 @@ extern asmlinkage unsigned int do_IRQ(st
    19.4  
    19.5  #define VALID_EVTCHN(_chn) ((_chn) >= 0)
    19.6  
    19.7 -unsigned uber_debug;
    19.8 -
    19.9  /*
   19.10   * Force a proper event-channel callback from Xen after clearing the
   19.11   * callback mask. We do this in a very simple manner, by making a call
   19.12 @@ -160,11 +158,7 @@ asmlinkage void evtchn_do_upcall(struct 
   19.13              l2 &= ~(1 << l2i);
   19.14              
   19.15              port = (l1i << 5) + l2i;
   19.16 -	    if (uber_debug && cpu)
   19.17 -		printk("<0>Upcall to %d on %d.\n", port, cpu);
   19.18              if ( (irq = evtchn_to_irq[port]) != -1 ) {
   19.19 -		if (uber_debug && cpu)
   19.20 -		    printk("<0>IRQ %d.\n", irq);
   19.21                  do_IRQ(irq, regs);
   19.22  	    } else
   19.23                  evtchn_device_upcall(port);

    21.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/skbuff.c	Fri Aug 19 10:18:53 2005 +0000
    21.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/skbuff.c	Fri Aug 19 10:50:15 2005 +0000
    21.3 @@ -5,8 +5,6 @@
    21.4  #include <linux/kernel.h>
    21.5  #include <linux/sched.h>
    21.6  #include <linux/slab.h>
    21.7 -#include <linux/string.h>
    21.8 -#include <linux/errno.h>
    21.9  #include <linux/netdevice.h>
   21.10  #include <linux/inetdevice.h>
   21.11  #include <linux/etherdevice.h>
   21.12 @@ -14,34 +12,86 @@
   21.13  #include <linux/init.h>
   21.14  #include <asm/io.h>
   21.15  #include <asm/page.h>
   21.16 -
   21.17 -EXPORT_SYMBOL(__dev_alloc_skb);
   21.18 +#include <asm-xen/hypervisor.h>
   21.19  
   21.20  /* Referenced in netback.c. */
   21.21  /*static*/ kmem_cache_t *skbuff_cachep;
   21.22  
   21.23 -/* Size must be cacheline-aligned (alloc_skb uses SKB_DATA_ALIGN). */
   21.24 -#define XEN_SKB_SIZE \
   21.25 -    ((PAGE_SIZE - sizeof(struct skb_shared_info)) & ~(SMP_CACHE_BYTES - 1))
   21.26 +#define MAX_SKBUFF_ORDER 2
   21.27 +static kmem_cache_t *skbuff_order_cachep[MAX_SKBUFF_ORDER + 1];
   21.28  
   21.29  struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask)
   21.30  {
   21.31 -    struct sk_buff *skb;
   21.32 -    skb = alloc_skb_from_cache(skbuff_cachep, length + 16, gfp_mask);
   21.33 -    if ( likely(skb != NULL) )
   21.34 -        skb_reserve(skb, 16);
   21.35 -    return skb;
   21.36 +	struct sk_buff *skb;
   21.37 +	int order;
   21.38 +
   21.39 +	length = SKB_DATA_ALIGN(length + 16);
   21.40 +	order = get_order(length + sizeof(struct skb_shared_info));
   21.41 +	if (order > MAX_SKBUFF_ORDER) {
   21.42 +		printk(KERN_ALERT "Attempt to allocate order %d skbuff. "
   21.43 +		       "Increase MAX_SKBUFF_ORDER.\n", order);
   21.44 +		return NULL;
   21.45 +	}
   21.46 +
   21.47 +	skb = alloc_skb_from_cache(
   21.48 +		skbuff_order_cachep[order], length, gfp_mask);
   21.49 +	if (skb != NULL)
   21.50 +		skb_reserve(skb, 16);
   21.51 +
   21.52 +	return skb;
   21.53  }
   21.54  
   21.55  static void skbuff_ctor(void *buf, kmem_cache_t *cachep, unsigned long unused)
   21.56  {
   21.57 -    scrub_pages(buf, 1);
   21.58 +	int order = 0;
   21.59 +
   21.60 +	while (skbuff_order_cachep[order] != cachep)
   21.61 +		order++;
   21.62 +
   21.63 +	if (order != 0)
   21.64 +		xen_create_contiguous_region((unsigned long)buf, order);
   21.65 +
   21.66 +	scrub_pages(buf, 1 << order);
   21.67 +}
   21.68 +
   21.69 +static void skbuff_dtor(void *buf, kmem_cache_t *cachep, unsigned long unused)
   21.70 +{
   21.71 +	int order = 0;
   21.72 +
   21.73 +	while (skbuff_order_cachep[order] != cachep)
   21.74 +		order++;
   21.75 +
   21.76 +	if (order != 0)
   21.77 +		xen_destroy_contiguous_region((unsigned long)buf, order);
   21.78  }
   21.79  
   21.80  static int __init skbuff_init(void)
   21.81  {
   21.82 -    skbuff_cachep = kmem_cache_create(
   21.83 -        "xen-skb", PAGE_SIZE, PAGE_SIZE, 0, skbuff_ctor, NULL);
   21.84 -    return 0;
   21.85 +	static char name[MAX_SKBUFF_ORDER + 1][20];
   21.86 +	unsigned long size;
   21.87 +	int order;
   21.88 +
   21.89 +	for (order = 0; order <= MAX_SKBUFF_ORDER; order++) {
   21.90 +		size = PAGE_SIZE << order;
   21.91 +		sprintf(name[order], "xen-skb-%lu", size);
   21.92 +		skbuff_order_cachep[order] = kmem_cache_create(
   21.93 +			name[order], size, size, 0, skbuff_ctor, skbuff_dtor);
   21.94 +	}
   21.95 +
   21.96 +	skbuff_cachep = skbuff_order_cachep[0];
   21.97 +
   21.98 +	return 0;
   21.99  }
  21.100  __initcall(skbuff_init);
  21.101 +
  21.102 +EXPORT_SYMBOL(__dev_alloc_skb);
  21.103 +
  21.104 +/*
  21.105 + * Local variables:
  21.106 + *  c-file-style: "linux"
  21.107 + *  indent-tabs-mode: t
  21.108 + *  c-indent-level: 8
  21.109 + *  c-basic-offset: 8
  21.110 + *  tab-width: 8
  21.111 + * End:
  21.112 + */

    22.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c	Fri Aug 19 10:18:53 2005 +0000
    22.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c	Fri Aug 19 10:50:15 2005 +0000
    22.3 @@ -426,16 +426,10 @@ static __init void parse_cmdline_early (
    22.4  #ifdef CONFIG_XEN
    22.5  static void __init contig_initmem_init(void)
    22.6  {
    22.7 -        unsigned long bootmap_size, bootmap; 
    22.8 -
    22.9 -        bootmap_size = bootmem_bootmap_pages(end_pfn)<<PAGE_SHIFT;
   22.10 -        bootmap = start_pfn;
   22.11 -        bootmap_size = init_bootmem(bootmap, end_pfn);
   22.12 -        reserve_bootmem(bootmap, bootmap_size);
   22.13 -        
   22.14 -        free_bootmem(start_pfn << PAGE_SHIFT, (end_pfn - start_pfn) << PAGE_SHIFT);   
   22.15 -        reserve_bootmem(0, (PFN_PHYS(start_pfn) +
   22.16 -                            bootmap_size + PAGE_SIZE-1));
   22.17 +        unsigned long bootmap_size = init_bootmem(start_pfn, end_pfn);
   22.18 +        free_bootmem(0, end_pfn << PAGE_SHIFT);   
   22.19 +        /* XXX KAF: Why can't we leave low 1MB of memory free? */
   22.20 +        reserve_bootmem(0, (PFN_PHYS(start_pfn) + bootmap_size + PAGE_SIZE-1));
   22.21  }
   22.22  #else
   22.23  static void __init contig_initmem_init(void)

    23.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup64.c	Fri Aug 19 10:18:53 2005 +0000
    23.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup64.c	Fri Aug 19 10:50:15 2005 +0000
    23.3 @@ -280,19 +280,16 @@ void __init cpu_init (void)
    23.4  	if (cpu) {
    23.5  		memcpy(cpu_gdt_table[cpu], cpu_gdt_table[0], GDT_SIZE);
    23.6  	}	
    23.7 -#endif
    23.8  
    23.9  	cpu_gdt_descr[cpu].size = GDT_SIZE;
   23.10  	cpu_gdt_descr[cpu].address = (unsigned long)cpu_gdt_table[cpu];
   23.11  
   23.12 -        cpu_gdt_init(&cpu_gdt_descr[cpu]);
   23.13 -
   23.14 -#ifndef CONFIG_XEN 
   23.15  	memcpy(me->thread.tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8);
   23.16 -
   23.17  #else
   23.18   	memcpy(me->thread.tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN],
   23.19  	    GDT_ENTRY_TLS_ENTRIES * 8);
   23.20 +
   23.21 +    cpu_gdt_init(&cpu_gdt_descr[cpu]);
   23.22  #endif
   23.23         
   23.24  	/*

    24.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/mm/fault.c	Fri Aug 19 10:18:53 2005 +0000
    24.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/mm/fault.c	Fri Aug 19 10:50:15 2005 +0000
    24.3 @@ -250,7 +250,11 @@ static int vmalloc_fault(unsigned long a
    24.4  	   happen within a race in page table update. In the later
    24.5  	   case just flush. */
    24.6  
    24.7 -	pgd = pgd_offset(current->mm ?: &init_mm, address);
    24.8 +	/* On Xen the line below does not always work. Needs investigating! */
    24.9 +	/*pgd = pgd_offset(current->mm ?: &init_mm, address);*/
   24.10 +	pgd = (pgd_t *)per_cpu(cur_pgd, smp_processor_id());
   24.11 +	pgd += pgd_index(address);
   24.12 +
   24.13  	pgd_ref = pgd_offset_k(address);
   24.14  	if (pgd_none(*pgd_ref))
   24.15  		return -1;

    25.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c	Fri Aug 19 10:18:53 2005 +0000
    25.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c	Fri Aug 19 10:50:15 2005 +0000
    25.3 @@ -40,6 +40,12 @@
    25.4  #include <asm/proto.h>
    25.5  #include <asm/smp.h>
    25.6  
    25.7 +extern unsigned long *contiguous_bitmap;
    25.8 +
    25.9 +#if defined(CONFIG_SWIOTLB)
   25.10 +extern void swiotlb_init(void);
   25.11 +#endif
   25.12 +
   25.13  #ifndef Dprintk
   25.14  #define Dprintk(x...)
   25.15  #endif
   25.16 @@ -794,8 +800,12 @@ void __init mem_init(void)
   25.17  	int codesize, reservedpages, datasize, initsize;
   25.18  	int tmp;
   25.19  
   25.20 +	contiguous_bitmap = alloc_bootmem_low_pages(
   25.21 +		(end_pfn + 2*BITS_PER_LONG) >> 3);
   25.22 +	BUG_ON(!contiguous_bitmap);
   25.23 +	memset(contiguous_bitmap, 0, (end_pfn + 2*BITS_PER_LONG) >> 3);
   25.24 +
   25.25  #if defined(CONFIG_SWIOTLB)
   25.26 -	extern void swiotlb_init(void);
   25.27  	swiotlb_init();	
   25.28  #endif
   25.29  

    26.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Aug 19 10:18:53 2005 +0000
    26.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Fri Aug 19 10:50:15 2005 +0000
    26.3 @@ -213,9 +213,7 @@ static void balloon_process(void *unused
    26.4              {
    26.5                  BUG_ON(HYPERVISOR_update_va_mapping(
    26.6                      (unsigned long)__va(pfn << PAGE_SHIFT),
    26.7 -                    __pte_ma((mfn_list[i] << PAGE_SHIFT) |
    26.8 -                             pgprot_val(PAGE_KERNEL)),
    26.9 -                    0));
   26.10 +                    pfn_pte_ma(mfn_list[i], PAGE_KERNEL), 0));
   26.11              }
   26.12  
   26.13              /* Finally, relinquish the memory back to the system allocator. */

    27.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Fri Aug 19 10:18:53 2005 +0000
    27.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Fri Aug 19 10:50:15 2005 +0000
    27.3 @@ -406,21 +406,15 @@ static void dispatch_probe(blkif_t *blki
    27.4  #endif
    27.5  
    27.6  
    27.7 -#ifdef CONFIG_XEN_BLKDEV_TAP_BE
    27.8      if ( HYPERVISOR_update_va_mapping_otherdomain(
    27.9          MMAP_VADDR(pending_idx, 0),
   27.10 -        (pte_t) { (req->frame_and_sects[0] & PAGE_MASK) | __PAGE_KERNEL },
   27.11 +        pfn_pte_ma(req->frame_and_sects[0] >> PAGE_SHIFT, PAGE_KERNEL),
   27.12 +#ifdef CONFIG_XEN_BLKDEV_TAP_BE
   27.13          0, (blkif->is_blktap ? ID_TO_DOM(req->id) : blkif->domid) ) )
   27.14 -        
   27.15 -        goto out;
   27.16  #else
   27.17 -    if ( HYPERVISOR_update_va_mapping_otherdomain(
   27.18 -        MMAP_VADDR(pending_idx, 0),
   27.19 -        (pte_t) { (req->frame_and_sects[0] & PAGE_MASK) | __PAGE_KERNEL },
   27.20 -        0, blkif->domid) ) 
   27.21 -        
   27.22 +        0, blkif->domid) )
   27.23 +#endif
   27.24          goto out;
   27.25 -#endif
   27.26  #endif /* endif CONFIG_XEN_BLKDEV_GRANT */
   27.27     
   27.28      rsp = vbd_probe(blkif, (vdisk_t *)MMAP_VADDR(pending_idx, 0), 

    28.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Aug 19 10:18:53 2005 +0000
    28.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Aug 19 10:50:15 2005 +0000
    28.3 @@ -48,15 +48,7 @@ static const struct xenbus_device_id *
    28.4  match_device(const struct xenbus_device_id *arr, struct xenbus_device *dev)
    28.5  {
    28.6  	for (; !streq(arr->devicetype, ""); arr++) {
    28.7 -		if (!streq(arr->devicetype, dev->devicetype))
    28.8 -			continue;
    28.9 -
   28.10 -		/* If they don't care what subtype, it's a match. */
   28.11 -		if (streq(arr->subtype, ""))
   28.12 -			return arr;
   28.13 -
   28.14 -		/* If they care, device must have (same) subtype. */
   28.15 -		if (dev->subtype && streq(arr->subtype, dev->subtype))
   28.16 +		if (streq(arr->devicetype, dev->devicetype))
   28.17  			return arr;
   28.18  	}
   28.19  	return NULL;
   28.20 @@ -72,10 +64,102 @@ static int xenbus_match(struct device *_
   28.21  	return match_device(drv->ids, to_xenbus_device(_dev)) != NULL;
   28.22  }
   28.23  
   28.24 +struct xen_bus_type
   28.25 +{
   28.26 +	char *root;
   28.27 +	unsigned int levels;
   28.28 +	int (*get_bus_id)(char bus_id[BUS_ID_SIZE], const char *nodename);
   28.29 +	int (*probe)(const char *type, const char *dir);
   28.30 +	struct bus_type bus;
   28.31 +	struct device dev;
   28.32 +};
   28.33 +
   28.34 +/* device/<type>/<id> => <type>-<id> */
   28.35 +static int frontend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename)
   28.36 +{
   28.37 +	nodename = strchr(nodename, '/');
   28.38 +	if (!nodename || strlen(nodename + 1) >= BUS_ID_SIZE) {
   28.39 +		printk(KERN_WARNING "XENBUS: bad frontend %s\n", nodename);
   28.40 +		return -EINVAL;
   28.41 +	}
   28.42 +
   28.43 +	strlcpy(bus_id, nodename + 1, BUS_ID_SIZE);
   28.44 +	if (!strchr(bus_id, '/')) {
   28.45 +		printk(KERN_WARNING "XENBUS: bus_id %s no slash\n", bus_id);
   28.46 +		return -EINVAL;
   28.47 +	}
   28.48 +	*strchr(bus_id, '/') = '-';
   28.49 +	return 0;
   28.50 +}
   28.51 +
   28.52  /* Bus type for frontend drivers. */
   28.53 -static struct bus_type xenbus_type = {
   28.54 -	.name  = "xenbus",
   28.55 -	.match = xenbus_match,
   28.56 +static int xenbus_probe_frontend(const char *type, const char *name);
   28.57 +static struct xen_bus_type xenbus_frontend = {
   28.58 +	.root = "device",
   28.59 +	.levels = 2, 		/* device/type/<id> */
   28.60 +	.get_bus_id = frontend_bus_id,
   28.61 +	.probe = xenbus_probe_frontend,
   28.62 +	.bus = {
   28.63 +		.name  = "xen",
   28.64 +		.match = xenbus_match,
   28.65 +	},
   28.66 +	.dev = {
   28.67 +		.bus_id = "xen",
   28.68 +	},
   28.69 +};
   28.70 +
   28.71 +/* backend/<type>/<fe-uuid>/<id> => <type>-<fe-domid>-<id> */
   28.72 +static int backend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename)
   28.73 +{
   28.74 +	int domid, err;
   28.75 +	const char *devid, *type, *frontend;
   28.76 +	unsigned int typelen;
   28.77 +
   28.78 +	type = strchr(nodename, '/');
   28.79 +	if (!type)
   28.80 +		return -EINVAL;
   28.81 +	type++;
   28.82 +	typelen = strcspn(type, "/");
   28.83 +	if (!typelen || type[typelen] != '/')
   28.84 +		return -EINVAL;
   28.85 +
   28.86 +	devid = strrchr(nodename, '/') + 1;
   28.87 +
   28.88 +	err = xenbus_gather(nodename, "frontend-id", "%i", &domid,
   28.89 +			    "frontend", NULL, &frontend,
   28.90 +			    NULL);
   28.91 +	if (err)
   28.92 +		return err;
   28.93 +	if (strlen(frontend) == 0)
   28.94 +		err = -ERANGE;
   28.95 +
   28.96 +	if (!err && !xenbus_exists(frontend, ""))
   28.97 +		err = -ENOENT;
   28.98 +
   28.99 +	if (err) {
  28.100 +		kfree(frontend);
  28.101 +		return err;
  28.102 +	}
  28.103 +
  28.104 +	if (snprintf(bus_id, BUS_ID_SIZE,
  28.105 +		     "%.*s-%i-%s", typelen, type, domid, devid) >= BUS_ID_SIZE)
  28.106 +		return -ENOSPC;
  28.107 +	return 0;
  28.108 +}
  28.109 +
  28.110 +static int xenbus_probe_backend(const char *type, const char *uuid);
  28.111 +static struct xen_bus_type xenbus_backend = {
  28.112 +	.root = "backend",
  28.113 +	.levels = 3, 		/* backend/type/<frontend>/<id> */
  28.114 +	.get_bus_id = backend_bus_id,
  28.115 +	.probe = xenbus_probe_backend,
  28.116 +	.bus = {
  28.117 +		.name  = "xen-backend",
  28.118 +		.match = xenbus_match,
  28.119 +	},
  28.120 +	.dev = {
  28.121 +		.bus_id = "xen-backend",
  28.122 +	},
  28.123  };
  28.124  
  28.125  static int xenbus_dev_probe(struct device *_dev)
  28.126 @@ -104,12 +188,13 @@ static int xenbus_dev_remove(struct devi
  28.127  	return drv->remove(dev);
  28.128  }
  28.129  
  28.130 -int xenbus_register_driver(struct xenbus_driver *drv)
  28.131 +static int xenbus_register_driver(struct xenbus_driver *drv,
  28.132 +				  struct xen_bus_type *bus)
  28.133  {
  28.134  	int err;
  28.135  
  28.136  	drv->driver.name = drv->name;
  28.137 -	drv->driver.bus = &xenbus_type;
  28.138 +	drv->driver.bus = &bus->bus;
  28.139  	drv->driver.owner = drv->owner;
  28.140  	drv->driver.probe = xenbus_dev_probe;
  28.141  	drv->driver.remove = xenbus_dev_remove;
  28.142 @@ -120,6 +205,16 @@ int xenbus_register_driver(struct xenbus
  28.143  	return err;
  28.144  }
  28.145  
  28.146 +int xenbus_register_device(struct xenbus_driver *drv)
  28.147 +{
  28.148 +	return xenbus_register_driver(drv, &xenbus_frontend);
  28.149 +}
  28.150 +
  28.151 +int xenbus_register_backend(struct xenbus_driver *drv)
  28.152 +{
  28.153 +	return xenbus_register_driver(drv, &xenbus_backend);
  28.154 +}
  28.155 +
  28.156  void xenbus_unregister_driver(struct xenbus_driver *drv)
  28.157  {
  28.158  	down(&xenbus_lock);
  28.159 @@ -130,52 +225,98 @@ void xenbus_unregister_driver(struct xen
  28.160  struct xb_find_info
  28.161  {
  28.162  	struct xenbus_device *dev;
  28.163 -	const char *busid;
  28.164 +	const char *nodename;
  28.165  };
  28.166  
  28.167  static int cmp_dev(struct device *dev, void *data)
  28.168  {
  28.169 +	struct xenbus_device *xendev = to_xenbus_device(dev);
  28.170  	struct xb_find_info *info = data;
  28.171  
  28.172 -	if (streq(dev->bus_id, info->busid)) {
  28.173 -		info->dev = container_of(get_device(dev),
  28.174 -					 struct xenbus_device, dev);
  28.175 +	if (streq(xendev->nodename, info->nodename)) {
  28.176 +		info->dev = xendev;
  28.177 +		get_device(dev);
  28.178  		return 1;
  28.179  	}
  28.180  	return 0;
  28.181  }
  28.182  
  28.183 -/* FIXME: device_find is fixed in 2.6.13-rc2 according to Greg KH --RR */
  28.184 -struct xenbus_device *xenbus_device_find(const char *busid)
  28.185 +struct xenbus_device *xenbus_device_find(const char *nodename,
  28.186 +					 struct bus_type *bus)
  28.187  {
  28.188 -	struct xb_find_info info = { .dev = NULL, .busid = busid };
  28.189 +	struct xb_find_info info = { .dev = NULL, .nodename = nodename };
  28.190  
  28.191 -	bus_for_each_dev(&xenbus_type, NULL, &info, cmp_dev);
  28.192 +	bus_for_each_dev(bus, NULL, &info, cmp_dev);
  28.193  	return info.dev;
  28.194  }
  28.195  
  28.196 +static int cleanup_dev(struct device *dev, void *data)
  28.197 +{
  28.198 +	struct xenbus_device *xendev = to_xenbus_device(dev);
  28.199 +	struct xb_find_info *info = data;
  28.200 +	int len = strlen(info->nodename);
  28.201 +
  28.202 +	if (!strncmp(xendev->nodename, info->nodename, len)) {
  28.203 +		info->dev = xendev;
  28.204 +		get_device(dev);
  28.205 +		return 1;
  28.206 +	}
  28.207 +	return 0;
  28.208 +}
  28.209 +
  28.210 +static void xenbus_cleanup_devices(const char *path, struct bus_type *bus)
  28.211 +{
  28.212 +	struct xb_find_info info = { .nodename = path };
  28.213 +
  28.214 +	do {
  28.215 +		info.dev = NULL;
  28.216 +		bus_for_each_dev(bus, NULL, &info, cleanup_dev);
  28.217 +		if (info.dev) {
  28.218 +			device_unregister(&info.dev->dev);
  28.219 +			put_device(&info.dev->dev);
  28.220 +		}
  28.221 +	} while (info.dev);
  28.222 +}
  28.223  
  28.224  static void xenbus_release_device(struct device *dev)
  28.225  {
  28.226  	if (dev) {
  28.227  		struct xenbus_device *xendev = to_xenbus_device(dev);
  28.228  
  28.229 -		kfree(xendev->subtype);
  28.230  		kfree(xendev);
  28.231  	}
  28.232  }
  28.233 -/* devices/<typename>/<name> */
  28.234 -static int xenbus_probe_device(const char *dirpath, const char *devicetype,
  28.235 -			       const char *name)
  28.236 +
  28.237 +/* Simplified asprintf. */
  28.238 +static char *kasprintf(const char *fmt, ...)
  28.239 +{
  28.240 +	va_list ap;
  28.241 +	unsigned int len;
  28.242 +	char *p, dummy[1];
  28.243 +
  28.244 +	va_start(ap, fmt);
  28.245 +	/* FIXME: vsnprintf has a bug, NULL should work */
  28.246 +	len = vsnprintf(dummy, 0, fmt, ap);
  28.247 +	va_end(ap);
  28.248 +
  28.249 +	p = kmalloc(len + 1, GFP_KERNEL);
  28.250 +	if (!p)
  28.251 +		return NULL;
  28.252 +	va_start(ap, fmt);
  28.253 +	vsprintf(p, fmt, ap);
  28.254 +	va_end(ap);
  28.255 +	return p;
  28.256 +}
  28.257 +
  28.258 +static int xenbus_probe_node(struct xen_bus_type *bus,
  28.259 +			     const char *type,
  28.260 +			     const char *nodename)
  28.261  {
  28.262  	int err;
  28.263  	struct xenbus_device *xendev;
  28.264  	unsigned int stringlen;
  28.265  
  28.266 -	/* Nodename: /device/<typename>/<name>/ */
  28.267 -	stringlen = strlen(dirpath) + strlen(devicetype) + strlen(name) + 3;
  28.268 -	/* Typename */
  28.269 -	stringlen += strlen(devicetype) + 1;
  28.270 +	stringlen = strlen(nodename) + 1 + strlen(type) + 1;
  28.271  	xendev = kmalloc(sizeof(*xendev) + stringlen, GFP_KERNEL);
  28.272  	if (!xendev)
  28.273  		return -ENOMEM;
  28.274 @@ -183,38 +324,103 @@ static int xenbus_probe_device(const cha
  28.275  
  28.276  	/* Copy the strings into the extra space. */
  28.277  	xendev->nodename = (char *)(xendev + 1);
  28.278 -	sprintf(xendev->nodename, "%s/%s/%s", dirpath, devicetype, name);
  28.279 +	strcpy(xendev->nodename, nodename);
  28.280  	xendev->devicetype = xendev->nodename + strlen(xendev->nodename) + 1;
  28.281 -	strcpy(xendev->devicetype, devicetype);
  28.282 +	strcpy(xendev->devicetype, type);
  28.283  
  28.284 -	/* FIXME: look for "subtype" field. */
  28.285 -	snprintf(xendev->dev.bus_id, BUS_ID_SIZE, "%s-%s", devicetype, name);
  28.286 -	xendev->dev.bus = &xenbus_type;
  28.287 +	xendev->dev.parent = &bus->dev;
  28.288 +	xendev->dev.bus = &bus->bus;
  28.289  	xendev->dev.release = xenbus_release_device;
  28.290  
  28.291 +	err = bus->get_bus_id(xendev->dev.bus_id, xendev->nodename);
  28.292 +	if (err) {
  28.293 +		kfree(xendev);
  28.294 +		return err;
  28.295 +	}
  28.296 +
  28.297  	/* Register with generic device framework. */
  28.298  	err = device_register(&xendev->dev);
  28.299  	if (err) {
  28.300 -		printk("XENBUS: Registering device %s: error %i\n",
  28.301 -		       xendev->dev.bus_id, err);
  28.302 +		printk("XENBUS: Registering %s device %s: error %i\n",
  28.303 +		       bus->bus.name, xendev->dev.bus_id, err);
  28.304  		kfree(xendev);
  28.305  	}
  28.306  	return err;
  28.307  }
  28.308  
  28.309 -static int xenbus_probe_device_type(const char *dirpath, const char *typename)
  28.310 +/* device/<typename>/<name> */
  28.311 +static int xenbus_probe_frontend(const char *type, const char *name)
  28.312 +{
  28.313 +	char *nodename;
  28.314 +	int err;
  28.315 +
  28.316 +	nodename = kasprintf("%s/%s/%s", xenbus_frontend.root, type, name);
  28.317 +	if (!nodename)
  28.318 +		return -ENOMEM;
  28.319 +	
  28.320 +	err = xenbus_probe_node(&xenbus_frontend, type, nodename);
  28.321 +	kfree(nodename);
  28.322 +	return err;
  28.323 +}
  28.324 +
  28.325 +/* backend/<typename>/<frontend-uuid>/<name> */
  28.326 +static int xenbus_probe_backend_unit(const char *dir,
  28.327 +				     const char *type,
  28.328 +				     const char *name)
  28.329 +{
  28.330 +	char *nodename;
  28.331 +	int err;
  28.332 +
  28.333 +	nodename = kasprintf("%s/%s", dir, name);
  28.334 +	if (!nodename)
  28.335 +		return -ENOMEM;
  28.336 +
  28.337 +	err = xenbus_probe_node(&xenbus_backend, type, nodename);
  28.338 +	kfree(nodename);
  28.339 +	return err;
  28.340 +}
  28.341 +
  28.342 +/* backend/<typename>/<frontend-uuid> */
  28.343 +static int xenbus_probe_backend(const char *type, const char *uuid)
  28.344 +{
  28.345 +	char *nodename;
  28.346 +	int err = 0;
  28.347 +	char **dir;
  28.348 +	unsigned int i, dir_n = 0;
  28.349 +
  28.350 +	nodename = kasprintf("%s/%s/%s", xenbus_backend.root, type, uuid);
  28.351 +	if (!nodename)
  28.352 +		return -ENOMEM;
  28.353 +
  28.354 +	dir = xenbus_directory(nodename, "", &dir_n);
  28.355 +	if (IS_ERR(dir)) {
  28.356 +		kfree(nodename);
  28.357 +		return PTR_ERR(dir);
  28.358 +	}
  28.359 +
  28.360 +	for (i = 0; i < dir_n; i++) {
  28.361 +		err = xenbus_probe_backend_unit(nodename, type, dir[i]);
  28.362 +		if (err)
  28.363 +			break;
  28.364 +	}
  28.365 +	kfree(dir);
  28.366 +	kfree(nodename);
  28.367 +	return err;
  28.368 +}
  28.369 +
  28.370 +static int xenbus_probe_device_type(struct xen_bus_type *bus, const char *type)
  28.371  {
  28.372  	int err = 0;
  28.373  	char **dir;
  28.374  	unsigned int dir_n = 0;
  28.375  	int i;
  28.376  
  28.377 -	dir = xenbus_directory(dirpath, typename, &dir_n);
  28.378 +	dir = xenbus_directory(bus->root, type, &dir_n);
  28.379  	if (IS_ERR(dir))
  28.380  		return PTR_ERR(dir);
  28.381  
  28.382  	for (i = 0; i < dir_n; i++) {
  28.383 -		err = xenbus_probe_device(dirpath, typename, dir[i]);
  28.384 +		err = bus->probe(type, dir[i]);
  28.385  		if (err)
  28.386  			break;
  28.387  	}
  28.388 @@ -222,18 +428,18 @@ static int xenbus_probe_device_type(cons
  28.389  	return err;
  28.390  }
  28.391  
  28.392 -static int xenbus_probe_devices(const char *path)
  28.393 +static int xenbus_probe_devices(struct xen_bus_type *bus)
  28.394  {
  28.395  	int err = 0;
  28.396  	char **dir;
  28.397  	unsigned int i, dir_n;
  28.398  
  28.399 -	dir = xenbus_directory(path, "", &dir_n);
  28.400 +	dir = xenbus_directory(bus->root, "", &dir_n);
  28.401  	if (IS_ERR(dir))
  28.402  		return PTR_ERR(dir);
  28.403  
  28.404  	for (i = 0; i < dir_n; i++) {
  28.405 -		err = xenbus_probe_device_type(path, dir[i]);
  28.406 +		err = xenbus_probe_device_type(bus, dir[i]);
  28.407  		if (err)
  28.408  			break;
  28.409  	}
  28.410 @@ -251,58 +457,111 @@ static unsigned int char_count(const cha
  28.411  	return ret;
  28.412  }
  28.413  
  28.414 -static void dev_changed(struct xenbus_watch *watch, const char *node)
  28.415 +static int strsep_len(const char *str, char c, unsigned int len)
  28.416  {
  28.417 -	char busid[BUS_ID_SIZE];
  28.418 -	int exists;
  28.419 -	struct xenbus_device *dev;
  28.420 -	char *p;
  28.421 +	unsigned int i;
  28.422 +
  28.423 +	for (i = 0; str[i]; i++)
  28.424 +		if (str[i] == c) {
  28.425 +			if (len == 0)
  28.426 +				return i;
  28.427 +			len--;
  28.428 +		}
  28.429 +	return (len == 0) ? i : -ERANGE;
  28.430 +}
  28.431  
  28.432 -	/* Node is of form device/<type>/<identifier>[/...] */
  28.433 -	if (char_count(node, '/') != 2)
  28.434 -		return;
  28.435 +static void dev_changed(const char *node, struct xen_bus_type *bus)
  28.436 +{
  28.437 +	int exists, rootlen;
  28.438 +	struct xenbus_device *dev;
  28.439 +	char type[BUS_ID_SIZE];
  28.440 +	const char *p, *root;
  28.441  
  28.442 -	/* Created or deleted? */
  28.443 -	exists = xenbus_exists(node, "");
  28.444 +	if (char_count(node, '/') < 2)
  28.445 + 		return;
  28.446  
  28.447 -	p = strchr(node, '/') + 1;
  28.448 -	if (strlen(p) + 1 > BUS_ID_SIZE) {
  28.449 -		printk("Device for node %s is too big!\n", node);
  28.450 +	exists = xenbus_exists(node, "");
  28.451 +	if (!exists) {
  28.452 +		xenbus_cleanup_devices(node, &bus->bus);
  28.453  		return;
  28.454  	}
  28.455 -	/* Bus ID is name with / changed to - */
  28.456 -	strcpy(busid, p);
  28.457 -	*strchr(busid, '/') = '-';
  28.458 +
  28.459 +	/* backend/<type>/... or device/<type>/... */
  28.460 +	p = strchr(node, '/') + 1;
  28.461 +	snprintf(type, BUS_ID_SIZE, "%.*s", strcspn(p, "/"), p);
  28.462 +	type[BUS_ID_SIZE-1] = '\0';
  28.463 +
  28.464 +	rootlen = strsep_len(node, '/', bus->levels);
  28.465 +	if (rootlen < 0)
  28.466 +		return;
  28.467 +	root = kasprintf("%.*s", rootlen, node);
  28.468 +	if (!root)
  28.469 +		return;
  28.470  
  28.471 -	dev = xenbus_device_find(busid);
  28.472 -	printk("xenbus: device %s %s\n", busid, dev ? "exists" : "new");
  28.473 -	if (dev && !exists) {
  28.474 -		printk("xenbus: Unregistering device %s\n", busid);
  28.475 -		/* FIXME: free? */
  28.476 -		device_unregister(&dev->dev);
  28.477 -	} else if (!dev && exists) {
  28.478 -		printk("xenbus: Adding device %s\n", busid);
  28.479 -		/* Hack bus id back into two strings. */
  28.480 -		*strrchr(busid, '-') = '\0';
  28.481 -		xenbus_probe_device("device", busid, busid+strlen(busid)+1);
  28.482 -	} else
  28.483 -		printk("xenbus: strange, %s already %s\n", busid,
  28.484 -		       exists ? "exists" : "gone");
  28.485 -	if (dev)
  28.486 +	dev = xenbus_device_find(root, &bus->bus);
  28.487 +	if (!dev)
  28.488 +		xenbus_probe_node(bus, type, root);
  28.489 +	else
  28.490  		put_device(&dev->dev);
  28.491 +
  28.492 +	kfree(root);
  28.493 +}
  28.494 +
  28.495 +static void frontend_changed(struct xenbus_watch *watch, const char *node)
  28.496 +{
  28.497 +	dev_changed(node, &xenbus_frontend);
  28.498 +}
  28.499 +
  28.500 +static void backend_changed(struct xenbus_watch *watch, const char *node)
  28.501 +{
  28.502 +	dev_changed(node, &xenbus_backend);
  28.503  }
  28.504  
  28.505  /* We watch for devices appearing and vanishing. */
  28.506 -static struct xenbus_watch dev_watch = {
  28.507 -	/* FIXME: Ideally we'd only watch for changes 2 levels deep... */
  28.508 +static struct xenbus_watch fe_watch = {
  28.509  	.node = "device",
  28.510 -	.callback = dev_changed,
  28.511 +	.callback = frontend_changed,
  28.512 +};
  28.513 +
  28.514 +static struct xenbus_watch be_watch = {
  28.515 +	.node = "backend",
  28.516 +	.callback = backend_changed,
  28.517  };
  28.518  
  28.519 +static int suspend_dev(struct device *dev, void *data)
  28.520 +{
  28.521 +	int err = 0;
  28.522 +	struct xenbus_driver *drv = to_xenbus_driver(dev->driver);
  28.523 +	struct xenbus_device *xdev
  28.524 +		= container_of(dev, struct xenbus_device, dev);
  28.525 +
  28.526 +	if (drv->suspend)
  28.527 +		err = drv->suspend(xdev);
  28.528 +	if (err)
  28.529 +		printk("xenbus: suspend %s failed: %i\n", dev->bus_id, err);
  28.530 +	return 0;
  28.531 +}
  28.532 +
  28.533 +static int resume_dev(struct device *dev, void *data)
  28.534 +{
  28.535 +	int err = 0;
  28.536 +	struct xenbus_driver *drv = to_xenbus_driver(dev->driver);
  28.537 +	struct xenbus_device *xdev
  28.538 +		= container_of(dev, struct xenbus_device, dev);
  28.539 +
  28.540 +	if (drv->resume)
  28.541 +		err = drv->resume(xdev);
  28.542 +	if (err)
  28.543 +		printk("xenbus: resume %s failed: %i\n", dev->bus_id, err);
  28.544 +	return 0;
  28.545 +}
  28.546 +
  28.547  void xenbus_suspend(void)
  28.548  {
  28.549  	/* We keep lock, so no comms can happen as page moves. */
  28.550  	down(&xenbus_lock);
  28.551 +	bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev);
  28.552 +	bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev);
  28.553  	xb_suspend_comms();
  28.554  }
  28.555  
  28.556 @@ -310,6 +569,8 @@ void xenbus_resume(void)
  28.557  {
  28.558  	xb_init_comms();
  28.559  	reregister_xenbus_watches();
  28.560 +	bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, resume_dev);
  28.561 +	bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, resume_dev);
  28.562  	up(&xenbus_lock);
  28.563  }
  28.564  
  28.565 @@ -354,30 +615,23 @@ int do_xenbus_probe(void *unused)
  28.566  	}
  28.567  
  28.568  	down(&xenbus_lock);
  28.569 -	err = notifier_call_chain(&xenstore_chain, 0, 0);
  28.570 -	up(&xenbus_lock);
  28.571 -
  28.572 -	if (err == NOTIFY_BAD) {
  28.573 -		printk("%s: calling xenstore notify chain failed\n",
  28.574 -		       __FUNCTION__);
  28.575 -		return -EINVAL;
  28.576 -	}
  28.577 -
  28.578 -	err = 0;
  28.579 -
  28.580 -	down(&xenbus_lock);
  28.581  	/* Enumerate devices in xenstore. */
  28.582 -	xenbus_probe_devices("device");
  28.583 +	xenbus_probe_devices(&xenbus_frontend);
  28.584 +	xenbus_probe_devices(&xenbus_backend);
  28.585  	/* Watch for changes. */
  28.586 -	register_xenbus_watch(&dev_watch);
  28.587 +	register_xenbus_watch(&fe_watch);
  28.588 +	register_xenbus_watch(&be_watch);
  28.589  	up(&xenbus_lock);
  28.590  	return 0;
  28.591  }
  28.592  
  28.593  static int __init xenbus_probe_init(void)
  28.594  {
  28.595 -	bus_register(&xenbus_type);
  28.596 -
  28.597 +	bus_register(&xenbus_frontend.bus);
  28.598 +	bus_register(&xenbus_backend.bus);
  28.599 +	device_register(&xenbus_frontend.dev);
  28.600 +	device_register(&xenbus_backend.dev);
  28.601 +	
  28.602  	if (!xen_start_info.store_evtchn)
  28.603  		return 0;
  28.604  

    29.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Fri Aug 19 10:18:53 2005 +0000
    29.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Fri Aug 19 10:50:15 2005 +0000
    29.3 @@ -187,6 +187,7 @@ static char *join(const char *dir, const
    29.4  	static char buffer[4096];
    29.5  
    29.6  	BUG_ON(down_trylock(&xenbus_lock) == 0);
    29.7 +	/* XXX FIXME: might not be correct if name == "" */
    29.8  	BUG_ON(strlen(dir) + strlen("/") + strlen(name) + 1 > sizeof(buffer));
    29.9  
   29.10  	strcpy(buffer, dir);
   29.11 @@ -399,9 +400,12 @@ int xenbus_gather(const char *dir, ...)
   29.12  			ret = PTR_ERR(p);
   29.13  			break;
   29.14  		}
   29.15 -		if (sscanf(p, fmt, result) == 0)
   29.16 -			ret = -EINVAL;
   29.17 -		kfree(p);
   29.18 +		if (fmt) {
   29.19 +			if (sscanf(p, fmt, result) == 0)
   29.20 +				ret = -EINVAL;
   29.21 +			kfree(p);
   29.22 +		} else
   29.23 +			*(char **)result = p;
   29.24  	}
   29.25  	va_end(ap);
   29.26  	return ret;

    30.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h	Fri Aug 19 10:18:53 2005 +0000
    30.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h	Fri Aug 19 10:50:15 2005 +0000
    30.3 @@ -26,7 +26,9 @@ address_needs_mapping(struct device *hwd
    30.4  static inline int
    30.5  range_straddles_page_boundary(void *p, size_t size)
    30.6  {
    30.7 -	return ((((unsigned long)p & ~PAGE_MASK) + size) > PAGE_SIZE);
    30.8 +	extern unsigned long *contiguous_bitmap;
    30.9 +	return (((((unsigned long)p & ~PAGE_MASK) + size) > PAGE_SIZE) &&
   30.10 +		!test_bit(__pa(p) >> PAGE_SHIFT, contiguous_bitmap));
   30.11  }
   30.12  
   30.13  #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

    33.1 --- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Fri Aug 19 10:18:53 2005 +0000
    33.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h	Fri Aug 19 10:50:15 2005 +0000
    33.3 @@ -37,7 +37,6 @@
    33.4  /* A xenbus device. */
    33.5  struct xenbus_device {
    33.6  	char *devicetype;
    33.7 -	char *subtype;
    33.8  	char *nodename;
    33.9  	struct device dev;
   33.10  	int has_error;
   33.11 @@ -53,7 +52,6 @@ struct xenbus_device_id
   33.12  {
   33.13  	/* .../device/<device_type>/<identifier> */
   33.14  	char devicetype[32]; 	/* General class of device. */
   33.15 -	char subtype[32];	/* Contents of "subtype" for this device */
   33.16  };
   33.17  
   33.18  /* A xenbus driver. */
   33.19 @@ -61,9 +59,11 @@ struct xenbus_driver {
   33.20  	char *name;
   33.21  	struct module *owner;
   33.22  	const struct xenbus_device_id *ids;
   33.23 -	int  (*probe)    (struct xenbus_device * dev,
   33.24 -			  const struct xenbus_device_id * id);
   33.25 -	int  (*remove)   (struct xenbus_device * dev);
   33.26 +	int (*probe)(struct xenbus_device *dev,
   33.27 +		     const struct xenbus_device_id *id);
   33.28 +	int (*remove)(struct xenbus_device *dev);
   33.29 +	int (*suspend)(struct xenbus_device *dev);
   33.30 +	int (*resume)(struct xenbus_device *dev);
   33.31  	struct device_driver driver;
   33.32  };
   33.33  
   33.34 @@ -72,7 +72,8 @@ static inline struct xenbus_driver *to_x
   33.35  	return container_of(drv, struct xenbus_driver, driver);
   33.36  }
   33.37  
   33.38 -int xenbus_register_driver(struct xenbus_driver *drv);
   33.39 +int xenbus_register_device(struct xenbus_driver *drv);
   33.40 +int xenbus_register_backend(struct xenbus_driver *drv);
   33.41  void xenbus_unregister_driver(struct xenbus_driver *drv);
   33.42  
   33.43  /* Caller must hold this lock to call these functions: it's also held

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/patches/linux-2.6.12/workaround_double_br_del_if.patch	Fri Aug 19 10:50:15 2005 +0000
    34.3 @@ -0,0 +1,11 @@
    34.4 +--- linux-2.6.12/net/bridge/br_if.c	2005-06-17 14:48:29.000000000 -0500
    34.5 ++++ linux-2.6.12-xen0-smp/net/bridge/br_if.c	2005-08-18 15:17:27.302615846 -0500
    34.6 +@@ -382,7 +382,7 @@
    34.7 + {
    34.8 + 	struct net_bridge_port *p = dev->br_port;
    34.9 + 	
   34.10 +-	if (!p || p->br != br) 
   34.11 ++	if (!p || p->br != br || p->state == BR_STATE_DISABLED)
   34.12 + 		return -EINVAL;
   34.13 + 
   34.14 + 	br_sysfs_removeif(p);

    35.1 --- a/tools/examples/network-bridge	Fri Aug 19 10:18:53 2005 +0000
    35.2 +++ b/tools/examples/network-bridge	Fri Aug 19 10:50:15 2005 +0000
    35.3 @@ -51,7 +51,7 @@ for arg ; do export "${arg}" ; done
    35.4  
    35.5  bridge=${bridge:-xen-br0}
    35.6  netdev=${netdev:-eth0}
    35.7 -antispoof=${antispoof:-yes}
    35.8 +antispoof=${antispoof:-no}
    35.9  
   35.10  echo "*network $OP bridge=$bridge netdev=$netdev antispoof=$antispoof" >&2
   35.11  

    36.1 --- a/tools/misc/policyprocessor/Makefile	Fri Aug 19 10:18:53 2005 +0000
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,42 +0,0 @@
    36.4 -XEN_ROOT = ../../..
    36.5 -include $(XEN_ROOT)/tools/Rules.mk
    36.6 -
    36.7 -CFLAGS   += -static
    36.8 -CFLAGS   += -Wall
    36.9 -CFLAGS   += -Werror
   36.10 -CFLAGS   += -O3
   36.11 -CFLAGS   += -fno-strict-aliasing
   36.12 -CFLAGS   += -I.
   36.13 -
   36.14 -all: build
   36.15 -
   36.16 -build: mk-symlinks
   36.17 -	$(MAKE) xml_to_bin
   36.18 -
   36.19 -default: all
   36.20 -
   36.21 -install: all
   36.22 -
   36.23 -xml_to_bin : make_include XmlToBin.java XmlToBinInterface.java SsidsEntry.java SecurityLabel.java myHandler.java
   36.24 -	javac XmlToBin.java
   36.25 -
   36.26 -make_include : c2j_include
   36.27 -	./c2j_include
   36.28 -
   36.29 -c2j_include: c2j_include.c
   36.30 -	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $<
   36.31 -
   36.32 -clean:
   36.33 -	rm -rf *.class xen c2j_include policy_version.java *.bin
   36.34 -
   36.35 -
   36.36 -LINUX_ROOT := $(XEN_ROOT)/linux-2.6-xen-sparse
   36.37 -mk-symlinks:
   36.38 -	[ -e xen/linux ] || mkdir -p xen/linux
   36.39 -	[ -e xen/io ]    || mkdir -p xen/io
   36.40 -	( cd xen >/dev/null ; \
   36.41 -	  ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . )
   36.42 -	( cd xen/io >/dev/null ; \
   36.43 -	  ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . )
   36.44 -	( cd xen/linux >/dev/null ; \
   36.45 -	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )

    37.1 --- a/tools/misc/policyprocessor/SecurityLabel.java	Fri Aug 19 10:18:53 2005 +0000
    37.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.3 @@ -1,34 +0,0 @@
    37.4 -/**
    37.5 - * (C) Copyright IBM Corp. 2005
    37.6 - *
    37.7 - * $Id: SecurityLabel.java,v 1.2 2005/06/17 20:00:04 rvaldez Exp $
    37.8 - *
    37.9 - * Author: Ray Valdez
   37.10 - *
   37.11 - * This program is free software; you can redistribute it and/or
   37.12 - * modify it under the terms of the GNU General Public License as
   37.13 - * published by the Free Software Foundation, version 2 of the
   37.14 - * License.
   37.15 - *
   37.16 - * SecurityLabel Class.  
   37.17 - *
   37.18 - * <p>
   37.19 - *
   37.20 - * Keeps track of types.
   37.21 - *
   37.22 - * <p>
   37.23 - *
   37.24 - *
   37.25 - */
   37.26 -import java.util.*;
   37.27 -public class SecurityLabel
   37.28 -{
   37.29 - Vector ids;
   37.30 - Vector vlans;
   37.31 - Vector slots;
   37.32 - Vector steTypes;
   37.33 - int steSsidPosition;
   37.34 - Vector chwIDs;
   37.35 - Vector chwTypes;
   37.36 - int chwSsidPosition;
   37.37 -}

    38.1 --- a/tools/misc/policyprocessor/SecurityPolicySpec.xsd	Fri Aug 19 10:18:53 2005 +0000
    38.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.3 @@ -1,115 +0,0 @@
    38.4 -<?xml version="1.0" encoding="UTF-8"?>
    38.5 -<!-- Author: Ray Valdez, rvaldez@us.ibm.com -->
    38.6 -<!-- xml schema definition for xen xml policies -->
    38.7 -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    38.8 -targetNamespace="http://www.ibm.com"
    38.9 -xmlns="http://www.ibm.com" 
   38.10 -elementFormDefault="qualified">
   38.11 -
   38.12 -<xsd:element name="TE" type="xsd:string" />
   38.13 -<xsd:element name="ChWall" type="xsd:string" />
   38.14 -
   38.15 -<xsd:element name="Definition">
   38.16 -  <xsd:complexType>
   38.17 - 	<xsd:sequence>
   38.18 -
   38.19 -	  <!-- simple type enforcement -->
   38.20 -	  <xsd:element name="Types" minOccurs ="0" maxOccurs="1">
   38.21 -		<xsd:complexType>
   38.22 -		  <xsd:sequence>
   38.23 -			<xsd:element ref="TE" minOccurs ="1" maxOccurs ="unbounded"/>
   38.24 -		  </xsd:sequence>
   38.25 -		</xsd:complexType>
   38.26 -	  </xsd:element>
   38.27 -
   38.28 -	  <!-- chinese wall -->
   38.29 -	  <!--   type definition -->
   38.30 -	  <xsd:element name="ChWallTypes" minOccurs ="0" maxOccurs="1">
   38.31 -		<xsd:complexType>
   38.32 -		  <xsd:sequence>
   38.33 -			<xsd:element ref="ChWall"  minOccurs ="1" maxOccurs ="unbounded"/>
   38.34 -
   38.35 -      	   	</xsd:sequence>
   38.36 -          </xsd:complexType>
   38.37 -	</xsd:element>
   38.38 -
   38.39 -  	<!--   conflict set -->
   38.40 -	  <xsd:element name="ConflictSet" minOccurs ="0" maxOccurs="unbounded">
   38.41 -		<xsd:complexType>
   38.42 -		  <xsd:sequence>
   38.43 -			<xsd:element ref="ChWall"  minOccurs ="2" maxOccurs ="unbounded"/>
   38.44 -		  </xsd:sequence>
   38.45 -		</xsd:complexType>
   38.46 -	</xsd:element>
   38.47 -
   38.48 -	</xsd:sequence>
   38.49 -  </xsd:complexType>
   38.50 -</xsd:element>
   38.51 -
   38.52 -<xsd:element name="Policy">
   38.53 -    <xsd:complexType>
   38.54 -      <xsd:sequence>
   38.55 -
   38.56 -	<xsd:element name="PolicyHeader">
   38.57 -    	<xsd:complexType>
   38.58 -      	   <xsd:all>
   38.59 -		<xsd:element name = "Name" type="xsd:string"/>
   38.60 -		<xsd:element name = "DateTime" type="xsd:dateTime"/>
   38.61 -		<xsd:element name = "Tag" minOccurs ="1" maxOccurs ="1" type="xsd:string"/>
   38.62 -		<xsd:element name = "TypeDefinition">
   38.63 -    		<xsd:complexType>
   38.64 -      	   	  <xsd:all>
   38.65 -			<xsd:element name = "url" type="xsd:string"/>
   38.66 -			<xsd:element name = "hash" minOccurs ="0" maxOccurs ="1" type="xsd:string"/>
   38.67 -      	   	  </xsd:all>
   38.68 -    		</xsd:complexType>
   38.69 -		</xsd:element>
   38.70 -
   38.71 -      	   </xsd:all>
   38.72 -    	</xsd:complexType>
   38.73 -	</xsd:element>
   38.74 -
   38.75 -	<xsd:element name="VM" minOccurs ="1" maxOccurs="unbounded">
   38.76 -    	  <xsd:complexType>
   38.77 -      	   <xsd:sequence>
   38.78 -		<xsd:element name="id" type="xsd:integer"/>
   38.79 -		<xsd:element ref="TE" minOccurs="0" maxOccurs="unbounded" />
   38.80 -		<xsd:element ref="ChWall" minOccurs ="0" maxOccurs="unbounded"/>
   38.81 -      	   </xsd:sequence>
   38.82 -    	  </xsd:complexType>
   38.83 -	</xsd:element>
   38.84 -
   38.85 -	<xsd:element name="Vlan" minOccurs ="0" maxOccurs="unbounded">
   38.86 -    	  <xsd:complexType>
   38.87 -      	   <xsd:sequence>
   38.88 -		<xsd:element name="vid" type="xsd:integer"/>
   38.89 -		<xsd:element ref="TE" minOccurs="1" maxOccurs="unbounded" />
   38.90 -      	   </xsd:sequence>
   38.91 -    	  </xsd:complexType>
   38.92 -	</xsd:element>
   38.93 -
   38.94 -	<xsd:element name="Slot" minOccurs ="0" maxOccurs="unbounded">
   38.95 -    	  <xsd:complexType>
   38.96 -      	   <xsd:sequence>
   38.97 -		<xsd:element name="bus" type="xsd:integer"/>
   38.98 -		<xsd:element name="slot" type="xsd:integer"/>
   38.99 -		<xsd:element ref="TE" minOccurs="1" maxOccurs="unbounded" />
  38.100 -      	   </xsd:sequence>
  38.101 -    	  </xsd:complexType>
  38.102 -	</xsd:element>
  38.103 -
  38.104 -
  38.105 -      </xsd:sequence>
  38.106 -    </xsd:complexType>
  38.107 -</xsd:element>
  38.108 -
  38.109 -<!-- root element -->
  38.110 -<xsd:element name="SecurityPolicySpec">
  38.111 -    <xsd:complexType>
  38.112 -      <xsd:choice>
  38.113 -		<xsd:element ref="Definition" minOccurs ="1" maxOccurs="unbounded"/>
  38.114 -		<xsd:element ref="Policy" minOccurs ="1" maxOccurs="unbounded"/>
  38.115 -      </xsd:choice>
  38.116 -    </xsd:complexType>
  38.117 -</xsd:element>
  38.118 -</xsd:schema>

    39.1 --- a/tools/misc/policyprocessor/SsidsEntry.java	Fri Aug 19 10:18:53 2005 +0000
    39.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.3 @@ -1,29 +0,0 @@
    39.4 -/**
    39.5 - * (C) Copyright IBM Corp. 2005
    39.6 - *
    39.7 - * $Id: SsidsEntry.java,v 1.2 2005/06/17 20:02:40 rvaldez Exp $
    39.8 - *
    39.9 - * Author: Ray Valdez
   39.10 - * 
   39.11 - * This program is free software; you can redistribute it and/or
   39.12 - * modify it under the terms of the GNU General Public License as
   39.13 - * published by the Free Software Foundation, version 2 of the
   39.14 - * License.
   39.15 - *
   39.16 - * SsidsEntry Class.  
   39.17 - * <p>
   39.18 - *
   39.19 - * Holds ssid information.
   39.20 - *
   39.21 - * <p>
   39.22 - *
   39.23 - *
   39.24 - */
   39.25 -public class SsidsEntry 
   39.26 - {
   39.27 -  int id;	/* used for partition and vlan */
   39.28 -  int bus;	/* used for slots */
   39.29 -  int slot;
   39.30 -  int ste = 0xffffffff;
   39.31 -  int chw = 0xffffffff;
   39.32 - }

    40.1 --- a/tools/misc/policyprocessor/XmlToBin.java	Fri Aug 19 10:18:53 2005 +0000
    40.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.3 @@ -1,1570 +0,0 @@
    40.4 -/**
    40.5 - * (C) Copyright IBM Corp. 2005
    40.6 - *
    40.7 - * $Id: XmlToBin.java,v 1.3 2005/06/20 21:07:37 rvaldez Exp $
    40.8 - *
    40.9 - * Author: Ray Valdez
   40.10 - *
   40.11 - * Contributors:
   40.12 - *         Reiner Sailer - adjust type-lengths
   40.13 - *
   40.14 - * This program is free software; you can redistribute it and/or
   40.15 - * modify it under the terms of the GNU General Public License as
   40.16 - * published by the Free Software Foundation, version 2 of the
   40.17 - * License.
   40.18 - *
   40.19 - * XmlToBin  Class.  
   40.20 - * <p>
   40.21 - *
   40.22 - * Translates a xml representation of a SHYPE policy into a binary  
   40.23 - * format.  The class processes an xml policy file based on elment tags 
   40.24 - * defined in a schema definition files: SecurityPolicySpec.xsd.
   40.25 - *
   40.26 - * XmlToBin Command line Options: 
   40.27 - *
   40.28 - *      -i              inputFile:      name of policyfile (.xml)
   40.29 - *      -o              outputFile:     name of binary policy file (Big Endian)
   40.30 - *      -xssid          SsidFile:       xen ssids to types text file
   40.31 - *      -xssidconf      SsidConf:   	xen conflict ssids to types text file
   40.32 - *      -debug                          turn on debug messages
   40.33 - *      -help                           help. This printout
   40.34 - *
   40.35 - * <p>
   40.36 - *
   40.37 - *
   40.38 - */
   40.39 -import java.util.*;
   40.40 -import java.io.*;
   40.41 -import java.io.IOException;
   40.42 -import java.io.FileNotFoundException;
   40.43 -import org.w3c.dom.Document;
   40.44 -import org.w3c.dom.Element;
   40.45 -import org.w3c.dom.Node;
   40.46 -import org.w3c.dom.Attr;
   40.47 -import org.w3c.dom.NodeList;
   40.48 -import org.w3c.dom.NamedNodeMap;
   40.49 -import org.xml.sax.*;
   40.50 -import javax.xml.parsers.*;
   40.51 -import org.xml.sax.helpers.*;
   40.52 -
   40.53 -public class XmlToBin 
   40.54 - implements XmlToBinInterface
   40.55 -{
   40.56 -  class SlotInfo {
   40.57 -	String bus;
   40.58 -	String slot;
   40.59 -  }
   40.60 -
   40.61 - boolean LittleEndian = false;
   40.62 - boolean debug = false;
   40.63 -
   40.64 - static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
   40.65 -
   40.66 - static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
   40.67 -
   40.68 - public static void printUsage()
   40.69 - {
   40.70 -  System.out.println("XmlToBin Command line Options: ");
   40.71 -  System.out.println("\t-i\t\tinputFile:\tname of policyfile (.xml)");
   40.72 -  System.out.println("\t-o\t\toutputFile:\tname of binary policy file (Big Endian)");
   40.73 -  System.out.println("\t-xssid\t\tSsidFile:\tXen ssids to named types text file");
   40.74 -  System.out.println("\t-xssidconf\tSsidConfFile:\tXen conflict ssids to named types text file");
   40.75 -  System.out.println("\t-debug\t\t\t\tturn on debug messages");
   40.76 -  System.out.println("\t-help\t\t\t\thelp. This printout");
   40.77 -  return;
   40.78 - }
   40.79 -
   40.80 - public void printDebug(String message) 
   40.81 - {
   40.82 -  if (debug)
   40.83 -    System.out.println(message);
   40.84 - }
   40.85 -
   40.86 - public void writeBinPolicy(byte[] binPolicy, String outputFileName)
   40.87 -  throws Exception
   40.88 - {
   40.89 -    if (debug) 
   40.90 -    	printHex(binPolicy,binPolicy.length);
   40.91 -
   40.92 -    DataOutputStream writeObj = new DataOutputStream(
   40.93 -                                new FileOutputStream(outputFileName));
   40.94 -
   40.95 -    writeObj.write(binPolicy);
   40.96 -    writeObj.flush();
   40.97 -    writeObj.close();
   40.98 -    System.out.println(" wBP:: wrote outputfile: " + outputFileName);
   40.99 -
  40.100 -    return; 
  40.101 - }  
  40.102 -
  40.103 - public void writeXenTypeVectorFile(Vector list, String outputFileName)
  40.104 -  throws Exception
  40.105 - {
  40.106 -  PrintWriter out;
  40.107 -
  40.108 -  if (0 == list.size())
  40.109 -  {
  40.110 -   	printDebug(" wSTF : size of input is zero when writing :" + outputFileName); 
  40.111 -	return;
  40.112 -  }
  40.113 - out = new PrintWriter(
  40.114 -	 	new BufferedWriter(
  40.115 -                      new FileWriter(outputFileName)));
  40.116 -
  40.117 -
  40.118 -  for (int i = 0; i < list.size(); i++)
  40.119 -  {
  40.120 -	Vector	ee = (Vector) list.elementAt(i);
  40.121 -   	out.println(i + " " +ee.toString());
  40.122 -  } 
  40.123 -    out.close();
  40.124 -   
  40.125 -    return; 
  40.126 - }
  40.127 -
  40.128 - public void writeXenTypeFile(Vector list, String outputFileName, boolean slabel)
  40.129 -  throws Exception
  40.130 - {
  40.131 -  Vector entry; 
  40.132 -  String strTypes = "";
  40.133 -  SecurityLabel ee;
  40.134 -  PrintWriter out;
  40.135 -
  40.136 -  if (0 == list.size())
  40.137 -  {
  40.138 -   	printDebug(" wSTF : size of input is zero when writing :" + outputFileName); 
  40.139 -	return;
  40.140 -  }
  40.141 -  out = new PrintWriter(
  40.142 -	 	new BufferedWriter(
  40.143 -                      new FileWriter(outputFileName)));
  40.144 -
  40.145 -  for (int i = 0; i < list.size(); i++)
  40.146 -  {
  40.147 -	ee = (SecurityLabel) list.elementAt(i);
  40.148 -
  40.149 -	if (slabel)
  40.150 -	{
  40.151 -		entry = ee.steTypes; 
  40.152 -	} else {
  40.153 -
  40.154 -		entry = ee.chwTypes; 
  40.155 -	}
  40.156 -	if (null == entry) continue;
  40.157 -
  40.158 -	Enumeration e = entry.elements(); 
  40.159 -	while (e.hasMoreElements())
  40.160 -	{
  40.161 -  	  String typeName = (String) e.nextElement(); 
  40.162 -	  strTypes = strTypes + " " + typeName;
  40.163 -        }
  40.164 -    	  printDebug(" WXTF:: ssid : "+i +" :"+strTypes); 
  40.165 -   	  out.println(i +" "+strTypes);
  40.166 -	  strTypes = "";
  40.167 -  } 
  40.168 -  out.close();
  40.169 -   
  40.170 -  return; 
  40.171 - }
  40.172 -
  40.173 - public void setDebug(boolean value)
  40.174 - {
  40.175 -  debug=value;
  40.176 - }
  40.177 -
  40.178 - public void setEndian(boolean value)
  40.179 - {
  40.180 -  LittleEndian = value;
  40.181 - }
  40.182 -
  40.183 - public byte[] generateVlanSsids(Vector bagOfSsids)
  40.184 -  throws Exception
  40.185 - {
  40.186 -  /**
  40.187 -        typedef struct {
  40.188 -        u16 vlan;
  40.189 -        u16 ssid_ste;
  40.190 -        } acm_vlan_entry_t;
  40.191 -  **/
  40.192 -
  40.193 -  Hashtable  vlanSsid = new Hashtable();
  40.194 -  printDebug(" gVS::Size of bagOfSsids: "+ bagOfSsids.size());
  40.195 -
  40.196 -  /* Get the number of partitions */
  40.197 -  for (int i = 0; i < bagOfSsids.size(); i++)
  40.198 -  {
  40.199 -	SecurityLabel entry = (SecurityLabel) bagOfSsids.elementAt(i);
  40.200 -
  40.201 -	if (null == entry.vlans)
  40.202 -	  continue;
  40.203 -
  40.204 -	Enumeration e = entry.vlans.elements(); 
  40.205 -	while (e.hasMoreElements())
  40.206 -	{
  40.207 -  	  String id = (String) e.nextElement(); 
  40.208 -      	  printDebug(" gVS:: vlan: " + id + "has ste ssid: " + entry.steSsidPosition);
  40.209 -	  if (-1 == entry.steSsidPosition)
  40.210 -		continue;  
  40.211 -
  40.212 -	  /* Only use ste for vlan */
  40.213 -	  SsidsEntry  ssidsObj = new SsidsEntry();
  40.214 -
  40.215 -	  ssidsObj.id = Integer.parseInt(id); 
  40.216 -	  ssidsObj.ste = entry.steSsidPosition;
  40.217 -
  40.218 -	  if (vlanSsid.contains(id))
  40.219 -      	  	printDebug(" gVS:: Error already in the Hash part:" + ssidsObj.id);
  40.220 -	  else 
  40.221 - 		vlanSsid.put(id, ssidsObj);
  40.222 -      	  	printDebug(" gVS:: added part: " + id + "has ste ssid: " + entry.steSsidPosition);
  40.223 -	}
  40.224 -  }
  40.225 -
  40.226 -  /* allocate array */ 
  40.227 -  int numOfVlan = vlanSsid.size();
  40.228 -  int totalSize = (numOfVlan * vlanEntrySz);  
  40.229 -
  40.230 -  if (0 == numOfVlan) 
  40.231 -  {
  40.232 -  	printDebug(" gVS:: vlan: binary ==> zero");
  40.233 -        return new byte[0];
  40.234 -  }
  40.235 -
  40.236 -  byte[] vlanArray = new byte[totalSize];
  40.237 -
  40.238 -  int index = 0;
  40.239 -
  40.240 -  Enumeration e = vlanSsid.elements(); 
  40.241 -  while (e.hasMoreElements())
  40.242 -  {
  40.243 -  	SsidsEntry entry = (SsidsEntry) e.nextElement(); 
  40.244 -      	printDebug(" gVS:: part: " + entry.id + " ste ssid: " + entry.ste);
  40.245 -
  40.246 -	/* Write id */
  40.247 -   	writeShortToStream(vlanArray,(short)entry.id,index);
  40.248 -	index = index + u16Size;
  40.249 -
  40.250 -	/* write ste ssid */
  40.251 -   	writeShortToStream(vlanArray,(short) entry.ste,index);
  40.252 -	index = index + u16Size;
  40.253 -  }
  40.254 -
  40.255 -  printDebug(" gVS:: vlan: num of vlans  " + numOfVlan);
  40.256 -  printDebug(" gVS:: vlan: binary ==> Length "+ vlanArray.length);
  40.257 -
  40.258 -  if (debug) 
  40.259 -	printHex(vlanArray,vlanArray.length);
  40.260 -  printDebug("\n");
  40.261 -
  40.262 -  return vlanArray; 
  40.263 - }  
  40.264 -
  40.265 - public byte[] generateSlotSsids(Vector bagOfSsids)
  40.266 -  throws Exception
  40.267 - {
  40.268 -  /**
  40.269 -        typedef struct {
  40.270 -        u16 slot_max;
  40.271 -        u16 slot_offset;
  40.272 -        } acm_slot_buffer_t;
  40.273 -
  40.274 -        typedef struct {
  40.275 -        u16 bus;
  40.276 -        u16 slot;
  40.277 -        u16 ssid_ste;
  40.278 -        } acm_slot_entry_t;
  40.279 -  **/
  40.280 -  Hashtable  slotSsid = new Hashtable();
  40.281 -  printDebug(" gSS::Size of bagOfSsids: "+ bagOfSsids.size());
  40.282 -
  40.283 -  /* Find the number of VMs */ 
  40.284 -  for (int i = 0; i < bagOfSsids.size(); i++)
  40.285 -  {
  40.286 -	SecurityLabel entry = (SecurityLabel) bagOfSsids.elementAt(i);
  40.287 -
  40.288 -	if (null == entry.slots)
  40.289 -	  continue;
  40.290 -
  40.291 -	Enumeration e = entry.slots.elements(); 
  40.292 -	while (e.hasMoreElements())
  40.293 -	{
  40.294 -  	  SlotInfo item = (SlotInfo) e.nextElement(); 
  40.295 -      	  printDebug(" gSS:: bus slot: " + item.bus + " "+ item.slot + " " +  entry.steSsidPosition);
  40.296 -	  if (-1 == entry.steSsidPosition)
  40.297 -		continue;  
  40.298 -
  40.299 -	  SsidsEntry  ssidsObj = new SsidsEntry();
  40.300 -
  40.301 -	  String id = item.bus +" "+item.slot;
  40.302 -	  ssidsObj.bus = Integer.parseInt(item.bus); 
  40.303 -	  ssidsObj.slot = Integer.parseInt(item.slot); 
  40.304 -	  /* set ste ssid */
  40.305 -	  ssidsObj.ste = entry.steSsidPosition;
  40.306 -
  40.307 -	  if (slotSsid.contains(id))
  40.308 -      	  	printDebug(" gSS:: Error already in the Hash part:" + id);
  40.309 -	  else 
  40.310 -	  	slotSsid.put(id, ssidsObj);
  40.311 -
  40.312 -      	  	printDebug(" gSS:: added slot: " + id + "has ste ssid: " + entry.steSsidPosition);
  40.313 -	}
  40.314 -  }
  40.315 -
  40.316 -  /* allocate array */
  40.317 -  int numOfSlot = slotSsid.size();
  40.318 -
  40.319 -  if (0 == numOfSlot) 
  40.320 -  {
  40.321 -  	printDebug(" gVS:: slot: binary ==> zero");
  40.322 -        return new byte[0];
  40.323 -  }
  40.324 -
  40.325 -  int totalSize = (numOfSlot * slotEntrySz);  
  40.326 -
  40.327 -  byte[] slotArray = new byte[totalSize];
  40.328 -
  40.329 -  int index = 0;
  40.330 -
  40.331 -  Enumeration e = slotSsid.elements(); 
  40.332 -  while (e.hasMoreElements())
  40.333 -  {
  40.334 -  	SsidsEntry entry = (SsidsEntry) e.nextElement(); 
  40.335 -      	System.out.println(" gSS:: bus slot: " + entry.bus + " " + entry.slot + " ste ssid: " + entry.ste);
  40.336 -
  40.337 -	/* Write bus */
  40.338 -   	writeShortToStream(slotArray,(short)entry.bus,index);
  40.339 -	index = index + u16Size;
  40.340 -
  40.341 -	/* Write slot */ 
  40.342 -   	writeShortToStream(slotArray,(short)entry.slot,index);
  40.343 -	index = index + u16Size;
  40.344 -
  40.345 -	/* Write ste ssid */
  40.346 -   	writeShortToStream(slotArray,(short) entry.ste,index);
  40.347 -	index = index + u16Size;
  40.348 -
  40.349 -  }
  40.350 -   
  40.351 -  printDebug(" gSS:: slot: num of vlans  " + numOfSlot);
  40.352 -  printDebug(" gSS:: slot: binary ==> Length "+ slotArray.length);
  40.353 -
  40.354 -  if (debug) 
  40.355 - 	 printHex(slotArray,slotArray.length);
  40.356 -  printDebug("\n");
  40.357 -
  40.358 -  return slotArray; 
  40.359 -
  40.360 - }  
  40.361 -
  40.362 - public byte[] generatePartSsids(Vector bagOfSsids, Vector bagOfChwSsids)
  40.363 -  throws Exception
  40.364 - {
  40.365 -  /**
  40.366 -        typedef struct {
  40.367 -        u16 id;
  40.368 -        u16 ssid_ste;
  40.369 -        u16 ssid_chwall;
  40.370 -        } acm_partition_entry_t;
  40.371 -
  40.372 -  **/
  40.373 -  Hashtable  partSsid = new Hashtable();
  40.374 -  printDebug(" gPS::Size of bagOfSsids: "+ bagOfSsids.size());
  40.375 -
  40.376 -  /* Find the number of VMs */ 
  40.377 -  for (int i = 0; i < bagOfSsids.size(); i++)
  40.378 -  {
  40.379 -	SecurityLabel entry = (SecurityLabel) bagOfSsids.elementAt(i);
  40.380 -
  40.381 -	if (null == entry.ids)
  40.382 -	  continue;
  40.383 -
  40.384 -	Enumeration e = entry.ids.elements(); 
  40.385 -	while (e.hasMoreElements())
  40.386 -	{
  40.387 -  	  String id = (String) e.nextElement(); 
  40.388 -      	  printDebug(" gPS:: part: " + id + "has ste ssid: " + entry.steSsidPosition);
  40.389 -	  if (-1 == entry.steSsidPosition)
  40.390 -		continue;  
  40.391 -
  40.392 -	  SsidsEntry  ssidsObj = new SsidsEntry();
  40.393 -
  40.394 -	  ssidsObj.id = Integer.parseInt(id); 
  40.395 -	  ssidsObj.ste = entry.steSsidPosition;
  40.396 -
  40.397 -	  if (partSsid.contains(id))
  40.398 -      	  	printDebug(" gPS:: Error already in the Hash part:" + ssidsObj.id);
  40.399 -	  else 
  40.400 - 		partSsid.put(id, ssidsObj);
  40.401 -      	  	printDebug(" gPS:: added part: " + id + "has ste ssid: " + entry.steSsidPosition);
  40.402 -	}
  40.403 -
  40.404 -  }
  40.405 -
  40.406 -  for (int i = 0; i < bagOfChwSsids.size(); i++)
  40.407 -  {
  40.408 -	SecurityLabel entry = (SecurityLabel) bagOfChwSsids.elementAt(i);
  40.409 -
  40.410 -	Enumeration e = entry.chwIDs.elements(); 
  40.411 -	while (e.hasMoreElements())
  40.412 -	{
  40.413 -  	  String id = (String) e.nextElement(); 
  40.414 -      	  printDebug(" gPS:: part: " + id + "has chw ssid: " + entry.chwSsidPosition);
  40.415 -	  if (partSsid.containsKey(id))
  40.416 -	  {
  40.417 -		SsidsEntry item = (SsidsEntry) partSsid.get(id);
  40.418 -		item.chw = entry.chwSsidPosition;
  40.419 -      	  	printDebug(" gPS:: added :" + item.id +" chw: " + item.chw);
  40.420 -	  }
  40.421 -	  else 
  40.422 -	  {
  40.423 -      	  	printDebug(" gPS:: creating :" + id +" chw: " + entry.chwSsidPosition);
  40.424 -	  	SsidsEntry  ssidsObj = new SsidsEntry();
  40.425 -	  	ssidsObj.id = Integer.parseInt(id); 
  40.426 -	  	ssidsObj.chw = entry.chwSsidPosition;
  40.427 - 		partSsid.put(id, ssidsObj);
  40.428 -
  40.429 -	  }
  40.430 -	}
  40.431 -  }	  
  40.432 -
  40.433 -  /* Allocate array */
  40.434 -  int numOfPar = partSsid.size();
  40.435 -  int totalSize =  (numOfPar * partitionEntrySz);  
  40.436 -
  40.437 -  if (0 == numOfPar) 
  40.438 -  {
  40.439 -  	printDebug(" gPS:: part: binary ==> zero");
  40.440 -        return new byte[0];
  40.441 -  }
  40.442 -
  40.443 -  byte[] partArray = new byte[totalSize];
  40.444 -
  40.445 -  int index = 0;
  40.446 -
  40.447 -  Enumeration e = partSsid.elements(); 
  40.448 -  while (e.hasMoreElements())
  40.449 -  {
  40.450 -  	SsidsEntry entry = (SsidsEntry) e.nextElement(); 
  40.451 -      	printDebug(" gPS:: part: " + entry.id + " ste ssid: " + entry.ste + " chw ssid: "+ entry.chw);
  40.452 -
  40.453 -	/* Write id */
  40.454 -   	writeShortToStream(partArray,(short)entry.id,index);
  40.455 -	index = index + u16Size;
  40.456 -
  40.457 -	/* Write ste ssid */
  40.458 -   	writeShortToStream(partArray,(short) entry.ste,index);
  40.459 -	index = index + u16Size;
  40.460 -
  40.461 -	/* Write chw ssid */
  40.462 -   	writeShortToStream(partArray,(short) entry.chw,index);
  40.463 -	index = index + u16Size;
  40.464 -  }
  40.465 -
  40.466 -  printDebug(" gPS:: part: num of partitions  " + numOfPar);
  40.467 -  printDebug(" gPS:: part: binary ==> Length " + partArray.length);
  40.468 -
  40.469 -  if (debug) 
  40.470 -	printHex(partArray,partArray.length);
  40.471 -  printDebug("\n");
  40.472 -   
  40.473 -   return partArray; 
  40.474 - }
  40.475 -
  40.476 - public  byte[] GenBinaryPolicyBuffer(byte[] chwPolicy, byte[] stePolicy, byte [] partMap, byte[] vlanMap, byte[] slotMap)
  40.477 - {
  40.478 -  byte[] binBuffer;
  40.479 -  short chwSize =0;
  40.480 -  short steSize =0;
  40.481 -  int	index = 0;
  40.482 -
  40.483 -  /* Builds data structure acm_policy_buffer_t */
  40.484 -  /* Get number of colorTypes */
  40.485 -  if (null != chwPolicy)
  40.486 -	chwSize = (short) chwPolicy.length;
  40.487 -
  40.488 -  if (null != stePolicy)
  40.489 -    	steSize = (short) stePolicy.length;
  40.490 -
  40.491 -  int totalDataSize = chwSize + steSize + resourceOffsetSz +  3 *(2 * u16Size);
  40.492 -
  40.493 -  /*  Add vlan and slot */ 
  40.494 -  totalDataSize = totalDataSize +partMap.length + vlanMap.length + slotMap.length; 
  40.495 -  binBuffer = new byte[binaryBufferHeaderSz +totalDataSize];
  40.496 -	
  40.497 -
  40.498 -  try {
  40.499 -	  index = 0;
  40.500 -	  /* fill in General Policy Version */
  40.501 -	  writeIntToStream(binBuffer, ACM_POLICY_VERSION, index);
  40.502 -	  index += u32Size;
  40.503 -
  40.504 -	  /* Write magic */
  40.505 -	  writeIntToStream(binBuffer, ACM_MAGIC, index);
  40.506 -	  index += u32Size;
  40.507 -
  40.508 -	  /* write len */
  40.509 -	  writeIntToStream(binBuffer, binBuffer.length, index);
  40.510 -	  index += u32Size;
  40.511 -
  40.512 -  } catch (IOException ee) {
  40.513 -	  System.out.println(" GBPB:: got exception : " + ee);
  40.514 -	  return null;
  40.515 -  }
  40.516 -
  40.517 -  int offset, address;
  40.518 -  address = index;
  40.519 -
  40.520 -  if (null != partMap) 
  40.521 -	  offset = binaryBufferHeaderSz + resourceOffsetSz;
  40.522 -  else
  40.523 -	  offset = binaryBufferHeaderSz;
  40.524 -
  40.525 -  try {
  40.526 -	  int skip = 0;
  40.527 -
  40.528 -	  /* init with NULL policy setting */
  40.529 -	  writeIntToStream(binBuffer, ACM_NULL_POLICY, index);
  40.530 -	  writeIntToStream(binBuffer, 0, index + u32Size);
  40.531 -	  writeIntToStream(binBuffer, ACM_NULL_POLICY, index + 2*u32Size);
  40.532 -	  writeIntToStream(binBuffer, 0, index + 3*u32Size);
  40.533 -	  
  40.534 -	  index = address;
  40.535 -	  if (null != chwPolicy) {
  40.536 -	  
  40.537 -		  /* Write policy name */
  40.538 -		  writeIntToStream(binBuffer, ACM_CHINESE_WALL_POLICY, index);
  40.539 -		  index += u32Size;
  40.540 -
  40.541 -		  /* Write offset */
  40.542 -		  writeIntToStream(binBuffer, offset, index);
  40.543 -		  index += u32Size;
  40.544 -
  40.545 -		  /* Write payload. No need increment index */
  40.546 -		  address = offset;
  40.547 -		  System.arraycopy(chwPolicy, 0, binBuffer,address, chwPolicy.length);
  40.548 -		  address = address + chwPolicy.length;
  40.549 -	  } else
  40.550 -		  skip += 2*u32Size;
  40.551 -
  40.552 -	  if (null != stePolicy) 
  40.553 -	  {	
  40.554 -	  	/* Write policy name */
  40.555 -	  	writeIntToStream(binBuffer, ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY, index);
  40.556 -  	  	index += u32Size;
  40.557 -
  40.558 -	  	/* Write offset */
  40.559 -	  	writeIntToStream(binBuffer, address, index);
  40.560 -  	  	index += u32Size;
  40.561 -
  40.562 -		/* Copy array */
  40.563 -	  	System.arraycopy(stePolicy, 0, binBuffer,address, stePolicy.length);
  40.564 -		/* Update address */
  40.565 -		address = address + stePolicy.length;
  40.566 -	  } else
  40.567 -		 skip += 2*u32Size;
  40.568 -
  40.569 -	  /* Skip writing policy name and offset for each null policy*/
  40.570 -	  index +=  skip;
  40.571 -
  40.572 -	  int size;
  40.573 -	  /* Assumes that you will always have a partition defined in policy */
  40.574 -	  if ( 0 < partMap.length) {
  40.575 -		  writeIntToStream(binBuffer, address, index);
  40.576 -		  index = address;
  40.577 -
  40.578 -		  /* Compute num of VMs */
  40.579 -		  size = partMap.length / (3 * u16Size);
  40.580 -
  40.581 -		  writeShortToStream(binBuffer, (short)size,index);
  40.582 -		  index = index + u16Size;
  40.583 -
  40.584 -		  /* part, vlan and slot: each one consists of two entries */
  40.585 -		  offset = 3 * (2 * u16Size);
  40.586 -		  writeShortToStream(binBuffer, (short) offset,index);
  40.587 -
  40.588 -		  /* Write partition array at offset */
  40.589 -		  System.arraycopy(partMap, 0, binBuffer,(offset + address), partMap.length);
  40.590 -		  index = index + u16Size;
  40.591 -		  offset = offset + partMap.length;
  40.592 -	  }
  40.593 -
  40.594 -	  if ( 0 < vlanMap.length) {
  40.595 -		  size = vlanMap.length / (2 * u16Size);
  40.596 -		  writeShortToStream(binBuffer, (short) size,index);
  40.597 -		  index = index + u16Size;
  40.598 -
  40.599 -		  writeShortToStream(binBuffer, (short) offset,index);
  40.600 -		  index = index + u16Size;
  40.601 -		  System.arraycopy(vlanMap, 0, binBuffer,(offset + address), vlanMap.length);
  40.602 -	  } else {
  40.603 -		  /* Write vlan max */
  40.604 -		  writeShortToStream(binBuffer, (short) 0,index);
  40.605 -		  index = index + u16Size;
  40.606 - 
  40.607 -		  /* Write vlan offset */
  40.608 -		  writeShortToStream(binBuffer, (short) 0,index);
  40.609 -		  index = index + u16Size;
  40.610 -	  }
  40.611 -
  40.612 -	  offset = offset + vlanMap.length;
  40.613 -	  if ( 0 < slotMap.length) {
  40.614 -		  size = slotMap.length / (3 * u16Size);
  40.615 -		  writeShortToStream(binBuffer, (short) size,index);
  40.616 -		  index = index + u16Size;
  40.617 -
  40.618 -		  writeShortToStream(binBuffer, (short) offset,index);
  40.619 -		  index = index + u16Size;
  40.620 -		  System.arraycopy(slotMap, 0, binBuffer,(offset + address), slotMap.length);
  40.621 -	  }
  40.622 -  } catch (IOException ee) {
  40.623 -	  System.out.println(" GBPB:: got exception : " + ee);
  40.624 -	  return null;
  40.625 -  }
  40.626 -
  40.627 -  printDebug(" GBP:: Binary Policy ==> length " + binBuffer.length);
  40.628 -  if (debug)
  40.629 -	  printHex(binBuffer,binBuffer.length);
  40.630 -
  40.631 -  return  binBuffer;
  40.632 - } 
  40.633 -
  40.634 - public  byte[] generateChwBuffer(Vector Ssids, Vector ConflictSsids, Vector ColorTypes)
  40.635 - {
  40.636 -  byte[] chwBuffer;
  40.637 -  int index = 0;
  40.638 -  int position = 0;
  40.639 -
  40.640 -  /* Get number of rTypes */
  40.641 -  int maxTypes = ColorTypes.size();
  40.642 -
  40.643 -  /* Get number of SSids entry */
  40.644 -  int maxSsids = Ssids.size();
  40.645 -
  40.646 -  /* Get number of conflict sets */
  40.647 -  int maxConflict = ConflictSsids.size();
  40.648 -
  40.649 -   
  40.650 -  if (maxTypes * maxSsids == 0)
  40.651 -	return null; 
  40.652 -  /*
  40.653 -     data structure acm_chwall_policy_buffer
  40.654 -     se XmlToBinInterface.java
  40.655 -  */
  40.656 -  int totalBytes = chwHeaderSize  + u16Size *(maxTypes * (maxSsids + maxConflict)); 
  40.657 -
  40.658 -  chwBuffer = new byte[ totalBytes ];
  40.659 -  int address = chwHeaderSize + (u16Size * maxTypes * maxSsids );
  40.660 -
  40.661 -  printDebug(" gCB:: chwall totalbytes : "+totalBytes); 
  40.662 -
  40.663 -  try {
  40.664 -	  index = 0;
  40.665 -	  /* fill in General Policy Version */
  40.666 -	  writeIntToStream(chwBuffer, ACM_CHWALL_VERSION, index);
  40.667 -	  index += u32Size;
  40.668 -
  40.669 -	  writeIntToStream(chwBuffer, ACM_CHINESE_WALL_POLICY, index);
  40.670 -	  index += u32Size;
  40.671 -
  40.672 -	  writeIntToStream(chwBuffer, maxTypes, index);
  40.673 -	  index += u32Size;
  40.674 -
  40.675 -	  writeIntToStream(chwBuffer, maxSsids, index);
  40.676 -	  index += u32Size;
  40.677 -
  40.678 -	  writeIntToStream(chwBuffer, maxConflict, index);
  40.679 -	  index += u32Size;
  40.680 -
  40.681 -	  /*  Write chwall_ssid_offset */
  40.682 -	  writeIntToStream(chwBuffer, chwHeaderSize, index);
  40.683 -	  index += u32Size;
  40.684 -
  40.685 -	  /* Write chwall_conflict_sets_offset */
  40.686 -	  writeIntToStream(chwBuffer, address, index);
  40.687 -	  index += u32Size;
  40.688 -
  40.689 -	  /*  Write chwall_running_types_offset */
  40.690 -	  writeIntToStream(chwBuffer, 0, index);
  40.691 -	  index += u32Size;
  40.692 -
  40.693 -	  /*  Write chwall_conflict_aggregate_offset */
  40.694 -	  writeIntToStream(chwBuffer, 0, index);
  40.695 -	  index += u32Size;
  40.696 -
  40.697 -  } catch (IOException ee) {
  40.698 -    	System.out.println(" gCB:: got exception : " + ee); 
  40.699 -	return null;
  40.700 -  }
  40.701 -  int markPos = 0;
  40.702 -
  40.703 -  /* Create the SSids entry */
  40.704 -  for (int i = 0; i < maxSsids; i++)
  40.705 -  {
  40.706 -	SecurityLabel ssidEntry = (SecurityLabel) Ssids.elementAt(i);
  40.707 -   	/* Get chwall types */
  40.708 -	ssidEntry.chwSsidPosition = i;
  40.709 -	Enumeration e = ssidEntry.chwTypes.elements(); 
  40.710 -	while (e.hasMoreElements())
  40.711 -	{
  40.712 -  	  String typeName = (String) e.nextElement(); 
  40.713 -      	  printDebug(" gCB:: Ssid "+ i+ ": has type : " + typeName);
  40.714 -	  position = ColorTypes.indexOf(typeName);
  40.715 -
  40.716 -	  if (position < 0) 
  40.717 -	  {
  40.718 -      	  	System.out.println (" gCB:: Error type : " + typeName + " not found in ColorTypes"); 
  40.719 -		return null; 
  40.720 -	  }
  40.721 -   	  printDebug(" GCB:: type : " + typeName + "  found in ColorTypes at position: " + position); 
  40.722 -	  markPos = ((i * maxTypes + position) * u16Size) + index;	
  40.723 -
  40.724 -	  try {
  40.725 -	  	writeShortToStream(chwBuffer,markSymbol,markPos);
  40.726 -  	  } catch (IOException ee) {
  40.727 -   	  	System.out.println(" gCB:: got exception : "); 
  40.728 -		return null; 
  40.729 -  	  }
  40.730 -	}
  40.731 -  }
  40.732 -
  40.733 -  if (debug) 
  40.734 -      printHex(chwBuffer,chwBuffer.length);
  40.735 -
  40.736 -  /* Add conflict set */
  40.737 -  index = address;
  40.738 -  for (int i = 0; i < maxConflict; i++)
  40.739 -  {
  40.740 -   	/* Get ste types */
  40.741 -	Vector entry = (Vector) ConflictSsids.elementAt(i);
  40.742 -	Enumeration e = entry.elements(); 
  40.743 -	while (e.hasMoreElements())
  40.744 -	{
  40.745 -  	  String typeName = (String) e.nextElement(); 
  40.746 -      	  printDebug (" GCB:: conflict Ssid "+ i+ ": has type : " + typeName);
  40.747 -	  position = ColorTypes.indexOf(typeName);
  40.748 -
  40.749 -	  if (position < 0) 
  40.750 -	  {
  40.751 -      	  	System.out.println (" GCB:: Error type : " + typeName + " not found in ColorTypes"); 
  40.752 -		return null; 
  40.753 -	  }
  40.754 -   	  printDebug(" GCB:: type : " + typeName + "  found in ColorTypes at position: " + position); 
  40.755 -	  markPos = ((i * maxTypes + position) * u16Size) + index;	
  40.756 -
  40.757 -	  try {
  40.758 -	  	writeShortToStream(chwBuffer,markSymbol,markPos);
  40.759 -  	  } catch (IOException ee) {
  40.760 -   	  	System.out.println(" GCB:: got exception : "); 
  40.761 -		return null; 
  40.762 -  	  }
  40.763 -	}
  40.764 -		
  40.765 -  } 
  40.766 -  printDebug(" gSB:: chw binary  ==> Length " + chwBuffer.length); 
  40.767 -  if (debug) 
  40.768 -   	printHex(chwBuffer,chwBuffer.length);
  40.769 -  printDebug("\n");
  40.770 -
  40.771 -  return chwBuffer;
  40.772 - }
  40.773 -
  40.774 -/**********************************************************************
  40.775 - Generate byte representation of policy using type information
  40.776 - <p>
  40.777 - @param Ssids    	      	Vector
  40.778 - @param ColorTypes         	Vector
  40.779 - <p>
  40.780 - @return bytes represenation of simple type enforcement policy 
  40.781 -**********************************************************************/
  40.782 - public  byte[] generateSteBuffer(Vector Ssids, Vector ColorTypes)
  40.783 - {
  40.784 -  byte[] steBuffer;
  40.785 -  int index = 0;
  40.786 -  int position = 0;
  40.787 -
  40.788 -  /* Get number of colorTypes */
  40.789 -  int numColorTypes = ColorTypes.size();
  40.790 -
  40.791 -  /* Get number of SSids entry */
  40.792 -  int numSsids = Ssids.size();
  40.793 -   
  40.794 -  if (numColorTypes * numSsids == 0)
  40.795 -	return null; 
  40.796 -
  40.797 -  /* data structure: acm_ste_policy_buffer
  40.798 -   * see XmlToBinInterface.java
  40.799 -   * total bytes: steHeaderSize * 2B + colorTypes(size) * Ssids(size)
  40.800 -   * 
  40.801 -  */
  40.802 -  steBuffer = new byte[ steHeaderSize + (numColorTypes * numSsids) * 2];
  40.803 -
  40.804 -  try {
  40.805 -	
  40.806 -	  index = 0;
  40.807 -	  writeIntToStream(steBuffer, ACM_STE_VERSION, index);
  40.808 -	  index += u32Size;
  40.809 -
  40.810 -	  writeIntToStream(steBuffer, ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY, index);
  40.811 -	  index += u32Size;
  40.812 -
  40.813 -	  writeIntToStream(steBuffer, numColorTypes, index);
  40.814 -	  index += u32Size;
  40.815 -
  40.816 -	  writeIntToStream(steBuffer, numSsids, index);
  40.817 -	  index += u32Size;
  40.818 -
  40.819 -	  writeIntToStream(steBuffer, steHeaderSize, index);
  40.820 -	  index += u32Size;
  40.821 -
  40.822 -
  40.823 -  } catch (IOException ee) {
  40.824 -	System.out.println(" gSB:: got exception : " + ee); 
  40.825 -	return null; 
  40.826 -  }
  40.827 -  int markPos = 0;
  40.828 -  for (int i = 0; i < numSsids; i++)
  40.829 -  {
  40.830 -	
  40.831 -	SecurityLabel ssidEntry = (SecurityLabel) Ssids.elementAt(i);
  40.832 -	ssidEntry.steSsidPosition = i;
  40.833 -   	/* Get ste types */
  40.834 -	Enumeration e = ssidEntry.steTypes.elements(); 
  40.835 -	while (e.hasMoreElements())
  40.836 -	{
  40.837 -  	  String typeName = (String) e.nextElement(); 
  40.838 -      	  printDebug (" gSB:: Ssid "+ i+ ": has type : " + typeName);
  40.839 -	  position = ColorTypes.indexOf(typeName);
  40.840 -
  40.841 -	  if (position < 0) 
  40.842 -	  {
  40.843 -      	  	printDebug(" gSB:: Error type : " + typeName + " not found in ColorTypes"); 
  40.844 -		return null; 
  40.845 -	  }
  40.846 -   	  printDebug(" gSB:: type : " + typeName + "  found in ColorTypes at position: " + position); 
  40.847 -	  markPos = ((i * numColorTypes + position) * u16Size) + index;	
  40.848 -
  40.849 -	  try {
  40.850 -	  	writeShortToStream(steBuffer,markSymbol,markPos);
  40.851 -  	  } catch (IOException ee)
  40.852 -  	  {
  40.853 -   	  	System.out.println(" gSB:: got exception : "); 
  40.854 -		return null; 
  40.855 -  	  }
  40.856 -	}
  40.857 -		
  40.858 -  } 
  40.859 -
  40.860 -  printDebug(" gSB:: ste binary  ==> Length " + steBuffer.length); 
  40.861 -  if (debug) 
  40.862 - 	printHex(steBuffer,steBuffer.length);
  40.863 -  printDebug("\n");
  40.864 -
  40.865 -  return steBuffer;
  40.866 - }
  40.867 -
  40.868 - public static  void printHex(byte [] dataArray, int length)
  40.869 - {
  40.870 -  char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7',
  40.871 -                '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
  40.872 -  int hexIndex;
  40.873 -  int value;
  40.874 -  int arraylength;
  40.875 -
  40.876 -  arraylength = length;
  40.877 -
  40.878 -  if (dataArray == null)
  40.879 -  {
  40.880 -        System.err.print("printHex: input byte array is null");
  40.881 -  }
  40.882 -
  40.883 -  if (length > dataArray.length || length < 0)
  40.884 -        arraylength = dataArray.length;
  40.885 -
  40.886 -  System.out.print("\n\t");
  40.887 -
  40.888 -  int i;
  40.889 -  for(i = 0; i < arraylength; )
  40.890 -  {
  40.891 -        value = dataArray[i] & 0xFF;
  40.892 -        hexIndex = (value >>> 4);
  40.893 -        System.out.print(hexChars[hexIndex]);
  40.894 -        hexIndex = (value & 0x0F);
  40.895 -        System.out.print(hexChars[hexIndex]);
  40.896 -
  40.897 -        i++;
  40.898 -        /* if done, print a final newline */
  40.899 -        if (i == arraylength) {
  40.900 -            if (arraylength < dataArray.length) {
  40.901 -                System.out.print("...");
  40.902 -            }
  40.903 -            System.out.println();
  40.904 -        }
  40.905 -        else if ((i % 24) == 0) {
  40.906 -            System.out.print("\n\t");
  40.907 -        }
  40.908 -        else if ((i % 4) == 0) {
  40.909 -                System.out.print(" ");
  40.910 -        }
  40.911 -  }
  40.912 -
  40.913 -  return;
  40.914 - }
  40.915 -
  40.916 -  
  40.917 - private void writeShortToStream(byte[] stream, short value, int index)
  40.918 -  throws IOException
  40.919 - {
  40.920 -  int littleEndian = 0;
  40.921 -  int byteVal;
  40.922 -
  40.923 -  if (index + 2 > stream.length)
  40.924 -  {
  40.925 -      throw new IOException("Writing beyond stream length: " +
  40.926 -                            stream.length + " writing at locations from: " + index + " to " + (index + 4));
  40.927 -  }
  40.928 -
  40.929 -  if (!LittleEndian)
  40.930 -  {
  40.931 -
  40.932 -	byteVal = value >> 8;
  40.933 -	stream[index ] = (byte) byteVal;
  40.934 -
  40.935 -	byteVal = value;
  40.936 -	stream[index + 1] = (byte) byteVal;
  40.937 -  } else {
  40.938 -	stream[index]  = (byte) ((value & 0x00ff) );
  40.939 -	stream[index + 1]  = (byte) ((value & 0xff00) >> 8);
  40.940 - }
  40.941 -  return;
  40.942 - }
  40.943 -
  40.944 - private void writeIntToStream(byte[] stream, int value, int index)
  40.945 -  throws IOException
  40.946 - {
  40.947 -  int littleEndian = 0;
  40.948 -  int byteVal;
  40.949 -
  40.950 -  if (4 > stream.length)
  40.951 -  {
  40.952 -      throw new IOException("writeIntToStream: stream length less than 4 bytes " +
  40.953 -                            stream.length);
  40.954 -  }
  40.955 -
  40.956 -  /* Do not Write beyond range */
  40.957 -  if (index + 4 > stream.length)
  40.958 -  {
  40.959 -      throw new IOException("writeIntToStream: writing beyond stream length: " +
  40.960 -                            stream.length + " writing at locations from: " + index + " to " + (index + 4));
  40.961 -  }
  40.962 -  if (!LittleEndian)
  40.963 -  {
  40.964 -	byteVal = value >>> 24;
  40.965 -	stream[index] = (byte) byteVal;
  40.966 -
  40.967 -	byteVal = value >> 16;
  40.968 -	stream[index + 1] = (byte) byteVal;
  40.969 -
  40.970 -	byteVal = value >> 8;
  40.971 -	stream[index + 2] = (byte) byteVal;
  40.972 -
  40.973 -	byteVal = value;
  40.974 -	stream[index + 3] = (byte) byteVal;
  40.975 -  } else {
  40.976 -	stream[index] = (byte) value;
  40.977 -	stream[index + 1]  = (byte) ((value & 0x0000ff00) >> 8);
  40.978 -	stream[index + 2]  = (byte) ((value & 0x00ff0000) >> 16);
  40.979 -	stream[index + 3] = (byte) ( value >>> 24);
  40.980 -  }
  40.981 -  return;
  40.982 - }
  40.983 -
  40.984 - public Document getDomTree(String xmlFileName)
  40.985 -  throws Exception, SAXException, ParserConfigurationException
  40.986 - {
  40.987 -  javax.xml.parsers.DocumentBuilderFactory dbf = 
  40.988 -	javax.xml.parsers.DocumentBuilderFactory.newInstance();
  40.989 -
  40.990 -  /* Turn on namespace aware and validation */
  40.991 -  dbf.setNamespaceAware(true);	
  40.992 -  dbf.setValidating(true);	
  40.993 -  dbf.setAttribute(JAXP_SCHEMA_LANGUAGE,W3C_XML_SCHEMA);
  40.994 -
  40.995 -  /* Checks that the document is well-formed */
  40.996 -  javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
  40.997 -
  40.998 -  myHandler errHandler= new myHandler();
  40.999 -  db.setErrorHandler(errHandler);
 40.1000 -  Document doc = db.parse(xmlFileName);
 40.1001 -
 40.1002 -  /* Checks for validation errors */
 40.1003 -  if (errHandler.isValid)
 40.1004 -       printDebug(" gDT:: Xml file: " + xmlFileName + " is valid");
 40.1005 -   else
 40.1006 -      throw new Exception("Xml file: " + xmlFileName + " is NOT valid");
 40.1007 -
 40.1008 -  return doc;
 40.1009 - }  
 40.1010 -
 40.1011 - public void processDomTree(
 40.1012 -	Document doc,
 40.1013 -	Vector bagOfSsids, 	
 40.1014 -	Vector bagOfTypes, 
 40.1015 -	Vector bagOfChwSsids, 
 40.1016 -	Vector bagOfChwTypes, 
 40.1017 -	Vector bagOfConflictSsids)
 40.1018 -  throws Exception, SAXException, ParserConfigurationException
 40.1019 - {
 40.1020 -  boolean found;
 40.1021 -
 40.1022 -  /* print the root Element */
 40.1023 -  Element root = doc.getDocumentElement();
 40.1024 -  printDebug ("\n pDT:: Document Element: Name = " + root.getNodeName() + ",Value = " + root.getNodeValue());
 40.1025 -
 40.1026 -  /* Go through the list of the root Element's Attributes */
 40.1027 -  NamedNodeMap nnm = root.getAttributes();
 40.1028 -  printDebug (" pDT:: # of Attributes: " + nnm.getLength());
 40.1029 -  for (int i = 0; i < nnm.getLength(); i++)
 40.1030 -  {
 40.1031 -         Node n = nnm.item (i);
 40.1032 -        printDebug (" pDT:: Attribute: Name = " + n.getNodeName() + ", Value = " 
 40.1033 -             + n.getNodeValue());
 40.1034 -  }
 40.1035 -
 40.1036 -  /* Retrieve the policy definition */ 
 40.1037 -  NodeList elementList = root.getElementsByTagName ("url");
 40.1038 -  String definitionFileName = elementList.item(0).getFirstChild().getNodeValue();  
 40.1039 -
 40.1040 -  String definitionHash = null;
 40.1041 -
 40.1042 -  /* Note that SecurityPolicySpec.xsd allows for 0 hash value! */
 40.1043 -  elementList = root.getElementsByTagName ("hash");
 40.1044 -  if (0 != elementList.getLength())
 40.1045 -      	definitionHash = elementList.item(0).getFirstChild().getNodeValue();  
 40.1046 -
 40.1047 -  Document definitionDoc = pGetDomDefinition(definitionFileName,definitionHash);
 40.1048 -  pGetTypes(definitionDoc,bagOfTypes, bagOfChwTypes, bagOfConflictSsids);
 40.1049 -
 40.1050 -
 40.1051 -  /* Get VM security information */
 40.1052 -  elementList = root.getElementsByTagName ("VM");
 40.1053 -  printDebug ("\n pDT:: partition length of NodeList:" + elementList.getLength());
 40.1054 -  /* Add default Ssid to Ste and Chw bags */			
 40.1055 -  SecurityLabel defEntry = new SecurityLabel();
 40.1056 -
 40.1057 -  defEntry.chwTypes = new Vector();
 40.1058 -  defEntry.steTypes = new Vector();
 40.1059 -  defEntry.chwIDs = new Vector();
 40.1060 -  defEntry.ids = new Vector();
 40.1061 -
 40.1062 -  defEntry.steSsidPosition =0;
 40.1063 -  defEntry.chwSsidPosition =0;
 40.1064 -  bagOfChwSsids.add(defEntry);
 40.1065 -  bagOfSsids.add(defEntry);
 40.1066 -
 40.1067 -  for (int x = 0; x < elementList.getLength(); x++)
 40.1068 -  {
 40.1069 -	found = false;
 40.1070 -
 40.1071 -        Node node = elementList.item (x);          
 40.1072 -
 40.1073 -	if (node.getNodeType() == Node.ELEMENT_NODE)
 40.1074 -	{
 40.1075 -	  printDebug (" pDT:: child: " + x + " is an element node" );
 40.1076 -	  Element e1 = (Element) node;
 40.1077 -
 40.1078 -  	  /* Get id */
 40.1079 -      	  NodeList elist = e1.getElementsByTagName ("id");
 40.1080 -      	  String idStr = elist.item(0).getFirstChild().getNodeValue();  
 40.1081 -      	  printDebug (" pDT:: id:" + idStr);
 40.1082 -
 40.1083 -	  /* Get TE */
 40.1084 -	  Vector colorTypes = new Vector();
 40.1085 -	  pConflictEntries(e1, "TE", bagOfTypes, colorTypes);
 40.1086 -
 40.1087 -	  Enumeration e = bagOfSsids.elements();
 40.1088 -	  while (e.hasMoreElements())
 40.1089 -	  {
 40.1090 -		SecurityLabel elem = (SecurityLabel) e.nextElement(); 
 40.1091 -		if ( elem.steTypes.size() == colorTypes.size() && elem.steTypes.containsAll(colorTypes))
 40.1092 -		{
 40.1093 -		  found = true;
 40.1094 -		  elem.ids.add(idStr);
 40.1095 -		}
 40.1096 -		
 40.1097 -	  }
 40.1098 -		if (!found && (0 < colorTypes.size()))
 40.1099 -		{
 40.1100 -		 SecurityLabel entry = new SecurityLabel();
 40.1101 -		 entry.steTypes = colorTypes;
 40.1102 -		 entry.ids = new Vector();
 40.1103 -		 entry.ids.add(idStr);
 40.1104 -		 bagOfSsids.add(entry);
 40.1105 -		}
 40.1106 -
 40.1107 -		/* Get Chinese wall type */
 40.1108 -	 	Vector chwTypes = new Vector();
 40.1109 -		pConflictEntries(e1, "ChWall", bagOfChwTypes, chwTypes);
 40.1110 -
 40.1111 -	        found = false;
 40.1112 -		e = bagOfChwSsids.elements();
 40.1113 -
 40.1114 -		while (e.hasMoreElements())
 40.1115 -		{
 40.1116 -  		  SecurityLabel elem = (SecurityLabel) e.nextElement(); 
 40.1117 -		  if ( elem.chwTypes.size() == chwTypes.size() && elem.chwTypes.containsAll(chwTypes))
 40.1118 -		  {
 40.1119 -		    found = true;
 40.1120 -		    elem.chwIDs.add(idStr);
 40.1121 -		  }
 40.1122 -		
 40.1123 -		}
 40.1124 -
 40.1125 -		if (!found && (0 < chwTypes.size()))
 40.1126 -		{
 40.1127 -		 SecurityLabel entry = new SecurityLabel();
 40.1128 -		 entry.chwTypes = chwTypes;
 40.1129 -		 entry.chwIDs = new Vector();
 40.1130 -		 entry.chwIDs.add(idStr);
 40.1131 -		 bagOfChwSsids.add(entry);
 40.1132 -		}
 40.1133 -      }
 40.1134 -  } 
 40.1135 -  return;
 40.1136 - }
 40.1137 -
 40.1138 - public Document pGetDomDefinition(
 40.1139 -	String definitionFileName, 
 40.1140 -	String definitionHash) 
 40.1141 -  throws Exception, SAXException, ParserConfigurationException
 40.1142 - {
 40.1143 -  printDebug("\n pGDD:: definition file name: " + definitionFileName);
 40.1144 -  printDebug("\n pGDD:: definition file hash: " + definitionHash);
 40.1145 -  
 40.1146 -  Document doc =  getDomTree(definitionFileName);
 40.1147 -  return doc; 
 40.1148 - }
 40.1149 -
 40.1150 - public void pGetTypes(
 40.1151 -	Document defDoc,
 40.1152 -	Vector bagOfTypes, 
 40.1153 -	Vector bagOfChwTypes, 
 40.1154 -	Vector bagOfConflictSsids)
 40.1155 -  throws Exception
 40.1156 - {
 40.1157 -
 40.1158 -
 40.1159 -  if (null == defDoc)
 40.1160 -      throw new Exception(" pGT:: definition file DOM is null ");
 40.1161 -
 40.1162 -  Element root = defDoc.getDocumentElement();
 40.1163 -
 40.1164 -  /* Get list of TE types */
 40.1165 -  NodeList elementList = root.getElementsByTagName ("Types");
 40.1166 -  printDebug ("\n pGT:: Types length of NodeList:" + elementList.getLength());
 40.1167 -  Element e1 = (Element) elementList.item (0);          
 40.1168 -  pGetEntries(e1,"TE",bagOfTypes);
 40.1169 -
 40.1170 -  /* Get list of Chinese types */
 40.1171 -  elementList = root.getElementsByTagName ("ChWallTypes");
 40.1172 -  printDebug ("\n pGT:: ChwTypes length of NodeList:" + elementList.getLength());
 40.1173 -  if (0 ==  elementList.getLength())
 40.1174 -  {
 40.1175 -  	printDebug ("\n pGT:: ChWallTypes has zero length: :" + elementList.getLength());
 40.1176 -  } else {
 40.1177 -	e1 = (Element) elementList.item (0);          
 40.1178 -	pGetEntries(e1,"ChWall",bagOfChwTypes);
 40.1179 -  }
 40.1180 -  printDebug (" pGT:: Total number of unique chw types: " + bagOfChwTypes.size());
 40.1181 -
 40.1182 -  /* Get Chinese type conflict sets */
 40.1183 -  elementList = root.getElementsByTagName ("ConflictSet");
 40.1184 -  printDebug ("\n pGT:: Conflict sets length of NodeList:" + elementList.getLength());
 40.1185 -  for (int x = 0; x < elementList.getLength(); x++)
 40.1186 -  {
 40.1187 - 	Vector conflictEntry  = new Vector();
 40.1188 -  	e1 = (Element) elementList.item (x);          
 40.1189 -  	printDebug ("\n pGT:: Conflict sets : " + x);
 40.1190 -
 40.1191 -	pConflictEntries(e1, "ChWall", bagOfChwTypes, conflictEntry);
 40.1192 -
 40.1193 -	if (conflictEntry.size() > 0)
 40.1194 -	{
 40.1195 -	  boolean found = false;
 40.1196 -	  Enumeration e = bagOfConflictSsids.elements();
 40.1197 -	
 40.1198 -	  while (e.hasMoreElements())
 40.1199 -	  {
 40.1200 -		Vector elem = (Vector) e.nextElement(); 
 40.1201 -		if (elem.size() == conflictEntry.size() && elem.containsAll(conflictEntry))
 40.1202 -	  	{
 40.1203 -	    	  found = true;
 40.1204 -	  	}
 40.1205 -		
 40.1206 -	  }
 40.1207 -	  if (!found)
 40.1208 -	  {
 40.1209 -		bagOfConflictSsids.add(conflictEntry);
 40.1210 -	  }
 40.1211 -  	}
 40.1212 -  }
 40.1213 -
 40.1214 - }
 40.1215 -
 40.1216 - public void  pGetEntries(Element doc, String tag, Vector typeBag)
 40.1217 -  throws Exception
 40.1218 - {
 40.1219 -
 40.1220 -  if (null == doc)
 40.1221 -      throw new Exception(" pGE:: Element doc is null");
 40.1222 -
 40.1223 -  if (null == typeBag)
 40.1224 -      throw new Exception(" pGE:: typeBag  is null");
 40.1225 -
 40.1226 -  NodeList elist = doc.getElementsByTagName (tag);
 40.1227 -  for (int j = 0; j < elist.getLength(); j++)
 40.1228 -  {
 40.1229 -  	Node knode = elist.item (j);          
 40.1230 -       	Node childNode = knode.getFirstChild();     
 40.1231 -       	String value = childNode.getNodeValue();
 40.1232 -
 40.1233 -	printDebug (" pGT:: "+ tag +" type: " + value);
 40.1234 -
 40.1235 -        /* Check if value is known */
 40.1236 -	if (!typeBag.contains(value))
 40.1237 -		typeBag.addElement(value);
 40.1238 -  }
 40.1239 - }
 40.1240 -
 40.1241 - public void  pConflictEntries(Element doc, String tag, Vector typeBag, Vector conflictEntry)
 40.1242 -  throws Exception
 40.1243 - {
 40.1244 -
 40.1245 -  if (null == doc)
 40.1246 -      throw new Exception(" pGE:: Element doc is null");
 40.1247 -
 40.1248 -  if (null == typeBag)
 40.1249 -      throw new Exception(" pGE:: typeBag  is null");
 40.1250 -
 40.1251 -  if (null == conflictEntry)
 40.1252 -      throw new Exception(" pGE:: typeBag  is null");
 40.1253 -
 40.1254 -
 40.1255 -  NodeList elist = doc.getElementsByTagName (tag);
 40.1256 -
 40.1257 -  for (int j = 0; j < elist.getLength(); j++)
 40.1258 -  {
 40.1259 -  	Node knode = elist.item (j);          
 40.1260 -       	Node childNode = knode.getFirstChild();     
 40.1261 -       	String value = childNode.getNodeValue();
 40.1262 -
 40.1263 -	printDebug (" pGE:: "+ tag +" type: " + value);
 40.1264 -
 40.1265 -        /* Check if value is known */
 40.1266 -	if (!typeBag.contains(value))
 40.1267 -      		throw new Exception(" pCE:: found undefined type set " + value);
 40.1268 -
 40.1269 -	if (!conflictEntry.contains(value))
 40.1270 -		conflictEntry.addElement(value);
 40.1271 -
 40.1272 -  }
 40.1273 - }
 40.1274 -
 40.1275 -  public void processDomTreeVlanSlot(
 40.1276 -	Document doc,
 40.1277 -	Vector bagOfSsids, 	
 40.1278 -	Vector bagOfTypes) 	
 40.1279 -  throws Exception
 40.1280 - {
 40.1281 -      boolean found;
 40.1282 -
 40.1283 -  printDebug(" pDTVS::Size of bagOfSsids: "+ bagOfSsids.size());
 40.1284 -  Element root = doc.getDocumentElement();
 40.1285 -
 40.1286 -  NodeList elementList = root.getElementsByTagName ("Vlan");
 40.1287 -  printDebug("\n pDTVS:: Vlan length of NodeList:" + elementList.getLength());
 40.1288 -
 40.1289 -  for (int x = 0; x < elementList.getLength(); x++)
 40.1290 -  {
 40.1291 -	found = false;
 40.1292 -
 40.1293 -        Node node = elementList.item (x);          
 40.1294 -
 40.1295 -	if (node.getNodeType() == Node.ELEMENT_NODE)
 40.1296 -	{
 40.1297 -	  printDebug(" pDTVS:: child: " + x + " is an element node" );
 40.1298 -	  Element e1 = (Element) node;
 40.1299 -
 40.1300 -	  /* Get vid */
 40.1301 -      	  NodeList elist = e1.getElementsByTagName ("vid");
 40.1302 -      	  String idStr = elist.item(0).getFirstChild().getNodeValue();  
 40.1303 -      	  printDebug (" pDTVS:: vid:" + idStr);
 40.1304 -
 40.1305 -	  /* Get TE */
 40.1306 -      	  elist = e1.getElementsByTagName ("TE");
 40.1307 -          printDebug (" pDTVS:: Total ste types: " + elist.getLength());
 40.1308 -
 40.1309 -	  Vector colorTypes = new Vector();
 40.1310 -	  for (int j = 0; j < elist.getLength(); j++)
 40.1311 -	  {
 40.1312 -		Node knode = elist.item (j);          
 40.1313 -        	Node childNode = knode.getFirstChild();     
 40.1314 -        	String value = childNode.getNodeValue();
 40.1315 -
 40.1316 -		printDebug (" pDT:: My color is: " + value);
 40.1317 -		if (!bagOfTypes.contains(value))
 40.1318 -		{
 40.1319 -      		  throw new IOException("pDT:: Vlan: " + idStr+ " has unknown type : "+ value);
 40.1320 -		}
 40.1321 -
 40.1322 -		if (!colorTypes.contains(value))
 40.1323 -		  colorTypes.addElement(value);
 40.1324 -	  }
 40.1325 -	  Enumeration e = bagOfSsids.elements();
 40.1326 -	  while (e.hasMoreElements())
 40.1327 -	  {
 40.1328 -		SecurityLabel elem = (SecurityLabel) e.nextElement(); 
 40.1329 -		if ( elem.steTypes.size() == colorTypes.size() && elem.steTypes.containsAll(colorTypes))
 40.1330 -		{
 40.1331 -		  found = true;
 40.1332 -		  if (null == elem.vlans)
 40.1333 -			elem.vlans = new Vector();
 40.1334 -		   elem.vlans.add(idStr);
 40.1335 -		}
 40.1336 -		
 40.1337 -	  }
 40.1338 -	  if (!found && (0 < colorTypes.size()))
 40.1339 -	  {
 40.1340 -		 SecurityLabel entry = new SecurityLabel();
 40.1341 -		 entry.steTypes = colorTypes;
 40.1342 -		 entry.vlans = new Vector();
 40.1343 -		 entry.vlans.add(idStr);
 40.1344 -		 bagOfSsids.add(entry);
 40.1345 -	  }
 40.1346 -
 40.1347 -	}
 40.1348 -  } 
 40.1349 -  printDebug(" pDTVS::After slot Size of bagOfSsids: "+ bagOfSsids.size());
 40.1350 -
 40.1351 -  elementList = root.getElementsByTagName ("Slot");
 40.1352 -  printDebug ("\n pDTVS:: Slot length of NodeList:" + elementList.getLength());
 40.1353 -
 40.1354 -  for (int x = 0; x < elementList.getLength(); x++)
 40.1355 -  {
 40.1356 -	found = false;
 40.1357 -
 40.1358 -        Node node = elementList.item (x);          
 40.1359 -
 40.1360 -	if (node.getNodeType() == Node.ELEMENT_NODE)
 40.1361 -	{
 40.1362 -	  printDebug(" pDT:: child: " + x + " is an element node" );
 40.1363 -	  Element e1 = (Element) node;
 40.1364 -
 40.1365 -
 40.1366 -	  /* Get slot and bus */
 40.1367 -	  SlotInfo item = new SlotInfo();
 40.1368 -
 40.1369 -	  NodeList elist = e1.getElementsByTagName ("bus");
 40.1370 -	  item.bus = elist.item(0).getFirstChild().getNodeValue();  
 40.1371 -      	  elist = e1.getElementsByTagName ("slot");
 40.1372 -      	  item.slot = elist.item(0).getFirstChild().getNodeValue();  
 40.1373 -      	  printDebug (" pDT:: bus and slot:" + item.bus + " "+ item.slot);
 40.1374 -
 40.1375 -	  /* Get TE */
 40.1376 -      	  elist = e1.getElementsByTagName ("TE");
 40.1377 -          printDebug (" pDT:: Total ste types: " + elist.getLength());
 40.1378 -
 40.1379 -	  Vector colorTypes = new Vector();
 40.1380 -	  for (int j = 0; j < elist.getLength(); j++)
 40.1381 -	  {
 40.1382 -        	Node knode = elist.item (j);          
 40.1383 -        	Node childNode = knode.getFirstChild();     
 40.1384 -        	String value = childNode.getNodeValue();
 40.1385 -
 40.1386 -		printDebug (" pDT:: My color is: " + value);
 40.1387 -		if (!bagOfTypes.contains(value))
 40.1388 -		{
 40.1389 -		  throw new IOException("pDT:: bus: " + item.bus + " slot: "+ item.slot + " has unknown type : "+ value);
 40.1390 -		}
 40.1391 -
 40.1392 -		if (!colorTypes.contains(value))
 40.1393 -		  colorTypes.addElement(value);
 40.1394 -		}
 40.1395 -
 40.1396 -		Enumeration e = bagOfSsids.elements();
 40.1397 -		while (e.hasMoreElements())
 40.1398 -		{
 40.1399 -  		  SecurityLabel elem = (SecurityLabel) e.nextElement(); 
 40.1400 -		  if ( elem.steTypes.size() == colorTypes.size() && elem.steTypes.containsAll(colorTypes))
 40.1401 -		  {
 40.1402 -			found = true;
 40.1403 -			if (null == elem.slots)
 40.1404 -			  elem.slots = new Vector();
 40.1405 -			elem.slots.add(item);
 40.1406 -
 40.1407 -		  }
 40.1408 -		
 40.1409 -		}
 40.1410 -
 40.1411 -		if (!found && (0 < colorTypes.size()))
 40.1412 -		{
 40.1413 -		  SecurityLabel entry = new SecurityLabel();
 40.1414 -		  entry.steTypes = colorTypes;
 40.1415 -		  entry.slots = new Vector();
 40.1416 -		  entry.slots.add(item);
 40.1417 -		  bagOfSsids.add(entry);
 40.1418 -		}
 40.1419 -
 40.1420 -	}
 40.1421 -  }
 40.1422 -  return;
 40.1423 - }
 40.1424 -
 40.1425 - public static void main (String[] args) 
 40.1426 - {
 40.1427 -  String xmlFileName = null;        	/* policy file */ 
 40.1428 -  String outputFileName = null;     	/* binary policy file */
 40.1429 -  String xenSsidOutputFileName = null; 	/* outputfile ssid to named types */	
 40.1430 -					/* outputfile conflicts ssid to named types */	
 40.1431 -  String xenSsidConfOutputFileName = null; 	
 40.1432 -
 40.1433 -  XmlToBin genObj = new XmlToBin(); 
 40.1434 -
 40.1435 -  policy_version active_policy = new policy_version();
 40.1436 -
 40.1437 -  if ((active_policy.ACM_POLICY_VERSION != ACM_POLICY_VERSION) ||
 40.1438 -      (active_policy.ACM_CHWALL_VERSION != ACM_CHWALL_VERSION) ||
 40.1439 -      (active_policy.ACM_STE_VERSION != ACM_STE_VERSION)) {
 40.1440 -	  System.out.println("ACM policy versions differ.");
 40.1441 -	  System.out.println("Please verify that data structures are correct");
 40.1442 -	  System.out.println("and then adjust the version numbers in XmlToBinInterface.java.");
 40.1443 -	  return;
 40.1444 -  }
 40.1445 -
 40.1446 -
 40.1447 -  for (int i = 0 ; i < args.length ; i++) {
 40.1448 -
 40.1449 -	if ( args[i].equals("-help"))  {
 40.1450 -          printUsage();
 40.1451 -          System.exit(1);
 40.1452 -
 40.1453 -        } else if ( args[i].equals("-i"))  {
 40.1454 -          i++;
 40.1455 -          if (i < args.length) {
 40.1456 -               xmlFileName = args[i];   
 40.1457 -          } else  {
 40.1458 -                System.out.println("-i argument needs parameter");
 40.1459 -                System.exit(1);
 40.1460 -          }
 40.1461 -
 40.1462 -	} else if ( args[i].equals("-o"))  {
 40.1463 -          i++;
 40.1464 -          if (i < args.length) {
 40.1465 -                outputFileName = args[i];   
 40.1466 -          } else {
 40.1467 -                System.out.println("-o argument needs parameter");
 40.1468 -                System.exit(1);
 40.1469 -          }
 40.1470 -
 40.1471 -	} else if ( args[i].equals("-xssid"))  {
 40.1472 -          i++;
 40.1473 -          if (i < args.length) {
 40.1474 -                 xenSsidOutputFileName = args[i];   
 40.1475 -          } else {
 40.1476 -                System.out.println("-xssid argument needs parameter");
 40.1477 -                System.exit(1);
 40.1478 -          }
 40.1479 -
 40.1480 -	} else if ( args[i].equals("-xssidconf"))  {
 40.1481 -          i++;
 40.1482 -          if (i < args.length) {
 40.1483 -                xenSsidConfOutputFileName = args[i]; 
 40.1484 -          } else {
 40.1485 -                System.out.println("-xssidconf argument needs parameter");
 40.1486 -                System.exit(1);
 40.1487 -          }
 40.1488 -	} else if ( args[i].equals("-debug"))  { /* turn on debug msg */
 40.1489 -	 	genObj.setDebug(true);
 40.1490 -        } else {
 40.1491 -          System.out.println("bad command line argument: " + args[i]);
 40.1492 -          printUsage();
 40.1493 -          System.exit(1);
 40.1494 -        }
 40.1495 -
 40.1496 -  }
 40.1497 -
 40.1498 -  if (xmlFileName == null)
 40.1499 -  { 
 40.1500 -	System.out.println("Need to specify input file -i option");
 40.1501 -        printUsage();
 40.1502 -        System.exit(1);
 40.1503 -  }
 40.1504 -
 40.1505 -
 40.1506 -  try 
 40.1507 -  {
 40.1508 -	/* Parse and validate */
 40.1509 - 	Document doc =  genObj.getDomTree(xmlFileName);
 40.1510 -
 40.1511 -	/* Vectors to hold sets of types */
 40.1512 -	Vector bagOfSsids = new Vector();
 40.1513 -	Vector bagOfTypes = new Vector();
 40.1514 -	Vector bagOfChwSsids = new Vector();
 40.1515 -	Vector bagOfChwTypes = new Vector();
 40.1516 -	Vector bagOfConflictSsids = new Vector();
 40.1517 -
 40.1518 -	Vector vlanMapSsids = new Vector();
 40.1519 -	Vector slotMapSsids = new Vector();
 40.1520 -
 40.1521 -	genObj.processDomTree(doc, bagOfSsids, bagOfTypes, bagOfChwSsids, bagOfChwTypes, bagOfConflictSsids);
 40.1522 -
 40.1523 -	genObj.processDomTreeVlanSlot(doc, bagOfSsids, bagOfTypes);
 40.1524 -
 40.1525 -	/* Get binary representation of policies */
 40.1526 -  	byte[] stePolicy = genObj.generateSteBuffer(bagOfSsids, bagOfTypes);
 40.1527 -  	byte[] chwPolicy = genObj.generateChwBuffer(bagOfChwSsids, bagOfConflictSsids,bagOfChwTypes);
 40.1528 -
 40.1529 -  	byte[] binPolicy = null;
 40.1530 - 	byte[] binaryPartionSsid = null;
 40.1531 -  	byte[] binaryVlanSsid = null;
 40.1532 -  	byte[] binarySlotSsid = null;
 40.1533 -
 40.1534 -	/* Get binary representation of partition to ssid mapping */
 40.1535 -  	binaryPartionSsid = genObj.generatePartSsids(bagOfSsids,bagOfChwSsids);
 40.1536 -
 40.1537 -	/* Get binary representation of vlan to ssid mapping */
 40.1538 -  	binaryVlanSsid = genObj.generateVlanSsids(bagOfSsids);
 40.1539 -
 40.1540 -	/* Get binary representation of slot to ssid mapping */
 40.1541 -  	binarySlotSsid = genObj.generateSlotSsids(bagOfSsids);
 40.1542 -
 40.1543 -	/* Generate binary representation: policy, partition, slot and vlan */
 40.1544 -  	binPolicy = genObj.GenBinaryPolicyBuffer(chwPolicy,stePolicy, binaryPartionSsid, binaryVlanSsid, binarySlotSsid);
 40.1545 -
 40.1546 -
 40.1547 -	/* Write binary policy into file */
 40.1548 -	if (null != outputFileName)
 40.1549 -	{
 40.1550 -  		genObj.writeBinPolicy(binPolicy, outputFileName);
 40.1551 -	} else {
 40.1552 -		System.out.println (" No binary policy generated, outputFileName:  " + outputFileName);
 40.1553 -	}
 40.1554 -
 40.1555 -	/* Print total number of types */
 40.1556 -	System.out.println (" Total number of unique ste types: " + bagOfTypes.size());
 40.1557 -	System.out.println (" Total number of Ssids : " + bagOfSsids.size());
 40.1558 -	System.out.println (" Total number of unique chw types: " + bagOfChwTypes.size());
 40.1559 -	System.out.println (" Total number of conflict ssids : " + bagOfConflictSsids.size());
 40.1560 -	System.out.println (" Total number of chw Ssids : " + bagOfChwSsids.size());
 40.1561 -
 40.1562 -   	if (null != xenSsidOutputFileName)
 40.1563 -  		genObj.writeXenTypeFile(bagOfSsids, xenSsidOutputFileName, true);
 40.1564 -
 40.1565 -   	if (null != xenSsidConfOutputFileName)
 40.1566 -  		genObj.writeXenTypeFile(bagOfChwSsids, xenSsidConfOutputFileName, false);
 40.1567 -    } 
 40.1568 -    catch (Exception e) 
 40.1569 -    {
 40.1570 -      e.printStackTrace();
 40.1571 -    }
 40.1572 -  }
 40.1573 -}