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.4 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=ham 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 499D6C433B4 for ; Thu, 6 May 2021 19:07:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28F42613BA for ; Thu, 6 May 2021 19:07:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234694AbhEFTI1 (ORCPT ); Thu, 6 May 2021 15:08:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29991 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233217AbhEFTI1 (ORCPT ); Thu, 6 May 2021 15:08:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620328048; 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: references:references; bh=MveHt3pNOHJ4AJPORxOX037kRSEbnzFSeZIFDxPmdN0=; b=DEjMZhNTgAPPpIO1Rd6C4/e3YWq8mY6DJAGVKxGKDTipo7ZqDaMIv6GLf+iMLEtWYVWUhD K/Cgo67bSj1I4Bq5DG7VmjRwBQhcO3DAU6mccrLnquVPEmohj4CJgDpKFr/WboqR11GvBI X6HgC1GkD3WHpVNZf6nK+UCvS/PzGRg= 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-472-BhDYdW1sO4SPcNsY0TORnA-1; Thu, 06 May 2021 15:07:24 -0400 X-MC-Unique: BhDYdW1sO4SPcNsY0TORnA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D2895801106; Thu, 6 May 2021 19:07:23 +0000 (UTC) Received: from fuller.cnet (ovpn-112-4.gru2.redhat.com [10.97.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 922D360D06; Thu, 6 May 2021 19:07:23 +0000 (UTC) Received: by fuller.cnet (Postfix, from userid 1000) id E9FAA40E6DFB; Thu, 6 May 2021 16:07:03 -0300 (-03) Message-ID: <20210506190419.451446263@redhat.com> User-Agent: quilt/0.66 Date: Thu, 06 May 2021 15:57:33 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org Cc: Paolo Bonzini , Alex Williamson , Sean Christopherson , Marcelo Tosatti Subject: [patch 1/2] KVM: x86: add start_assignment hook to kvm_x86_ops References: <20210506185732.609010123@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add a start_assignment hook to kvm_x86_ops, which is called when kvm_arch_start_assignment is done. The hook is required to update the wakeup vector of a sleeping vCPU when a device is assigned to the guest. Signed-off-by: Marcelo Tosatti Index: kvm/arch/x86/include/asm/kvm_host.h =================================================================== --- kvm.orig/arch/x86/include/asm/kvm_host.h +++ kvm/arch/x86/include/asm/kvm_host.h @@ -1322,6 +1322,7 @@ struct kvm_x86_ops { int (*update_pi_irte)(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq, bool set); + void (*start_assignment)(struct kvm *kvm, int device_count); void (*apicv_post_state_restore)(struct kvm_vcpu *vcpu); bool (*dy_apicv_has_pending_interrupt)(struct kvm_vcpu *vcpu); Index: kvm/arch/x86/kvm/svm/svm.c =================================================================== --- kvm.orig/arch/x86/kvm/svm/svm.c +++ kvm/arch/x86/kvm/svm/svm.c @@ -4601,6 +4601,7 @@ static struct kvm_x86_ops svm_x86_ops __ .deliver_posted_interrupt = svm_deliver_avic_intr, .dy_apicv_has_pending_interrupt = svm_dy_apicv_has_pending_interrupt, .update_pi_irte = svm_update_pi_irte, + .start_assignment = NULL, .setup_mce = svm_setup_mce, .smi_allowed = svm_smi_allowed, Index: kvm/arch/x86/kvm/vmx/vmx.c =================================================================== --- kvm.orig/arch/x86/kvm/vmx/vmx.c +++ kvm/arch/x86/kvm/vmx/vmx.c @@ -7732,6 +7732,7 @@ static struct kvm_x86_ops vmx_x86_ops __ .nested_ops = &vmx_nested_ops, .update_pi_irte = pi_update_irte, + .start_assignment = NULL, #ifdef CONFIG_X86_64 .set_hv_timer = vmx_set_hv_timer, Index: kvm/arch/x86/kvm/x86.c =================================================================== --- kvm.orig/arch/x86/kvm/x86.c +++ kvm/arch/x86/kvm/x86.c @@ -11295,7 +11295,11 @@ bool kvm_arch_can_dequeue_async_page_pre void kvm_arch_start_assignment(struct kvm *kvm) { - atomic_inc(&kvm->arch.assigned_device_count); + int ret; + + ret = atomic_inc_return(&kvm->arch.assigned_device_count); + if (kvm_x86_ops.start_assignment) + kvm_x86_ops.start_assignment(kvm, ret); } EXPORT_SYMBOL_GPL(kvm_arch_start_assignment);