From patchwork Wed Apr 5 23:19:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9665887 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 795E560352 for ; Wed, 5 Apr 2017 23:23:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B5D32816B for ; Wed, 5 Apr 2017 23:23:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 603B328584; Wed, 5 Apr 2017 23:23:01 +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 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 E93692816B for ; Wed, 5 Apr 2017 23:23:00 +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 1cvuEn-0005D9-VU; Wed, 05 Apr 2017 23:21:17 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvuEm-00059G-Ff for xen-devel@lists.xenproject.org; Wed, 05 Apr 2017 23:21:16 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id C9/DD-03648-BEB75E85; Wed, 05 Apr 2017 23:21:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRWlGSWpSXmKPExsVysyfVTfdV9dM Ig3fvTC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozFt2axFDRqVyxfcYm5gXGHYhcjF4eQwCZG ifUNJxghnL2MEtc+TWTvYuTkYBPQldhx8zUziC0iECox5+cjIJuDg1mgUqJ7ET9IWFjAQuLFl 21gYRYBVYlP51JBwrwC7hLnz55hBQlLCMhJXPmXABLmBAq/bD3GAmILCbhJXJs4lWUCI/cCRo ZVjBrFqUVlqUW6hqZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBvmUAgh2M35Y FHGKU5GBSEuVV8HkSIcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC16bqaYSQYFFqempFWmYOMMhg 0hIcPEoivFYgad7igsTc4sx0iNQpRkUpcV5dkIQASCKjNA+uDRbYlxhlpYR5GYEOEeIpSC3Kz SxBlX/FKM7BqCTMOwVkCk9mXgnc9FdAi5mAFj+58xBkcUkiQkqqgVE/9ID0hltRvNpqe/7HWP +30fv89k5nqYmnxT3bWdlX29PnPF0sO7cztdWmI2zeC4eK+inVe+4/tXOcPicr8O6roMeBwjv ueJ3IKe6ZvOeGpXnFkdXb/1VIfLpj9NScNeDh8slqN+fsaJww4/k/b53M/bte3/EUufR5UaPn Ad75yoai3mnauw8qsRRnJBpqMRcVJwIA9mIUxmcCAAA= X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1491434474!65354251!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21558 invoked from network); 5 Apr 2017 23:21:14 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-11.tower-27.messagelabs.com with SMTP; 5 Apr 2017 23:21:14 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0A22C344; Wed, 5 Apr 2017 16:21:14 -0700 (PDT) Received: from slackpad.lan (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BD6653F4FF; Wed, 5 Apr 2017 16:21:12 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 6 Apr 2017 00:19:16 +0100 Message-Id: <1491434362-30310-25-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1491434362-30310-1-git-send-email-andre.przywara@arm.com> References: <1491434362-30310-1-git-send-email-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Shanker Donthineni , Vijay Kilari Subject: [Xen-devel] [PATCH v5 24/30] ARM: vITS: handle MOVI command 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 The MOVI command moves the interrupt affinity from one redistributor (read: VCPU) to another. For now migration of "live" LPIs is not yet implemented, but we store the changed affinity in the host LPI structure and in our virtual ITTE. Signed-off-by: Andre Przywara --- xen/arch/arm/gic-v3-its.c | 24 ++++++++++++++++++++ xen/arch/arm/gic-v3-lpi.c | 15 +++++++++++++ xen/arch/arm/vgic-v3-its.c | 47 ++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/gic_v3_its.h | 4 ++++ 4 files changed, 90 insertions(+) diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c index d970119..a57e63a 100644 --- a/xen/arch/arm/gic-v3-its.c +++ b/xen/arch/arm/gic-v3-its.c @@ -851,6 +851,30 @@ struct pending_irq *gicv3_assign_guest_event(struct domain *d, return pirq; } +/* Changes the target VCPU for a given host LPI assigned to a domain. */ +int gicv3_lpi_change_vcpu(struct domain *d, paddr_t vdoorbell, + uint32_t vdevid, uint32_t veventid, + unsigned int vcpu_id) +{ + uint32_t host_lpi; + struct its_devices *dev; + + spin_lock(&d->arch.vgic.its_devices_lock); + dev = get_its_device(d, vdoorbell, vdevid); + if ( dev ) + host_lpi = get_host_lpi(dev, veventid); + else + host_lpi = 0; + spin_unlock(&d->arch.vgic.its_devices_lock); + + if ( !host_lpi ) + return -ENOENT; + + gicv3_lpi_update_host_vcpuid(host_lpi, vcpu_id); + + return 0; +} + /* Scan the DT for any ITS nodes and create a list of host ITSes out of it. */ void gicv3_its_dt_init(const struct dt_device_node *node) { diff --git a/xen/arch/arm/gic-v3-lpi.c b/xen/arch/arm/gic-v3-lpi.c index c997ed5..b9960aa 100644 --- a/xen/arch/arm/gic-v3-lpi.c +++ b/xen/arch/arm/gic-v3-lpi.c @@ -234,6 +234,21 @@ void gicv3_lpi_update_host_entry(uint32_t host_lpi, int domain_id, write_u64_atomic(&hlpip->data, hlpi.data); } +int gicv3_lpi_update_host_vcpuid(uint32_t host_lpi, unsigned int vcpu_id) +{ + union host_lpi *hlpip; + + ASSERT(host_lpi >= LPI_OFFSET); + + host_lpi -= LPI_OFFSET; + + hlpip = &lpi_data.host_lpis[host_lpi / HOST_LPIS_PER_PAGE][host_lpi % HOST_LPIS_PER_PAGE]; + + write_u16_atomic(&hlpip->vcpu_id, vcpu_id); + + return 0; +} + static int gicv3_lpi_allocate_pendtable(uint64_t *reg) { uint64_t val; diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 079dd44..6afb915 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -508,6 +508,47 @@ static int its_handle_mapti(struct virt_its *its, uint64_t *cmdptr) return 0; } +static int its_handle_movi(struct virt_its *its, uint64_t *cmdptr) +{ + uint32_t devid = its_cmd_get_deviceid(cmdptr); + uint32_t eventid = its_cmd_get_id(cmdptr); + int collid = its_cmd_get_collection(cmdptr); + struct pending_irq *p; + struct vcpu *vcpu; + uint32_t vlpi; + int ret = -1; + + spin_lock(&its->its_lock); + /* Check for a mapped LPI and get the LPI number. */ + if ( !read_itte_locked(its, devid, eventid, &vcpu, &vlpi) ) + goto out_unlock; + + /* Check the new collection ID and get the new VCPU pointer */ + vcpu = get_vcpu_from_collection(its, collid); + if ( !vcpu ) + goto out_unlock; + + /* Update our cached vcpu_id in the pending_irq. */ + p = its->d->arch.vgic.handler->lpi_to_pending(its->d, vlpi); + p->vcpu_id = vcpu->vcpu_id; + + /* Now store the new collection in the translation table. */ + if ( !write_itte_locked(its, devid, eventid, collid, vlpi, &vcpu) ) + goto out_unlock; + + spin_unlock(&its->its_lock); + + /* TODO: lookup currently-in-guest virtual IRQs and migrate them? */ + + return gicv3_lpi_change_vcpu(its->d, its->doorbell_address, + devid, eventid, vcpu->vcpu_id); + +out_unlock: + spin_unlock(&its->its_lock); + + return ret; +} + #define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) /* @@ -552,6 +593,12 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its) case GITS_CMD_MAPTI: ret = its_handle_mapti(its, command); break; + case GITS_CMD_MOVALL: + gdprintk(XENLOG_G_INFO, "ITS: ignoring MOVALL command\n"); + break; + case GITS_CMD_MOVI: + ret = its_handle_movi(its, command); + break; case GITS_CMD_SYNC: /* We handle ITS commands synchronously, so we ignore SYNC. */ break; diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h index 30aa1ef..daae143 100644 --- a/xen/include/asm-arm/gic_v3_its.h +++ b/xen/include/asm-arm/gic_v3_its.h @@ -177,8 +177,12 @@ void gicv3_free_host_lpi_block(uint32_t first_lpi); struct pending_irq *gicv3_assign_guest_event(struct domain *d, paddr_t doorbell, uint32_t devid, uint32_t eventid, struct vcpu *v, uint32_t virt_lpi); +int gicv3_lpi_change_vcpu(struct domain *d, paddr_t doorbell, + uint32_t devid, uint32_t eventid, + unsigned int vcpu_id); void gicv3_lpi_update_host_entry(uint32_t host_lpi, int domain_id, unsigned int vcpu_id, uint32_t virt_lpi); +int gicv3_lpi_update_host_vcpuid(uint32_t host_lpi, unsigned int vcpu_id); #else