From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Xen-devel <xen-devel@lists.xen.org>
Subject: Re: [PATCH v4 10/26] xen/x86: Improve disabling of features which have dependencies
Date: Mon, 28 Mar 2016 11:18:17 -0400 [thread overview]
Message-ID: <20160328151817.GH17944@char.us.oracle.com> (raw)
In-Reply-To: <1458750989-28967-11-git-send-email-andrew.cooper3@citrix.com>
On Wed, Mar 23, 2016 at 04:36:13PM +0000, Andrew Cooper wrote:
> APIC and XSAVE have dependent features, which also need disabling if Xen
> chooses to disable a feature.
>
> Use setup_clear_cpu_cap() rather than clear_bit(), as it takes care of
> dependent features as well.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Reviewed-by: Jan Beulich <JBeulich@suse.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> v2: Move boolean_param() adjacent to use_xsave in xstate_init()
> ---
> xen/arch/x86/apic.c | 2 +-
> xen/arch/x86/cpu/common.c | 12 +++---------
> xen/arch/x86/xstate.c | 6 +++++-
> 3 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
> index b9601ad..8df5bd3 100644
> --- a/xen/arch/x86/apic.c
> +++ b/xen/arch/x86/apic.c
> @@ -1349,7 +1349,7 @@ void pmu_apic_interrupt(struct cpu_user_regs *regs)
> int __init APIC_init_uniprocessor (void)
> {
> if (enable_local_apic < 0)
> - __clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
> + setup_clear_cpu_cap(X86_FEATURE_APIC);
>
> if (!smp_found_config && !cpu_has_apic) {
> skip_ioapic_setup = 1;
> diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
> index 0942b44..b5c023f 100644
> --- a/xen/arch/x86/cpu/common.c
> +++ b/xen/arch/x86/cpu/common.c
> @@ -16,9 +16,6 @@
>
> #include "cpu.h"
>
> -static bool_t use_xsave = 1;
> -boolean_param("xsave", use_xsave);
> -
> bool_t opt_arat = 1;
> boolean_param("arat", opt_arat);
>
> @@ -341,12 +338,6 @@ void identify_cpu(struct cpuinfo_x86 *c)
> if (this_cpu->c_init)
> this_cpu->c_init(c);
>
> - /* Initialize xsave/xrstor features */
> - if ( !use_xsave )
> - __clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability);
> -
> - if ( cpu_has_xsave )
> - xstate_init(c);
>
> if ( !opt_pku )
> setup_clear_cpu_cap(X86_FEATURE_PKU);
> @@ -370,6 +361,9 @@ void identify_cpu(struct cpuinfo_x86 *c)
>
> /* Now the feature flags better reflect actual CPU features! */
>
> + if ( cpu_has_xsave )
> + xstate_init(c);
> +
> #ifdef NOISY_CAPS
> printk(KERN_DEBUG "CPU: After all inits, caps:");
> for (i = 0; i < NCAPINTS; i++)
> diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c
> index f649405..5060704 100644
> --- a/xen/arch/x86/xstate.c
> +++ b/xen/arch/x86/xstate.c
> @@ -502,11 +502,15 @@ unsigned int xstate_ctxt_size(u64 xcr0)
> /* Collect the information of processor's extended state */
> void xstate_init(struct cpuinfo_x86 *c)
> {
> + static bool_t __initdata use_xsave = 1;
> + boolean_param("xsave", use_xsave);
> +
> bool_t bsp = c == &boot_cpu_data;
> u32 eax, ebx, ecx, edx;
> u64 feature_mask;
>
> - if ( boot_cpu_data.cpuid_level < XSTATE_CPUID )
> + if ( (bsp && !use_xsave) ||
> + boot_cpu_data.cpuid_level < XSTATE_CPUID )
> {
> BUG_ON(!bsp);
> setup_clear_cpu_cap(X86_FEATURE_XSAVE);
> --
> 2.1.4
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-28 15:18 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 16:36 [PATCH v4 00/26] x86: Improvements to cpuid handling for guests Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 01/26] xen/public: Export cpu featureset information in the public API Andrew Cooper
2016-03-24 14:08 ` Jan Beulich
2016-03-24 14:12 ` Andrew Cooper
2016-03-24 14:16 ` Jan Beulich
2016-03-23 16:36 ` [PATCH v4 02/26] xen/x86: Script to automatically process featureset information Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 03/26] xen/x86: Collect more cpuid feature leaves Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 04/26] xen/x86: Mask out unknown features from Xen's capabilities Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 05/26] xen/x86: Annotate special features Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 06/26] xen/x86: Annotate VM applicability in featureset Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 07/26] xen/x86: Calculate maximum host and guest featuresets Andrew Cooper
2016-03-29 8:57 ` Jan Beulich
2016-03-23 16:36 ` [PATCH v4 08/26] xen/x86: Generate deep dependencies of features Andrew Cooper
2016-03-24 16:16 ` Jan Beulich
2016-03-23 16:36 ` [PATCH v4 09/26] xen/x86: Clear dependent features when clearing a cpu cap Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 10/26] xen/x86: Improve disabling of features which have dependencies Andrew Cooper
2016-03-28 15:18 ` Konrad Rzeszutek Wilk [this message]
2016-03-23 16:36 ` [PATCH v4 11/26] xen/x86: Improvements to in-hypervisor cpuid sanity checks Andrew Cooper
2016-03-24 15:38 ` Andrew Cooper
2016-03-24 16:47 ` Jan Beulich
2016-03-24 17:01 ` Andrew Cooper
2016-03-24 17:11 ` Jan Beulich
2016-03-24 17:12 ` Andrew Cooper
2016-03-28 15:29 ` Konrad Rzeszutek Wilk
2016-04-05 15:25 ` Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 12/26] x86/cpu: Move set_cpumask() calls into c_early_init() Andrew Cooper
2016-03-28 15:55 ` Konrad Rzeszutek Wilk
2016-04-05 16:19 ` Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 13/26] x86/cpu: Sysctl and common infrastructure for levelling context switching Andrew Cooper
2016-03-24 16:58 ` Jan Beulich
2016-03-28 16:12 ` Konrad Rzeszutek Wilk
2016-04-05 16:33 ` Andrew Cooper
2016-03-28 17:37 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 14/26] x86/cpu: Rework AMD masking MSR setup Andrew Cooper
2016-03-28 18:55 ` Konrad Rzeszutek Wilk
2016-04-05 16:44 ` Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 15/26] x86/cpu: Rework Intel masking/faulting setup Andrew Cooper
2016-03-28 19:14 ` Konrad Rzeszutek Wilk
2016-04-05 16:45 ` Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 16/26] x86/cpu: Context switch cpuid masks and faulting state in context_switch() Andrew Cooper
2016-03-28 19:27 ` Konrad Rzeszutek Wilk
2016-04-05 18:34 ` Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 17/26] x86/pv: Provide custom cpumasks for PV domains Andrew Cooper
2016-03-28 19:40 ` Konrad Rzeszutek Wilk
2016-04-05 16:55 ` Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 18/26] x86/domctl: Update PV domain cpumasks when setting cpuid policy Andrew Cooper
2016-03-24 17:04 ` Jan Beulich
2016-03-24 17:05 ` Andrew Cooper
2016-03-28 19:51 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 19/26] xen+tools: Export maximum host and guest cpu featuresets via SYSCTL Andrew Cooper
2016-03-28 19:59 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 20/26] tools/libxc: Modify bitmap operations to take void pointers Andrew Cooper
2016-03-28 20:05 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 21/26] tools/libxc: Use public/featureset.h for cpuid policy generation Andrew Cooper
2016-03-28 20:07 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 22/26] tools/libxc: Expose the automatically generated cpu featuremask information Andrew Cooper
2016-03-28 20:08 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 23/26] tools: Utility for dealing with featuresets Andrew Cooper
2016-03-28 20:26 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 24/26] tools/libxc: Wire a featureset through to cpuid policy logic Andrew Cooper
2016-03-28 20:39 ` Konrad Rzeszutek Wilk
2016-03-23 16:36 ` [PATCH v4 25/26] tools/libxc: Use featuresets rather than guesswork Andrew Cooper
2016-03-23 16:36 ` [PATCH v4 26/26] tools/libxc: Calculate xstate cpuid leaf from guest information Andrew Cooper
2016-03-24 17:20 ` Wei Liu
2016-03-31 7:48 ` Jan Beulich
2016-04-05 17:48 ` Andrew Cooper
2016-04-07 0:16 ` Jan Beulich
2016-04-07 0:40 ` Andrew Cooper
2016-04-07 0:56 ` Jan Beulich
2016-04-07 11:34 ` Andrew Cooper
2016-03-24 10:27 ` [PATCH v4 00/26] x86: Improvements to cpuid handling for guests Jan Beulich
2016-03-24 10:28 ` Andrew Cooper
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=20160328151817.GH17944@char.us.oracle.com \
--to=konrad.wilk@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=xen-devel@lists.xen.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).