From nobody Mon Feb 9 16:02:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630007450; cv=none; d=zohomail.com; s=zohoarc; b=bBAisQJL93s0D7Sv6MosUy52mT1rU+cpE6HeF6r1rG+o0iScnIFz0/2nGAmV0arZ+v3DEsG37oi5ekgTzMM4ZhUthb/M/Fneg1z8tAQAyy8yXX+BqVUXfCxwTi97FtXm1sc5H8PVkjJ07YBfBY4ZwwAWSpAEQrGnj3HtqbYQyDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630007450; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=yPAeN1ELfe7bdUEPxcVE2xQF9fAx3P6/HJ2p3gjANPc=; b=KnZG3FglFv+iqqLYmKMNgjbYqw3MypUKSzp8xfkZsZiJiQabagJsuNxAqmXaJWpfMroO7m8ZBviKtRfAJSDkjkJrLD+EFMzl7Hgl2bTF39NUDEwhYGkOXZnEztcHhu1Cc4Wxvo4oTEje2Z2F+RbQFQl0vTQN/4Kg4rnAcEWrpNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1630007450691183.4502313704221; Thu, 26 Aug 2021 12:50:50 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14--rTt13XFPIKfiDjzjz2ykQ-1; Thu, 26 Aug 2021 15:50:48 -0400 Received: by mail-wr1-f69.google.com with SMTP id r17-20020adfda510000b02901526f76d738so1230361wrl.0 for ; Thu, 26 Aug 2021 12:50:48 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id z137sm9522151wmc.14.2021.08.26.12.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 12:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630007449; 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=yPAeN1ELfe7bdUEPxcVE2xQF9fAx3P6/HJ2p3gjANPc=; b=ZuOz7KVif5nkt449h2mQ/YaVYx1mRE1a2euaXKDNzvAW70chFU9iMEWzJlLugg0w7ZHBQJ OofAaPrhFFKO9eznjf4kofTFVu3jvmEuHxASCETrqP+BLW14jkoBc7e5H1KH6fuMDGWSWd fHECCQenahQQ66QopxprdVFXp6BIlwM= X-MC-Unique: -rTt13XFPIKfiDjzjz2ykQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yPAeN1ELfe7bdUEPxcVE2xQF9fAx3P6/HJ2p3gjANPc=; b=g6dSW7B2Vd8y2XlbaA8qkKwJIfz3et/uPCMcElcXofidArYMNPSPo4SRBhIojK/M5z RLu8dpr5x75F9/fahZxE9eRXicrxchYe86EaQ9JekadzlU2zRunawEjsGZZ8ViM+2UuO m4/XtUNdyx4eLSbXeElOhMYmIFxg94kWAG5BWqtI9WpZ1+qsDOlbJ+6rD4KD0bRfGRPt wzTKSnqi0VnSY3vFefIUL6QD3K1R+HkozxUfrInDRT8YFdycE3hDfJ3ZuKkxE9aq9HPL 2vkeIJKjiwSdIkZ9Sc6lq7u8IqMz+l9SINCG1GsDUs/dU8pKudA8OFaXAN6ISUx93GjH KRGA== X-Gm-Message-State: AOAM5308ddF4w6be4ynMEIrLy8dQVIgYdiuiJgksBAVYBRqyQ1q6bzik qYj0HoQaT5vh/aiK644IIapHVNhsXT2nXdC8ml1gh2yqq5voApPyPmO86r0rtJd41ZCUBZHzEwt YfbeR2oU0SiT8Ww== X-Received: by 2002:a1c:2209:: with SMTP id i9mr5245157wmi.92.1630007447168; Thu, 26 Aug 2021 12:50:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvwCtxIeyv/Wa8uD6Rfs62sxbIWRS5/+E5nqnpvvnuaWK1lYYpSxcT7NwU5XrhcIvrR8GOWw== X-Received: by 2002:a1c:2209:: with SMTP id i9mr5245143wmi.92.1630007447016; Thu, 26 Aug 2021 12:50:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Klaus Jensen , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Fam Zheng , Stefan Hajnoczi , Auger Eric Subject: [PATCH v2 07/11] util/vfio-helpers: Extract qemu_vfio_water_mark_reached() Date: Thu, 26 Aug 2021 21:50:10 +0200 Message-Id: <20210826195014.2180369-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210826195014.2180369-1-philmd@redhat.com> References: <20210826195014.2180369-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630007451873100001 Extract qemu_vfio_water_mark_reached() for readability, and have it provide an error hint it its Error* handle. Suggested-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- util/vfio-helpers.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 77cdec845d9..306b5a83e48 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -721,6 +721,21 @@ qemu_vfio_find_temp_iova(QEMUVFIOState *s, size_t size= , uint64_t *iova) return -ENOMEM; } =20 +/** + * qemu_vfio_water_mark_reached: + * + * Returns %true if high watermark has been reached, %false otherwise. + */ +static bool qemu_vfio_water_mark_reached(QEMUVFIOState *s, size_t size, + Error **errp) +{ + if (s->high_water_mark - s->low_water_mark + 1 < size) { + error_setg(errp, "iova exhausted (water mark reached)"); + return true; + } + return false; +} + /* 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 @@ -742,7 +757,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, siz= e_t size, if (mapping) { iova0 =3D mapping->iova + ((uint8_t *)host - (uint8_t *)mapping->h= ost); } else { - if (s->high_water_mark - s->low_water_mark + 1 < size) { + if (qemu_vfio_water_mark_reached(s, size, errp)) { ret =3D -ENOMEM; goto out; } --=20 2.31.1