From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751531AbdCBWJP (ORCPT ); Thu, 2 Mar 2017 17:09:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54562 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbdCBWJM (ORCPT ); Thu, 2 Mar 2017 17:09:12 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xenproject.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Boris Ostrovsky , Juergen Gross , Andrew Jones Subject: [PATCH v2 03/21] x86/xen: add CONFIG_XEN_PV to Kconfig Date: Thu, 2 Mar 2017 18:53:39 +0100 Message-Id: <20170302175357.8222-4-vkuznets@redhat.com> In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 02 Mar 2017 17:54:06 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All code to supprot Xen PV will get under this new option. For the beginning, check for it in the common code. Signed-off-by: Vitaly Kuznetsov --- arch/x86/kernel/cpu/hypervisor.c | 4 +++- arch/x86/kernel/process_64.c | 2 +- arch/x86/xen/Kconfig | 23 ++++++++++++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c index a77f18d..ce6fcc3 100644 --- a/arch/x86/kernel/cpu/hypervisor.c +++ b/arch/x86/kernel/cpu/hypervisor.c @@ -28,8 +28,10 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = { -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV &x86_hyper_xen_pv, +#endif +#ifdef CONFIG_XEN_PVHVM &x86_hyper_xen_hvm, #endif &x86_hyper_vmware, diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index a61e141..5e8d129 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -438,7 +438,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV)) __switch_to_xtra(prev_p, next_p, tss); -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV /* * On Xen PV, IOPL bits in pt_regs->flags have no effect, and * current_pt_regs()->flags may not match the current task's diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 76b6dbd..c387560 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -6,7 +6,6 @@ config XEN bool "Xen guest support" depends on PARAVIRT select PARAVIRT_CLOCK - select XEN_HAVE_PVMMU select XEN_HAVE_VPMU depends on X86_64 || (X86_32 && X86_PAE) depends on X86_LOCAL_APIC && X86_TSC @@ -15,18 +14,32 @@ config XEN kernel to boot in a paravirtualized environment under the Xen hypervisor. +config XEN_PV + bool "Xen PV guest support" + default y + depends on XEN + help + Support running as a Xen PV guest. + config XEN_DOM0 - def_bool y - depends on XEN && PCI_XEN && SWIOTLB_XEN + bool "Xen PV Dom0 support" + default y + depends on XEN_PV && PCI_XEN && SWIOTLB_XEN depends on X86_IO_APIC && ACPI && PCI + select XEN_HAVE_PVMMU + help + Support running as a Xen PV Dom0 guest. config XEN_PVHVM - def_bool y + bool "Xen PVHVM guest support" + default y depends on XEN && PCI && X86_LOCAL_APIC + help + Support running as a Xen PVHVM guest. config XEN_512GB bool "Limit Xen pv-domain memory to 512GB" - depends on XEN && X86_64 + depends on XEN_PV && X86_64 default y help Limit paravirtualized user domains to 512GB of RAM. -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Subject: [PATCH v2 03/21] x86/xen: add CONFIG_XEN_PV to Kconfig Date: Thu, 2 Mar 2017 18:53:39 +0100 Message-ID: <20170302175357.8222-4-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjUvX-0003Ng-QA for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 17:54:07 +0000 In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Boris Ostrovsky , x86@kernel.org, Andrew Jones , linux-kernel@vger.kernel.org List-Id: xen-devel@lists.xenproject.org QWxsIGNvZGUgdG8gc3VwcHJvdCBYZW4gUFYgd2lsbCBnZXQgdW5kZXIgdGhpcyBuZXcgb3B0aW9u LiBGb3IgdGhlCmJlZ2lubmluZywgY2hlY2sgZm9yIGl0IGluIHRoZSBjb21tb24gY29kZS4KClNp Z25lZC1vZmYtYnk6IFZpdGFseSBLdXpuZXRzb3YgPHZrdXpuZXRzQHJlZGhhdC5jb20+Ci0tLQog YXJjaC94ODYva2VybmVsL2NwdS9oeXBlcnZpc29yLmMgfCAgNCArKystCiBhcmNoL3g4Ni9rZXJu ZWwvcHJvY2Vzc182NC5jICAgICB8ICAyICstCiBhcmNoL3g4Ni94ZW4vS2NvbmZpZyAgICAgICAg ICAgICB8IDIzICsrKysrKysrKysrKysrKysrKy0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIyIGlu c2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVs L2NwdS9oeXBlcnZpc29yLmMgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L2h5cGVydmlzb3IuYwppbmRl eCBhNzdmMThkLi5jZTZmY2MzIDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L2h5cGVy dmlzb3IuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L2h5cGVydmlzb3IuYwpAQCAtMjgsOCAr MjgsMTAgQEAKIAogc3RhdGljIGNvbnN0IF9faW5pdGNvbnN0IHN0cnVjdCBoeXBlcnZpc29yX3g4 NiAqIGNvbnN0IGh5cGVydmlzb3JzW10gPQogewotI2lmZGVmIENPTkZJR19YRU4KKyNpZmRlZiBD T05GSUdfWEVOX1BWCiAJJng4Nl9oeXBlcl94ZW5fcHYsCisjZW5kaWYKKyNpZmRlZiBDT05GSUdf WEVOX1BWSFZNCiAJJng4Nl9oeXBlcl94ZW5faHZtLAogI2VuZGlmCiAJJng4Nl9oeXBlcl92bXdh cmUsCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvcHJvY2Vzc182NC5jIGIvYXJjaC94ODYv a2VybmVsL3Byb2Nlc3NfNjQuYwppbmRleCBhNjFlMTQxLi41ZThkMTI5IDEwMDY0NAotLS0gYS9h cmNoL3g4Ni9rZXJuZWwvcHJvY2Vzc182NC5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9wcm9jZXNz XzY0LmMKQEAgLTQzOCw3ICs0MzgsNyBAQCBfX3N3aXRjaF90byhzdHJ1Y3QgdGFza19zdHJ1Y3Qg KnByZXZfcCwgc3RydWN0IHRhc2tfc3RydWN0ICpuZXh0X3ApCiAJCSAgICAgdGFza190aHJlYWRf aW5mbyhwcmV2X3ApLT5mbGFncyAmIF9USUZfV09SS19DVFhTV19QUkVWKSkKIAkJX19zd2l0Y2hf dG9feHRyYShwcmV2X3AsIG5leHRfcCwgdHNzKTsKIAotI2lmZGVmIENPTkZJR19YRU4KKyNpZmRl ZiBDT05GSUdfWEVOX1BWCiAJLyoKIAkgKiBPbiBYZW4gUFYsIElPUEwgYml0cyBpbiBwdF9yZWdz LT5mbGFncyBoYXZlIG5vIGVmZmVjdCwgYW5kCiAJICogY3VycmVudF9wdF9yZWdzKCktPmZsYWdz IG1heSBub3QgbWF0Y2ggdGhlIGN1cnJlbnQgdGFzaydzCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94 ZW4vS2NvbmZpZyBiL2FyY2gveDg2L3hlbi9LY29uZmlnCmluZGV4IDc2YjZkYmQuLmMzODc1NjAg MTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9LY29uZmlnCisrKyBiL2FyY2gveDg2L3hlbi9LY29u ZmlnCkBAIC02LDcgKzYsNiBAQCBjb25maWcgWEVOCiAJYm9vbCAiWGVuIGd1ZXN0IHN1cHBvcnQi CiAJZGVwZW5kcyBvbiBQQVJBVklSVAogCXNlbGVjdCBQQVJBVklSVF9DTE9DSwotCXNlbGVjdCBY RU5fSEFWRV9QVk1NVQogCXNlbGVjdCBYRU5fSEFWRV9WUE1VCiAJZGVwZW5kcyBvbiBYODZfNjQg fHwgKFg4Nl8zMiAmJiBYODZfUEFFKQogCWRlcGVuZHMgb24gWDg2X0xPQ0FMX0FQSUMgJiYgWDg2 X1RTQwpAQCAtMTUsMTggKzE0LDMyIEBAIGNvbmZpZyBYRU4KIAkgIGtlcm5lbCB0byBib290IGlu IGEgcGFyYXZpcnR1YWxpemVkIGVudmlyb25tZW50IHVuZGVyIHRoZQogCSAgWGVuIGh5cGVydmlz b3IuCiAKK2NvbmZpZyBYRU5fUFYKKwlib29sICJYZW4gUFYgZ3Vlc3Qgc3VwcG9ydCIKKwlkZWZh dWx0IHkKKwlkZXBlbmRzIG9uIFhFTgorCWhlbHAKKwkgIFN1cHBvcnQgcnVubmluZyBhcyBhIFhl biBQViBndWVzdC4KKwogY29uZmlnIFhFTl9ET00wCi0JZGVmX2Jvb2wgeQotCWRlcGVuZHMgb24g WEVOICYmIFBDSV9YRU4gJiYgU1dJT1RMQl9YRU4KKwlib29sICJYZW4gUFYgRG9tMCBzdXBwb3J0 IgorCWRlZmF1bHQgeQorCWRlcGVuZHMgb24gWEVOX1BWICYmIFBDSV9YRU4gJiYgU1dJT1RMQl9Y RU4KIAlkZXBlbmRzIG9uIFg4Nl9JT19BUElDICYmIEFDUEkgJiYgUENJCisJc2VsZWN0IFhFTl9I QVZFX1BWTU1VCisJaGVscAorCSAgU3VwcG9ydCBydW5uaW5nIGFzIGEgWGVuIFBWIERvbTAgZ3Vl c3QuCiAKIGNvbmZpZyBYRU5fUFZIVk0KLQlkZWZfYm9vbCB5CisJYm9vbCAiWGVuIFBWSFZNIGd1 ZXN0IHN1cHBvcnQiCisJZGVmYXVsdCB5CiAJZGVwZW5kcyBvbiBYRU4gJiYgUENJICYmIFg4Nl9M T0NBTF9BUElDCisJaGVscAorCSAgU3VwcG9ydCBydW5uaW5nIGFzIGEgWGVuIFBWSFZNIGd1ZXN0 LgogCiBjb25maWcgWEVOXzUxMkdCCiAJYm9vbCAiTGltaXQgWGVuIHB2LWRvbWFpbiBtZW1vcnkg dG8gNTEyR0IiCi0JZGVwZW5kcyBvbiBYRU4gJiYgWDg2XzY0CisJZGVwZW5kcyBvbiBYRU5fUFYg JiYgWDg2XzY0CiAJZGVmYXVsdCB5CiAJaGVscAogCSAgTGltaXQgcGFyYXZpcnR1YWxpemVkIHVz ZXIgZG9tYWlucyB0byA1MTJHQiBvZiBSQU0uCi0tIAoyLjkuMwoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=