From patchwork Mon Sep 23 10:09:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 11156557 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1BA6717D4 for ; Mon, 23 Sep 2019 10:11:31 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB32720820 for ; Mon, 23 Sep 2019 10:11:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CzQiMu1j" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB32720820 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCLIM-0007Zm-Ly; Mon, 23 Sep 2019 10:10:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCLIL-0007ZH-9y for xen-devel@lists.xenproject.org; Mon, 23 Sep 2019 10:10:13 +0000 X-Inumbo-ID: 42ff5546-ddea-11e9-b76c-bc764e2007e4 Received: from mail-wm1-x343.google.com (unknown [2a00:1450:4864:20::343]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 42ff5546-ddea-11e9-b76c-bc764e2007e4; Mon, 23 Sep 2019 10:09:43 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id f22so1465785wmc.2 for ; Mon, 23 Sep 2019 03:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A9Koh0GsgVCT4pN4yJPa3MEazXKb1HbGcXbrkIuJu84=; b=CzQiMu1j5ykcWRa7i26QUa658su7ucyXKJ7qqbkXENsYZTyR9G9TG9roMnN39oxSmx pnpUcJh3SF5Fq36vhAP4zXeO2CWPAJ6q0w7A6vy46YaJRp0gXteCF0Vww1xUKzOiearF ogxwHX3SjYUqNfI2uvhywoWK+LdRua/v/B98EmYEsRqF3RA/ut8KIdNQfnRAFN9rQQPC Y1KPQeyPRCLjpeunk4CYqXEERxeGhy+Q4D2gPc7b9E8tGBrqP5guW+Prjxv14QUzRIqp ++NOKbJqAG4YKerw5UVIyPu6wHjUNrCqttd0HB72Z633u3CQ6vptZSRG/0qSXFwat8lK vq5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A9Koh0GsgVCT4pN4yJPa3MEazXKb1HbGcXbrkIuJu84=; b=LXc8KpaWrjA4uF7VgM0uTPiZkREawmH1iTGrDAxiQORJRKBa1PGSZXdjvqh4jRxqLK 5lyHpU7zi569hkheTqFy+fNBoYWMRINcsE8am/V69ogTGpHFvaEFo6lGu3IaqXeWXY6t L2a2L2UWv34DYe5eBBXfbPrO7zkybJPyvAfPcSfrVR5uE8TahzvtCbqTuKMq3/EFr/6M OoeyeI7KSPelWq3g1ti0XILCeCtYoLOI6bCKnlCabn/CPnlGkKnHX4wNGIxnjoUC5oAY d/Ya+REq9cGEE5ITU5SFTN0M4WeYCf0X6hBcbDOKUX2gNo8L9Vo9CPgb+KXDL8xE9HmA CS9Q== X-Gm-Message-State: APjAAAUm4lrH0BUjWDwm0IaJDKyQQOcDOH7WDyyRULnSzCYllhLLVo0v sLE3991DVJHDYns+TV8PcKfD8O51 X-Google-Smtp-Source: APXvYqwAn9PhG51WV0+u8bBUzZr7Q+/AVjkqcTH2tpe/NlUId/KPRDCUW46hZSu7fGR3T37VIonBPw== X-Received: by 2002:a7b:c40c:: with SMTP id k12mr14268922wmi.151.1569233382211; Mon, 23 Sep 2019 03:09:42 -0700 (PDT) Received: from debian.mshome.net (207.148.159.143.dyn.plus.net. [143.159.148.207]) by smtp.gmail.com with ESMTPSA id s10sm18241662wmf.48.2019.09.23.03.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 03:09:41 -0700 (PDT) From: Wei Liu X-Google-Original-From: Wei Liu To: Xen Development List Date: Mon, 23 Sep 2019 11:09:30 +0100 Message-Id: <20190923100931.29670-8-liuwe@microsoft.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190923100931.29670-1-liuwe@microsoft.com> References: <20190923100931.29670-1-liuwe@microsoft.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-next RFC 7/8] x86: introduce CONFIG_HYPERV and hyperv directory X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Wei Liu , Andrew Cooper , Michael Kelley , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" We use the same code structure as we did for Xen code. As starters, detect Hyper-V in probe_hyperv. More complex functionality will be added later. Signed-off-by: Wei Liu --- xen/arch/x86/Kconfig | 9 +++++ xen/arch/x86/guest/Makefile | 1 + xen/arch/x86/guest/hyperv/Makefile | 1 + xen/arch/x86/guest/hyperv/hyperv.c | 63 ++++++++++++++++++++++++++++++ xen/arch/x86/guest/hypervisor.c | 3 +- xen/include/asm-x86/guest.h | 1 + xen/include/asm-x86/guest/hyperv.h | 48 +++++++++++++++++++++++ 7 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 xen/arch/x86/guest/hyperv/Makefile create mode 100644 xen/arch/x86/guest/hyperv/hyperv.c create mode 100644 xen/include/asm-x86/guest/hyperv.h diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 584bdc1bb8..c5a93babfe 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -163,6 +163,15 @@ endchoice config GUEST bool +config HYPERV_GUEST + def_bool n + select GUEST + prompt "Hyper-V Guest" + ---help--- + Support for Xen detecting when it is running under Hyper-V. + + If unsure, say N. + config XEN_GUEST def_bool n select GUEST diff --git a/xen/arch/x86/guest/Makefile b/xen/arch/x86/guest/Makefile index f63d64bbee..f164196772 100644 --- a/xen/arch/x86/guest/Makefile +++ b/xen/arch/x86/guest/Makefile @@ -1,3 +1,4 @@ obj-y += hypervisor.o +subdir-$(CONFIG_HYPERV_GUEST) += hyperv subdir-$(CONFIG_XEN_GUEST) += xen diff --git a/xen/arch/x86/guest/hyperv/Makefile b/xen/arch/x86/guest/hyperv/Makefile new file mode 100644 index 0000000000..68170109a9 --- /dev/null +++ b/xen/arch/x86/guest/hyperv/Makefile @@ -0,0 +1 @@ +obj-y += hyperv.o diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c new file mode 100644 index 0000000000..488e9c14a3 --- /dev/null +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -0,0 +1,63 @@ +/****************************************************************************** + * arch/x86/guest/hyperv/hyperv.c + * + * Support for detecting and running under Hyper-V. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see . + * + * Copyright (c) 2019 Microsoft. + */ +#include + +#include + +bool __read_mostly hyperv_guest; + +bool __init probe_hyperv(void) +{ + uint32_t eax, ebx, ecx, edx; + + if ( hyperv_guest ) + return true; + + cpuid(0x40000000, &eax, &ebx, &ecx, &edx); + if ( (ebx == 0x7263694d) && /* "Micr" */ + (ecx == 0x666f736f) && /* "osof" */ + (edx == 0x76482074) ) /* "t Hv" */ + hyperv_guest = true; + + return hyperv_guest; +} + +void __init hyperv_setup(void) +{ +} + +void hyperv_ap_setup(void) +{ +} + +void hyperv_resume(void) +{ +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/guest/hypervisor.c b/xen/arch/x86/guest/hypervisor.c index fb572b0402..17d56cd05e 100644 --- a/xen/arch/x86/guest/hypervisor.c +++ b/xen/arch/x86/guest/hypervisor.c @@ -37,7 +37,8 @@ void __init probe_hypervisor(void) if ( probe_xen() ) return; - /* Hyper-V probing to follow. */ + if ( probe_hyperv() ) + return; } static void __init init_memmap(void) diff --git a/xen/include/asm-x86/guest.h b/xen/include/asm-x86/guest.h index 8e167165ae..94448606d4 100644 --- a/xen/include/asm-x86/guest.h +++ b/xen/include/asm-x86/guest.h @@ -20,6 +20,7 @@ #define __X86_GUEST_H__ #include +#include #include #include #include diff --git a/xen/include/asm-x86/guest/hyperv.h b/xen/include/asm-x86/guest/hyperv.h new file mode 100644 index 0000000000..30e5135a72 --- /dev/null +++ b/xen/include/asm-x86/guest/hyperv.h @@ -0,0 +1,48 @@ +/****************************************************************************** + * asm-x86/guest/hyperv.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms and conditions of the GNU General Public + * License, version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; If not, see . + * + * Copyright (c) 2019 Microsoft. + */ + +#ifndef __X86_GUEST_HYPERV_H__ +#define __X86_GUEST_HYPERV_H__ + +#ifdef CONFIG_HYPERV_GUEST + +extern bool hyperv_guest; + +bool probe_hyperv(void); +void hyperv_setup(void); +void hyperv_ap_setup(void); +void hyperv_resume(void); + +#else + +#define hyperv_guest 0 + +static inline bool probe_hyperv(void) { return false; } + +#endif /* CONFIG_HYPERV_GUEST */ +#endif /* __X86_GUEST_HYPERV_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */