Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1730351yba; Sun, 14 Apr 2019 19:05:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqwEedjlWhIfgg2Z5WVG2WuZucdiWkfcLSiq5gBeZc75uZec7tH7Vmc30ySurLgFn7PwlAtw X-Received: by 2002:a62:1215:: with SMTP id a21mr71728796pfj.126.1555293907230; Sun, 14 Apr 2019 19:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555293907; cv=none; d=google.com; s=arc-20160816; b=tIQOnV2ONh/qW21bqmZaaVMj7RFO/gB8ZuMe1aD8P5PFQ8qE67vEfcyoESlhBerVGL NAmCgXaQKUINblxYVWa/aGFLpOum8cVdg6QzymvaNcRmd3dJQzEPURvYimULBWEpFpg3 NttppBm3QXrNWu6wjpzDgrcSaBLjChDNDWdQ+jlSE6yKJ7jAIcFOYcqILAbTa6W4DCF+ xNvOaKcBPOWGEiP//T2LmvKYBsNukPjmPcOXBFezd+SOkQHjCJ9ToMOIKRxanpRvlR9k oj+45QDu5srsWO24Z5hgZjo0NZ7D+pOYXl5trM7OGzIWSeriiFQdl9KSGpnlKQy25cc8 HT5A== 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=zyhWb8fxAMV/DQBcFwV9O4zOA8xqsu+OregyuC1icrY=; b=r2a602S+Kc6us1q9jmWNooTsdMQ1LLhXqUO8hrdylMnZQXEjvRJ3DsGrAgDjLXWF3N 5jrqdFQiUnSen5XnGGxKn2FUUK6+olphKX+Z7gYwpN2nzxZk1rlWYbpND0M4ODn6lyFa OIgR7pF2tWNcHRFyGIOjNCSjzlf15rtlNnGDzQNMFmteP8lb0qHZVLdVw98utK7Z9Qfm m40AVj0YYYXPR0R+tIAQiRIE7bRDQxLc5Szz1IRqeqi3HGdLjAQpF3dAD/X37wxcyj0M Z6TrA240mhjXkE7BaLfS15MAxLoVkX/C7Yml8djQskRU80aXWchhrUzuub3ksMvqpkuV 6FOQ== 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 q2si28551231pfi.165.2019.04.14.19.04.50; Sun, 14 Apr 2019 19:05: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 S1727149AbfDOCDX (ORCPT + 99 others); Sun, 14 Apr 2019 22:03:23 -0400 Received: from mga07.intel.com ([134.134.136.100]:30388 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726884AbfDOCDH (ORCPT ); Sun, 14 Apr 2019 22:03:07 -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:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,351,1549958400"; d="scan'208";a="149422504" Received: from genxtest-ykzhao.sh.intel.com ([10.239.143.71]) by FMSMGA003.fm.intel.com with ESMTP; 14 Apr 2019 19:03:06 -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: [RFC PATCH v4 3/4] x86/acrn: Use HYPERVISOR_CALLBACK_VECTOR for ACRN guest upcall vector Date: Mon, 15 Apr 2019 10:00:56 +0800 Message-Id: <1555293657-32233-4-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 Linux kernel uses the HYPERVISOR_CALLBACK_VECTOR for hypervisor upcall vector. And it is already used for Xen and HyperV. After ACRN hypervisor is detected, it will also use this defined vector to notify kernel. Co-developed-by: Jason Chen CJ Signed-off-by: Jason Chen CJ Signed-off-by: Zhao Yakui --- V1->V2: Remove the unused API definition of acrn_setup_intr_handler and acrn_remove_intr_handler. Adjust the order of header file Add the declaration of acrn_hv_vector_handler and tracing definition of acrn_hv_callback_vector. v2->v3: Select the X86_HV_CALLBACK_VECTOR for ACRN guest v3->v4: Refine the file name of acrnhyper.h to acrn.h --- arch/x86/Kconfig | 1 + arch/x86/entry/entry_64.S | 5 +++++ arch/x86/include/asm/acrn.h | 11 +++++++++++ arch/x86/kernel/cpu/acrn.c | 22 ++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 arch/x86/include/asm/acrn.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b33bfe5..4bad72c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -848,6 +848,7 @@ config JAILHOUSE_GUEST config ACRN_GUEST bool "ACRN Guest support" depends on X86_64 + select X86_HV_CALLBACK_VECTOR help This option allows to run Linux as guest in ACRN hypervisor. Enabling this will allow the kernel to boot in virtualized environment under diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 1f0efdb..d1b8ad3 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1129,6 +1129,11 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \ hv_stimer0_callback_vector hv_stimer0_vector_handler #endif /* CONFIG_HYPERV */ +#if IS_ENABLED(CONFIG_ACRN_GUEST) +apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ + acrn_hv_callback_vector acrn_hv_vector_handler +#endif + idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK idtentry int3 do_int3 has_error_code=0 idtentry stack_segment do_stack_segment has_error_code=1 diff --git a/arch/x86/include/asm/acrn.h b/arch/x86/include/asm/acrn.h new file mode 100644 index 0000000..43ab032 --- /dev/null +++ b/arch/x86/include/asm/acrn.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_ACRN_H +#define _ASM_X86_ACRN_H + +void acrn_hv_callback_vector(void); +#ifdef CONFIG_TRACING +#define trace_acrn_hv_callback_vector acrn_hv_callback_vector +#endif + +void acrn_hv_vector_handler(struct pt_regs *regs); +#endif /* _ASM_X86_ACRN_H */ diff --git a/arch/x86/kernel/cpu/acrn.c b/arch/x86/kernel/cpu/acrn.c index f556640..d8072bf 100644 --- a/arch/x86/kernel/cpu/acrn.c +++ b/arch/x86/kernel/cpu/acrn.c @@ -9,7 +9,11 @@ * */ +#include +#include +#include #include +#include static uint32_t __init acrn_detect(void) { @@ -18,6 +22,8 @@ static uint32_t __init acrn_detect(void) static void __init acrn_init_platform(void) { + alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, + acrn_hv_callback_vector); } static bool acrn_x2apic_available(void) @@ -30,6 +36,22 @@ static bool acrn_x2apic_available(void) return false; } +static void (*acrn_intr_handler)(void); + +__visible void __irq_entry acrn_hv_vector_handler(struct pt_regs *regs) +{ + struct pt_regs *old_regs = set_irq_regs(regs); + + entering_ack_irq(); + inc_irq_stat(irq_hv_callback_count); + + if (acrn_intr_handler) + acrn_intr_handler(); + + exiting_irq(); + set_irq_regs(old_regs); +} + const __initconst struct hypervisor_x86 x86_hyper_acrn = { .name = "ACRN", .detect = acrn_detect, -- 2.7.4