From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19F80C432C1 for ; Tue, 24 Sep 2019 15:22:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDE8621655 for ; Tue, 24 Sep 2019 15:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732708AbfIXPWg (ORCPT ); Tue, 24 Sep 2019 11:22:36 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:46996 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732698AbfIXPWf (ORCPT ); Tue, 24 Sep 2019 11:22:35 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 4F6A85461CE3B3AB5C3B; Tue, 24 Sep 2019 23:22:34 +0800 (CST) Received: from linux-Bxxcye.huawei.com (10.175.104.222) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Tue, 24 Sep 2019 23:22:24 +0800 From: Heyi Guo To: , , , , CC: , Heyi Guo , Peter Maydell , Dave Martin , Marc Zyngier , Mark Rutland , James Morse , Julien Thierry , "Suzuki K Poulose" , Catalin Marinas , Will Deacon , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [RFC PATCH 2/2] kvm/arm64: expose hypercall_forwarding capability Date: Tue, 24 Sep 2019 23:20:54 +0800 Message-ID: <1569338454-26202-3-git-send-email-guoheyi@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1569338454-26202-1-git-send-email-guoheyi@huawei.com> References: <1569338454-26202-1-git-send-email-guoheyi@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.175.104.222] X-CFilter-Loop: Reflected Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add new KVM capability "KVM_CAP_FORWARD_HYPERCALL" for user space to probe whether KVM supports forwarding hypercall. The capability should be enabled by user space explicitly, for we don't want user space application to deal with unexpected hypercall exits. We also use an additional argument to pass exception bit mask, to request KVM to forward all hypercalls except the classes specified in the bit mask. Currently only PSCI can be set as exception, so that we can still keep consistent with the old PSCI processing flow. Signed-off-by: Heyi Guo Cc: Peter Maydell Cc: Dave Martin Cc: Marc Zyngier Cc: Mark Rutland Cc: James Morse Cc: Julien Thierry Cc: Suzuki K Poulose Cc: Catalin Marinas Cc: Will Deacon Cc: Paolo Bonzini Cc: "Radim Krčmář" --- arch/arm64/kvm/reset.c | 25 +++++++++++++++++++++++++ include/uapi/linux/kvm.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index f4a8ae9..2201b62 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -95,6 +95,9 @@ int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = has_vhe() && system_supports_address_auth() && system_supports_generic_auth(); break; + case KVM_CAP_FORWARD_HYPERCALL: + r = 1; + break; default: r = 0; } @@ -102,6 +105,28 @@ int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext) return r; } +int kvm_vm_ioctl_enable_cap(struct kvm *kvm, + struct kvm_enable_cap *cap) +{ + if (cap->flags) + return -EINVAL; + + switch (cap->cap) { + case KVM_CAP_FORWARD_HYPERCALL: { + __u64 exclude_flags = cap->args[0]; + /* Only support excluding PSCI right now */ + if (exclude_flags & ~KVM_CAP_FORWARD_HYPERCALL_EXCL_PSCI) + return -EINVAL; + kvm->arch.hypercall_forward = true; + if (exclude_flags & KVM_CAP_FORWARD_HYPERCALL_EXCL_PSCI) + kvm->arch.hypercall_excl_psci = true; + return 0; + } + } + + return -EINVAL; +} + unsigned int kvm_sve_max_vl; int kvm_arm_init_sve(void) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 5e3f12d..e3e5787 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -711,6 +711,8 @@ struct kvm_enable_cap { __u8 pad[64]; }; +#define KVM_CAP_FORWARD_HYPERCALL_EXCL_PSCI (1 << 0) + /* for KVM_PPC_GET_PVINFO */ #define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) @@ -996,6 +998,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_ARM_PTRAUTH_ADDRESS 171 #define KVM_CAP_ARM_PTRAUTH_GENERIC 172 #define KVM_CAP_PMU_EVENT_FILTER 173 +#define KVM_CAP_FORWARD_HYPERCALL 174 #ifdef KVM_CAP_IRQ_ROUTING -- 1.8.3.1