Received: by 2002:a05:6a10:c7d3:0:0:0:0 with SMTP id h19csp597680pxy; Sat, 14 Aug 2021 17:18:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwP7uteEvHdFF4QqFd6A32ZnUw7ve+2FaL5FYw/ZhlOnSl1Z3grviJDitTdrd9bdhyRgwkx X-Received: by 2002:a17:906:ad7:: with SMTP id z23mr9574598ejf.419.1628986730036; Sat, 14 Aug 2021 17:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628986730; cv=none; d=google.com; s=arc-20160816; b=M7pG90Ekrgy1O7y3N5pzQOXUDSUDGxMQrzXBGJyjpbXf1uz2yUALcgT39Ooi7hQawy REILw3qGVi1HSWHFcyPnL0L5nu01omIwpW18Pa1z9+6vlZbzO9kJ8gNiN49WcviXA1nC CsJnoL4iA0tck5mUFqeaiDsSLk1yYPSTWh3khm7znwA/itgcm980KkptgH/uadxw7hg0 BOJ5GT8uWQsBHJ9tSSqfNIe0uhDqRouk0gimti2ds916hPJuBFrlG3UzihpZAI0+1uqa r6miuhfgt9K/ePSMZwR6F+hHsCl9Hl7HbwVE3Ts6F00EStWW1U00XD0k5mhzqmc0z5gE sFJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zaiJSgXud0XzYOvxzl4324+bZefArVwrSA/+8UGrzEs=; b=v4B7CLl9YGrsgeCMPrTKOlRjMSq9G39lMmpj+8jvJ5T+rr4SXuXkt9gRl6TZc9lc9G rOCWQ3Zwu9HSzOPTGSb9rn+gFRTI7ABoNHvaRexeuPOoB3u8MMVFNqL9AFU4Wzl8YsHD fIncUAsWXKyumdhp0dTc0Oj03s43MArF57Yq+ZQoITr/gbHUnu3MCd/q0jgGb0C5KWdM jrsKcU9CzmvGTT9ZhK8meMK8TKCVjxosFe4fz9xvWs4oEZkexVJZRgFTXpESwdBnCQFb tuPY3LtR60ksJZ4cTJOY3O+J/37/19ix5vj4Mf7j/cRL/R/DiqxOKzXdCE/lTZVGVUyB 6ktw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AWWFhuvr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b17si6369466edw.315.2021.08.14.17.18.27; Sat, 14 Aug 2021 17:18:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AWWFhuvr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236800AbhHOAQj (ORCPT + 99 others); Sat, 14 Aug 2021 20:16:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48291 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235683AbhHOAQK (ORCPT ); Sat, 14 Aug 2021 20:16:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628986541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zaiJSgXud0XzYOvxzl4324+bZefArVwrSA/+8UGrzEs=; b=AWWFhuvrPfVi5zkCkDauE+44fztfTuirOyDv8mxFJSZKVNDNqsKqYD43Qgx+7pIwxIXFcW NpLDbWIATYXcAbWweDR/sJ86Hnvgb9PBXnJtxZ9RRdaex+ZKLZ8I07uLOP7R7pJ0FyM3OX 4WTjx0anQ5ZPAMZCHMwK1JWQM/T073E= 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-230-T530wJTCO3ioRw8-0TKMLg-1; Sat, 14 Aug 2021 20:15:39 -0400 X-MC-Unique: T530wJTCO3ioRw8-0TKMLg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5907A871471; Sun, 15 Aug 2021 00:15:38 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-103.bne.redhat.com [10.64.54.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F24E21036D2E; Sun, 15 Aug 2021 00:15:33 +0000 (UTC) From: Gavin Shan To: kvmarm@lists.cs.columbia.edu Cc: linux-kernel@vger.kernel.org, james.morse@arm.com, mark.rutland@arm.com, Jonathan.Cameron@huawei.com, will@kernel.org, maz@kernel.org, pbonzini@redhat.com Subject: [PATCH v4 17/21] KVM: arm64: Support SDEI ioctl commands on vCPU Date: Sun, 15 Aug 2021 08:13:48 +0800 Message-Id: <20210815001352.81927-18-gshan@redhat.com> In-Reply-To: <20210815001352.81927-1-gshan@redhat.com> References: <20210815001352.81927-1-gshan@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This supports ioctl commands on vCPU to manage the various object. It's primarily used by VMM to accomplish live migration. The ioctl commands introduced by this are highlighted as below: * KVM_SDEI_CMD_GET_VEVENT_COUNT Retrieve number of SDEI events that pend for handling on the vCPU * KVM_SDEI_CMD_GET_VEVENT Retrieve the state of SDEI event, which has been delivered to the vCPU for handling * KVM_SDEI_CMD_SET_VEVENT Populate the SDEI event, which has been delivered to the vCPU for handling * KVM_SDEI_CMD_GET_VCPU_STATE Retrieve vCPU state related to SDEI handling * KVM_SDEI_CMD_SET_VCPU_STATE Populate vCPU state related to SDEI handling Signed-off-by: Gavin Shan --- arch/arm64/include/asm/kvm_sdei.h | 1 + arch/arm64/include/uapi/asm/kvm_sdei.h | 7 + arch/arm64/kvm/arm.c | 3 + arch/arm64/kvm/sdei.c | 228 +++++++++++++++++++++++++ 4 files changed, 239 insertions(+) diff --git a/arch/arm64/include/asm/kvm_sdei.h b/arch/arm64/include/asm/kvm_sdei.h index 8f5ea947ed0e..a997989bab77 100644 --- a/arch/arm64/include/asm/kvm_sdei.h +++ b/arch/arm64/include/asm/kvm_sdei.h @@ -126,6 +126,7 @@ int kvm_sdei_register_notifier(struct kvm *kvm, unsigned long num, kvm_sdei_notifier notifier); void kvm_sdei_deliver(struct kvm_vcpu *vcpu); long kvm_sdei_vm_ioctl(struct kvm *kvm, unsigned long arg); +long kvm_sdei_vcpu_ioctl(struct kvm_vcpu *vcpu, unsigned long arg); void kvm_sdei_destroy_vcpu(struct kvm_vcpu *vcpu); void kvm_sdei_destroy_vm(struct kvm *kvm); diff --git a/arch/arm64/include/uapi/asm/kvm_sdei.h b/arch/arm64/include/uapi/asm/kvm_sdei.h index 35ff05be3c28..b916c3435646 100644 --- a/arch/arm64/include/uapi/asm/kvm_sdei.h +++ b/arch/arm64/include/uapi/asm/kvm_sdei.h @@ -62,6 +62,11 @@ struct kvm_sdei_vcpu_state { #define KVM_SDEI_CMD_GET_KEVENT_COUNT 2 #define KVM_SDEI_CMD_GET_KEVENT 3 #define KVM_SDEI_CMD_SET_KEVENT 4 +#define KVM_SDEI_CMD_GET_VEVENT_COUNT 5 +#define KVM_SDEI_CMD_GET_VEVENT 6 +#define KVM_SDEI_CMD_SET_VEVENT 7 +#define KVM_SDEI_CMD_GET_VCPU_STATE 8 +#define KVM_SDEI_CMD_SET_VCPU_STATE 9 struct kvm_sdei_cmd { __u32 cmd; @@ -71,6 +76,8 @@ struct kvm_sdei_cmd { __u64 num; struct kvm_sdei_event_state kse_state; struct kvm_sdei_kvm_event_state kske_state; + struct kvm_sdei_vcpu_event_state ksve_state; + struct kvm_sdei_vcpu_state ksv_state; }; }; diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 8d61585124b2..215cdbeb272a 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1308,6 +1308,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp, return kvm_arm_vcpu_finalize(vcpu, what); } + case KVM_ARM_SDEI_COMMAND: { + return kvm_sdei_vcpu_ioctl(vcpu, arg); + } default: r = -EINVAL; } diff --git a/arch/arm64/kvm/sdei.c b/arch/arm64/kvm/sdei.c index bdd76c3e5153..79315b77f24b 100644 --- a/arch/arm64/kvm/sdei.c +++ b/arch/arm64/kvm/sdei.c @@ -35,6 +35,25 @@ static struct kvm_sdei_event *kvm_sdei_find_event(struct kvm *kvm, return NULL; } +static struct kvm_sdei_vcpu_event *kvm_sdei_find_vcpu_event(struct kvm_vcpu *vcpu, + unsigned long num) +{ + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_vcpu_event *ksve; + + list_for_each_entry(ksve, &vsdei->critical_events, link) { + if (ksve->state.num == num) + return ksve; + } + + list_for_each_entry(ksve, &vsdei->normal_events, link) { + if (ksve->state.num == num) + return ksve; + } + + return NULL; +} + static void kvm_sdei_remove_events(struct kvm *kvm) { struct kvm_sdei_kvm *ksdei = kvm->arch.sdei; @@ -1102,6 +1121,215 @@ long kvm_sdei_vm_ioctl(struct kvm *kvm, unsigned long arg) return ret; } +static long kvm_sdei_get_vevent_count(struct kvm_vcpu *vcpu, int *count) +{ + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_vcpu_event *ksve = NULL; + int total = 0; + + list_for_each_entry(ksve, &vsdei->critical_events, link) { + total++; + } + + list_for_each_entry(ksve, &vsdei->normal_events, link) { + total++; + } + + *count = total; + return 0; +} + +static struct kvm_sdei_vcpu_event *next_vcpu_event(struct kvm_vcpu *vcpu, + unsigned long num) +{ + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_event *kse = NULL; + struct kvm_sdei_kvm_event *kske = NULL; + struct kvm_sdei_vcpu_event *ksve = NULL; + + ksve = kvm_sdei_find_vcpu_event(vcpu, num); + if (!ksve) + return NULL; + + kske = ksve->kske; + kse = kske->kse; + if (kse->state.priority == SDEI_EVENT_PRIORITY_CRITICAL) { + if (!list_is_last(&ksve->link, &vsdei->critical_events)) { + ksve = list_next_entry(ksve, link); + return ksve; + } + + ksve = list_first_entry_or_null(&vsdei->normal_events, + struct kvm_sdei_vcpu_event, link); + return ksve; + } + + if (!list_is_last(&ksve->link, &vsdei->normal_events)) { + ksve = list_next_entry(ksve, link); + return ksve; + } + + return NULL; +} + +static long kvm_sdei_get_vevent(struct kvm_vcpu *vcpu, + struct kvm_sdei_vcpu_event_state *ksve_state) +{ + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_vcpu_event *ksve = NULL; + + /* + * If the event number is invalid, the first critical or + * normal event is fetched. Otherwise, the next valid event + * is returned. + */ + if (!kvm_sdei_is_valid_event_num(ksve_state->num)) { + ksve = list_first_entry_or_null(&vsdei->critical_events, + struct kvm_sdei_vcpu_event, link); + if (!ksve) { + ksve = list_first_entry_or_null(&vsdei->normal_events, + struct kvm_sdei_vcpu_event, link); + } + } else { + ksve = next_vcpu_event(vcpu, ksve_state->num); + } + + if (!ksve) + return -ENOENT; + + *ksve_state = ksve->state; + + return 0; +} + +static long kvm_sdei_set_vevent(struct kvm_vcpu *vcpu, + struct kvm_sdei_vcpu_event_state *ksve_state) +{ + struct kvm *kvm = vcpu->kvm; + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_event *kse = NULL; + struct kvm_sdei_kvm_event *kske = NULL; + struct kvm_sdei_vcpu_event *ksve = NULL; + + if (!kvm_sdei_is_valid_event_num(ksve_state->num)) + return -EINVAL; + + kske = kvm_sdei_find_kvm_event(kvm, ksve_state->num); + if (!kske) + return -ENOENT; + + ksve = kvm_sdei_find_vcpu_event(vcpu, ksve_state->num); + if (ksve) + return -EEXIST; + + ksve = kzalloc(sizeof(*ksve), GFP_KERNEL); + if (!ksve) + return -ENOMEM; + + kse = kske->kse; + ksve->state = *ksve_state; + ksve->kske = kske; + ksve->vcpu = vcpu; + + if (kse->state.priority == SDEI_EVENT_PRIORITY_CRITICAL) + list_add_tail(&ksve->link, &vsdei->critical_events); + else + list_add_tail(&ksve->link, &vsdei->normal_events); + + kvm_make_request(KVM_REQ_SDEI, vcpu); + + return 0; +} + +static long kvm_sdei_set_vcpu_state(struct kvm_vcpu *vcpu, + struct kvm_sdei_vcpu_state *ksv_state) +{ + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_vcpu_event *critical_ksve = NULL; + struct kvm_sdei_vcpu_event *normal_ksve = NULL; + + if (kvm_sdei_is_valid_event_num(ksv_state->critical_num)) { + critical_ksve = kvm_sdei_find_vcpu_event(vcpu, + ksv_state->critical_num); + if (!critical_ksve) + return -EINVAL; + } + + if (kvm_sdei_is_valid_event_num(ksv_state->critical_num)) { + normal_ksve = kvm_sdei_find_vcpu_event(vcpu, + ksv_state->critical_num); + if (!normal_ksve) + return -EINVAL; + } + + vsdei->state = *ksv_state; + vsdei->critical_event = critical_ksve; + vsdei->normal_event = normal_ksve; + + return 0; +} + +long kvm_sdei_vcpu_ioctl(struct kvm_vcpu *vcpu, unsigned long arg) +{ + struct kvm *kvm = vcpu->kvm; + struct kvm_sdei_kvm *ksdei = kvm->arch.sdei; + struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_cmd *cmd = NULL; + void __user *argp = (void __user *)arg; + bool copy = false; + long ret = 0; + + /* Sanity check */ + if (!(ksdei && vsdei)) { + ret = -EPERM; + goto out; + } + + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) { + ret = -ENOMEM; + goto out; + } + + if (copy_from_user(cmd, argp, sizeof(*cmd))) { + ret = -EFAULT; + goto out; + } + + spin_lock(&vsdei->lock); + + switch (cmd->cmd) { + case KVM_SDEI_CMD_GET_VEVENT_COUNT: + copy = true; + ret = kvm_sdei_get_vevent_count(vcpu, &cmd->count); + break; + case KVM_SDEI_CMD_GET_VEVENT: + copy = true; + ret = kvm_sdei_get_vevent(vcpu, &cmd->ksve_state); + break; + case KVM_SDEI_CMD_SET_VEVENT: + ret = kvm_sdei_set_vevent(vcpu, &cmd->ksve_state); + break; + case KVM_SDEI_CMD_GET_VCPU_STATE: + copy = true; + cmd->ksv_state = vsdei->state; + break; + case KVM_SDEI_CMD_SET_VCPU_STATE: + ret = kvm_sdei_set_vcpu_state(vcpu, &cmd->ksv_state); + break; + default: + ret = -EINVAL; + } + + spin_unlock(&vsdei->lock); +out: + if (!ret && copy && copy_to_user(argp, cmd, sizeof(*cmd))) + ret = -EFAULT; + + kfree(cmd); + return ret; +} + void kvm_sdei_destroy_vcpu(struct kvm_vcpu *vcpu) { struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; -- 2.23.0