From nobody Fri Dec 19 12:14:47 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CCD12727F9 for ; Fri, 10 Oct 2025 08:59:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760086744; cv=none; b=VwUaxLOa7ICZCi37Jb9BExLM4+ItDkmHIBhWccb7K6ok52eQ9FKhdW+fXrWKt8hIKCTQMDBqWt6ME3Jbz7b+PlJcpqTVGmX3nEjwHdJP8JvofI3GhP9i4K3jQYVz7yzVoReYhFHqLwpIpPr6/VnIQ/rbyyeqjC+3+dLbkKTRtms= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760086744; c=relaxed/simple; bh=K4ASnwZprwTFcGZE3ZLOBGvFlyTGftRQZSnSLFGOWnc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G/BojPphi4sQBxOBh1t3cpfbC+dWlyizJdUpO1VeA98O1b5gzNldpc9sOtt7IphORCyY7j95y6h+ddS0FGZz1dYagXziO1ICbo+IPnyBt4xcfhp40aROBrp4diCqyi3XuhNFjUrervwr6Fjk4IjPhMWWO1kWOD9DYgNhBzSRKT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GinMwEPA; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GinMwEPA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760086742; 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=iRHRYri8X5KVjX4QxDJz0RoUB2f1AcZ23dBEU2WTFDo=; b=GinMwEPAF9sKx6D3kP4DP9QdSj81SWQdVLOp2qVoxtjO4IBvq16JAF3Mu7favnDY7Wn3vj 5qX9XYg8R1HdQtswmdyXwe0hyNtAyqpvZKQD4c/07NL1Q7ArmMNppF6T9b81ggag8nuhZy zr1FRsOmR77GhnjO55rLcCBIoXtXFWI= Received: from mx-prod-mc-05.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-610-bbzYcaJjMDiJzp36N9XFMA-1; Fri, 10 Oct 2025 04:58:58 -0400 X-MC-Unique: bbzYcaJjMDiJzp36N9XFMA-1 X-Mimecast-MFC-AGG-ID: bbzYcaJjMDiJzp36N9XFMA_1760086737 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 735CF19560BA; Fri, 10 Oct 2025 08:58:57 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.226.113]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8B951180047F; Fri, 10 Oct 2025 08:58:53 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: Yongji Xie , Stefano Garzarella , Xuan Zhuo , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Maxime Coquelin , Laurent Vivier , Cindy Lu , =?UTF-8?q?Eugenio=20P=C3=A9rez?= Subject: [PATCH v7 5/7] vduse: refactor vdpa_dev_add for goto err handling Date: Fri, 10 Oct 2025 10:58:25 +0200 Message-ID: <20251010085827.116958-6-eperezma@redhat.com> In-Reply-To: <20251010085827.116958-1-eperezma@redhat.com> References: <20251010085827.116958-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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.93 Next patches introduce more error paths in this function. Refactor it so they can be accomodated through gotos. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- v6: New in v6. --- drivers/vdpa/vdpa_user/vduse_dev.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 923330da9bef..0ce7f40b84fa 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -2173,21 +2173,27 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev,= const char *name, dev->bounce_size); write_unlock(&dev->domain_lock); if (!dev->domain) { - put_device(&dev->vdev->vdpa.dev); - return -ENOMEM; + ret =3D -ENOMEM; + goto domain_err; } =20 ret =3D _vdpa_register_device(&dev->vdev->vdpa, dev->vq_num); if (ret) { - put_device(&dev->vdev->vdpa.dev); - write_lock(&dev->domain_lock); - vduse_domain_destroy(dev->domain); - dev->domain =3D NULL; - write_unlock(&dev->domain_lock); - return ret; + goto register_err; } =20 return 0; + +register_err: + write_lock(&dev->domain_lock); + vduse_domain_destroy(dev->domain); + dev->domain =3D NULL; + write_unlock(&dev->domain_lock); + +domain_err: + put_device(&dev->vdev->vdpa.dev); + + return ret; } =20 static void vdpa_dev_del(struct vdpa_mgmt_dev *mdev, struct vdpa_device *d= ev) --=20 2.51.0