mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: "Michael S . Tsirkin " <mst@redhat.com>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	virtualization@lists.linux.dev,
	"Maxime Coquelin" <mcoqueli@redhat.com>,
	"Cindy Lu" <lulu@redhat.com>,
	jasowang@redhat.com, linux-kernel@vger.kernel.org,
	"Eugenio Pérez" <eperezma@redhat.com>,
	"Yongji Xie" <xieyongji@bytedance.com>,
	"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
	"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v9 4/6] vduse: refactor vdpa_dev_add for goto err handling
Date: Thu, 13 Nov 2025 12:55:56 +0100	[thread overview]
Message-ID: <20251113115558.1277981-5-eperezma@redhat.com> (raw)
In-Reply-To: <20251113115558.1277981-1-eperezma@redhat.com>

Next patches introduce more error paths in this function.  Refactor it
so they can be accomodated through gotos.

Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
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/vduse_dev.c
index b01f55a1c22d..97be04f73fbf 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 = -ENOMEM;
+		goto domain_err;
 	}
 
 	ret = _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 = NULL;
-		mutex_unlock(&dev->domain_lock);
-		return ret;
+		goto register_err;
 	}
 
 	return 0;
+
+register_err:
+	mutex_lock(&dev->domain_lock);
+	vduse_domain_destroy(dev->domain);
+	dev->domain = NULL;
+	mutex_unlock(&dev->domain_lock);
+
+domain_err:
+	put_device(&dev->vdev->vdpa.dev);
+
+	return ret;
 }
 
 static void vdpa_dev_del(struct vdpa_mgmt_dev *mdev, struct vdpa_device *dev)
-- 
2.51.1


  parent reply	other threads:[~2025-11-13 11:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-13 11:55 [PATCH v9 0/6] Add multiple address spaces support to VDUSE Eugenio Pérez
2025-11-13 11:55 ` [PATCH v9 1/6] vduse: add v1 API definition Eugenio Pérez
2025-11-13 11:55 ` [PATCH v9 2/6] vduse: add vq group support Eugenio Pérez
2025-11-13 11:55 ` [PATCH v9 3/6] vduse: return internal vq group struct as map token Eugenio Pérez
2025-11-13 11:55 ` Eugenio Pérez [this message]
2025-11-13 11:55 ` [PATCH v9 5/6] vduse: add vq group asid support Eugenio Pérez
2025-11-14  0:55   ` Jason Wang
2025-11-14 11:25     ` Eugenio Perez Martin
2025-11-17  4:23       ` Jason Wang
2025-11-17 12:15         ` Eugenio Perez Martin
2025-11-19  2:38           ` Jason Wang
2025-11-19  9:26             ` Eugenio Perez Martin
2025-11-19  9:32               ` Michael S. Tsirkin
2025-11-19 10:38                 ` Eugenio Perez Martin
2025-11-19 12:29                   ` Michael S. Tsirkin
2025-11-20  1:37               ` Jason Wang
2025-12-03  7:57                 ` Eugenio Perez Martin
2025-12-04  2:15                   ` Jason Wang
2025-12-04  8:32                     ` Eugenio Perez Martin
2025-12-05  1:51                       ` Jason Wang
2025-12-05 15:30                         ` Eugenio Perez Martin
2025-12-08  2:58                           ` Jason Wang
2025-11-17 10:50       ` Michael S. Tsirkin
2025-11-17 12:16         ` Eugenio Perez Martin
2025-11-17  3:10   ` 谢永吉
2025-11-17  9:08     ` Eugenio Perez Martin
2025-11-13 11:55 ` [PATCH v9 6/6] vduse: bump version number Eugenio Pérez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251113115558.1277981-5-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lulu@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mcoqueli@redhat.com \
    --cc=mst@redhat.com \
    --cc=sgarzare@redhat.com \
    --cc=virtualization@lists.linux.dev \
    --cc=xieyongji@bytedance.com \
    --cc=xuanzhuo@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®