From patchwork Mon May 13 14:38:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Chartre X-Patchwork-Id: 10941125 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43C666C5 for ; Mon, 13 May 2019 14:41:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B7C28306 for ; Mon, 13 May 2019 14:41:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A38D2832D; Mon, 13 May 2019 14:41:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C91DD28334 for ; Mon, 13 May 2019 14:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730739AbfEMOlj (ORCPT ); Mon, 13 May 2019 10:41:39 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:33390 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729639AbfEMOlj (ORCPT ); Mon, 13 May 2019 10:41:39 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4DEd3QK194955; Mon, 13 May 2019 14:39:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=ivlXRYid08bCLk7EeeAFLog7R/4eiJfJ3h7LO8cUdeI=; b=z94gwv/h6a2eKxGWAbRUGkTU6KQJtXJ5d9W6ZAsILmq9BIFlV0LuM3OrSOh/UH7Pz5NG 96qNkm9FPETMU1CK7gybTPwq+ay4+eI/5ZBk7+Q+y/kQOV/x7sjuvp8KNOiVPI3sWHJp aavXu55k8608Ik9cqQUYuPI190YDw9stqWSKV2ovjULIm12NLn2fEyPVAmeiTcuHgcon 8059HBgFrgSpkKo1gDcIsSnBF1vNWz4rpcg52v7RzoR3yGYo4g+LLYhNJsd8LIgK7av1 KVYEFQoIDdxdVwMIjw1yVhHummBBRuJpdrOk80g5n+iCI4jKYptxDL+3/5eTCqCqtgeN 4g== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2sdq1q7atx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2019 14:39:03 +0000 Received: from achartre-desktop.fr.oracle.com (dhcp-10-166-106-34.fr.oracle.com [10.166.106.34]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x4DEcZQ8022780; Mon, 13 May 2019 14:38:53 GMT From: Alexandre Chartre To: pbonzini@redhat.com, rkrcmar@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, kvm@vger.kernel.org, x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: konrad.wilk@oracle.com, jan.setjeeilers@oracle.com, liran.alon@oracle.com, jwadams@google.com, alexandre.chartre@oracle.com Subject: [RFC KVM 05/27] KVM: x86: Add handler to exit kvm isolation Date: Mon, 13 May 2019 16:38:13 +0200 Message-Id: <1557758315-12667-6-git-send-email-alexandre.chartre@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1557758315-12667-1-git-send-email-alexandre.chartre@oracle.com> References: <1557758315-12667-1-git-send-email-alexandre.chartre@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9255 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905130103 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Liran Alon Interrupt handlers will need this handler to switch from the KVM address space back to the kernel address space on their prelog. Signed-off-by: Liran Alon Signed-off-by: Alexandre Chartre --- arch/x86/include/asm/irq.h | 1 + arch/x86/kernel/irq.c | 11 +++++++++++ arch/x86/kvm/isolation.c | 13 +++++++++++++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index 8f95686..eb32abc 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -29,6 +29,7 @@ static inline int irq_canonicalize(int irq) extern __visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs); extern __visible void smp_kvm_posted_intr_wakeup_ipi(struct pt_regs *regs); extern __visible void smp_kvm_posted_intr_nested_ipi(struct pt_regs *regs); +extern void kvm_set_isolation_exit_handler(void (*handler)(void)); #endif extern void (*x86_platform_ipi_callback)(void); diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 59b5f2e..e68483b 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -295,6 +295,17 @@ void kvm_set_posted_intr_wakeup_handler(void (*handler)(void)) } EXPORT_SYMBOL_GPL(kvm_set_posted_intr_wakeup_handler); +void (*kvm_isolation_exit_handler)(void) = dummy_handler; + +void kvm_set_isolation_exit_handler(void (*handler)(void)) +{ + if (handler) + kvm_isolation_exit_handler = handler; + else + kvm_isolation_exit_handler = dummy_handler; +} +EXPORT_SYMBOL_GPL(kvm_set_isolation_exit_handler); + /* * Handler for POSTED_INTERRUPT_VECTOR. */ diff --git a/arch/x86/kvm/isolation.c b/arch/x86/kvm/isolation.c index 35aa659..22ff9c2 100644 --- a/arch/x86/kvm/isolation.c +++ b/arch/x86/kvm/isolation.c @@ -5,6 +5,7 @@ * KVM Address Space Isolation */ +#include #include #include #include @@ -95,6 +96,16 @@ static void kvm_isolation_uninit_mm(void) free_pages((unsigned long)kvm_pgd, PGD_ALLOCATION_ORDER); } +static void kvm_isolation_set_handlers(void) +{ + kvm_set_isolation_exit_handler(kvm_isolation_exit); +} + +static void kvm_isolation_clear_handlers(void) +{ + kvm_set_isolation_exit_handler(NULL); +} + int kvm_isolation_init(void) { int r; @@ -106,6 +117,7 @@ int kvm_isolation_init(void) if (r) return r; + kvm_isolation_set_handlers(); pr_info("KVM: x86: Running with isolated address space\n"); return 0; @@ -116,6 +128,7 @@ void kvm_isolation_uninit(void) if (!address_space_isolation) return; + kvm_isolation_clear_handlers(); kvm_isolation_uninit_mm(); pr_info("KVM: x86: End of isolated address space\n"); }