Received: by 2002:ac2:4c26:0:0:0:0:0 with SMTP id u6csp4383272lfq; Tue, 29 Sep 2020 01:56:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAeVpzccGcxVikui12cMqEDuNGQwBCD1XJi51G3CnQV1qO9Y+8akZdk4UOjIdwy6+AjCMB X-Received: by 2002:a25:cf84:: with SMTP id f126mr4718046ybg.148.1601369814445; Tue, 29 Sep 2020 01:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601369814; cv=none; d=google.com; s=arc-20160816; b=GDO/st91Ew754dwjNT7yuPjByDamZunkLEKG4lPlmKDiyp8YpijFFC+B0Rj4c1uoI3 Mt6c8KXyVxpYI6yhiz+uVAtx4E1zI40IA2mgyXWnQfl9Aseedto42eSt9B7TDNy28u9g Y3FbKmIfnrvzbVVcvx3rp8hYJm/ONy7cpvbW5dDmf43lQ/BBbFbU5oQVdzdwEpiyR5Yl MxdCR3zXhgpKtbdOkyGr6PoPjGXD+Kp91+Hdz1NeY7W17n0cVXFTvfWTj2MU0UmDBzxJ ILEYRn4nOZ3jWDIEBgfl7QzpMOD4ESvCvJNla+hr+iWU9gTikS4AEFEw45lrfGVQ2HQf DIdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=JNg0jJ8QHbPOvKUGkvHLxcaUNNqbmVByG1qEKoxw+k8=; b=ybjDhFTttb1X7vHrb4kbkzgV7IQorPpRY1I0oeVfFh7sNnA20defwzDUzabx11wLmQ W4MQWaxKP19BynllxsEI7TTp3MlN/VOeWHWFaZ5p9l2iliCvNjdOsGp6prJOBcSl5ruH 3gaRdJlkBAqR0iESW4RZNuJrGphF+HhdxW/8vvLDTAzFAHORCKwhUc7mDq4+t7xQ3J2m AaKuOl3b83g/wQsRWADPSQKJ1Gk/6TlGVuJw6mmCMPOrXyyMmvQfFtXACsMO+Oa6xzCz m0vwPHL9aSigeJuH8qO2UUVMQF07Mw9PWiOPKkEWTyQRZMahWnTPR2TJBRYiYpURsOcI Kaqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="KIg/aB0v"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o125si3722037ybg.332.2020.09.29.01.56.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Sep 2020 01:56:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="KIg/aB0v"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:60030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNBRN-0001Qt-Ou for alex.bennee@linaro.org; Tue, 29 Sep 2020 04:56:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNBQq-0000wz-HT for qemu-arm@nongnu.org; Tue, 29 Sep 2020 04:56:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNBQo-0000Fw-Gd for qemu-arm@nongnu.org; Tue, 29 Sep 2020 04:56:20 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601369776; 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=JNg0jJ8QHbPOvKUGkvHLxcaUNNqbmVByG1qEKoxw+k8=; b=KIg/aB0v1KoH12Ld2PXdOBW2LoP4QL6+fHuehRxWLCGpwuaBSQGOKIa9Zn7VFEXr6iEuDB 5JV2SBQx41azJQ7I5WY/rCDlSyd9kfyH5gqcDlITx2ILKk4+4nYOCwAFJxbbSUdOFWuGZu bKjvmtZ6AEx1AefIpkPQ6X1HfQq7O1c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-_y3SV-8SMDKI2kXAVy9ZYA-1; Tue, 29 Sep 2020 04:56:14 -0400 X-MC-Unique: _y3SV-8SMDKI2kXAVy9ZYA-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A7559CC08; Tue, 29 Sep 2020 08:56:13 +0000 (UTC) Received: from laptop.redhat.com (ovpn-113-210.ams2.redhat.com [10.36.113.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5956055773; Tue, 29 Sep 2020 08:56:10 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, stefanha@redhat.com, fam@euphon.net, philmd@redhat.com, alex.williamson@redhat.com Subject: [PATCH v2 2/2] util/vfio-helpers: Rework the IOVA allocator to avoid IOVA reserved regions Date: Tue, 29 Sep 2020 10:55:50 +0200 Message-Id: <20200929085550.30926-3-eric.auger@redhat.com> In-Reply-To: <20200929085550.30926-1-eric.auger@redhat.com> References: <20200929085550.30926-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/29 02:22:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, kwolf@redhat.com, cohuck@redhat.com, mreitz@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: eSNm6quX/o3H Introduce the qemu_vfio_find_fixed/temp_iova helpers which respectively allocate IOVAs from the bottom/top parts of the usable IOVA range, without picking within host IOVA reserved windows. The allocation remains basic: if the size is too big for the remaining of the current usable IOVA range, we jump to the next one, leaving a hole in the address map. Signed-off-by: Eric Auger --- v1 -> v2: - handle possible wrap --- util/vfio-helpers.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index ba0ee6e21c..71145970f3 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -667,6 +667,50 @@ static bool qemu_vfio_verify_mappings(QEMUVFIOState *s) return true; } +static int +qemu_vfio_find_fixed_iova(QEMUVFIOState *s, size_t size, uint64_t *iova) +{ + int i; + + for (i = 0; i < s->nb_iova_ranges; i++) { + if (s->usable_iova_ranges[i].end < s->low_water_mark) { + continue; + } + s->low_water_mark = + MAX(s->low_water_mark, s->usable_iova_ranges[i].start); + + if (s->usable_iova_ranges[i].end - s->low_water_mark + 1 >= size || + s->usable_iova_ranges[i].end - s->low_water_mark + 1 == 0) { + *iova = s->low_water_mark; + s->low_water_mark += size; + return 0; + } + } + return -ENOMEM; +} + +static int +qemu_vfio_find_temp_iova(QEMUVFIOState *s, size_t size, uint64_t *iova) +{ + int i; + + for (i = s->nb_iova_ranges - 1; i >= 0; i--) { + if (s->usable_iova_ranges[i].start > s->high_water_mark) { + continue; + } + s->high_water_mark = + MIN(s->high_water_mark, s->usable_iova_ranges[i].end + 1); + + if (s->high_water_mark - s->usable_iova_ranges[i].start + 1 >= size || + s->high_water_mark - s->usable_iova_ranges[i].start + 1 == 0) { + *iova = s->high_water_mark - size; + s->high_water_mark = *iova; + return 0; + } + } + return -ENOMEM; +} + /* Map [host, host + size) area into a contiguous IOVA address space, and store * the result in @iova if not NULL. The caller need to make sure the area is * aligned to page size, and mustn't overlap with existing mapping areas (split @@ -693,7 +737,11 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size, goto out; } if (!temporary) { - iova0 = s->low_water_mark; + if (qemu_vfio_find_fixed_iova(s, size, &iova0)) { + ret = -ENOMEM; + goto out; + } + mapping = qemu_vfio_add_mapping(s, host, size, index + 1, iova0); if (!mapping) { ret = -ENOMEM; @@ -705,15 +753,16 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size, qemu_vfio_undo_mapping(s, mapping, NULL); goto out; } - s->low_water_mark += size; qemu_vfio_dump_mappings(s); } else { - iova0 = s->high_water_mark - size; + if (qemu_vfio_find_temp_iova(s, size, &iova0)) { + ret = -ENOMEM; + goto out; + } ret = qemu_vfio_do_mapping(s, host, size, iova0); if (ret) { goto out; } - s->high_water_mark -= size; } } if (iova) { -- 2.21.3