From nobody Sun Nov 16 00:56:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745570912; cv=none; d=zohomail.com; s=zohoarc; b=bIQ6iHpnH9ACXAJqxQTCXFXR07LfFpbI+RxtKY+0Fci+roSeJ3Oo/gEp197ErCYSBxKdLvnVu2VB9bGsgGE+LPetZQd0OuSkCfThwYP8o+uI47rudltQPrxa9EvN+Qa8dCtflMxKxYbWML7+9OBCivGlsqrijhu8iPOnr83Sm/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745570912; 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=gBgpznxmwMkdPoCPXXwHNcIYnDpO/rm3Dg3GzUyU6gI=; b=UcdGCHGv/pescPQV25d6FvNAxNSSmf2633E0tualm2c9/ZKWUZI4vkTFbFNu0J5nkd+0ppl5zmVqbuO8dcTL7ulMkHl4NiDQ5qwfSFk5mHSyBnvEQsjGGIbUMGV0+bA6kuOHeZJx1Oo5lpOTygMiDT/xV/jz+py/oB5ng7vDIzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745570912487325.46719792902365; Fri, 25 Apr 2025 01:48:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8EiR-0002lh-BB; Fri, 25 Apr 2025 04:47:25 -0400 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 1u8EiF-0002iF-4W for qemu-devel@nongnu.org; Fri, 25 Apr 2025 04:47:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8EiB-0003Bn-RC for qemu-devel@nongnu.org; Fri, 25 Apr 2025 04:47:10 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-60-Q81m6SFDMya9M0Nh4lqxuA-1; Fri, 25 Apr 2025 04:47:03 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A78319560A1; Fri, 25 Apr 2025 08:47:02 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.33.65]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0343730001A2; Fri, 25 Apr 2025 08:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745570827; 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=gBgpznxmwMkdPoCPXXwHNcIYnDpO/rm3Dg3GzUyU6gI=; b=UTBzSZvsvf6kU8DUl7F+8tQiHWTiVa7+CRTAznJdrF96de6ClT/fHKCLSlE4xGHt+b/RyT nhdhJb9LxyC061uwuVNT6iHz3NpvQCo3tOCLoGx9L23lw8xJBkrMMA3RTF1L56zrDB4LhY Ep4W8qzHtq0XugdqyA+OCxVYK9ll+4U= X-MC-Unique: Q81m6SFDMya9M0Nh4lqxuA-1 X-Mimecast-MFC-AGG-ID: Q81m6SFDMya9M0Nh4lqxuA_1745570822 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Alex Williamson , Amit Machhiwal , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 03/50] vfio/spapr: Enhance error handling in vfio_spapr_create_window() Date: Fri, 25 Apr 2025 10:45:56 +0200 Message-ID: <20250425084644.102196-4-clg@redhat.com> In-Reply-To: <20250425084644.102196-1-clg@redhat.com> References: <20250425084644.102196-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.84, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: 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 @redhat.com) X-ZM-MESSAGEID: 1745570914908019100 From: Amit Machhiwal Introduce an Error ** parameter to vfio_spapr_create_window() to enable structured error reporting. This allows the function to propagate detailed errors back to callers. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Amit Machhiwal Reviewed-by: C=C3=A9dric Le Goater Link: https://lore.kernel.org/qemu-devel/20250408124042.2695955-2-amachhiw@= linux.ibm.com Signed-off-by: C=C3=A9dric Le Goater --- hw/vfio/spapr.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 66a2d2bb0dc1b7370ab89075085db185ecc56c40..3d6354134c3d517b810d28404f3= e2a7eee9b1192 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -230,9 +230,9 @@ static int vfio_spapr_remove_window(VFIOContainer *cont= ainer, return 0; } =20 -static int vfio_spapr_create_window(VFIOContainer *container, +static bool vfio_spapr_create_window(VFIOContainer *container, MemoryRegionSection *section, - hwaddr *pgsize) + hwaddr *pgsize, Error **errp) { int ret =3D 0; VFIOContainerBase *bcontainer =3D &container->bcontainer; @@ -252,11 +252,11 @@ static int vfio_spapr_create_window(VFIOContainer *co= ntainer, pgmask =3D bcontainer->pgsizes & (pagesize | (pagesize - 1)); pagesize =3D pgmask ? (1ULL << (63 - clz64(pgmask))) : 0; if (!pagesize) { - error_report("Host doesn't support page size 0x%"PRIx64 - ", the supported mask is 0x%lx", - memory_region_iommu_get_min_page_size(iommu_mr), - bcontainer->pgsizes); - return -EINVAL; + error_setg_errno(errp, EINVAL, "Host doesn't support page size 0x%= "PRIx64 + ", the supported mask is 0x%lx", + memory_region_iommu_get_min_page_size(iommu_mr), + bcontainer->pgsizes); + return false; } =20 /* @@ -302,17 +302,17 @@ static int vfio_spapr_create_window(VFIOContainer *co= ntainer, } } if (ret) { - error_report("Failed to create a window, ret =3D %d (%m)", ret); - return -errno; + error_setg_errno(errp, errno, "Failed to create a window, ret =3D = %d", ret); + return false; } =20 if (create.start_addr !=3D section->offset_within_address_space) { vfio_spapr_remove_window(container, create.start_addr); =20 - error_report("Host doesn't support DMA window at %"HWADDR_PRIx", m= ust be %"PRIx64, - section->offset_within_address_space, - (uint64_t)create.start_addr); - return -EINVAL; + error_setg_errno(errp, EINVAL, "Host doesn't support DMA window at= %"HWADDR_PRIx + ", must be %"PRIx64, section->offset_within_addre= ss_space, + (uint64_t)create.start_addr); + return false; } trace_vfio_spapr_create_window(create.page_shift, create.levels, @@ -320,7 +320,7 @@ static int vfio_spapr_create_window(VFIOContainer *cont= ainer, create.start_addr); *pgsize =3D pagesize; =20 - return 0; + return true; } =20 static bool @@ -377,9 +377,8 @@ vfio_spapr_container_add_section_window(VFIOContainerBa= se *bcontainer, } } =20 - ret =3D vfio_spapr_create_window(container, section, &pgsize); - if (ret) { - error_setg_errno(errp, -ret, "Failed to create SPAPR window"); + ret =3D vfio_spapr_create_window(container, section, &pgsize, errp); + if (!ret) { return false; } =20 --=20 2.49.0