From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 82B77C433F5 for ; Sun, 30 Jan 2022 05:23:42 +0000 (UTC) Received: from localhost ([::1]:36482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nE2ge-00067i-Eo for qemu-devel@archiver.kernel.org; Sun, 30 Jan 2022 00:23:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nE2ek-0005RO-3H for qemu-devel@nongnu.org; Sun, 30 Jan 2022 00:21:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nE2eh-00083h-3y for qemu-devel@nongnu.org; Sun, 30 Jan 2022 00:21:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643520097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3nKOwreE1qfvcZ3p2TLShBBGEacxqpCN+u4VuVedi5g=; b=F0qsD9ztroJ9/ZiPEuq+gNt3ZvvZao6inwGdQ4O56LsJweeWNdUK0P3HQ1GVJjgn48zA2j NfrtIRHP2Va/zF+AlbHPFc2DdiEKmqGXUKDc1mQlYudcd2DS9IOTZSTKnffDKmTKk4/RHz 5rI7tOxoLC9XFYSIxe7oBFSKEhStZno= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-184-5q1Mi3RSMB6V1xjTlyI3Fw-1; Sun, 30 Jan 2022 00:21:35 -0500 X-MC-Unique: 5q1Mi3RSMB6V1xjTlyI3Fw-1 Received: by mail-pf1-f200.google.com with SMTP id f24-20020aa782d8000000b004bc00caa4c0so5500388pfn.3 for ; Sat, 29 Jan 2022 21:21:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=3nKOwreE1qfvcZ3p2TLShBBGEacxqpCN+u4VuVedi5g=; b=hfKeV/8SP2CpRTY+/jxcPE6DrUbr3DijJu6glftv4QCbVpHIjqMOSa1E3EqDXODB3e Ceow/i/4H37zELYcrR8o0ger4Qi2+TioEaLzAR6Yvmcl8vYbcXxOnZb0ZuhyvAn+yCzF rIjIItoasCOfJLhhnHZiQZtTNeskn3B5l27BM58Mo3qHfdNuJVibDEtcELS3piayPabd 6qEfmksEe2JFlgnmrKNFvfUe0VwqzkP4RG8NTt3FL6k8LQFRzP7IAoTT+1VWXfjsSTYd 8Ax9bJst05HFaUFtEnso5lHVTHsYAzhmfjA+DuYWm0KGVRhVJSTQwFJG3hYKfjoglXbf yF0w== X-Gm-Message-State: AOAM533c8TOeDzpGfAPsEXQWvRj4kOPU3OjI0NjlwK7AryI5RHkKuSL9 ApFkd4IfpbR3+dgBcoqK3noqAtE92f2arvR76bKyqMK5RNRI7LeQ5boaFsJxqwKmT0mDPRUTDK0 Ae2fwQ+KD7gahXF4= X-Received: by 2002:a17:902:e849:: with SMTP id t9mr15515337plg.106.1643520094356; Sat, 29 Jan 2022 21:21:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYMyV9jHc3EiGcItO+fCjZSq/yUCZ1FmPCUv1xvSPajk7LjCgLtawY+jg2lMuE3eFOkdf5ng== X-Received: by 2002:a17:902:e849:: with SMTP id t9mr15515304plg.106.1643520094019; Sat, 29 Jan 2022 21:21:34 -0800 (PST) Received: from [10.72.13.18] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id mu13sm7282937pjb.28.2022.01.29.21.21.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Jan 2022 21:21:33 -0800 (PST) Message-ID: <2eb07526-0143-d612-8969-097ccdf00fae@redhat.com> Date: Sun, 30 Jan 2022 13:21:21 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Subject: Re: [PATCH 22/31] vhost: Add VhostIOVATree To: =?UTF-8?Q?Eugenio_P=c3=a9rez?= , qemu-devel@nongnu.org References: <20220121202733.404989-1-eperezma@redhat.com> <20220121202733.404989-23-eperezma@redhat.com> From: Jason Wang In-Reply-To: <20220121202733.404989-23-eperezma@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Parav Pandit , Cindy Lu , "Michael S. Tsirkin" , Juan Quintela , Richard Henderson , Markus Armbruster , Gautam Dawar , virtualization@lists.linux-foundation.org, Eduardo Habkost , Harpreet Singh Anand , Xiao W Wang , Peter Xu , Stefan Hajnoczi , Eli Cohen , Paolo Bonzini , Zhu Lingshan , Eric Blake , Stefano Garzarella Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 在 2022/1/22 上午4:27, Eugenio Pérez 写道: > This tree is able to look for a translated address from an IOVA address. > > At first glance it is similar to util/iova-tree. However, SVQ working on > devices with limited IOVA space need more capabilities, So did the IOVA tree (e.g l2 vtd can only work in the range of GAW and without RMRRs). > like allocating > IOVA chunks or performing reverse translations (qemu addresses to iova). This looks like a general request as well. So I wonder if we can simply extend iova tree instead. Thanks > > The allocation capability, as "assign a free IOVA address to this chunk > of memory in qemu's address space" allows shadow virtqueue to create a > new address space that is not restricted by guest's addressable one, so > we can allocate shadow vqs vrings outside of it. > > It duplicates the tree so it can search efficiently both directions, > and it will signal overlap if iova or the translated address is > present in any tree. > > Signed-off-by: Eugenio Pérez > --- > hw/virtio/vhost-iova-tree.h | 27 +++++++ > hw/virtio/vhost-iova-tree.c | 157 ++++++++++++++++++++++++++++++++++++ > hw/virtio/meson.build | 2 +- > 3 files changed, 185 insertions(+), 1 deletion(-) > create mode 100644 hw/virtio/vhost-iova-tree.h > create mode 100644 hw/virtio/vhost-iova-tree.c > > diff --git a/hw/virtio/vhost-iova-tree.h b/hw/virtio/vhost-iova-tree.h > new file mode 100644 > index 0000000000..610394eaf1 > --- /dev/null > +++ b/hw/virtio/vhost-iova-tree.h > @@ -0,0 +1,27 @@ > +/* > + * vhost software live migration ring > + * > + * SPDX-FileCopyrightText: Red Hat, Inc. 2021 > + * SPDX-FileContributor: Author: Eugenio Pérez > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + */ > + > +#ifndef HW_VIRTIO_VHOST_IOVA_TREE_H > +#define HW_VIRTIO_VHOST_IOVA_TREE_H > + > +#include "qemu/iova-tree.h" > +#include "exec/memory.h" > + > +typedef struct VhostIOVATree VhostIOVATree; > + > +VhostIOVATree *vhost_iova_tree_new(uint64_t iova_first, uint64_t iova_last); > +void vhost_iova_tree_delete(VhostIOVATree *iova_tree); > +G_DEFINE_AUTOPTR_CLEANUP_FUNC(VhostIOVATree, vhost_iova_tree_delete); > + > +const DMAMap *vhost_iova_tree_find_iova(const VhostIOVATree *iova_tree, > + const DMAMap *map); > +int vhost_iova_tree_map_alloc(VhostIOVATree *iova_tree, DMAMap *map); > +void vhost_iova_tree_remove(VhostIOVATree *iova_tree, const DMAMap *map); > + > +#endif > diff --git a/hw/virtio/vhost-iova-tree.c b/hw/virtio/vhost-iova-tree.c > new file mode 100644 > index 0000000000..0021dbaf54 > --- /dev/null > +++ b/hw/virtio/vhost-iova-tree.c > @@ -0,0 +1,157 @@ > +/* > + * vhost software live migration ring > + * > + * SPDX-FileCopyrightText: Red Hat, Inc. 2021 > + * SPDX-FileContributor: Author: Eugenio Pérez > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + */ > + > +#include "qemu/osdep.h" > +#include "qemu/iova-tree.h" > +#include "vhost-iova-tree.h" > + > +#define iova_min_addr qemu_real_host_page_size > + > +/** > + * VhostIOVATree, able to: > + * - Translate iova address > + * - Reverse translate iova address (from translated to iova) > + * - Allocate IOVA regions for translated range (potentially slow operation) > + * > + * Note that it cannot remove nodes. > + */ > +struct VhostIOVATree { > + /* First addresable iova address in the device */ > + uint64_t iova_first; > + > + /* Last addressable iova address in the device */ > + uint64_t iova_last; > + > + /* IOVA address to qemu memory maps. */ > + IOVATree *iova_taddr_map; > + > + /* QEMU virtual memory address to iova maps */ > + GTree *taddr_iova_map; > +}; > + > +static gint vhost_iova_tree_cmp_taddr(gconstpointer a, gconstpointer b, > + gpointer data) > +{ > + const DMAMap *m1 = a, *m2 = b; > + > + if (m1->translated_addr > m2->translated_addr + m2->size) { > + return 1; > + } > + > + if (m1->translated_addr + m1->size < m2->translated_addr) { > + return -1; > + } > + > + /* Overlapped */ > + return 0; > +} > + > +/** > + * Create a new IOVA tree > + * > + * Returns the new IOVA tree > + */ > +VhostIOVATree *vhost_iova_tree_new(hwaddr iova_first, hwaddr iova_last) > +{ > + VhostIOVATree *tree = g_new(VhostIOVATree, 1); > + > + /* Some devices does not like 0 addresses */ > + tree->iova_first = MAX(iova_first, iova_min_addr); > + tree->iova_last = iova_last; > + > + tree->iova_taddr_map = iova_tree_new(); > + tree->taddr_iova_map = g_tree_new_full(vhost_iova_tree_cmp_taddr, NULL, > + NULL, g_free); > + return tree; > +} > + > +/** > + * Delete an iova tree > + */ > +void vhost_iova_tree_delete(VhostIOVATree *iova_tree) > +{ > + iova_tree_destroy(iova_tree->iova_taddr_map); > + g_tree_unref(iova_tree->taddr_iova_map); > + g_free(iova_tree); > +} > + > +/** > + * Find the IOVA address stored from a memory address > + * > + * @tree The iova tree > + * @map The map with the memory address > + * > + * Return the stored mapping, or NULL if not found. > + */ > +const DMAMap *vhost_iova_tree_find_iova(const VhostIOVATree *tree, > + const DMAMap *map) > +{ > + return g_tree_lookup(tree->taddr_iova_map, map); > +} > + > +/** > + * Allocate a new mapping > + * > + * @tree The iova tree > + * @map The iova map > + * > + * Returns: > + * - IOVA_OK if the map fits in the container > + * - IOVA_ERR_INVALID if the map does not make sense (like size overflow) > + * - IOVA_ERR_OVERLAP if the tree already contains that map > + * - IOVA_ERR_NOMEM if tree cannot allocate more space. > + * > + * It returns assignated iova in map->iova if return value is VHOST_DMA_MAP_OK. > + */ > +int vhost_iova_tree_map_alloc(VhostIOVATree *tree, DMAMap *map) > +{ > + /* Some vhost devices does not like addr 0. Skip first page */ > + hwaddr iova_first = tree->iova_first ?: qemu_real_host_page_size; > + DMAMap *new; > + int r; > + > + if (map->translated_addr + map->size < map->translated_addr || > + map->perm == IOMMU_NONE) { > + return IOVA_ERR_INVALID; > + } > + > + /* Check for collisions in translated addresses */ > + if (vhost_iova_tree_find_iova(tree, map)) { > + return IOVA_ERR_OVERLAP; > + } > + > + /* Allocate a node in IOVA address */ > + r = iova_tree_alloc(tree->iova_taddr_map, map, iova_first, > + tree->iova_last); > + if (r != IOVA_OK) { > + return r; > + } > + > + /* Allocate node in qemu -> iova translations */ > + new = g_malloc(sizeof(*new)); > + memcpy(new, map, sizeof(*new)); > + g_tree_insert(tree->taddr_iova_map, new, new); > + return IOVA_OK; > +} > + > +/** > + * Remove existing mappings from iova tree > + * > + * @param iova_tree The vhost iova tree > + * @param map The map to remove > + */ > +void vhost_iova_tree_remove(VhostIOVATree *iova_tree, const DMAMap *map) > +{ > + const DMAMap *overlap; > + > + iova_tree_remove(iova_tree->iova_taddr_map, map); > + while ((overlap = vhost_iova_tree_find_iova(iova_tree, map))) { > + g_tree_remove(iova_tree->taddr_iova_map, overlap); > + } > +} > diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build > index 2dc87613bc..6047670804 100644 > --- a/hw/virtio/meson.build > +++ b/hw/virtio/meson.build > @@ -11,7 +11,7 @@ softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) > > virtio_ss = ss.source_set() > virtio_ss.add(files('virtio.c')) > -virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c', 'vhost-shadow-virtqueue.c')) > +virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c', 'vhost-shadow-virtqueue.c', 'vhost-iova-tree.c')) > virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) > virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) > virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c'))