From patchwork Fri Sep 28 13:39:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 10620011 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 1B4B8913 for ; Fri, 28 Sep 2018 13:59:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B00C2B4AF for ; Fri, 28 Sep 2018 13:59:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F350D2B4BD; Fri, 28 Sep 2018 13:59:03 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 600192B4AF for ; Fri, 28 Sep 2018 13:59:03 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=G24BL6UB9XVK8hM+BcR2Kmv2Opf71mSBvToSOkYwBXM=; b=ZwhuRXyEngCA6fwHRIf0plju29 h/lF6uy1NpI1emyWqmfdKaL77cdmOEarL2HH1Y0sjG06AM32QApS696jow80715TsfiWBlYEBebLW /77OEF2nKPxJaExdc5v5G76D7YIMLmldjw2Uhn6H9PDIPZ52wleb+lVBNoAC4sGt6Ax4uO/k/85d1 Sf5RtaBegb+VxK6TZNMzZkqsO1g4TAVLMaeFDxoR3/RsQGopeoIZ+NoAoCw6y9md2ST28DNhtwvx0 uLnprpLxyNjJina92a3+/m+BSRolV/yLu0XCvS1es1QVD/SMyvb3o5HhNqreYXRzZ8Ob19koWQOgJ daqZANMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5tI8-0002CD-Is; Fri, 28 Sep 2018 13:58:48 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5tCz-0006gy-0I for linux-arm-kernel@bombadil.infradead.org; Fri, 28 Sep 2018 13:53:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ky94WlNzYa7M+xVZVTmfv4k5XJQennjBgddy+kP6KdI=; b=GFTUlay01dRpiOIxiD31dhJw3 NC3Om4/jc2gdtjfrW5rvCqQzG9hTYV3aAoKXuJi+mFRaT8JXMgqFxnYSVfG1ci3hNMpEraSRP7wAa 6fMNvAeWEpWdibbkqLyWznC6faDHzdVmDjb6/K47UKkU4t/LvebMf6kCGJfC0YOfh4lPCZun3xfJR mtiZ9dl/IviFHv9wNlgSvACrmOPtuDjmKg6Dp5f1SqH0+XffFaoA7BpQ/F0g6QcdQ/ClQb68Ols4z p0JhkFMqinlPMWyUU5Hj3r5kvmgXXDRKbwOF3a9NcqLr1Db7yBEndGE6nfW90WF2SvcBLA59VXZ4m W7BgIv4jw==; Received: from foss.arm.com ([217.140.101.70]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5t0l-0005mx-AY for linux-arm-kernel@lists.infradead.org; Fri, 28 Sep 2018 13:40:52 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 14308ED1; Fri, 28 Sep 2018 06:40:51 -0700 (PDT) Received: from e103592.Emea.Arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5C5BD3F5B7; Fri, 28 Sep 2018 06:40:49 -0700 (PDT) From: Dave Martin To: kvmarm@lists.cs.columbia.edu Subject: [RFC PATCH v2 18/23] KVM: arm64: Add arch vcpu ioctl hook Date: Fri, 28 Sep 2018 14:39:22 +0100 Message-Id: <1538141967-15375-19-git-send-email-Dave.Martin@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1538141967-15375-1-git-send-email-Dave.Martin@arm.com> References: <1538141967-15375-1-git-send-email-Dave.Martin@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180928_144051_494378_325597A3 X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Okamoto Takayuki , Christoffer Dall , Ard Biesheuvel , Marc Zyngier , Catalin Marinas , Will Deacon , =?utf-8?q?Alex_Benn=C3=A9e?= , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To enable arm64-specific vcpu ioctls to be added cleanly, this patch adds a kvm_arm_arch_vcpu_ioctl() hook so that these don't pollute the common code. No functional change: the -EINVAL return for unknown ioctls is retained, though it may or may not be intentional (KVM returns -ENXIO in various other similar contexts). Signed-off-by: Dave Martin --- arch/arm/include/asm/kvm_host.h | 7 +++++++ arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/guest.c | 6 ++++++ virt/kvm/arm/arm.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index c36760b..df2659d 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -19,6 +19,7 @@ #ifndef __ARM_KVM_HOST_H__ #define __ARM_KVM_HOST_H__ +#include #include #include #include @@ -278,6 +279,12 @@ static inline int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext) return 0; } +static inline int kvm_arm_arch_vcpu_ioctl(struct vcpu *vcpu, + unsigned int ioctl, unsigned long arg) +{ + return -EINVAL; +} + int kvm_perf_init(void); int kvm_perf_teardown(void); diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 8e9cd43..bbde597 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -55,6 +55,8 @@ DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use); int __attribute_const__ kvm_target_cpu(void); int kvm_reset_vcpu(struct kvm_vcpu *vcpu); int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext); +int kvm_arm_arch_vcpu_ioctl(struct kvm_vcpu *vcpu, + unsigned int ioctl, unsigned long arg); void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start); struct kvm_arch { diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 89eab68..331b85e 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -546,6 +546,12 @@ int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init) return 0; } +int kvm_arm_arch_vcpu_ioctl(struct kvm_vcpu *vcpu, + unsigned int ioctl, unsigned long arg) +{ + return -EINVAL; +} + int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) { return -EINVAL; diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 1418af9..6e894a8 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -1181,7 +1181,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, return kvm_arm_vcpu_set_events(vcpu, &events); } default: - r = -EINVAL; + r = kvm_arm_arch_vcpu_ioctl(vcpu, ioctl, arg); } return r;