Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1729807yba; Sun, 14 Apr 2019 19:04:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsERUpWVRIEYcQvuif+JLolaFSKWbLqQFKpeCUqnGBgFekWkEsWcZnpG1XdDJIdcAJxmij X-Received: by 2002:a63:3185:: with SMTP id x127mr21474776pgx.299.1555293847451; Sun, 14 Apr 2019 19:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555293847; cv=none; d=google.com; s=arc-20160816; b=MaH2WVilToOYM5WE2XW+8xS3ZGaQ+BOH/5IE61VyETbBZddCfrS6dKM1fCpO3nDXuB aXspZHyS6H/ifEwQwTQtZKaFkfTERPh9hj6ql+j+RoX6GTX+uXyV1/McvGfRlVlf0Ni2 VeckFY0ZrJ70bhOXSRd/GP54IdVfUPac/bJ6rowCUWOvACWGjAIQIEQJYliguu1AApTW atQEXT8mwgwm8Y0espjK2nHZlDIOH8zR+dgMT3YkXqvpoipQS7fPSgypELtKrQHKMo5c bT9zEOW7oWU/bwfpdTbLqMxc19HqAuiA8a+n8Lz4TBNeRc+qGn6n64wgnaSCm1Tv/tfh vFcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=pg7eR8TLiYwDKWBmS5mL1t2862sxtdrqI+pDFLqX1lA=; b=Ds9xEmtRcKhgSYWGH/Zr1GCs3XFUKxzSBOJvDfXZU2szYZlV1ymbDtVtdPicyGWy7w 3mxkpHp8KwMXXTB0GIez00Y8+TS03XQ3ktCf1qE6KWIGwSQlbR0WaBWTojWZHLqcWxHW xGrEuBtxBu649Gock3ouCoofLeSzpPrTeeZV5K8URWFx4CSG0tGxDgzD5Gf+EQpkh1YD 4pY5ALpZ9d+GGlQDR8hcpkp0M2JdLJLrThsslrzZPx52h/233PT9YU/iY6MkJle3C7LW m98XAZsf7ic9N3OPk1seypmxldwNagFdM00N2tqNhxQ4dkosdwLO8IWLQEydBFp/IaUA UkoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h3si21033856pgk.424.2019.04.14.19.03.50; Sun, 14 Apr 2019 19:04:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727041AbfDOCDL (ORCPT + 99 others); Sun, 14 Apr 2019 22:03:11 -0400 Received: from mga07.intel.com ([134.134.136.100]:30382 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726120AbfDOCDG (ORCPT ); Sun, 14 Apr 2019 22:03:06 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Apr 2019 19:03:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,351,1549958400"; d="scan'208";a="149422499" Received: from genxtest-ykzhao.sh.intel.com ([10.239.143.71]) by FMSMGA003.fm.intel.com with ESMTP; 14 Apr 2019 19:03:05 -0700 From: Zhao Yakui To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: bp@alien8.de, tglx@linutronix.de, Zhao Yakui , Jason Chen CJ Subject: [PATCH v4 2/4] x86: Add the support of Linux guest on ACRN hypervisor Date: Mon, 15 Apr 2019 10:00:55 +0800 Message-Id: <1555293657-32233-3-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555293657-32233-1-git-send-email-yakui.zhao@intel.com> References: <1555293657-32233-1-git-send-email-yakui.zhao@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ACRN is an open-source hypervisor maintained by Linux Foundation. It is built for embedded IOT with small footprint and real-time features. Add the ACRN guest support so that it allows linux to be booted under ACRN hypervisor. Following this patch it will setup the upcall notification vector, enable hypercall and provide the interface that is used to manage the virtualized CPU/memory/device/interrupt for other guest OS. Co-developed-by: Jason Chen CJ Signed-off-by: Jason Chen CJ Signed-off-by: Zhao Yakui --- v1->v2: Change the CONFIG_ACRN to CONFIG_ACRN_GUEST, which makes it easy to understand. Remove the export of x86_hyper_acrn. v2->v3: Remove the unnecessary dependency of PARAVIRT v3->v4: Refine the commit log and add meaningful description in Kconfig --- arch/x86/Kconfig | 12 ++++++++++++ arch/x86/include/asm/hypervisor.h | 1 + arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/acrn.c | 39 +++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/hypervisor.c | 4 ++++ 5 files changed, 57 insertions(+) create mode 100644 arch/x86/kernel/cpu/acrn.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 54d1fbc..b33bfe5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -845,6 +845,18 @@ config JAILHOUSE_GUEST cell. You can leave this option disabled if you only want to start Jailhouse and run Linux afterwards in the root cell. +config ACRN_GUEST + bool "ACRN Guest support" + depends on X86_64 + help + This option allows to run Linux as guest in ACRN hypervisor. Enabling + this will allow the kernel to boot in virtualized environment under + the ACRN hypervisor. + ACRN is a flexible, lightweight reference open-source hypervisor, built + with real-time and safety-criticality in mind. It is built for embedded + IOT with small footprint and real-time features. More details can be + found in https://projectacrn.org/ + endif #HYPERVISOR_GUEST source "arch/x86/Kconfig.cpu" diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h index 8c5aaba..50a30f6 100644 --- a/arch/x86/include/asm/hypervisor.h +++ b/arch/x86/include/asm/hypervisor.h @@ -29,6 +29,7 @@ enum x86_hypervisor_type { X86_HYPER_XEN_HVM, X86_HYPER_KVM, X86_HYPER_JAILHOUSE, + X86_HYPER_ACRN, }; #ifdef CONFIG_HYPERVISOR_GUEST diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index cfd24f9..17a7cdf 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o +obj-$(CONFIG_ACRN_GUEST) += acrn.o ifdef CONFIG_X86_FEATURE_NAMES quiet_cmd_mkcapflags = MKCAP $@ diff --git a/arch/x86/kernel/cpu/acrn.c b/arch/x86/kernel/cpu/acrn.c new file mode 100644 index 0000000..f556640 --- /dev/null +++ b/arch/x86/kernel/cpu/acrn.c @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ACRN detection support + * + * Copyright (C) 2019 Intel Corporation. All rights reserved. + * + * Jason Chen CJ + * Zhao Yakui + * + */ + +#include + +static uint32_t __init acrn_detect(void) +{ + return hypervisor_cpuid_base("ACRNACRNACRN\0\0", 0); +} + +static void __init acrn_init_platform(void) +{ +} + +static bool acrn_x2apic_available(void) +{ + /* x2apic is not supported now. + * Later it needs to check the X86_FEATURE_X2APIC bit of cpu info + * returned by CPUID to determine whether the x2apic is + * supported in Linux guest. + */ + return false; +} + +const __initconst struct hypervisor_x86 x86_hyper_acrn = { + .name = "ACRN", + .detect = acrn_detect, + .type = X86_HYPER_ACRN, + .init.init_platform = acrn_init_platform, + .init.x2apic_available = acrn_x2apic_available, +}; diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c index 479ca47..87e39ad 100644 --- a/arch/x86/kernel/cpu/hypervisor.c +++ b/arch/x86/kernel/cpu/hypervisor.c @@ -32,6 +32,7 @@ extern const struct hypervisor_x86 x86_hyper_xen_pv; extern const struct hypervisor_x86 x86_hyper_xen_hvm; extern const struct hypervisor_x86 x86_hyper_kvm; extern const struct hypervisor_x86 x86_hyper_jailhouse; +extern const struct hypervisor_x86 x86_hyper_acrn; static const __initconst struct hypervisor_x86 * const hypervisors[] = { @@ -49,6 +50,9 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = #ifdef CONFIG_JAILHOUSE_GUEST &x86_hyper_jailhouse, #endif +#ifdef CONFIG_ACRN_GUEST + &x86_hyper_acrn, +#endif }; enum x86_hypervisor_type x86_hyper_type; -- 2.7.4