From patchwork Tue Nov 29 15:33:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9452413 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 38A6760235 for ; Tue, 29 Nov 2016 15:36:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B83328391 for ; Tue, 29 Nov 2016 15:36:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E1A4283B9; Tue, 29 Nov 2016 15:36:25 +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 8465128391 for ; Tue, 29 Nov 2016 15:36:19 +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 1cBkQJ-0002AY-4w; Tue, 29 Nov 2016 15:34:23 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBkQH-000294-Mx for xen-devel@lists.xen.org; Tue, 29 Nov 2016 15:34:21 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 1F/AE-28694-DFF9D385; Tue, 29 Nov 2016 15:34:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRWlGSWpSXmKPExsXSO6nOVffPfNs Ig5VNGhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bEZ94FB2Urfuyay9TA2CDcxcjFISTQwSTx evVxJgjnC6PE86ZP7BDOBkaJLxf/MUM4ExglVn9exdrFyMnBJmAkcfbodEYQW0RAWuLa58uMI EXMAlsYJe5O2cQCkhAWcJH49+AHE4jNIqAqMX/ba7A4r4C3xMrDf8HiEgJyEjfPdTKD2JxA8T +/X4MtEBLwkmi4sJ8RosZYom9WH8sERr4FjAyrGDWKU4vKUot0DQ30kooy0zNKchMzc4A8M73 c1OLixPTUnMSkYr3k/NxNjMBgYQCCHYz3lgUcYpTkYFIS5Z3uZhMhxJeUn1KZkVicEV9UmpNa fIhRhoNDSYL3zjzbCCHBotT01Iq0zBxg2MKkJTh4lER4p84FSvMWFyTmFmemQ6ROMSpKifOyA oNdSAAkkVGaB9cGi5VLjLJSwryMQIcI8RSkFuVmlqDKv2IU52BUEuYVApnCk5lXAjf9FdBiJq DFb19bgywuSURISTUwnnapru+vLe1fY9PLx72ZqXjWn9eRbGt+Kh/sX/DdfEGfq9Yk/o1LK/4 5vH/9eg3vBM+eWlPd/vNL0hamnG7NMQ4S+/jg1q7IVpPv359eVJ1zs9f/3VWHVdO0Tl6Y6z6v qYe/SINjuXVozNHSOut9fAk/31v+W3Hn9Z2p7mvnXxTa9a/1spLfDSWW4oxEQy3mouJEAAw6c caQAgAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1480433659!54587252!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 42046 invoked from network); 29 Nov 2016 15:34:20 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Nov 2016 15:34:20 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uATFXk3t020287 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Nov 2016 15:33:46 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uATFXkx2031128 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Nov 2016 15:33:46 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uATFXjAL013321; Tue, 29 Nov 2016 15:33:45 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:45 -0800 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Tue, 29 Nov 2016 10:33:16 -0500 Message-Id: <1480433602-13290-10-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 09/15] x86/domctl: Handle ACPI access from domctl 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: * New patch xen/arch/x86/hvm/acpi.c | 61 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/acpi.c b/xen/arch/x86/hvm/acpi.c index c80c464..1c205eb 100644 --- a/xen/arch/x86/hvm/acpi.c +++ b/xen/arch/x86/hvm/acpi.c @@ -7,9 +7,11 @@ #include #include +#include + #include -static int acpi_access_common(struct domain *d, +static int acpi_access_common(struct domain *d, bool is_guest_access, int dir, unsigned int port, unsigned int bytes, uint32_t *val) { @@ -87,8 +89,13 @@ static int acpi_access_common(struct domain *d, else { /* Guests do not write CPU map */ - if ( !mask_sts ) - return X86EMUL_UNHANDLEABLE; + if ( !is_guest_access && !mask_sts ) + { + unsigned int first_byte = port - XEN_ACPI_CPU_MAP; + + memcpy((uint8_t *)d->avail_vcpus + first_byte, val, + min(bytes, ((d->max_vcpus + 7) / 8) - first_byte)); + } else if ( mask_sts ) { uint32_t v = *val; @@ -97,14 +104,20 @@ static int acpi_access_common(struct domain *d, switch ( port & 3 ) { case 0: - *sts &= ~(v & 0xff); + if ( is_guest_access ) + *sts &= ~(v & 0xff); + else + *sts = (*sts & 0xff00) | (v & 0xff); *sts &= *mask_sts; if ( !--bytes ) break; v >>= 8; case 1: - *sts &= ~((v & 0xff) << 8); + if ( is_guest_access ) + *sts &= ~((v & 0xff) << 8); + else + *sts = ((v & 0xff) << 8) | (*sts & 0xff); *sts &= *mask_sts; if ( !--bytes ) break; @@ -128,13 +141,47 @@ static int acpi_access_common(struct domain *d, int hvm_acpi_domctl_access(struct domain *d, uint8_t rw, gas_t *gas, XEN_GUEST_HANDLE_PARAM(uint8) arg) { - return -ENOSYS; + unsigned int port, tot_bytes, bytes; + unsigned int i; + uint32_t val; + uint8_t *ptr = (uint8_t *)&val; + int rc; + + /* + * Only allow accesses to IO space. Accesses should be byte-aligned + * and integral number of bytes. + */ + if ( gas->space_id != XEN_ACPI_SYSTEM_IO || + gas->bit_width & 7 || gas->bit_offset & 7 ) + return -EINVAL; + + port = gas->address + (gas->bit_offset >> 3); + tot_bytes = gas->bit_width >> 3; + + for ( i = 0; i < tot_bytes; i += sizeof(val) ) + { + bytes = (tot_bytes - i > sizeof(val)) ? sizeof(val) : tot_bytes - i; + + if ((rw == XEN_DOMCTL_ACPI_WRITE) && + copy_from_guest_offset(ptr, arg, i, bytes)) + return -EFAULT; + + rc = acpi_access_common(d, false, rw, port + i, bytes, &val); + if ( rc ) + return rc; + + if ((rw == XEN_DOMCTL_ACPI_READ) && + copy_to_guest_offset(arg, i, ptr, bytes)) + return -EFAULT; + } + + return 0; } static int acpi_guest_access(int dir, unsigned int port, unsigned int bytes, uint32_t *val) { - return acpi_access_common(current->domain, + return acpi_access_common(current->domain, true, (dir == IOREQ_READ) ? XEN_DOMCTL_ACPI_READ: XEN_DOMCTL_ACPI_WRITE, port, bytes, val);