From nobody Tue Nov 26 14:37:35 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=1706910895; cv=none; d=zohomail.com; s=zohoarc; b=iy/wz1xMI/XlJH+vXkcQJiNRU6SiTzOYC8e2rzdAyMNVjrK9QQhPktBB/pk5bl3bAlVGVG/r1GcPsEEh5kBIgQFpFpGKuXiXktB6u5Mcnee1mgzX65/H64141Itm0BZXNpz7GGGlVidR4oE+AJxBihotn2a9IpC1ZVg5lurY6hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706910895; 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=tnD1WbeLBV3hwUM53n89RabIQheGwulLSgdIZsqwAE4=; b=Ib+suEwgmIABDfEExZoN4aZT7A7yfN5r2x046t5vfD4q0IXnE2g+eu+Jowfvq6D+f0tEXxnbW4eAWzzhmoBmN+FvzizLHvA9At16+1eFsywr/k6wu2J4QT2Rt0QrE/GyBqktXEiDzRNEYYVtR2Lsfu7crOP73v/95v/FXYUDbRo= 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 1706910895087755.6478264010001; Fri, 2 Feb 2024 13:54:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rW1Tx-0008CI-RY; Fri, 02 Feb 2024 16:53:57 -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 1rW1Tw-0008C8-K8 for qemu-devel@nongnu.org; Fri, 02 Feb 2024 16:53:56 -0500 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 1rW1Tv-0004r9-8G for qemu-devel@nongnu.org; Fri, 02 Feb 2024 16:53:56 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-408-9urfckw3ML6wLm4ccBagpw-1; Fri, 02 Feb 2024 16:53:51 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id B54C63C0ED43; Fri, 2 Feb 2024 21:53:50 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C3DE2166B31; Fri, 2 Feb 2024 21:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706910834; 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=tnD1WbeLBV3hwUM53n89RabIQheGwulLSgdIZsqwAE4=; b=XHquorGSh1xpZ+3HUNJhSlVZPlUEauWQ1BR+26A5c3mBv2Vg6VYPikjAKazuBfCDlQ04Zn Z0rlZpmAzqYPNXCOesKOvOVt+T12NnKes+7m2Uua4bAO2crCKUP41zIj7zzxSyzmUZqwDF EeXsrsWR+Cr7CtBGedtAN/CVQOg7QRE= X-MC-Unique: 9urfckw3ML6wLm4ccBagpw-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: David Hildenbrand , "Michael S . Tsirkin" , Jason Wang , Stefan Hajnoczi , Stefano Garzarella , Germano Veit Michel , Raphael Norwitz Subject: [PATCH v1 04/15] libvhost-user: Factor out removing all mem regions Date: Fri, 2 Feb 2024 22:53:21 +0100 Message-ID: <20240202215332.118728-5-david@redhat.com> In-Reply-To: <20240202215332.118728-1-david@redhat.com> References: <20240202215332.118728-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.276, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1706910896072100007 Content-Type: text/plain; charset="utf-8" Let's factor it out. Note that the check for MAP_FAILED was wrong as we never set mmap_addr if mmap() failed. We'll remove the NULL check separately. Signed-off-by: David Hildenbrand Reviewed-by: Raphael Norwitz --- subprojects/libvhost-user/libvhost-user.c | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvho= st-user/libvhost-user.c index 8a5a7a2295..d5b3468e43 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -240,6 +240,22 @@ qva_to_va(VuDev *dev, uint64_t qemu_addr) return NULL; } =20 +static void +vu_remove_all_mem_regs(VuDev *dev) +{ + unsigned int i; + + for (i =3D 0; i < dev->nregions; i++) { + VuDevRegion *r =3D &dev->regions[i]; + void *ma =3D (void *)(uintptr_t)r->mmap_addr; + + if (ma) { + munmap(ma, r->size + r->mmap_offset); + } + } + dev->nregions =3D 0; +} + static void vmsg_close_fds(VhostUserMsg *vmsg) { @@ -1003,14 +1019,7 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg) unsigned int i; VhostUserMemory m =3D vmsg->payload.memory, *memory =3D &m; =20 - for (i =3D 0; i < dev->nregions; i++) { - VuDevRegion *r =3D &dev->regions[i]; - void *ma =3D (void *) (uintptr_t) r->mmap_addr; - - if (ma) { - munmap(ma, r->size + r->mmap_offset); - } - } + vu_remove_all_mem_regs(dev); dev->nregions =3D memory->nregions; =20 if (dev->postcopy_listening) { @@ -2112,14 +2121,7 @@ vu_deinit(VuDev *dev) { unsigned int i; =20 - for (i =3D 0; i < dev->nregions; i++) { - VuDevRegion *r =3D &dev->regions[i]; - void *m =3D (void *) (uintptr_t) r->mmap_addr; - if (m !=3D MAP_FAILED) { - munmap(m, r->size + r->mmap_offset); - } - } - dev->nregions =3D 0; + vu_remove_all_mem_regs(dev); =20 for (i =3D 0; i < dev->max_queues; i++) { VuVirtq *vq =3D &dev->vq[i]; --=20 2.43.0