x86/domctl: rework XEN_DOMCTL_{set,get}_address_size

Going through toolstack code, they are used for PV guests only.

Tighten their access to PV only. Return -EOPNOTSUPP if they are called
on HVM guests. Rewrite the code in a pattern that makes DCE work.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
Wei Liu committed 2018-11-05 16:09:50 +00:00
1 parent aa0816b74f
commit f969bc9fc9
1 file changed
+23 -9
+23 -9
View File
@@ -609,19 +609,33 @@ long arch_do_domctl(
break;
case XEN_DOMCTL_set_address_size:
if ( ((domctl->u.address_size.size == 64) && !d->arch.is_32bit_pv) ||
((domctl->u.address_size.size == 32) && d->arch.is_32bit_pv) )
ret = 0;
else if ( domctl->u.address_size.size == 32 )
ret = switch_compat(d);
if ( is_hvm_domain(d) )
ret = -EOPNOTSUPP;
else if ( is_pv_domain(d) )
{
if ( ((domctl->u.address_size.size == 64) && !d->arch.is_32bit_pv) ||
((domctl->u.address_size.size == 32) && d->arch.is_32bit_pv) )
ret = 0;
else if ( domctl->u.address_size.size == 32 )
ret = switch_compat(d);
else
ret = -EINVAL;
}
else
ret = -EINVAL;
ASSERT_UNREACHABLE();
break;
case XEN_DOMCTL_get_address_size:
domctl->u.address_size.size = is_pv_32bit_domain(d) ? 32 :
BITS_PER_LONG;
copyback = true;
if ( is_hvm_domain(d) )
ret = -EOPNOTSUPP;
else if ( is_pv_domain(d) )
{
domctl->u.address_size.size =
is_pv_32bit_domain(d) ? 32 : BITS_PER_LONG;
copyback = true;
}
else
ASSERT_UNREACHABLE();
break;
case XEN_DOMCTL_set_machine_address_size:
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.