From patchwork Tue Nov 29 15:33:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9452383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B53A660235 for ; Tue, 29 Nov 2016 15:35:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8C44283BB for ; Tue, 29 Nov 2016 15:35:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D616283E6; Tue, 29 Nov 2016 15:35:52 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 14812283BB for ; Tue, 29 Nov 2016 15:35:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBkPq-0001e5-Lv; Tue, 29 Nov 2016 15:33:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBkPp-0001bx-L3 for xen-devel@lists.xen.org; Tue, 29 Nov 2016 15:33:53 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 76/15-28568-1EF9D385; Tue, 29 Nov 2016 15:33:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRWlGSWpSXmKPExsXSO6nOVffBfNs Igy3vNCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxb09+wFfySqTgwaRdjA+NGsS5GLg4hgYlM EnOWvmGCcP4ySix9+YUZwtnAKPHp9xR2CGcCo8SrFxNZuhg5OdgEjCTOHp3OCGKLCEhLXPt8m RGkiFlgC6PE3SmbwIqEBRwkrr75wQxiswioSrQ/uwUW5xXwlvj9ZSdYs4SAnMTNc51gNZxA8T +/X7OC2EICXhINF/ZD1RhKfN64lHkCI98CRoZVjOrFqUVlqUW6lnpJRZnpGSW5iZk5uoYGZnq 5qcXFiempOYlJxXrJ+bmbGIHBwgAEOxjvbgo4xCjJwaQkyjvdzSZCiC8pP6UyI7E4I76oNCe1 +BCjDAeHkgRv7jzbCCHBotT01Iq0zBxg2MKkJTh4lER4p84FSvMWFyTmFmemQ6ROMSpKifNOA OkTAElklObBtcFi5RKjrJQwLyPQIUI8BalFuZklqPKvGMU5GJWEeWeBTOHJzCuBm/4KaDET0O K3r61BFpckIqSkGhi5LZ7vjZx9ql+r7qif4DH7lVNPa6R7qi5dNE3OPf1Lpuv15Ki761ar71/ 82l2kPenILtkd1sc+dRX8XGjeZvz9Y8DdJ4uqHx66kPieZcGSid+uaKWzcAacmuBq/Xfmn21m l8XV52ccSnu76nFvUKXqxMP3//nIal9P0Y3d6XvBSHrazZ2WirtPK7EUZyQaajEXFScCAOBel MyQAgAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1480433631!74369485!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31841 invoked from network); 29 Nov 2016 15:33:52 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Nov 2016 15:33:52 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uATFXmoU020320 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2016 15:33:48 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uATFXlW2010863 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2016 15:33:47 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uATFXlwv017895; Tue, 29 Nov 2016 15:33:47 GMT Received: from ostr-laptop.us.oracle.com (/10.152.23.90) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 29 Nov 2016 07:33:47 -0800 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Tue, 29 Nov 2016 10:33:18 -0500 Message-Id: <1480433602-13290-12-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480433602-13290-1-git-send-email-boris.ostrovsky@oracle.com> References: <1480433602-13290-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, Boris Ostrovsky , roger.pau@citrix.com Subject: [Xen-devel] [PATCH v4 11/15] pvh: Send an SCI on VCPU hotplug event X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP When GPE0 status register gets a bit set (currently XEN_GPE0_CPUHP_BIT only) send an SCI to the guest. Also update send_guest_global_virq() to handle cases when VCPU0 is offlined. Signed-off-by: Boris Ostrovsky --- Changes in v4: * Generate SCI only when needed (i.e. when status changes) * Deal with VCPU0 being offline xen/arch/x86/hvm/acpi.c | 10 ++++++++++ xen/common/event_channel.c | 7 +++++-- xen/include/xen/domain.h | 1 + xen/include/xen/event.h | 8 ++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/acpi.c b/xen/arch/x86/hvm/acpi.c index 1c205eb..9b11a52 100644 --- a/xen/arch/x86/hvm/acpi.c +++ b/xen/arch/x86/hvm/acpi.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include @@ -99,6 +100,7 @@ static int acpi_access_common(struct domain *d, bool is_guest_access, else if ( mask_sts ) { uint32_t v = *val; + uint16_t sts_orig = *sts; /* Status register is write-1-to-clear by guests */ switch ( port & 3 ) @@ -132,6 +134,14 @@ static int acpi_access_common(struct domain *d, bool is_guest_access, case 3: *en = (((v & 0xff) << 8) | (*en & 0xff)) & *mask_en; } + + /* + * If a new bit has been set in status register and corresponding + * event is enabled then an SCI is sent to the guest. + */ + if ( !is_guest_access && + ((*sts ^ sts_orig) & ~sts_orig) && (*sts & *en)) + send_guest_global_virq(d, VIRQ_SCI); } } diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 638dc5e..1d77373 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -727,7 +727,7 @@ void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) spin_unlock_irqrestore(&v->virq_lock, flags); } -static void send_guest_global_virq(struct domain *d, uint32_t virq) +void send_guest_global_virq(struct domain *d, uint32_t virq) { unsigned long flags; int port; @@ -739,7 +739,10 @@ static void send_guest_global_virq(struct domain *d, uint32_t virq) if ( unlikely(d == NULL) || unlikely(d->vcpu == NULL) ) return; - v = d->vcpu[0]; + /* Send to first available VCPU */ + for_each_vcpu(d, v) + if ( is_vcpu_online(v) ) + break; if ( unlikely(v == NULL) ) return; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index bce0ea1..b386038 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -52,6 +52,7 @@ void vcpu_destroy(struct vcpu *v); int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset); void unmap_vcpu_info(struct vcpu *v); +int arch_update_avail_vcpus(struct domain *d); int arch_domain_create(struct domain *d, unsigned int domcr_flags, struct xen_arch_domainconfig *config); diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 5008c80..74bd605 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -23,6 +23,14 @@ void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq); /* + * send_guest_global_virq: Notify guest via a global VIRQ. + * @d: domain to which virtual IRQ should be sent. First + * online VCPU will be selected. + * @virq: Virtual IRQ number (VIRQ_*) + */ +void send_guest_global_virq(struct domain *d, uint32_t virq); + +/* * send_global_virq: Notify the domain handling a global VIRQ. * @virq: Virtual IRQ number (VIRQ_*) */