From nobody Sun Apr 12 02:49:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1771833981; cv=none; d=zohomail.com; s=zohoarc; b=N6pVbYSHqOEkbHIA1OiV0Th248tSfVBu38cSNlAOqEkZcKUwWa93b9VtpJlC+C98em6exxoJ0xAAm87k7P554TFwKR2gYIzdDe2gE3BjmffPd289AUv7IF4pVNIPR5HhM5La9dFE1TSJ2dJWVyJSUMC3dz/WTjifNaQYcAL1kQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771833981; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MEVb3OBiyV4R6fHQ2fSdy2Rq8QGHST0YfvIFvHPTk6I=; b=C0ksWiR+bz+05GnGeUDuplHbAF8SbPxaaMy12EjaGdyk+QxaIG+gVExc3UIrl+bbAo47P+liG000X6qYxKv36Ru1mkiFhPGJRUafHwl5XnKyoiYfuqJFfAhvA7m+ng2aJ05fnsPt824M3N9cgmK6n4GfgJdx/xITxAGYDOdT2P0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771833981302294.95691385040845; Mon, 23 Feb 2026 00:06:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuQvm-0002x4-Py; Mon, 23 Feb 2026 03:04:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vuQvk-0002vZ-08 for qemu-devel@nongnu.org; Mon, 23 Feb 2026 03:04:36 -0500 Received: from mgamail.intel.com ([192.198.163.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vuQvi-0004Ki-6o for qemu-devel@nongnu.org; Mon, 23 Feb 2026 03:04:35 -0500 Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2026 00:04:23 -0800 Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2026 00:04:23 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1771833874; x=1803369874; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rEN7gJG69z1iHbkpzNoQlYFgF+PtYJCFEZUSWY1s9U8=; b=ZH1Nr39GwCsXgEr9piKwwUSIly4gNwVpAH9oVBEjnlivZTtSA+Oa9tps dswrivRa7xwEnm+MznQvyNeCOzxQUAJuAFi6kYXvN9YvGka6/iVLEjUGz SLdXbed+R/61Y1+n68Nt5rnd6g9pXDRcQ7CBb21WJh2yp2iqUfgfux32Q 5Ohp8JIKr+B7vwC1tTxVjbywojMJ/J+Vr9RKgl8swidEVRwN1S1lf4gSc 3uk/0hv8z76bIFGccPXvCZ3p96D8Yk2jJAWxQvMKSTO7upDT3wfUNmdHk MbuAHEEP27bNdH5wQlLafPmXbrwYeBeTV+qwOqaSniaKLlylpaPJ8tYBW Q==; X-CSE-ConnectionGUID: w3UiYE+kQ2esYyx/NvZB1g== X-CSE-MsgGUID: r2dLbhTAQSK5LVALz9V6Gg== X-IronPort-AV: E=McAfee;i="6800,10657,11709"; a="72027131" X-IronPort-AV: E=Sophos;i="6.21,306,1763452800"; d="scan'208";a="72027131" X-CSE-ConnectionGUID: DwWQjd3WQB6tlN0cIrGAJQ== X-CSE-MsgGUID: zLxSUqgHREmwbB/gLMWgUQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,306,1763452800"; d="scan'208";a="246079170" From: Vivek Kasireddy To: qemu-devel@nongnu.org Cc: Vivek Kasireddy , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v7 06/10] virtio-gpu-dmabuf: Improve error handling with 'Error **' and err enum Date: Mon, 23 Feb 2026 00:00:10 -0800 Message-ID: <20260223080200.468558-7-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223080200.468558-1-vivek.kasireddy@intel.com> References: <20260223080200.468558-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.18; envelope-from=vivek.kasireddy@intel.com; helo=mgamail.intel.com 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.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.798, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.79, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1771833983275154100 Make the error handling more robust in virtio_gpu_init_udmabuf() by introducing 'Error **' parameter to capture errors and an enum to categorize Guest and Host errors. This allows for better error reporting and handling of errors from virtio_gpu_create_udmabuf() and virtio_gpu_remap_dmabuf(). Cc: Marc-Andr=C3=A9 Lureau Cc: Alex Benn=C3=A9e Cc: Akihiko Odaki Cc: Dmitry Osipenko Cc: Alex Williamson Cc: C=C3=A9dric Le Goater Signed-off-by: Vivek Kasireddy --- hw/display/virtio-gpu-dmabuf.c | 65 +++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/hw/display/virtio-gpu-dmabuf.c b/hw/display/virtio-gpu-dmabuf.c index 8d67ef7c2a..fdcf8e53a2 100644 --- a/hw/display/virtio-gpu-dmabuf.c +++ b/hw/display/virtio-gpu-dmabuf.c @@ -27,7 +27,17 @@ #include "standard-headers/linux/udmabuf.h" #include "standard-headers/drm/drm_fourcc.h" =20 -static void virtio_gpu_create_udmabuf(struct virtio_gpu_simple_resource *r= es) +typedef enum VirtIOGPUErrorType { + VIRTIO_GPU_NO_ERROR =3D 0, + /* Guest is responsible for this error */ + VIRTIO_GPU_GUEST_ERROR =3D 1, + /* Host is at fault for this error */ + VIRTIO_GPU_HOST_ERROR =3D 2, +} VirtIOGPUErrorType; + +static VirtIOGPUErrorType +virtio_gpu_create_udmabuf(struct virtio_gpu_simple_resource *res, int *fd, + Error **errp) { g_autofree struct udmabuf_create_list *list =3D NULL; RAMBlock *rb; @@ -36,7 +46,8 @@ static void virtio_gpu_create_udmabuf(struct virtio_gpu_s= imple_resource *res) =20 udmabuf =3D udmabuf_fd(); if (udmabuf < 0) { - return; + error_setg(errp, "udmabuf device not available"); + return VIRTIO_GPU_HOST_ERROR; } =20 list =3D g_malloc0(sizeof(struct udmabuf_create_list) + @@ -45,7 +56,8 @@ static void virtio_gpu_create_udmabuf(struct virtio_gpu_s= imple_resource *res) for (i =3D 0; i < res->iov_cnt; i++) { rb =3D qemu_ram_block_from_host(res->iov[i].iov_base, false, &offs= et); if (!rb || rb->fd < 0) { - return; + error_setg(errp, "Could not find valid ramblock"); + return VIRTIO_GPU_GUEST_ERROR; } =20 list->list[i].memfd =3D rb->fd; @@ -56,22 +68,30 @@ static void virtio_gpu_create_udmabuf(struct virtio_gpu= _simple_resource *res) list->count =3D res->iov_cnt; list->flags =3D UDMABUF_FLAGS_CLOEXEC; =20 - res->dmabuf_fd =3D ioctl(udmabuf, UDMABUF_CREATE_LIST, list); - if (res->dmabuf_fd < 0) { - warn_report("%s: UDMABUF_CREATE_LIST: %s", __func__, - strerror(errno)); + *fd =3D ioctl(udmabuf, UDMABUF_CREATE_LIST, list); + if (*fd < 0) { + error_setg_errno(errp, errno, "UDMABUF_CREATE_LIST: ioctl failed"); + if (errno =3D=3D EINVAL || errno =3D=3D EBADFD) { + return VIRTIO_GPU_GUEST_ERROR; + } + return VIRTIO_GPU_HOST_ERROR; } + return VIRTIO_GPU_NO_ERROR; } =20 -static void virtio_gpu_remap_dmabuf(struct virtio_gpu_simple_resource *res) +static bool virtio_gpu_remap_dmabuf(struct virtio_gpu_simple_resource *res, + Error **errp) { - res->remapped =3D mmap(NULL, res->blob_size, PROT_READ, - MAP_SHARED, res->dmabuf_fd, 0); - if (res->remapped =3D=3D MAP_FAILED) { - warn_report("%s: dmabuf mmap failed: %s", __func__, - strerror(errno)); + void *map; + + map =3D mmap(NULL, res->blob_size, PROT_READ, MAP_SHARED, res->dmabuf_= fd, 0); + if (map =3D=3D MAP_FAILED) { + error_setg_errno(errp, errno, "dmabuf mmap failed"); res->remapped =3D NULL; + return false; } + res->remapped =3D map; + return true; } =20 static void virtio_gpu_destroy_dmabuf(struct virtio_gpu_simple_resource *r= es) @@ -125,19 +145,30 @@ bool virtio_gpu_have_udmabuf(void) =20 void virtio_gpu_init_dmabuf(struct virtio_gpu_simple_resource *res) { + Error *local_err =3D NULL; + VirtIOGPUErrorType err; void *pdata =3D NULL; + int fd; =20 res->dmabuf_fd =3D -1; if (res->iov_cnt =3D=3D 1 && res->iov[0].iov_len < 4096) { pdata =3D res->iov[0].iov_base; } else { - virtio_gpu_create_udmabuf(res); - if (res->dmabuf_fd < 0) { + err =3D virtio_gpu_create_udmabuf(res, &fd, &local_err); + if (err !=3D VIRTIO_GPU_NO_ERROR) { + error_prepend(&local_err, "Cannot create dmabuf: "); + if (err =3D=3D VIRTIO_GPU_GUEST_ERROR) { + qemu_log_mask(LOG_GUEST_ERROR, + "Cannot create dmabuf: incompatible mem\n"); + } + error_report_err(local_err); return; } - virtio_gpu_remap_dmabuf(res); - if (!res->remapped) { + + res->dmabuf_fd =3D fd; + if (!virtio_gpu_remap_dmabuf(res, &local_err)) { + error_report_err(local_err); return; } pdata =3D res->remapped; --=20 2.53.0