From patchwork Tue Sep 24 15:20:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heyi Guo X-Patchwork-Id: 11159079 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 0D76513B1 for ; Tue, 24 Sep 2019 15:23:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 DF97E20665 for ; Tue, 24 Sep 2019 15:23:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lyhhPpQH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF97E20665 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Iie+ycq9f1QjB3qhh7R0ta7IYNn6Ge5cTaeS8fRtVSE=; b=lyhhPpQHLLh8FM PWa15/D8F7iw6CSwYVXd/yvetVg2Dvm3YqjfMtq+dko9gaucxgHmkbpj9R+6M95puVvYZQHr79LIr FlTBvs0Pa2XlFP1UtFnZ+tCaOF/ezyNfWgFCPteysVTWjvhGT8PZdXcMV/taFWRsDu4EP96Lv9aAy u9hNnjZgbwzcQqrPIx7nJcBLlhgQYntfO7RjnbBxc7DfqVN0zziofmCzERZ5szbHZkcQlAQLABw/K ONM7/TtHJ9KXd+bY+mmrzoTbzx7oSWDhNJ8O7F8ImG3jUaPpqo6kmPLN/ror/ZSJVCT85IW0pvh8T oLMGyNQLEWAlWH8mNyXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCmej-0002mY-E7; Tue, 24 Sep 2019 15:23:09 +0000 Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCmeC-0002Q1-M8 for linux-arm-kernel@lists.infradead.org; Tue, 24 Sep 2019 15:22:39 +0000 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: , , , , 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 X-Originating-IP: [10.175.104.222] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190924_082237_032261_91FC84A6 X-CRM114-Status: GOOD ( 10.73 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [45.249.212.32 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Peter Maydell , Suzuki K Poulose , Marc Zyngier , Catalin Marinas , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , James Morse , Paolo Bonzini , Heyi Guo , wanghaibin.wang@huawei.com, Will Deacon , Dave Martin , Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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