From patchwork Tue Nov 29 15:33:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9452387 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 0EAA760235 for ; Tue, 29 Nov 2016 15:35:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 018C8283E6 for ; Tue, 29 Nov 2016 15:35:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9BCE283E8; Tue, 29 Nov 2016 15:35:57 +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 50AC828399 for ; Tue, 29 Nov 2016 15:35:57 +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 1cBkPt-0001hC-26; Tue, 29 Nov 2016 15:33:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBkPr-0001eW-Hb for xen-devel@lists.xen.org; Tue, 29 Nov 2016 15:33:55 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id C9/87-27365-2EF9D385; Tue, 29 Nov 2016 15:33:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsUyZ7p8oO7D+bY RBsuemFos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBmdvf4FG3Qrnu7dz9TAuFaui5GLQ0igg0ni 1ZFGNgjnG6PEjyd/GCGcDYwSy6ZOhMpMYJSYsX0SUxcjJwebgJHE2aPTGUFsEQFpiWufL4N1M AtsYZS4O2UTC0hCWMBdYtuc18xdjBwcLAKqEtePVIGEeQW8JCZsOQpWIiEgJ3HzXCcziM0p4C 3x5/drVhBbCKim4cJ+RogaY4m+WX0sExj5FjAyrGJUL04tKkst0jXXSyrKTM8oyU3MzNE1NDD Vy00tLk5MT81JTCrWS87P3cQIDBQGINjBeGyy8yFGSQ4mJVHe6W42EUJ8SfkplRmJxRnxRaU5 qcWHGGU4OJQkeHPn2UYICRalpqdWpGXmAEMWJi3BwaMkwjt1LlCat7ggMbc4Mx0idYpRUUqcd wJInwBIIqM0D64NFieXGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMwbAzKFJzOvBG76K6DFTE CL3762BllckoiQkmpgbFefPYlLzpF/qeU7Dh7Vhp9qBft/XtuvGd+TlblKqP6x1HxT1vW6XP2 9V15cX7w/evtyPu0trteKjJ1zMqS+hvvxne8LP3bst+7spN/GfT3zUl74xR5adl1Bc5WGXkOM bVOSxjfenMuGTXdkf2YufxtbufOxovDDiwn3OTTYI3f5njJZWHhEiaU4I9FQi7moOBEAFg5/w I4CAAA= X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1480433630!72690513!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33239 invoked from network); 29 Nov 2016 15:33:52 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-8.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Nov 2016 15:33:52 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uATFXlWl006710 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Nov 2016 15:33:47 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uATFXlYd031175 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA 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 aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id uATFXjbT011406; Tue, 29 Nov 2016 15:33:46 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:44 -0800 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Tue, 29 Nov 2016 10:33:15 -0500 Message-Id: <1480433602-13290-9-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: aserv0021.oracle.com [141.146.126.233] 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 08/15] pvh/acpi: Handle ACPI accesses for PVH guests 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 Signed-off-by: Boris Ostrovsky --- Changes in v4: * Registers are now explicitly split into 2-byte status and enable. xen/arch/x86/hvm/acpi.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++- xen/common/domctl.c | 5 ++ xen/include/xen/sched.h | 3 ++ 3 files changed, 129 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/acpi.c b/xen/arch/x86/hvm/acpi.c index a1f7fd2..c80c464 100644 --- a/xen/arch/x86/hvm/acpi.c +++ b/xen/arch/x86/hvm/acpi.c @@ -2,12 +2,129 @@ * * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. */ +#include #include #include #include #include +static int acpi_access_common(struct domain *d, + int dir, unsigned int port, + unsigned int bytes, uint32_t *val) +{ + uint16_t *sts = NULL, *en = NULL; + const uint16_t *mask_sts = NULL, *mask_en = NULL; + static const uint16_t pm1a_sts_mask = ACPI_BITMASK_GLOBAL_LOCK_STATUS; + static const uint16_t pm1a_en_mask = ACPI_BITMASK_GLOBAL_LOCK_ENABLE; + static const uint16_t gpe0_sts_mask = 1U << XEN_GPE0_CPUHP_BIT; + static const uint16_t gpe0_en_mask = 1U << XEN_GPE0_CPUHP_BIT; + + BUILD_BUG_ON(XEN_ACPI_CPU_MAP + XEN_ACPI_CPU_MAP_LEN + >= ACPI_GPE0_BLK_ADDRESS_V1); + + ASSERT(!has_acpi_dm_ff(d)); + + switch ( port ) + { + case ACPI_PM1A_EVT_BLK_ADDRESS_V1 ... + ACPI_PM1A_EVT_BLK_ADDRESS_V1 + + sizeof (d->arch.hvm_domain.acpi.pm1a_sts) + + sizeof (d->arch.hvm_domain.acpi.pm1a_en): + + sts = &d->arch.hvm_domain.acpi.pm1a_sts; + en = &d->arch.hvm_domain.acpi.pm1a_en; + mask_sts = &pm1a_sts_mask; + mask_en = &pm1a_en_mask; + break; + + case ACPI_GPE0_BLK_ADDRESS_V1 ... + ACPI_GPE0_BLK_ADDRESS_V1 + + sizeof (d->arch.hvm_domain.acpi.gpe0_sts) + + sizeof (d->arch.hvm_domain.acpi.gpe0_en): + + sts = &d->arch.hvm_domain.acpi.gpe0_sts; + en = &d->arch.hvm_domain.acpi.gpe0_en; + mask_sts = &gpe0_sts_mask; + mask_en = &gpe0_en_mask; + break; + + case XEN_ACPI_CPU_MAP ... + XEN_ACPI_CPU_MAP + XEN_ACPI_CPU_MAP_LEN - 1: + break; + + default: + return X86EMUL_UNHANDLEABLE; + } + + if ( dir == XEN_DOMCTL_ACPI_READ ) + { + uint32_t mask = (bytes < 4) ? ~0U << (bytes * 8) : 0; + + if ( !mask_sts ) + { + unsigned int first_byte = port - XEN_ACPI_CPU_MAP; + + /* + * Clear bits that we are about to read to in case we + * copy fewer than @bytes. + */ + *val &= mask; + + if ( ((d->max_vcpus + 7) / 8) > first_byte ) + { + memcpy(val, (uint8_t *)d->avail_vcpus + first_byte, + min(bytes, ((d->max_vcpus + 7) / 8) - first_byte)); + } + } + else + { + uint32_t data = (((uint32_t)*en) << 16) | *sts; + data >>= 8 * (port & 3); + *val = (*val & mask) | (data & ~mask); + } + } + else + { + /* Guests do not write CPU map */ + if ( !mask_sts ) + return X86EMUL_UNHANDLEABLE; + else if ( mask_sts ) + { + uint32_t v = *val; + + /* Status register is write-1-to-clear by guests */ + switch ( port & 3 ) + { + case 0: + *sts &= ~(v & 0xff); + *sts &= *mask_sts; + if ( !--bytes ) + break; + v >>= 8; + + case 1: + *sts &= ~((v & 0xff) << 8); + *sts &= *mask_sts; + if ( !--bytes ) + break; + v >>= 8; + + case 2: + *en = ((*en & 0xff00) | (v & 0xff)) & *mask_en; + if ( !--bytes ) + break; + v >>= 8; + + case 3: + *en = (((v & 0xff) << 8) | (*en & 0xff)) & *mask_en; + } + } + } + + return X86EMUL_OKAY; +} + int hvm_acpi_domctl_access(struct domain *d, uint8_t rw, gas_t *gas, XEN_GUEST_HANDLE_PARAM(uint8) arg) { @@ -17,7 +134,10 @@ int hvm_acpi_domctl_access(struct domain *d, uint8_t rw, gas_t *gas, static int acpi_guest_access(int dir, unsigned int port, unsigned int bytes, uint32_t *val) { - return X86EMUL_UNHANDLEABLE; + return acpi_access_common(current->domain, + (dir == IOREQ_READ) ? + XEN_DOMCTL_ACPI_READ: XEN_DOMCTL_ACPI_WRITE, + port, bytes, val); } void hvm_acpi_init(struct domain *d) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index b0ee961..0a08b83 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -651,6 +651,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) goto maxvcpu_out; } + d->avail_vcpus = xzalloc_array(unsigned long, + BITS_TO_LONGS(d->max_vcpus)); + if ( !d->avail_vcpus ) + goto maxvcpu_out; + ret = 0; maxvcpu_out: diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 1fbda87..3ef9c9e 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -315,6 +315,9 @@ struct domain unsigned int max_vcpus; struct vcpu **vcpu; + /* Bitmap of available VCPUs. */ + unsigned long *avail_vcpus; + shared_info_t *shared_info; /* shared data area */ spinlock_t domain_lock;