From nobody Thu Dec 18 07:57:21 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 617F634252D for ; Wed, 17 Dec 2025 11:24:43 +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=1765970687; cv=none; b=mdVcBh0JMu8TtvURx1g6kGEasaCcqIct1Pi3R5mPfFl9FQvAev0cIOg2gP9Qpf1iMocNkZ9Wa3ogVj6yfaiO9RaQgCZl8qddkVF91oBB75qPbfOsQFi60mjOqpb94QYNMoVcwRWW8BDudQYdShIGuVnVkLDiLN2Ks/QeyX9fHII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765970687; c=relaxed/simple; bh=X1M6J9+dIKSIzDc+fVLR0WvDyVHOGc8KzXnSDOE50Uk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Y5EF05w8jQM+bC6n9IqVp3BQK/D12PZTIJ5hNFIDRPLw8qeYtFW7oDgxLJ1jqXxzZYky0UthRhtzNj7QodJtMxO9vcsZMMX/jBD6CS4Kx/GQOnxxjLJHTR38B80wMsAtOdKR2W3Rj0k2GFDXg4NJDN8sISJ8/hB3qxEQwQ3hb8U= 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=NnfAp98b; 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="NnfAp98b" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765970682; 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=ZjuJlhdDNznWR9Xj3wMK1yvwzZv5UKds5cBizS2xYxg=; b=NnfAp98bLXV4pJayvgpUcV3nfLoh2KnsKugWxhryao2dlOQq9qhu0bLDsqXp/HJATTTpwM aR/WCFnHpD80dFkyzqAPs3Nr8HCn9fJnpaYIvr1tXMGojMLSP8SKkwe1aNOlsoxZPoNSV0 qyEquYTDX64O/B8YfckzARY03gnk56U= 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-448-1jmfh5rDOj60WFXmR1qSEw-1; Wed, 17 Dec 2025 06:24:38 -0500 X-MC-Unique: 1jmfh5rDOj60WFXmR1qSEw-1 X-Mimecast-MFC-AGG-ID: 1jmfh5rDOj60WFXmR1qSEw_1765970677 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 770351956080; Wed, 17 Dec 2025 11:24:37 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.69]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0AECF180044F; Wed, 17 Dec 2025 11:24:33 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: Maxime Coquelin , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Stefano Garzarella , Yongji Xie , jasowang@redhat.com, Xuan Zhuo , Cindy Lu , =?UTF-8?q?Eugenio=20P=C3=A9rez?= Subject: [PATCH v10 4/8] vduse: refactor vdpa_dev_add for goto err handling Date: Wed, 17 Dec 2025 12:24:10 +0100 Message-ID: <20251217112414.2374672-5-eperezma@redhat.com> In-Reply-To: <20251217112414.2374672-1-eperezma@redhat.com> References: <20251217112414.2374672-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.111 Next patches introduce more error paths in this function. Refactor it so they can be accomodated through gotos. Acked-by: Jason Wang Reviewed-by: Xie Yongji Signed-off-by: Eugenio P=C3=A9rez --- 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 d64bcd9ce76e..0390e012c584 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -2172,21 +2172,27 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev,= const char *name, dev->bounce_size); mutex_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); - mutex_lock(&dev->domain_lock); - vduse_domain_destroy(dev->domain); - dev->domain =3D NULL; - mutex_unlock(&dev->domain_lock); - return ret; + goto register_err; } =20 return 0; + +register_err: + mutex_lock(&dev->domain_lock); + vduse_domain_destroy(dev->domain); + dev->domain =3D NULL; + mutex_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.52.0