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=-16.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 29209C433E6 for ; Tue, 9 Feb 2021 05:10:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEC9664EB1 for ; Tue, 9 Feb 2021 05:10:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230182AbhBIFKd (ORCPT ); Tue, 9 Feb 2021 00:10:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34052 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229959AbhBIFGe (ORCPT ); Tue, 9 Feb 2021 00:06:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612847108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dJPF3D2lIfpavWv0ASGM2tGJ9PKIi2CsfVfBDqQ79RI=; b=CxD7+4xRX+HCHXYFTtAMYoLIbnhL46jMwy2327DAtG0EPp41QlGhadJg4vJVZTp0EF82dk iZAObihn5UjtT8Pv+6Y8d1YV9/0cgOcLyKM38P8VccjhqlgUSE+6UhFmDn2R013zG1YrJi Skgq/dDvUsLnApHW/S1azdociMTien0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-LX637OOGPVGrBmjeTiGgZA-1; Tue, 09 Feb 2021 00:05:04 -0500 X-MC-Unique: LX637OOGPVGrBmjeTiGgZA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE95B192CC41; Tue, 9 Feb 2021 05:05:02 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-26.bne.redhat.com [10.64.54.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BF4D5D9C0; Tue, 9 Feb 2021 05:04:59 +0000 (UTC) From: Gavin Shan To: kvmarm@lists.cs.columbia.edu Cc: linux-kernel@vger.kernel.org, pbonzini@redhat.com, maz@kernel.org, james.morse@arm.com, Jonathan.Cameron@huawei.com, mark.rutland@arm.com, will@kernel.org, shan.gavin@gmail.com Subject: [PATCH v2 12/17] KVM: arm64: Support async PF ioctl commands Date: Tue, 9 Feb 2021 13:03:58 +0800 Message-Id: <20210209050403.103143-13-gshan@redhat.com> In-Reply-To: <20210209050403.103143-1-gshan@redhat.com> References: <20210209050403.103143-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This supports ioctl commands for configuration and migration: KVM_ARM_ASYNC_PF_CMD_GET_VERSION Return implementation version KVM_ARM_ASYNC_PF_CMD_GET_SDEI Return SDEI event number used for page-not-present notification KVM_ARM_ASYNC_PF_CMD_GET_IRQ Return IRQ number used for page-ready notification KVM_ARM_ASYNC_PF_CMD_GET_CONTROL Get control block when VM is migrated KVM_ARM_ASYNC_PF_CMD_SET_SDEI Set SDEI event number when VM is started or migrated KVM_ARM_ASYNC_PF_CMD_SET_IRQ Set IRQ number during when VM is started or migrated KVM_ARM_ASYNC_PF_CMD_SET_CONTROL Set control block when VM is migrated Signed-off-by: Gavin Shan --- arch/arm64/include/asm/kvm_host.h | 14 +++++++ arch/arm64/include/uapi/asm/kvm.h | 19 +++++++++ arch/arm64/kvm/arm.c | 6 +++ arch/arm64/kvm/async_pf.c | 64 +++++++++++++++++++++++++++++++ include/uapi/linux/kvm.h | 3 ++ 5 files changed, 106 insertions(+) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 6349920fd9ce..14b3d1505b15 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -778,6 +778,8 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu, struct kvm_async_pf *work); long kvm_arch_async_pf_hypercall(struct kvm_vcpu *vcpu, long *r1, long *r2, long *r3); +long kvm_arch_async_pf_vm_ioctl(struct kvm *kvm, unsigned long arg); +long kvm_arch_async_pf_vcpu_ioctl(struct kvm_vcpu *vcpu, unsigned long arg); void kvm_arch_async_pf_destroy_vcpu(struct kvm_vcpu *vcpu); #else static inline void kvm_arch_async_pf_create_vcpu(struct kvm_vcpu *vcpu) { } @@ -799,6 +801,18 @@ static inline long kvm_arch_async_pf_hypercall(struct kvm_vcpu *vcpu, { return SMCCC_RET_NOT_SUPPORTED; } + +static inline long kvm_arch_async_pf_vm_ioctl(struct kvm *kvm, + unsigned long arg) +{ + return -EPERM; +} + +static inline long kvm_arch_async_pf_vcpu_ioctl(struct kvm_vcpu *vcpu, + unsigned long arg) +{ + return -EPERM; +} #endif /* Guest/host FPSIMD coordination helpers */ diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 15499751997d..a6124068bee6 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -403,6 +403,25 @@ struct kvm_vcpu_events { #define KVM_PSCI_RET_INVAL PSCI_RET_INVALID_PARAMS #define KVM_PSCI_RET_DENIED PSCI_RET_DENIED +/* Asynchronous page fault */ +#define KVM_ARM_ASYNC_PF_CMD_GET_VERSION 0 +#define KVM_ARM_ASYNC_PF_CMD_GET_SDEI 1 +#define KVM_ARM_ASYNC_PF_CMD_GET_IRQ 2 +#define KVM_ARM_ASYNC_PF_CMD_GET_CONTROL 3 +#define KVM_ARM_ASYNC_PF_CMD_SET_SDEI 4 +#define KVM_ARM_ASYNC_PF_CMD_SET_IRQ 5 +#define KVM_ARM_ASYNC_PF_CMD_SET_CONTROL 6 + +struct kvm_arm_async_pf_cmd { + __u32 cmd; + union { + __u32 version; + __u64 sdei; + __u32 irq; + __u64 control; + }; +}; + #endif #endif /* __ARM_KVM_H__ */ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index e34fca3fa0ff..be0e6c2db2a5 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1287,6 +1287,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp, case KVM_ARM_SDEI_COMMAND: { return kvm_sdei_vcpu_ioctl(vcpu, arg); } + case KVM_ARM_ASYNC_PF_COMMAND: { + return kvm_arch_async_pf_vcpu_ioctl(vcpu, arg); + } default: r = -EINVAL; } @@ -1364,6 +1367,9 @@ long kvm_arch_vm_ioctl(struct file *filp, case KVM_ARM_SDEI_COMMAND: { return kvm_sdei_vm_ioctl(kvm, arg); } + case KVM_ARM_ASYNC_PF_COMMAND: { + return kvm_arch_async_pf_vm_ioctl(kvm, arg); + } default: return -EINVAL; } diff --git a/arch/arm64/kvm/async_pf.c b/arch/arm64/kvm/async_pf.c index 4734c5b26aa8..6f763edbe3a3 100644 --- a/arch/arm64/kvm/async_pf.c +++ b/arch/arm64/kvm/async_pf.c @@ -464,6 +464,70 @@ long kvm_arch_async_pf_hypercall(struct kvm_vcpu *vcpu, return ret; } +long kvm_arch_async_pf_vm_ioctl(struct kvm *kvm, unsigned long arg) +{ + struct kvm_arm_async_pf_cmd cmd; + unsigned int version = 0x010000; /* v1.0.0 */ + void __user *argp = (void __user *)arg; + + if (copy_from_user(&cmd, argp, sizeof(cmd))) + return -EFAULT; + + if (cmd.cmd != KVM_ARM_ASYNC_PF_CMD_GET_VERSION) + return -EINVAL; + + cmd.version = version; + if (copy_to_user(argp, &cmd, sizeof(cmd))) + return -EFAULT; + + return 0; +} + +long kvm_arch_async_pf_vcpu_ioctl(struct kvm_vcpu *vcpu, unsigned long arg) +{ + struct kvm_arch_async_pf_control *apf = vcpu->arch.apf; + struct kvm_arm_async_pf_cmd cmd; + void __user *argp = (void __user *)arg; + long ret = 0; + + if (!apf) + return -EPERM; + + if (copy_from_user(&cmd, argp, sizeof(cmd))) + return -EFAULT; + + switch (cmd.cmd) { + case KVM_ARM_ASYNC_PF_CMD_GET_SDEI: + cmd.sdei = apf->sdei_event_num; + break; + case KVM_ARM_ASYNC_PF_CMD_GET_IRQ: + cmd.irq = apf->irq; + break; + case KVM_ARM_ASYNC_PF_CMD_GET_CONTROL: + cmd.control = apf->control_block; + break; + case KVM_ARM_ASYNC_PF_CMD_SET_SDEI: + apf->sdei_event_num = cmd.sdei; + break; + case KVM_ARM_ASYNC_PF_CMD_SET_IRQ: + apf->irq = cmd.irq; + break; + case KVM_ARM_ASYNC_PF_CMD_SET_CONTROL: + if (kvm_arch_async_enable(vcpu, cmd.control) != + SMCCC_RET_SUCCESS) + ret = -EIO; + + break; + default: + ret = -EINVAL; + } + + if (!ret && copy_to_user(argp, &cmd, sizeof(cmd))) + ret = -EFAULT; + + return ret; +} + void kvm_arch_async_pf_destroy_vcpu(struct kvm_vcpu *vcpu) { kfree(vcpu->arch.apf); diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 133128d45fcb..1f161156edb2 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1569,6 +1569,9 @@ struct kvm_pv_cmd { /* Available with KVM_CAP_ARM_SDEI */ #define KVM_ARM_SDEI_COMMAND _IOWR(KVMIO, 0xc8, struct kvm_sdei_cmd) +/* Available with KVM_CAP_ASYNC_PF or KVM_CAP_ASYNC_PF_INT */ +#define KVM_ARM_ASYNC_PF_COMMAND _IOWR(KVMIO, 0xc9, struct kvm_arm_async_pf_cmd) + /* Secure Encrypted Virtualization command */ enum sev_cmd_id { /* Guest initialization commands */ -- 2.23.0