From nobody Sat Nov 23 21:32:22 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729627764; cv=none; d=zohomail.com; s=zohoarc; b=QDBp5vboljVKhFwbYfZjjjmWwd5prQF74k45wwxLWYHroQJeziP7LU9HzNkUp+GZZoIzVbCGst8Ewnuo00+T8KMstLzGGoNZXBIon7sFUwcusS3ZwTXz6Tw7je93VPU4nMLRdbfNk2no8n6mm0WiZk2anQ5Zytm24Ed1xbLQo90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729627764; h=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=cejL+OkeykWVMv/qxY90R1x2b9lU18Sy6vUusx4Pam0=; b=JsfCNkiWboN/nS7ZRmo6tYnMeXz6BoKZQiUWUOnsaVs3mJf3/Pgw+UJjmABoynyhxohRQJEPwcn4UN5B01h1k+stbhEOc6rDn3t1+u2C8LXGvqR+kzJnUWtY3zcMQLTx7Vl1NXhTVC0aDyJVcrNQds8lMBZaI6zkQE/wv70vJSc= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729627764646894.9990768860479; Tue, 22 Oct 2024 13:09:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3LBM-0006N6-VJ; Tue, 22 Oct 2024 16:08:44 -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 1t3LBK-0006M9-I0 for qemu-devel@nongnu.org; Tue, 22 Oct 2024 16:08:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3LBI-00052B-Mu for qemu-devel@nongnu.org; Tue, 22 Oct 2024 16:08:42 -0400 Received: from mx-prod-mc-02.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-323-rQbBn9ngMHGnLWgmq-jejA-1; Tue, 22 Oct 2024 16:08:37 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B488919560A7 for ; Tue, 22 Oct 2024 20:08:36 +0000 (UTC) Received: from omen.home.shazbot.org (unknown [10.22.64.59]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2F65119560A2; Tue, 22 Oct 2024 20:08:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729627720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cejL+OkeykWVMv/qxY90R1x2b9lU18Sy6vUusx4Pam0=; b=aOaMEl/ksrvq8NGJBVlm+gwmVh4IxiBKR3VS1beuHPTLbzStZhG1vTeREf/n9R9sDxbdUo matDyZ70FwFX/BZVE411otSsRKEE9QSq/QODoY6mMmoCEeStEw9Yhoy0vX8MAK13x8R+SZ NJj87Z7MF7yUtzWZpXrRA/YoauP/19g= X-MC-Unique: rQbBn9ngMHGnLWgmq-jejA-1 From: Alex Williamson To: qemu-devel@nongnu.org Cc: Alex Williamson , clg@redhat.com, peterx@redhat.com Subject: [PATCH 1/2] vfio/helpers: Refactor vfio_region_mmap() error handling Date: Tue, 22 Oct 2024 14:08:28 -0600 Message-ID: <20241022200830.4129598-2-alex.williamson@redhat.com> In-Reply-To: <20241022200830.4129598-1-alex.williamson@redhat.com> References: <20241022200830.4129598-1-alex.williamson@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.129.124; envelope-from=alex.williamson@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.519, 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_H2=-1.697, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1729627765905116600 Content-Type: text/plain; charset="utf-8" Move error handling code to the end of the function so that it can more easily be shared by new mmap failure conditions. No functional change intended. Signed-off-by: Alex Williamson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu --- hw/vfio/helpers.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c index ea15c79db0a3..b9e606e364a2 100644 --- a/hw/vfio/helpers.c +++ b/hw/vfio/helpers.c @@ -395,7 +395,7 @@ static void vfio_subregion_unmap(VFIORegion *region, in= t index) =20 int vfio_region_mmap(VFIORegion *region) { - int i, prot =3D 0; + int i, ret, prot =3D 0; char *name; =20 if (!region->mem) { @@ -411,22 +411,8 @@ int vfio_region_mmap(VFIORegion *region) region->fd_offset + region->mmaps[i].offset); if (region->mmaps[i].mmap =3D=3D MAP_FAILED) { - int ret =3D -errno; - - trace_vfio_region_mmap_fault(memory_region_name(region->mem), = i, - region->fd_offset + - region->mmaps[i].offset, - region->fd_offset + - region->mmaps[i].offset + - region->mmaps[i].size - 1, ret); - - region->mmaps[i].mmap =3D NULL; - - for (i--; i >=3D 0; i--) { - vfio_subregion_unmap(region, i); - } - - return ret; + ret =3D -errno; + goto no_mmap; } =20 name =3D g_strdup_printf("%s mmaps[%d]", @@ -446,6 +432,20 @@ int vfio_region_mmap(VFIORegion *region) } =20 return 0; + +no_mmap: + trace_vfio_region_mmap_fault(memory_region_name(region->mem), i, + region->fd_offset + region->mmaps[i].offs= et, + region->fd_offset + region->mmaps[i].offs= et + + region->mmaps[i].size - 1, ret); + + region->mmaps[i].mmap =3D NULL; + + for (i--; i >=3D 0; i--) { + vfio_subregion_unmap(region, i); + } + + return ret; } =20 void vfio_region_unmap(VFIORegion *region) --=20 2.46.2