From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Jan Beulich <JBeulich@suse.com>
Cc: Wei Liu <wei.liu2@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
mpohlack@amazon.de, ross.lagerwall@citrix.com,
Julien Grall <julien.grall@arm.com>,
Stefano Stabellini <stefano.stabellini@citrix.com>,
xen-devel@lists.xenproject.org,
Daniel De Graaf <dgdegra@tycho.nsa.gov>,
Keir Fraser <keir@xen.org>,
sasha.levin@oracle.com
Subject: Re: [PATCH v4 04/34] HYPERCALL_version_op. New hypercall mirroring XENVER_ but sane.
Date: Fri, 18 Mar 2016 15:22:24 -0400 [thread overview]
Message-ID: <20160318192224.GA11924@char.us.oracle.com> (raw)
In-Reply-To: <56EC046302000078000DE54F@prv-mh.provo.novell.com>
. snip..
> > - VERSION_OP_commandline, VERSION_OP_changeset are privileged.
>
> Aiui this is no difference to the old one anymore if we assume
> patches get committed in the order they're being presented in
> this series.
The old one (XENVER) would disallow XENVER_cmdline for guests. The
rest are allowed.
.. snip..
> > @@ -87,6 +95,68 @@ typedef struct xen_feature_info xen_feature_info_t;
> > #define XENVER_commandline 9
> > typedef char xen_commandline_t[1024];
> >
> > +
> > +
> > +/*
> > + * The HYPERCALL_version_op has a set of sub-ops which mirror the
> > + * sub-ops of HYPERCALL_xen_version. However this hypercall differs
> > + * radically from the former:
> > + * - It returns the amount of bytes returned.
> > + * - It will return -XEN_EPERM if the guest is not permitted.
> > + * - It will return the requested data in arg.
> > + * - It requires an third argument (len) for the length of the
> > + * arg. Naturally the arg has to fit the requested data otherwise
> > + * -XEN_ENOBUFS is returned.
> > + *
> > + * It also offers an mechanism to probe for the amount of bytes an
> > + * sub-op will require. Having the arg have an NULL pointer will
>
> s/pointer/handle/
>
> > + * return the number of bytes requested for the operation. Or an
> > + * negative value if an error is encountered.
> > + */
> > +
> > +typedef uint64_t xen_version_op_val_t;
> > +DEFINE_XEN_GUEST_HANDLE(xen_version_op_val_t);
> > +
> > +typedef void xen_version_op_buf_t;
> > +DEFINE_XEN_GUEST_HANDLE(xen_version_op_buf_t);
>
> Are these actually useful for anything? And for the various strings,
The xen_version_op_val_t is definitly used by the toolstack.
> wouldn't a "char" handle be more natural?
Heh. It was char[] before but Andrew liked it as void.
The xen_version_op_buf_t is not used but I do reference it below in
comment. Let me put s/arg == version_op_buf/arg == char/ ?
Let me do that.
>
> > +/* arg == version_op_val_t. Encoded as major:minor (31..16:15..0) */
>
> Please make explicit that 63...32 are zero (or whatever they really
> are).
>
> > +#define XEN_VERSION_OP_version 0
> > +
> > +/* arg == version_op_buf. Contains NUL terminated utf-8 string. */
> > +#define XEN_VERSION_OP_extraversion 1
> > +
> > +/* arg == version_op_buf. Contains NUL terminated utf-8 string. */
> > +#define XEN_VERSION_OP_capabilities 3
> > +
> > +/* arg == version_op_buf. Contains NUL terminated utf-8 string. */
> > +#define XEN_VERSION_OP_changeset 4
> > +
> > +/*
> > + * arg == xen_version_op_val_t. Contains the virtual address
> > + * of the hypervisor encoded as [63..0].
>
> I'd say the encoding info here is unnecessary and could - just like
> you already do for pagesize below - be omitted.
>
> > + */
> > +#define XEN_VERSION_OP_platform_parameters 5
> > +
> > +/*
> > + * arg = xen_feature_info_t - shares the same structure
> > + * as the XENVER_get_features.
> > + */
> > +#define XEN_VERSION_OP_get_features 6
> > +
> > +/* arg == xen_version_op_val_t. */
> > +#define XEN_VERSION_OP_pagesize 7
> > +
> > +/* arg == version_op_buf.
> > + *
> > + * The toolstack fills it out for guest consumption. It is intended to hold
> > + * the UUID of the guest.
> > + */
> > +#define XEN_VERSION_OP_guest_handle 8
> > +
> > +/* arg = version_op_buf. Contains NUL terminated utf-8 string. */
> > +#define XEN_VERSION_OP_commandline 9
> > +
> > #endif /* __XEN_PUBLIC_VERSION_H__ */
>
> Would leaving out the _OP and _op everywhere result in any
> name collisions with the old one?
It worked out fine. Made it XEN_VERSION_[..]
See inline new patch:
From aa7ba11778dd3ffb2a53ebf6123ddfb196f203d8 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 18 Mar 2016 13:41:07 -0400
Subject: [PATCH] HYPERCALL_version_op. New hypercall mirroring XENVER_ but
sane.
This hypercall mirrors the XENVER_ in that it has similar functionality.
However it is designed differently:
- No compat layer. The data structures are the same size on 32
as on 64-bit.
- The hypercall accepts three arguments - the command, pointer to
an buffer, and the length of the buffer.
- Each sub-ops can be "probed" for size by returning the size of
buffer that will be needed - if the buffer is NULL.
- Subops can complete even if the buffer is too small - truncated
data will be filled and hypercall will return -ENOBUFS.
- VERSION_commandline, VERSION_changeset are privileged.
- There is no XENVER_compile_info equivalent.
- The hypercall can return -EPERM and toolstack/OSes are expected
to deal with it.
While we combine some of the common code between XENVER_ and VERSION_
take the liberty of moving pae_extended_cr3 in x86 area.
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@citrix.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Keir Fraser <keir@xen.org>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
v1-v3: Was not part of the series.
v4: New posting.
v5: Remove memset and use {}. Tweak copy_to_guest and capabilities_info,
add ASSERT(sz) per Andrew's review. Add cached=1 back in.
Per Jan, s/VERSION_OP/VERSION/, squash size check with do_version_op,
update the comments. Dropped Andrew's Review-by.
---
---
tools/flask/policy/policy/modules/xen/xen.te | 9 +-
xen/arch/arm/traps.c | 1 +
xen/arch/x86/hvm/hvm.c | 1 +
xen/arch/x86/x86_64/compat/entry.S | 2 +
xen/arch/x86/x86_64/entry.S | 2 +
xen/common/compat/kernel.c | 2 +
xen/common/kernel.c | 209 ++++++++++++++++++++++-----
xen/include/public/arch-arm.h | 3 +
xen/include/public/version.h | 70 ++++++++-
xen/include/public/xen.h | 1 +
xen/include/xen/hypercall.h | 4 +
xen/include/xsm/dummy.h | 19 +++
xen/include/xsm/xsm.h | 7 +
xen/xsm/dummy.c | 1 +
xen/xsm/flask/hooks.c | 39 +++++
xen/xsm/flask/policy/access_vectors | 24 ++-
16 files changed, 352 insertions(+), 42 deletions(-)
diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te
index 18f49b5..d61e697 100644
--- a/tools/flask/policy/policy/modules/xen/xen.te
+++ b/tools/flask/policy/policy/modules/xen/xen.te
@@ -74,11 +74,13 @@ allow dom0_t xen_t:xen2 {
get_symbol
};
-# Allow dom0 to use all XENVER_ subops that have checks.
+# Allow dom0 to use all XENVER_ subops that have checks and VERSION subops
# Note that dom0 is part of domain_type so this has duplicates.
allow dom0_t xen_t:version {
xen_extraversion xen_compile_info xen_capabilities
xen_changeset xen_pagesize xen_guest_handle xen_commandline
+ version extraversion capabilities changeset platform_parameters
+ get_features pagesize guest_handle commandline
};
allow dom0_t xen_t:mmu memorymap;
@@ -145,10 +147,13 @@ if (guest_writeconsole) {
# pmu_ctrl is for)
allow domain_type xen_t:xen2 pmu_use;
-# For normal guests all possible except XENVER_commandline.
+# For normal guests all possible except XENVER_commandline, VERSION_changeset,
+# and VERSION_commandline
allow domain_type xen_t:version {
xen_extraversion xen_compile_info xen_capabilities
xen_changeset xen_pagesize xen_guest_handle
+ version extraversion capabilities platform_parameters
+ get_features pagesize guest_handle
};
###############################################################################
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 83744e8..31d2115 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -1235,6 +1235,7 @@ static arm_hypercall_t arm_hypercall_table[] = {
HYPERCALL(multicall, 2),
HYPERCALL(platform_op, 1),
HYPERCALL_ARM(vcpu_op, 3),
+ HYPERCALL(version_op, 3),
};
#ifndef NDEBUG
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 80d59ff..f16b590 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -5322,6 +5322,7 @@ static const struct {
COMPAT_CALL(platform_op),
COMPAT_CALL(mmuext_op),
HYPERCALL(xenpmu_op),
+ HYPERCALL(version_op),
HYPERCALL(arch_1)
};
diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index 33e2c12..fd25e84 100644
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -394,6 +394,7 @@ ENTRY(compat_hypercall_table)
.quad do_tmem_op
.quad do_ni_hypercall /* reserved for XenClient */
.quad do_xenpmu_op /* 40 */
+ .quad do_version_op
.rept __HYPERVISOR_arch_0-((.-compat_hypercall_table)/8)
.quad compat_ni_hypercall
.endr
@@ -445,6 +446,7 @@ ENTRY(compat_hypercall_args_table)
.byte 1 /* do_tmem_op */
.byte 0 /* reserved for XenClient */
.byte 2 /* do_xenpmu_op */ /* 40 */
+ .byte 3 /* do_version_op */
.rept __HYPERVISOR_arch_0-(.-compat_hypercall_args_table)
.byte 0 /* compat_ni_hypercall */
.endr
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 07ef096..b0e7257 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -730,6 +730,7 @@ ENTRY(hypercall_table)
.quad do_tmem_op
.quad do_ni_hypercall /* reserved for XenClient */
.quad do_xenpmu_op /* 40 */
+ .quad do_version_op
.rept __HYPERVISOR_arch_0-((.-hypercall_table)/8)
.quad do_ni_hypercall
.endr
@@ -781,6 +782,7 @@ ENTRY(hypercall_args_table)
.byte 1 /* do_tmem_op */
.byte 0 /* reserved for XenClient */
.byte 2 /* do_xenpmu_op */ /* 40 */
+ .byte 3 /* do_version_op */
.rept __HYPERVISOR_arch_0-(.-hypercall_args_table)
.byte 0 /* do_ni_hypercall */
.endr
diff --git a/xen/common/compat/kernel.c b/xen/common/compat/kernel.c
index df93fdd..7a7ca53 100644
--- a/xen/common/compat/kernel.c
+++ b/xen/common/compat/kernel.c
@@ -39,6 +39,8 @@ CHECK_TYPE(capabilities_info);
CHECK_TYPE(domain_handle);
+CHECK_TYPE(version_op_val);
+
#define xennmi_callback compat_nmi_callback
#define xennmi_callback_t compat_nmi_callback_t
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 06ecf26..3ea35cc 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -221,6 +221,47 @@ void __init do_initcalls(void)
#endif
+static int get_features(struct domain *d, xen_feature_info_t *fi)
+{
+ switch ( fi->submap_idx )
+ {
+ case 0:
+ fi->submap = (1U << XENFEAT_memory_op_vnode_supported);
+ if ( paging_mode_translate(d) )
+ fi->submap |=
+ (1U << XENFEAT_writable_page_tables) |
+ (1U << XENFEAT_auto_translated_physmap);
+ if ( is_hardware_domain(d) )
+ fi->submap |= 1U << XENFEAT_dom0;
+#ifdef CONFIG_X86
+ if ( VM_ASSIST(d, pae_extended_cr3) )
+ fi->submap |= (1U << XENFEAT_pae_pgdir_above_4gb);
+ switch ( d->guest_type )
+ {
+ case guest_type_pv:
+ fi->submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) |
+ (1U << XENFEAT_highmem_assist) |
+ (1U << XENFEAT_gnttab_map_avail_bits);
+ break;
+ case guest_type_pvh:
+ fi->submap |= (1U << XENFEAT_hvm_safe_pvclock) |
+ (1U << XENFEAT_supervisor_mode_kernel) |
+ (1U << XENFEAT_hvm_callback_vector);
+ break;
+ case guest_type_hvm:
+ fi->submap |= (1U << XENFEAT_hvm_safe_pvclock) |
+ (1U << XENFEAT_hvm_callback_vector) |
+ (1U << XENFEAT_hvm_pirqs);
+ break;
+ }
+#endif
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
/*
* Simple hypercalls.
*/
@@ -298,47 +339,14 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
case XENVER_get_features:
{
xen_feature_info_t fi;
- struct domain *d = current->domain;
+ int rc;
if ( copy_from_guest(&fi, arg, 1) )
return -EFAULT;
- switch ( fi.submap_idx )
- {
- case 0:
- fi.submap = (1U << XENFEAT_memory_op_vnode_supported);
- if ( VM_ASSIST(d, pae_extended_cr3) )
- fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb);
- if ( paging_mode_translate(d) )
- fi.submap |=
- (1U << XENFEAT_writable_page_tables) |
- (1U << XENFEAT_auto_translated_physmap);
- if ( is_hardware_domain(d) )
- fi.submap |= 1U << XENFEAT_dom0;
-#ifdef CONFIG_X86
- switch ( d->guest_type )
- {
- case guest_type_pv:
- fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) |
- (1U << XENFEAT_highmem_assist) |
- (1U << XENFEAT_gnttab_map_avail_bits);
- break;
- case guest_type_pvh:
- fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) |
- (1U << XENFEAT_supervisor_mode_kernel) |
- (1U << XENFEAT_hvm_callback_vector);
- break;
- case guest_type_hvm:
- fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) |
- (1U << XENFEAT_hvm_callback_vector) |
- (1U << XENFEAT_hvm_pirqs);
- break;
- }
-#endif
- break;
- default:
- return -EINVAL;
- }
+ rc = get_features(current->domain, &fi);
+ if ( rc )
+ return rc;
if ( __copy_to_guest(arg, &fi, 1) )
return -EFAULT;
@@ -380,6 +388,133 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
return -ENOSYS;
}
+static const char *capabilities_info(unsigned int *len)
+{
+ static xen_capabilities_info_t __read_mostly cached_cap;
+ static unsigned int __read_mostly cached_cap_len;
+ static bool_t cached;
+
+ if ( unlikely(!cached) )
+ {
+ arch_get_xen_caps(&cached_cap);
+ cached_cap_len = strlen(cached_cap) + 1;
+ cached = 1;
+ }
+
+ *len = cached_cap_len;
+ return cached_cap;
+}
+
+/*
+ * Similar to HYPERVISOR_xen_version but with a sane interface
+ * (has a length, one can probe for the length) and with one less sub-ops:
+ * missing XENVER_compile_info.
+ */
+DO(version_op)(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg,
+ unsigned int len)
+{
+ union {
+ xen_version_op_val_t val;
+ xen_feature_info_t fi;
+ } u = {};
+ unsigned int sz = 0;
+ const void *ptr = NULL;
+ int rc = xsm_version_op(XSM_OTHER, cmd);
+
+ /* We can safely return -EPERM! */
+ if ( rc )
+ return rc;
+
+ /*
+ * The HYPERVISOR_xen_version differs in that some return the value,
+ * and some copy it on back on argument. We follow the same rule for all
+ * sub-ops: return 0 on success, positive value of bytes returned, and
+ * always copy the result in arg. Yeey sanity!
+ */
+ switch ( cmd )
+ {
+ case XEN_VERSION_version:
+ sz = sizeof(xen_version_op_val_t);
+ u.val = (xen_major_version() << 16) | xen_minor_version();
+ break;
+
+ case XEN_VERSION_extraversion:
+ sz = strlen(xen_extra_version()) + 1;
+ ptr = xen_extra_version();
+ break;
+
+ case XEN_VERSION_capabilities:
+ ptr = capabilities_info(&sz);
+ break;
+
+ case XEN_VERSION_changeset:
+ sz = strlen(xen_changeset()) + 1;
+ ptr = xen_changeset();
+ break;
+
+ case XEN_VERSION_platform_parameters:
+ sz = sizeof(xen_version_op_val_t);
+ u.val = HYPERVISOR_VIRT_START;
+ break;
+
+ case XEN_VERSION_get_features:
+ if ( copy_from_guest(&u.fi, arg, 1) )
+ {
+ rc = -EFAULT;
+ break;
+ }
+ sz = sizeof(xen_feature_info_t);
+ rc = get_features(current->domain, &u.fi);
+ break;
+
+ case XEN_VERSION_pagesize:
+ sz = sizeof(xen_version_op_val_t);
+ u.val = PAGE_SIZE;
+ break;
+
+ case XEN_VERSION_guest_handle:
+ sz = ARRAY_SIZE(current->domain->handle);
+ ptr = current->domain->handle;
+ break;
+
+ case XEN_VERSION_commandline:
+ sz = strlen(saved_cmdline) + 1;
+ ptr = saved_cmdline;
+ break;
+
+ default:
+ rc = -ENOSYS;
+ }
+
+ if ( rc )
+ return rc;
+
+ /*
+ * This hypercall also allows the client to probe. If it provides
+ * a NULL arg we will return the size of the space it has to
+ * allocate for the specific sub-op.
+ */
+ ASSERT(sz);
+ if ( guest_handle_is_null(arg) )
+ return sz;
+
+ if ( !rc )
+ {
+ unsigned int bytes = min(sz, len);
+
+ if ( copy_to_guest(arg, ptr ? : &u, bytes) )
+ rc = -EFAULT;
+
+ /*
+ * We return len (truncate) worth of data even if we fail.
+ */
+ if ( !rc && sz > len )
+ rc = -ENOBUFS;
+ }
+
+ return rc == 0 ? sz : rc;
+}
+
DO(nmi_op)(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct xennmi_callback cb;
diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index 870bc3b..c9ae315 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -128,6 +128,9 @@
* * VCPUOP_register_vcpu_info
* * VCPUOP_register_runstate_memory_area
*
+ * HYPERVISOR_version_op
+ * All generic sub-operations
+ *
*
* Other notes on the ARM ABI:
*
diff --git a/xen/include/public/version.h b/xen/include/public/version.h
index 24a582f..ebb0664 100644
--- a/xen/include/public/version.h
+++ b/xen/include/public/version.h
@@ -30,7 +30,15 @@
#include "xen.h"
-/* NB. All ops return zero on success, except XENVER_{version,pagesize} */
+/*
+ * There are two hypercalls mentioned in here. The XENVER_ are for
+ * HYPERCALL_xen_version (17), while VERSION_ are for the
+ * HYPERCALL_version_op (41).
+ *
+ * The subops are very similar except that the later hypercall has a
+ * sane interface.
+ */
+
/* arg == NULL; returns major:minor (16:16). */
#define XENVER_version 0
@@ -87,6 +95,66 @@ typedef struct xen_feature_info xen_feature_info_t;
#define XENVER_commandline 9
typedef char xen_commandline_t[1024];
+
+
+/*
+ * The HYPERCALL_version_op has a set of sub-ops which mirror the
+ * sub-ops of HYPERCALL_xen_version. However this hypercall differs
+ * radically from the former:
+ * - It returns the amount of bytes returned.
+ * - It will return -XEN_EPERM if the guest is not permitted.
+ * - It will return the requested data in arg.
+ * - It requires an third argument (len) for the length of the
+ * arg. Naturally the arg has to fit the requested data otherwise
+ * -XEN_ENOBUFS is returned.
+ *
+ * It also offers an mechanism to probe for the amount of bytes an
+ * sub-op will require. Having the arg have an NULL handle will
+ * return the number of bytes requested for the operation. Or an
+ * negative value if an error is encountered.
+ */
+
+typedef uint64_t xen_version_op_val_t;
+DEFINE_XEN_GUEST_HANDLE(xen_version_op_val_t);
+
+/*
+ * arg == xen_version_op_val_t. Encoded as major:minor (31..16:15..0), while
+ * 63..32 are zero.
+ */
+#define XEN_VERSION_version 0
+
+/* arg == char. Contains NUL terminated utf-8 string. */
+#define XEN_VERSION_extraversion 1
+
+/* arg == char. Contains NUL terminated utf-8 string. */
+#define XEN_VERSION_capabilities 3
+
+/* arg == char. Contains NUL terminated utf-8 string. */
+#define XEN_VERSION_changeset 4
+
+/* arg == xen_version_op_val_t. */
+#define XEN_VERSION_platform_parameters 5
+
+/*
+ * arg = xen_feature_info_t - shares the same structure
+ * as the XENVER_get_features.
+ */
+#define XEN_VERSION_get_features 6
+
+/* arg == xen_version_op_val_t. */
+#define XEN_VERSION_pagesize 7
+
+/*
+ * arg == char.
+ *
+ * The toolstack fills it out for guest consumption. It is intended to hold
+ * the UUID of the guest.
+ */
+#define XEN_VERSION_guest_handle 8
+
+/* arg = char. Contains NUL terminated utf-8 string. */
+#define XEN_VERSION_commandline 9
+
#endif /* __XEN_PUBLIC_VERSION_H__ */
/*
diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
index 64ba7ab..1a99929 100644
--- a/xen/include/public/xen.h
+++ b/xen/include/public/xen.h
@@ -115,6 +115,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);
#define __HYPERVISOR_tmem_op 38
#define __HYPERVISOR_xc_reserved_op 39 /* reserved for XenClient */
#define __HYPERVISOR_xenpmu_op 40
+#define __HYPERVISOR_version_op 41 /* supersedes xen_version (17) */
/* Architecture-specific hypercall definitions. */
#define __HYPERVISOR_arch_0 48
diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h
index 0c8ae0e..e8d2b81 100644
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -147,6 +147,10 @@ do_xenoprof_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
extern long
do_xenpmu_op(unsigned int op, XEN_GUEST_HANDLE_PARAM(xen_pmu_params_t) arg);
+extern long
+do_version_op(unsigned int cmd,
+ XEN_GUEST_HANDLE_PARAM(void) arg, unsigned int len);
+
#ifdef CONFIG_COMPAT
extern int
diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
index 87be9e5..71d9509 100644
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -751,3 +751,22 @@ static XSM_INLINE int xsm_xen_version (XSM_DEFAULT_ARG uint32_t op)
return xsm_default_action(XSM_PRIV, current->domain, NULL);
}
}
+
+static XSM_INLINE int xsm_version_op (XSM_DEFAULT_ARG uint32_t op)
+{
+ XSM_ASSERT_ACTION(XSM_OTHER);
+ switch ( op )
+ {
+ case XEN_VERSION_version:
+ case XEN_VERSION_extraversion:
+ case XEN_VERSION_capabilities:
+ case XEN_VERSION_platform_parameters:
+ case XEN_VERSION_get_features:
+ case XEN_VERSION_pagesize:
+ case XEN_VERSION_guest_handle:
+ /* These MUST always be accessible to any guest by default. */
+ return xsm_default_action(XSM_HOOK, current->domain, NULL);
+ default:
+ return xsm_default_action(XSM_PRIV, current->domain, NULL);
+ }
+}
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index db440f6..ac80472 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -194,6 +194,7 @@ struct xsm_operations {
int (*pmu_op) (struct domain *d, unsigned int op);
#endif
int (*xen_version) (uint32_t cmd);
+ int (*version_op) (uint32_t cmd);
};
#ifdef CONFIG_XSM
@@ -736,6 +737,12 @@ static inline int xsm_xen_version (xsm_default_t def, uint32_t op)
{
return xsm_ops->xen_version(op);
}
+
+static inline int xsm_version_op (xsm_default_t def, uint32_t op)
+{
+ return xsm_ops->version_op(op);
+}
+
#endif /* XSM_NO_WRAPPERS */
#ifdef CONFIG_MULTIBOOT
diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
index 9791ad4..776dd09 100644
--- a/xen/xsm/dummy.c
+++ b/xen/xsm/dummy.c
@@ -163,4 +163,5 @@ void xsm_fixup_ops (struct xsm_operations *ops)
set_to_dummy_if_null(ops, pmu_op);
#endif
set_to_dummy_if_null(ops, xen_version);
+ set_to_dummy_if_null(ops, version_op);
}
diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 1a95689..7569086 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -1658,6 +1658,44 @@ static int flask_xen_version (uint32_t op)
}
}
+static int flask_version_op (uint32_t op)
+{
+ u32 dsid = domain_sid(current->domain);
+
+ switch ( op )
+ {
+ case XEN_VERSION_version:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__VERSION, NULL);
+ case XEN_VERSION_extraversion:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__EXTRAVERSION, NULL);
+ case XEN_VERSION_capabilities:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__CAPABILITIES, NULL);
+ case XEN_VERSION_changeset:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__CHANGESET, NULL);
+ case XEN_VERSION_platform_parameters:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__PLATFORM_PARAMETERS, NULL);
+ case XEN_VERSION_get_features:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__GET_FEATURES, NULL);
+ case XEN_VERSION_pagesize:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__PAGESIZE, NULL);
+ case XEN_VERSION_guest_handle:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__GUEST_HANDLE, NULL);
+ case XEN_VERSION_commandline:
+ return avc_has_perm(dsid, SECINITSID_XEN, SECCLASS_VERSION,
+ VERSION__COMMANDLINE, NULL);
+ default:
+ return -EPERM;
+ }
+}
+
long do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op);
int compat_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op);
@@ -1797,6 +1835,7 @@ static struct xsm_operations flask_ops = {
.pmu_op = flask_pmu_op,
#endif
.xen_version = flask_xen_version,
+ .version_op = flask_version_op,
};
static __init void flask_init(void)
diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors
index badcf1c..7b098db 100644
--- a/xen/xsm/flask/policy/access_vectors
+++ b/xen/xsm/flask/policy/access_vectors
@@ -496,9 +496,10 @@ class security
del_ocontext
}
-# Class version is used to describe the XENVER_ hypercall.
+# Class version is used to describe the XENVER_ and VERSION hypercall.
# Almost all sub-ops are described here - in the default case all of them should
-# be allowed except the XENVER_commandline.
+# be allowed except the XENVER_commandline, VERSION_commandline, and
+# VERSION_changeset.
#
# The ones that are omitted are XENVER_version, XENVER_platform_parameters,
# and XENVER_get_features - as they MUST always be returned to a guest.
@@ -519,4 +520,23 @@ class version
xen_guest_handle
# Xen command line.
xen_commandline
+# --- VERSION hypercall ---
+# Often called by PV kernels to force an callback.
+ version
+# Extra informations (-unstable).
+ extraversion
+# Such as "xen-3.0-x86_64 xen-3.0-x86_32p hvm-3.0-x86_32 hvm-3.0-x86_32p hvm-3.0-x86_64".
+ capabilities
+# Such as the virtual address of where the hypervisor resides.
+ platform_parameters
+# Source code changeset.
+ changeset
+# The features the hypervisor supports.
+ get_features
+# Page size the hypervisor uses.
+ pagesize
+# An value that the control stack can choose.
+ guest_handle
+# Xen command line.
+ commandline
}
--
2.5.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-18 19:23 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 17:56 [PATCH v4] xSplice v1 design and implementation Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 01/34] compat/x86: Remove unncessary #define Konrad Rzeszutek Wilk
2016-03-15 18:57 ` Andrew Cooper
2016-03-16 11:08 ` Jan Beulich
2016-03-17 0:44 ` Konrad Rzeszutek Wilk
2016-03-17 7:45 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 02/34] libxc: Remove dead code (XENVER_capabilities) Konrad Rzeszutek Wilk
2016-03-15 18:04 ` Andrew Cooper
2016-03-15 18:08 ` Konrad Rzeszutek Wilk
2016-03-16 18:11 ` Wei Liu
2016-03-15 17:56 ` [PATCH v4 03/34] xsm/xen_version: Add XSM for the xen_version hypercall Konrad Rzeszutek Wilk
2016-03-18 11:55 ` Jan Beulich
2016-03-18 17:26 ` Konrad Rzeszutek Wilk
2016-03-21 11:22 ` Jan Beulich
2016-03-22 16:10 ` Konrad Rzeszutek Wilk
2016-03-22 17:54 ` Daniel De Graaf
2016-03-22 17:49 ` Daniel De Graaf
2016-03-24 15:34 ` anshul makkar
2016-03-24 19:19 ` Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 04/34] HYPERCALL_version_op. New hypercall mirroring XENVER_ but sane Konrad Rzeszutek Wilk
2016-03-15 18:29 ` Andrew Cooper
2016-03-15 20:19 ` Konrad Rzeszutek Wilk
2016-03-17 1:38 ` Konrad Rzeszutek Wilk
2016-03-17 14:28 ` Andrew Cooper
2016-03-18 12:36 ` Jan Beulich
2016-03-18 19:22 ` Konrad Rzeszutek Wilk [this message]
2016-03-21 12:45 ` Jan Beulich
2016-03-22 15:52 ` Konrad Rzeszutek Wilk
2016-03-22 16:06 ` Jan Beulich
2016-03-22 18:57 ` Konrad Rzeszutek Wilk
2016-03-22 19:28 ` Andrew Cooper
2016-03-22 20:39 ` Konrad Rzeszutek Wilk
2016-03-23 8:56 ` Jan Beulich
2016-03-24 2:37 ` Konrad Rzeszutek Wilk
2016-03-24 9:15 ` Jan Beulich
2016-03-24 11:39 ` Konrad Rzeszutek Wilk
2016-03-22 17:51 ` Daniel De Graaf
2016-03-15 17:56 ` [PATCH v4 05/34] libxc/libxl/python/xenstat: Use new XEN_VERSION_OP hypercall Konrad Rzeszutek Wilk
2016-03-15 18:45 ` Andrew Cooper
2016-03-16 12:31 ` George Dunlap
2016-03-16 18:11 ` Wei Liu
2016-03-17 1:08 ` Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 06/34] x86/arm: Add BUGFRAME_NR define and BUILD checks Konrad Rzeszutek Wilk
2016-03-15 18:54 ` Andrew Cooper
2016-03-16 11:49 ` Julien Grall
2016-03-18 12:40 ` Jan Beulich
2016-03-18 19:59 ` Konrad Rzeszutek Wilk
2016-03-21 12:49 ` Jan Beulich
2016-03-22 15:39 ` Konrad Rzeszutek Wilk
2016-03-22 15:58 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 07/34] arm/x86: Use struct virtual_region to do bug, symbol, and (x86) exception tables Konrad Rzeszutek Wilk
2016-03-15 19:24 ` Andrew Cooper
2016-03-15 19:34 ` Konrad Rzeszutek Wilk
2016-03-15 19:51 ` Andrew Cooper
2016-03-15 20:02 ` Andrew Cooper
2016-03-16 10:33 ` Jan Beulich
2016-03-18 13:07 ` Jan Beulich
2016-03-22 20:18 ` Konrad Rzeszutek Wilk
2016-03-23 8:19 ` Jan Beulich
2016-03-23 11:17 ` Julien Grall
2016-03-23 11:21 ` Jan Beulich
2016-03-24 2:49 ` Konrad Rzeszutek Wilk
2016-03-24 9:20 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 08/34] vmap: Make the while loop less fishy Konrad Rzeszutek Wilk
2016-03-15 19:33 ` Andrew Cooper
2016-03-17 11:49 ` Jan Beulich
2016-03-17 14:37 ` Andrew Cooper
2016-03-17 15:30 ` Jan Beulich
2016-03-17 16:06 ` Ian Jackson
2016-03-17 11:48 ` Jan Beulich
2016-03-17 16:08 ` Ian Jackson
2016-03-21 12:04 ` George Dunlap
2016-03-21 13:26 ` Jan Beulich
2016-03-21 14:22 ` George Dunlap
2016-03-21 15:05 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 09/34] vmap: ASSERT on NULL Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 10/34] vmap: Add vmalloc_cb and vfree_cb Konrad Rzeszutek Wilk
2016-03-18 13:20 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 11/34] xsplice: Design document Konrad Rzeszutek Wilk
2016-03-23 11:18 ` Jan Beulich
2016-03-23 20:12 ` Konrad Rzeszutek Wilk
2016-03-23 20:21 ` Konrad Rzeszutek Wilk
2016-03-24 3:15 ` Konrad Rzeszutek Wilk
2016-03-24 9:32 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 12/34] xen/xsplice: Hypervisor implementation of XEN_XSPLICE_op Konrad Rzeszutek Wilk
2016-03-16 12:12 ` Julien Grall
2016-03-16 19:58 ` Konrad Rzeszutek Wilk
2016-03-23 13:51 ` Jan Beulich
2016-03-24 3:13 ` Konrad Rzeszutek Wilk
2016-03-24 9:29 ` Jan Beulich
2016-03-15 17:56 ` [PATCH v4 13/34] libxc: Implementation of XEN_XSPLICE_op in libxc Konrad Rzeszutek Wilk
2016-03-16 18:12 ` Wei Liu
2016-03-16 20:36 ` Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 14/34] xen-xsplice: Tool to manipulate xsplice payloads Konrad Rzeszutek Wilk
2016-03-16 18:12 ` Wei Liu
2016-03-15 17:56 ` [PATCH v4 15/34] xsplice: Add helper elf routines Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 16/34] xsplice: Implement payload loading Konrad Rzeszutek Wilk
2016-03-22 17:25 ` Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 17/34] xsplice: Implement support for applying/reverting/replacing patches Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 18/34] x86/xen_hello_world.xsplice: Test payload for patching 'xen_extra_version' Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 19/34] xsplice, symbols: Implement symbol name resolution on address Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 20/34] x86, xsplice: Print payload's symbol name and payload name in backtraces Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 21/34] xsplice: Add .xsplice.hooks functions and test-case Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 22/34] xsplice: Add support for bug frames Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 23/34] xsplice: Add support for exception tables Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 24/34] xsplice: Add support for alternatives Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 25/34] build_id: Provide ld-embedded build-ids Konrad Rzeszutek Wilk
2016-03-16 18:34 ` Julien Grall
2016-03-16 21:02 ` Konrad Rzeszutek Wilk
2016-03-17 1:12 ` Konrad Rzeszutek Wilk
2016-03-17 11:08 ` Julien Grall
2016-03-17 13:39 ` Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 26/34] HYPERCALL_version_op: Add VERSION_OP_build_id to retrieve build-id Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 27/34] libxl: info: Display build_id of the hypervisor using XEN_VERSION_OP_build_id Konrad Rzeszutek Wilk
2016-03-16 18:12 ` Wei Liu
2016-03-15 17:56 ` [PATCH v4 28/34] xsplice: Print build_id in keyhandler and on bootup Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 29/34] xsplice: Stacking build-id dependency checking Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 30/34] xsplice/xen_replace_world: Test-case for XSPLICE_ACTION_REPLACE Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 31/34] xsplice: Print dependency and payloads build_id in the keyhandler Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 32/34] xsplice: Prevent duplicate payloads from being loaded Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 33/34] xsplice: Add support for shadow variables Konrad Rzeszutek Wilk
2016-03-15 17:56 ` [PATCH v4 34/34] MAINTAINERS/xsplice: Add myself and Ross as the maintainers Konrad Rzeszutek Wilk
2016-03-16 11:10 ` Jan Beulich
2016-03-17 0:44 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160318192224.GA11924@char.us.oracle.com \
--to=konrad.wilk@oracle.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=ian.jackson@eu.citrix.com \
--cc=julien.grall@arm.com \
--cc=keir@xen.org \
--cc=mpohlack@amazon.de \
--cc=ross.lagerwall@citrix.com \
--cc=sasha.levin@oracle.com \
--cc=stefano.stabellini@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).