Nested Virtualization: tools
PATCH 1/13 Nested Virtualization: tools
Signature · 7 lines
-- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
# HG changeset patch
# User cegger
# Date 1288975013 -3600
tools: Add nestedhvm guest config option
tools/libxc/xc_cpuid_x86.c +68 -8
@@ -30,7 +30,8 @@#define set_bit (idx, dst) ((dst) |= (1u << ((idx) & 31)))#define DEF_MAX_BASE 0x0000000du -#define DEF_MAX_EXT 0x80000008u +#define DEF_MAX_INTELEXT 0x80000008u +#define DEF_MAX_AMDEXT 0x8000000austatic int hypervisor_is_64bit (xc_interface *xch) {
@@ -78,7 +79,7 @@ static void xc_cpuid_brand_get(char *strstatic void amd_xc_cpuid_policy (xc_interface *xch,domid_t domid,const unsigned int *input,unsigned int *regs, -int is_pae) +int is_pae,int is_nestedhvm) {switch ( input[0 ] ) {
@@ -87,6 +88,11 @@ static void amd_xc_cpuid_policy( regs[0 ] = regs[1 ] = regs[2 ] =0 ;break ; +case 0x80000000 : +if ( regs[0 ] >DEF_MAX_AMDEXT ) + regs[0 ] =DEF_MAX_AMDEXT ; +break ; +case 0x80000001 : {int is_64bit =hypervisor_is_64bit (xch) && is_pae;
@@ -97,6 +103,7 @@ static void amd_xc_cpuid_policy(/* Filter all other features according to a whitelist. */ regs[2] &= ((is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | bitmaskof(X86_FEATURE_CMP_LEGACY) | + (is_nestedhvm ? bitmaskof(X86_FEATURE_SVME) : 0) | bitmaskof(X86_FEATURE_ALTMOVCR) | bitmaskof(X86_FEATURE_ABM) | bitmaskof(X86_FEATURE_SSE4A) |
@@ -121,16 +128,52 @@ static void amd_xc_cpuid_policy(*/ regs[2 ] = ((regs[2 ] &0xf000u ) +1 ) | ((regs[2 ] &0xffu ) <<1 ) |1u ;break ; + +case 0x8000000a : { +uint32_t edx; + +if (!is_nestedhvm) { + regs[0 ] = regs[1 ] = regs[2 ] = regs[3 ] =0 ; +break ; + } + +#define SVM_FEATURE_NPT 0x00000001 +#define SVM_FEATURE_LBRV 0x00000002 +#define SVM_FEATURE_SVML 0x00000004 +#define SVM_FEATURE_NRIPS 0x00000008 +#define SVM_FEATURE_PAUSEFILTER 0x00000400 + +/* Only passthrough SVM features which are implemented */ + edx =0 ; +if (regs[3 ] &SVM_FEATURE_NPT ) + edx |=SVM_FEATURE_NPT ; +if (regs[3 ] &SVM_FEATURE_LBRV ) + edx |=SVM_FEATURE_LBRV ; +if (regs[3 ] &SVM_FEATURE_NRIPS ) + edx |=SVM_FEATURE_NRIPS ; +if (regs[3 ] &SVM_FEATURE_PAUSEFILTER ) + edx |=SVM_FEATURE_PAUSEFILTER ; + + regs[3 ] = edx; +break ; + } + } }static void intel_xc_cpuid_policy (xc_interface *xch,domid_t domid,const unsigned int *input,unsigned int *regs, -int is_pae) +int is_pae,int is_nestedhvm) {switch ( input[0 ] ) { +case 0x00000001 : +/* ECX[5] is availability of VMX */ +if (is_nestedhvm) +set_bit (X86_FEATURE_VMXE , regs[2 ]); +break ; +case 0x00000004 :/* * EAX[31:26] is Maximum Cores Per Package (minus one).
@@ -141,6 +184,11 @@ static void intel_xc_cpuid_policy( regs[3 ] &=0x3ffu ;break ; +case 0x80000000 : +if ( regs[0 ] >DEF_MAX_INTELEXT ) + regs[0 ] =DEF_MAX_INTELEXT ; +break ; +case 0x80000001 : {int is_64bit =hypervisor_is_64bit (xch) && is_pae;
@@ -169,12 +217,17 @@ static void xc_cpuid_hvm_policy( const unsigned int *input, unsigned int *regs) { char brand[13]; +unsigned long nestedhvm;unsigned long pae;int is_pae; +int is_nestedhvm;xc_get_hvm_param (xch, domid,HVM_PARAM_PAE_ENABLED , &pae); is_pae = !!pae; +xc_get_hvm_param (xch, domid,HVM_PARAM_NESTEDHVM , &nestedhvm); + is_nestedhvm = !!nestedhvm; +switch ( input[0 ] ) {case 0x00000000 :
@@ -230,8 +283,7 @@ static void xc_cpuid_hvm_policy(break ;case 0x80000000 : -if ( regs[0 ] >DEF_MAX_EXT ) - regs[0 ] =DEF_MAX_EXT ; +/* Passthrough to cpu vendor specific functions */ break ;case 0x80000001 :
@@ -260,6 +312,7 @@ static void xc_cpuid_hvm_policy(case 0x80000004 :/* ... continued */ case 0x80000005 :/* AMD L1 cache/TLB info (dumped by Intel policy) */ case 0x80000006 :/* AMD L2/3 cache/TLB info ; Intel L2 cache features */ +case 0x8000000a :/* AMD SVM feature bits */ break ;default :
@@ -269,9 +322,9 @@ static void xc_cpuid_hvm_policy(xc_cpuid_brand_get (brand);if (strstr (brand,"AMD" ) ) -amd_xc_cpuid_policy (xch, domid, input, regs, is_pae); +amd_xc_cpuid_policy (xch, domid, input, regs, is_pae, is_nestedhvm);else -intel_xc_cpuid_policy (xch, domid, input, regs, is_pae); +intel_xc_cpuid_policy (xch, domid, input, regs, is_pae, is_nestedhvm); }
@@ -415,13 +468,20 @@ int xc_cpuid_apply_policy(xc_interface * {unsigned int input[2 ] = {0 ,0 }, regs[4 ];unsigned int base_max, ext_max; +char brand[13 ];int rc; +cpuid (input, regs); base_max = (regs[0 ] <=DEF_MAX_BASE ) ? regs[0 ] :DEF_MAX_BASE ; input[0 ] =0x80000000 ;cpuid (input, regs); - ext_max = (regs[0 ] <=DEF_MAX_EXT ) ? regs[0 ] :DEF_MAX_EXT ; + +xc_cpuid_brand_get (brand); +if (strstr (brand,"AMD" ) ) + ext_max = (regs[0 ] <=DEF_MAX_AMDEXT ) ? regs[0 ] :DEF_MAX_AMDEXT ; +else + ext_max = (regs[0 ] <=DEF_MAX_INTELEXT ) ? regs[0 ] :DEF_MAX_INTELEXT ; input[0 ] =0 ; input[1 ] =XEN_CPUID_INPUT_UNUSED ;
tools/libxl/libxl.idl +1 -0
@@ -107,6 +107,7 @@ libxl_domain_build_info = Struct("domain ("hpet", bool), ("vpt_align", bool), ("timer_mode", integer), + ("nested_hvm", bool), ])), ("pv", "!%s", Struct(None, [("slack_memkb", uint32),
tools/libxl/libxl_dom.c +1 -0
@@ -260,6 +260,7 @@ static int hvm_build_set_params(xc_inter#endif xc_set_hvm_param (handle, domid,HVM_PARAM_TIMER_MODE , (unsigned long ) info->u.hvm.timer_mode);xc_set_hvm_param (handle, domid,HVM_PARAM_VPT_ALIGN , (unsigned long ) info->u.hvm.vpt_align); +xc_set_hvm_param (handle, domid,HVM_PARAM_NESTEDHVM , info->u.hvm.nested_hvm);xc_set_hvm_param (handle, domid,HVM_PARAM_STORE_EVTCHN , store_evtchn);xc_set_hvm_param (handle, domid,HVM_PARAM_CONSOLE_EVTCHN , console_evtchn);return 0 ;
tools/libxl/xl_cmdimpl.c +4 -0
@@ -345,6 +345,7 @@ static void init_build_info(libxl_domain b_info->u.hvm.hpet =1 ; b_info->u.hvm.vpt_align =1 ; b_info->u.hvm.timer_mode =1 ; + b_info->u.hvm.nested_hvm =0 ; }else { b_info->u.pv.slack_memkb =8 *1024 ; }
@@ -532,6 +533,7 @@ static void printf_info(int domid,printf ("\t\t\t(hpet %d)\n" , b_info->u.hvm.hpet);printf ("\t\t\t(vpt_align %d)\n" , b_info->u.hvm.vpt_align);printf ("\t\t\t(timer_mode %d)\n" , b_info->u.hvm.timer_mode); +printf ("\t\t\t(nestedhvm %d)\n" , b_info->u.hvm.nested_hvm);printf ("\t\t\t(device_model %s)\n" , dm_info->device_model);printf ("\t\t\t(videoram %d)\n" , dm_info->videoram);
@@ -789,6 +791,8 @@ static void parse_config_data(const char b_info->u.hvm.vpt_align = l;if (!xlu_cfg_get_long (config,"timer_mode" , &l)) b_info->u.hvm.timer_mode = l; +if (!xlu_cfg_get_long (config,"nestedhvm" , &l)) + b_info->u.hvm.nested_hvm = l; }else {char *cmdline =NULL ;const char *root =NULL , *extra ="" ;
tools/python/xen/xend/XendConfig.py +1 -0
@@ -185,6 +185,7 @@ XENAPI_PLATFORM_CFG_TYPES = { 'vhpt': int, 'guest_os_type': str, 'hap': int, + 'nestedhvm' : int, 'xen_extended_power_mgmt': int, 'pci_msitranslate': int, 'pci_power_mgmt': int,
tools/python/xen/xend/XendConstants.py +1 -0
@@ -52,6 +52,7 @@ HVM_PARAM_TIMER_MODE = 10 HVM_PARAM_HPET_ENABLED = 11 HVM_PARAM_ACPI_S_STATE = 14 HVM_PARAM_VPT_ALIGN = 16 +HVM_PARAM_NESTEDHVM = 20 # x86 restart_modes = [ "restart",
tools/python/xen/xend/XendDomainInfo.py +9 -4
@@ -2585,10 +2585,15 @@ class XendDomainInfo: xc.hvm_set_param(self.domid, HVM_PARAM_TIMER_MODE, long(timer_mode)) - # Set Viridian interface configuration of domain - viridian = self.info["platform"].get("viridian") - if arch.type == "x86" and hvm and viridian is not None: - xc.hvm_set_param(self.domid, HVM_PARAM_VIRIDIAN, long(viridian)) + if arch.type == "x86" and hvm: + # Set Viridian interface configuration of domain + viridian = self.info["platform"].get("viridian") + if viridian is not None: + xc.hvm_set_param(self.domid, HVM_PARAM_VIRIDIAN, long(viridian)) + # Set nestedhvm of domain + nestedhvm = self.info["platform"].get("nestedhvm") + if nestedhvm is not None: + xc.hvm_set_param(self.domid, HVM_PARAM_NESTEDHVM, long(nestedhvm)) # If nomigrate is set, disable migration nomigrate = self.info["platform"].get("nomigrate")
tools/python/xen/xm/create.py +6 -1
@@ -633,6 +633,11 @@ gopts.var('hap', val='HAP', use="""Hap status (0=hap is disabled; 1=hap is enabled.""") +gopts.var('nestedhvm', val='NESTEDHVM', + fn=set_int, default=0, + use="""Nested HVM status (0=Nested HVM is disabled; + 1=Nested HVM is enabled.""") + gopts.var('s3_integrity', val='TBOOT_MEMORY_PROTECT', fn=set_int, default=1, use="""Should domain memory integrity be verified during S3?
@@ -1083,7 +1088,7 @@ def configure_hvm(config_image, vals): 'isa', 'keymap', 'localtime', - 'nographic', + 'nestedhvm', 'nographic', 'opengl', 'oos', 'pae', 'pci', 'pci_msitranslate', 'pci_power_mgmt', 'rtc_timeoffset',
xen/include/public/hvm/params.h +4 -1
@@ -124,6 +124,9 @@*/ #define HVM_PARAM_ACPI_IOPORTS_LOCATION 19 -#define HVM_NR_PARAMS 20 +/* Boolean: Enable nestedhvm (hvm only) */ +#define HVM_PARAM_NESTEDHVM 20 + +#define HVM_NR_PARAMS 21#endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Hi,
Quoted 8 lines · Christoph Egger
tools/libxc/xc_cpuid_x86.c +8
-0+#define SVM_FEATURE_NPT 0x00000001 +#define SVM_FEATURE_LBRV 0x00000002 +#define SVM_FEATURE_SVML 0x00000004 +#define SVM_FEATURE_NRIPS 0x00000008 +#define SVM_FEATURE_PAUSEFILTER 0x00000400 + +/* Only passthrough SVM features which are implemented */ + edx =0 ;
tools/libxc/xc_cpuid_x86.c static void amd_xc_cpuid_policy( · line 157
Quoted 10 lines
tools/libxc/xc_cpuid_x86.c +10
-0+if (regs[3 ] &SVM_FEATURE_NPT ) + edx |=SVM_FEATURE_NPT ; +if (regs[3 ] &SVM_FEATURE_LBRV ) + edx |=SVM_FEATURE_LBRV ; +if (regs[3 ] &SVM_FEATURE_NRIPS ) + edx |=SVM_FEATURE_NRIPS ; +if (regs[3 ] &SVM_FEATURE_PAUSEFILTER ) + edx |=SVM_FEATURE_PAUSEFILTER ; + + regs[3 ] = edx;
Minor niggle - why isn't this just a single &= operation?
Tim.
Signature · 3 lines
Tim Deegan <[email protected]> Principal Software Engineer, Xen Platform Team Citrix Systems UK Ltd. (Company #02937203, SL9 0BG)
Quoted 15 lines · On Tuesday 16 November 2010 12:37:06 Tim Deegan wrote:
Hi,
Quoted 12 lines · Christoph Egger
tools/libxc/xc_cpuid_x86.c +12
-0+#define SVM_FEATURE_NPT 0x00000001 +#define SVM_FEATURE_LBRV 0x00000002 +#define SVM_FEATURE_SVML 0x00000004 +#define SVM_FEATURE_NRIPS 0x00000008 +#define SVM_FEATURE_PAUSEFILTER 0x00000400 + +/* Only passthrough SVM features which are implemented */ + edx =0 ; +if (regs[3 ] &SVM_FEATURE_NPT ) + edx |=SVM_FEATURE_NPT ; +if (regs[3 ] &SVM_FEATURE_LBRV ) + edx |=SVM_FEATURE_LBRV ;
Quoted 8 lines
tools/libxc/xc_cpuid_x86.c static void amd_xc_cpuid_policy( · line 157
Quoted 6 lines
tools/libxc/xc_cpuid_x86.c +6
-0+if (regs[3 ] &SVM_FEATURE_NRIPS ) + edx |=SVM_FEATURE_NRIPS ; +if (regs[3 ] &SVM_FEATURE_PAUSEFILTER ) + edx |=SVM_FEATURE_PAUSEFILTER ; + + regs[3 ] = edx;Minor niggle - why isn't this just a single &= operation?
The l1 guest shouldn't see upcoming svm features yet. They will be added here when support for them is implemented.
Christoph
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
Quoted 25 lines · Christoph Egger
Quoted 15 lines · On Tuesday 16 November 2010 12:37:06 Tim Deegan wrote:
Hi,
Quoted 12 lines · Christoph Egger
tools/libxc/xc_cpuid_x86.c +12
-0+#define SVM_FEATURE_NPT 0x00000001 +#define SVM_FEATURE_LBRV 0x00000002 +#define SVM_FEATURE_SVML 0x00000004 +#define SVM_FEATURE_NRIPS 0x00000008 +#define SVM_FEATURE_PAUSEFILTER 0x00000400 + + /* Only passthrough SVM features which are implemented */ + edx = 0; + if (regs[3] & SVM_FEATURE_NPT) + edx |= SVM_FEATURE_NPT; + if (regs[3] & SVM_FEATURE_LBRV) + edx |= SVM_FEATURE_LBRV;Quoted 8 lines
Quoted 6 lines
+ if (regs[3] &
SVM_FEATURE_NRIPS)
+ edx |=SVM_FEATURE_NRIPS;
+ if (regs[3] &SVM_FEATURE_PAUSEFILTER)
+ edx |=SVM_FEATURE_PAUSEFILTER;
+
+ regs[3] = edx;Minor niggle - why isn't this just a single &= operation?
Quoted 2 lines
The l1 guest shouldn't see upcoming svm features yet. They will be added here when support for them is implemented.
I think Tim is suggesting this:
regs[3] &= SVM_FEATURE_NPT|SVM_FEATURE_LBRV|...
Which will have the same effect.
-George
Quoted 18 lines
Christoph
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 25 lines · Christoph Egger
Quoted 15 lines · On Tuesday 16 November 2010 12:37:06 Tim Deegan wrote:
Hi,
Quoted 12 lines · Christoph Egger
tools/libxc/xc_cpuid_x86.c +12
-0+#define SVM_FEATURE_NPT 0x00000001 +#define SVM_FEATURE_LBRV 0x00000002 +#define SVM_FEATURE_SVML 0x00000004 +#define SVM_FEATURE_NRIPS 0x00000008 +#define SVM_FEATURE_PAUSEFILTER 0x00000400 + +/* Only passthrough SVM features which are implemented */ + edx =0 ; +if (regs[3 ] &SVM_FEATURE_NPT ) + edx |=SVM_FEATURE_NPT ; +if (regs[3 ] &SVM_FEATURE_LBRV ) + edx |=SVM_FEATURE_LBRV ;Quoted 8 lines
tools/libxc/xc_cpuid_x86.c static void amd_xc_cpuid_policy( · line 157
Quoted 6 lines
tools/libxc/xc_cpuid_x86.c +6
-0+if (regs[3 ] &SVM_FEATURE_NRIPS ) + edx |=SVM_FEATURE_NRIPS ; +if (regs[3 ] &SVM_FEATURE_PAUSEFILTER ) + edx |=SVM_FEATURE_PAUSEFILTER ; + + regs[3 ] = edx;Minor niggle - why isn't this just a single &= operation?
Quoted 2 lines
The l1 guest shouldn't see upcoming svm features yet. They will be added here when support for them is implemented.
I meant: why don't you or together the feature flags you support (which should probably be defined in a header file with the other CPUID bits, btw) and just 'regs[3] &= SVM_FEAURE_FOO|SVM_FEATURE_BAR|...' instead of using ten lines of code?
It's just a coding style niggle, not a logic error.
Tim.
Signature · 3 lines
Tim Deegan <[email protected]> Principal Software Engineer, Xen Platform Team Citrix Systems UK Ltd. (Company #02937203, SL9 0BG)
Quoted 26 lines · On Tuesday 16 November 2010 14:03:40 Tim Deegan wrote:
Quoted 25 lines · Christoph Egger
Quoted 23 lines · On Tuesday 16 November 2010 12:37:06 Tim Deegan wrote:
Hi,
Quoted 8 lines · Christoph Egger
tools/libxc/xc_cpuid_x86.c +8
-0+#define SVM_FEATURE_NPT 0x00000001 +#define SVM_FEATURE_LBRV 0x00000002 +#define SVM_FEATURE_SVML 0x00000004 +#define SVM_FEATURE_NRIPS 0x00000008 +#define SVM_FEATURE_PAUSEFILTER 0x00000400 + +/* Only passthrough SVM features which are implemented */ + edx =0 ;tools/libxc/xc_cpuid_x86.c static void amd_xc_cpuid_policy( · line 157
Quoted 10 lines
tools/libxc/xc_cpuid_x86.c +10
-0+if (regs[3 ] &SVM_FEATURE_NPT ) + edx |=SVM_FEATURE_NPT ; +if (regs[3 ] &SVM_FEATURE_LBRV ) + edx |=SVM_FEATURE_LBRV ; +if (regs[3 ] &SVM_FEATURE_NRIPS ) + edx |=SVM_FEATURE_NRIPS ; +if (regs[3 ] &SVM_FEATURE_PAUSEFILTER ) + edx |=SVM_FEATURE_PAUSEFILTER ; + + regs[3 ] = edx;Minor niggle - why isn't this just a single &= operation?
Quoted 7 lines
Quoted 2 lines
The l1 guest shouldn't see upcoming svm features yet. They will be added here when support for them is implemented.
I meant: why don't you or together the feature flags you support (which should probably be defined in a header file with the other CPUID bits, btw) and just 'regs[3] &= SVM_FEAURE_FOO|SVM_FEATURE_BAR|...' instead of using ten lines of code?
Thanks for clarification (and the other people who guessed right). I changed that in my local tree.
Christoph
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632