Andrew Cooper [Wed, 3 Aug 2016 14:20:45 +0000 (15:20 +0100)]
Add CONFIG_{32,64}BIT to config.h
To allow the use of IS_DEFINED() in preference to #ifdef __x86_64__/__i386__
to reduce the likelihood of bitrot.
In turn, modify page.h and pagetable.h sufficiently to compile for unpaged
enviroments. This leaves a link error if dead-code-elimination doesn't manage
to elide the reference.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Wed, 3 Aug 2016 11:48:39 +0000 (12:48 +0100)]
Audit the use of the skip result
Report a skip for swint-emulation if the main purpose of the test is unable to
be performed. However, run the first half of the tests against real hardware
to confirm that the algorithm is correct
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 2 Aug 2016 18:43:12 +0000 (19:43 +0100)]
build: Fix the install rule for configuration files
install-$(env) should only depend on the $(env) subset of all configuration
files, and all configuration files should be installed, rather than just the
first listed.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 2 Aug 2016 18:08:43 +0000 (19:08 +0100)]
mkinfo: Fix JSON damage from splitting an empty string
In python, splitting an empty string results in a single-entry list containing
an empty string. This causes the variations list to be wrong when no
variations are in use.
It is only by chance that doesn't cause an issue for ./xtf-runner
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 2 Aug 2016 16:30:41 +0000 (17:30 +0100)]
Rework the pv-iopl test using variations
The hypercall and vmassist tests are logically separate, and while the
hypercall version has been around for a very long time, vmassist was only
introduced in Xen 4.7.
To be able to sensibly test the hypercall part on older versions of Xen, they
should be treated separately, so the skip from vmassist detection doesn't
influence the results from the hypercall test.
To test them independently, introduce variations which alter the cmdline
passed to the guest.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 2 Aug 2016 15:09:00 +0000 (16:09 +0100)]
Introduce GFN terminology to memory management
which allows for common code to use gfn_to_virt()/virt_to_gfn() without
needing to worry whether it is a PV or HVM guest.
Add a pte_from_virt() helper to construct a pagetable entry pointing at a data
item linked into the test microkernel. To avoid inclusion problems, split the
independent pagetable modification functions out into a separate header file.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 2 Aug 2016 09:46:45 +0000 (10:46 +0100)]
runner: Add --all and --non-default options to help with category selection
This allows calling software to easily find all tests to run without needing
to name categories, environments or tests specifically.
--all is expected to cover the usual case, while --non-default is provided
just in case. It is not expected to be running the non-default category tests
in bulk.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Wed, 27 Jul 2016 12:23:29 +0000 (13:23 +0100)]
Introduce test variations
In certain cases it will be useful to run the same test binary with different
configurations, providing logically separate results.
Introduce the concept of a test variation, which generates a different set of
configuraiton files referring to the same binary. xtf-runner is updated to
understand variations.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Fri, 29 Jul 2016 16:28:49 +0000 (16:28 +0000)]
runner: Rework test selection logic
The existing logic for test selection was awkward to use and somewhat
non-intuitive. It also had an annoying habit of accidentially running the msr
utility and causing excessive logspam.
First of all, switch the all_{categories,environments} tuples to sets, which
allows for cleaner logic during selection. Split all_categories into default
and non-default subsets, where the non-default subset is not available unless
explicitly referenced.
Introduce interpret_selection() with the purpse of interpreting a collection
of string parameter, and returning the commplete list of TestInstances covered
by the selection.
interpret_selection() is now called before action selection, and replaces the
existing ad-hoc logic in the list and run calls. As a result, selections are
now identical for the list and run paths.
The --help documentation is also updated to reflect the new behaviour.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Mon, 1 Aug 2016 10:20:02 +0000 (11:20 +0100)]
runner: Introduce TestInstance to wrap an individual test
Implement vm_name() and cfg_path() methods to move those details out of the
test running logic.
Introduce parse_test_instance_string() as a single location tasked with
parsing the string representation of a test instance, and verifying the
provided information.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Fri, 29 Jul 2016 15:31:26 +0000 (15:31 +0000)]
runner: Introduce TestInfo to wrap the raw test json
The constructor now performs appropriate verification on the json
configuration, rather than open-coding it in get_all_test_info(). Users of
the dictionary-like json are altered to use attributes.
An all_instances() method is added to return test instances for all suitable
environments, optionally with a subset filter. This is used in preference to
three open-coded loops, generating instance names.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Thu, 28 Jul 2016 11:54:26 +0000 (11:54 +0000)]
runner: Cache the combined test json
To avoid rereading the same data from the disk. Later it will be needed on
several paths. Additionally, rename 'test_info' to 'info_file' to make its
use more clear.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Wed, 20 Jul 2016 17:43:13 +0000 (18:43 +0100)]
Correct the usage of $(DESTDIR) and $(PREFIX)
The GNU coding standards expect $(DESTDIR) to be the root of everything
installed, and for $(PREFIX) to then be added to the path. This is not how
XTF previously behaved.
XTF is not a typical package, and doesn't meet the usual semantics; it expects
to arrange all files under a single directory. Drop the use of $(PREFIX)
entirely (to avoid the expectation that it behaves as $(prefix) usually
behaves) and introduce $(xtfdir) instead.
$(DESTDIR) now works as intended for staged installes, and $(xtfdir) is the
single selected directy containing all installed content.
The intended way to install XTF now:
$ make install DESTDIR=/path/to/staging/area xtfdir=/local/scratch/xtf
Reported-by: Wei Liu <wei.liu2@citrix.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Andrew Cooper [Sun, 17 Jul 2016 16:45:33 +0000 (17:45 +0100)]
pv32pae: Probe for leaked SMEP/SMAP before switching to user mappings
This allows XTF to panic() with a useful error message, rather than crashing
with an obscure error on the hypervisor console because of Xen failing to
create a bounce frame on the (now-user) stack.
Update the documentation, as Xen 4.7 no longer leaks SMEP/SMAP into guests.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 19 Jul 2016 13:58:46 +0000 (14:58 +0100)]
pv: Honour test_wants_user_mappings
32bit PV guests start on supervisor mappings, and previously unilaterally
switched to user mappings. Now, only switch to user mappings if a test has
opted in.
64bit PV guests run at cpl3, must use user mappings and architecturally have
no choice in the matter.
This change is best reviewed with `git show --ignore-all-space`
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 19 Jul 2016 13:51:04 +0000 (14:51 +0100)]
Introduce a per-test opt-in for using user mappings
The choice of user or supervisor mappings is currently chosen for the
test, and is inflexible for a test needing to run in situations where
Xen leaks SMEP/SMAP into the guest, or where the test specifically wants
to use SMEP/SMAP itself.
As it turns out, fewer tests require user mappings than not. For the
tests which don't require user mappings, allowing them to run on
supervisor mappings is quicker to set up, and allows the test to run
even if Xen leaks paging state.
Introduce test_wants_user_mappings and default it to false. Tests which
want user mappings can opt-in by overriding the weak reference to true.
Explicit set the opt-in for the three tests which currently require
them.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Fri, 27 May 2016 07:53:53 +0000 (08:53 +0100)]
Helpers to retrieve %ss and %esp from cpu_regs
In 32bit, if not stack switch occurs, this information isn't present in an
exception frame. As a result, regs->sp and regs->ss may actually alias the
interrupted stack frame. To avoid accidental incorrect use, prefix the names
in cpu_regs with an underscore.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 7 Jun 2016 17:08:10 +0000 (18:08 +0100)]
xtf-runner: Extend test selection to run multiple tests at once
A caller may now specify a test name (in which case all environments will be
run), an environment (in which case every test supporting that environment
will be run), or a category (in which case all tests in that category will be
run).
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Tue, 7 Jun 2016 13:25:38 +0000 (14:25 +0100)]
xtf-runner: Support listing tests
Without parameters, all tests will be returned.
Alternatively, specific environments or categories can be specified, to filter
the results. A special input of "host" will query Xen for the available
environments, and filter accordingly.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Roger Pau Monne [Thu, 19 May 2016 13:43:30 +0000 (15:43 +0200)]
Remove setting ROOT path in common.mk
Since it might be included from different paths that have different levels
of nestedness. Also all makefiles that include common.mk already define ROOT
on their own.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Andrew Cooper [Fri, 6 May 2016 16:40:02 +0000 (17:40 +0100)]
Extend exception table support to include custom handlers
Provide additional documentation, and a selftest. Introduce __used to
indicate to the compiler that an object is referenced, even if the reference
isn't visible.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
projects / people / liuw / xtf.git / log