From patchwork Mon Mar 27 09:31:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 9646303 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 31534602BF for ; Mon, 27 Mar 2017 10:08:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17EA8228C9 for ; Mon, 27 Mar 2017 10:08:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0ABB52833B; Mon, 27 Mar 2017 10:08:40 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 69987228C9 for ; Mon, 27 Mar 2017 10:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dfgxsoPErmKRYBaILtUVqL2zWXWCa/rvFAXv+9zUc+s=; b=QaTe1IUhFxRHz5MEP7hj1dNaft Cub6DOLkVj5QTNvWjgKUCivdynK2iHjOcCyp1hM35wvRwyXtDIAeBW1TANeMWSWJddr9fsIxlDXW7 a1bekidM8KmXN0h+LsOZtgSiiOq1UQDkoG71Mdm0C9gdMKqeHju5hM8zcH+h2t2ffr2FYPG3apO/W 9ePcWIAjQ5NbQD8eScB5tqofTB6GRy8waeQG2eTUprw8QotJFrITp2kS0fW0nittTGyY4VASI59sy Z9LjhKs5aRser/wyud10o78p25NtXQP/bQDAMMnSs0E0OUIWHnZuk6tTyreETGNbTWNNEZ1154uvg vv33OX3g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1csRZf-00073O-BR; Mon, 27 Mar 2017 10:08:31 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csRVo-0002f9-Ue for linux-arm-kernel@bombadil.infradead.org; Mon, 27 Mar 2017 10:04:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=HjfEVBzF3gyxoMNC7vQR5+axVgQIvW9qnM6WUCFUGVo=; b=asrLJoAqncjLxEr9/bIVHjZ3U T+ygZFw6x2O+SB5cW6l144SbDd6ITNgaVXvXMhlph6YxX8g5te+ZAvdwSLqF0m1fwA68fGdHol3TI OjQcZRKYcCTHGeWgjz4beA+hQDo/Li6bu+l40U3MiCAjZBZhI1xWVyffJt5triYUdoC6phw8VlAcz qGGDNyoXhaa7FBwNotkMF8FqMjh0xkJbLDvl/zPacSS6WbE/8UH0iGdLnkHlD5tQ6juIw70DjOnr/ zJbrFwA1019r6Cv2einWqLax34cERNrbuC4f/U6u6OBxYK4N6FjGX/rDBUBK9ZcratWbbmOHhTIMu PgLHlq+2A==; Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csR1M-0006sM-6i for linux-arm-kernel@lists.infradead.org; Mon, 27 Mar 2017 09:33:06 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 652FA63E3F; Mon, 27 Mar 2017 09:32:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 652FA63E3F Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eric.auger@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 652FA63E3F Received: from localhost.localdomain.com (ovpn-117-27.ams2.redhat.com [10.36.117.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA52117C46; Mon, 27 Mar 2017 09:32:42 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, andre.przywara@arm.com, vijayak@caviumnetworks.com, Vijaya.Kumar@cavium.com, peter.maydell@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH v4 17/22] KVM: arm64: ITS: Add infrastructure for table lookup Date: Mon, 27 Mar 2017 11:31:07 +0200 Message-Id: <1490607072-21610-18-git-send-email-eric.auger@redhat.com> In-Reply-To: <1490607072-21610-1-git-send-email-eric.auger@redhat.com> References: <1490607072-21610-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 27 Mar 2017 09:32:46 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170327_053304_394665_603F2371 X-CRM114-Status: GOOD ( 20.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasun.Kapoor@cavium.com, drjones@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add a generic lookup_table() helper whose role consists in scanning a contiguous table located in guest RAM and applying a callback on each entry. Entries can be handled as linked lists since the callback may return an offset to the next entry and also tell that an entry is the last one. Helper functions also are added to compute the device/event ID offset to the next DTE/ITE. compute_next_devid_offset, compute_next_eventid_offset and lookup_table will become static in subsequent patches Signed-off-by: Eric Auger --- v3 -> v4: - remove static to avoid compilation warning - correct size computation in looup_table() - defines now encode the number of bits used for devid and eventid offsets - use BIT() - 1 to encode the max offets --- virt/kvm/arm/vgic/vgic-its.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 7364b7d..8eaeba4 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -184,6 +184,8 @@ static struct its_ite *find_ite(struct vgic_its *its, u32 device_id, #define VITS_ESZ 8 #define VITS_TYPER_IDBITS 16 #define VITS_TYPER_DEVBITS 16 +#define VITS_DTE_MAX_DEVID_OFFSET (BIT(14) - 1) +#define VITS_ITE_MAX_EVENTID_OFFSET (BIT(16) - 1) /* * Finds and returns a collection in the ITS collection table. @@ -1686,6 +1688,111 @@ int vgic_its_attr_regs_access(struct kvm_device *dev, return ret; } +u32 compute_next_devid_offset(struct list_head *h, struct its_device *dev) +{ + struct list_head *e = &dev->dev_list; + struct its_device *next; + u32 next_offset; + + if (e->next == h) + return 0; + next = list_entry(e->next, struct its_device, dev_list); + next_offset = next->device_id - dev->device_id; + + return min_t(u32, next_offset, VITS_DTE_MAX_DEVID_OFFSET); +} + +u32 compute_next_eventid_offset(struct list_head *h, struct its_ite *ite) +{ + struct list_head *e = &ite->ite_list; + struct its_ite *next; + u32 next_offset; + + if (e->next == h) + return 0; + next = list_entry(e->next, struct its_ite, ite_list); + next_offset = next->event_id - ite->event_id; + + return min_t(u32, next_offset, VITS_ITE_MAX_EVENTID_OFFSET); +} + +/** + * entry_fn_t - Callback called on a table entry restore path + * @its: its handle + * @id: id of the entry + * @addr: kernel VA of the entry + * @opaque: pointer to an opaque data + * @next_offset: minimal ID offset to the next entry. 0 if this + * entry is the last one, 1 if the entry is invalid, >= 1 if an + * entry's next_offset field was truly decoded + * + * Return: < 0 on error, 0 otherwise + */ +typedef int (*entry_fn_t)(struct vgic_its *its, u32 id, void *addr, + void *opaque, u32 *next_offset); + +/** + * lookup_table - scans a contiguous table in guest RAM and applies a function + * to each entry + * + * @its: its handle + * @base: base gpa of the table + * @size: size of the table in bytes + * @esz: entry size in bytes + * @start_id: first entry's ID + * @fn: function to apply on each entry + * + * Return: < 0 on error, 1 if last element identified, 0 otherwise + */ +int lookup_table(struct vgic_its *its, gpa_t base, int size, int esz, + int start_id, entry_fn_t fn, void *opaque) +{ + gpa_t gpa = base, top = base + size - 1; + unsigned long len = size; + int ret, seg, offset = offset_in_page(gpa); + gfn_t gfn = gpa >> PAGE_SHIFT; + u32 id = start_id + (gpa - base)/esz; + struct kvm *kvm = its->dev->kvm; + kvm_pfn_t pfn; + + while ((seg = next_segment(len, offset)) != 0) { + u32 next_offset; + bool writeable; + void *addr; + + pfn = gfn_to_pfn_prot(kvm, gfn, true, &writeable); + if (is_error_noslot_pfn(pfn)) + return -EINVAL; + addr = phys_to_virt((u64)pfn << PAGE_SHIFT); + addr += offset; + + while (seg > 0) { + size_t byte_offset; + + ret = fn(its, id, addr, opaque, &next_offset); + if (ret < 0 || (!ret && !next_offset)) + goto out; + + byte_offset = next_offset * esz; + + id += next_offset; + gpa += byte_offset; + addr += byte_offset; + seg -= byte_offset; + } + kvm_release_pfn_clean(pfn); + + len = top - gpa + 1; + offset = offset_in_page(gpa); + gfn = gpa >> PAGE_SHIFT; + id = start_id + (gpa - base)/esz; + } + return 0; +out: + kvm_release_pfn_clean(pfn); + return (ret < 0 ? ret : 1); +} + /** * vgic_its_flush_pending_tables - Flush the pending tables into guest RAM */