From nobody Sat Feb 7 10:07:54 2026 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 5EA0B3803F1 for ; Mon, 19 Jan 2026 14:33:45 +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=1768833226; cv=none; b=LWxkxIgTJGPojSkY/8y5Fa8XKRs9cWcWOfM2djYjPelkT2TRhMQmCiuCwDJfVfO45bwqbdjGQSKEFsfof/pr+SRR+fRkYJudmZANpgtscsXgVwKi4aXMNPhDPln94WBmf8vwVKGBpPD5UDDodyQmx/S8jJTxuFWNn8/VqIzHhDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768833226; c=relaxed/simple; bh=7WkiaFQXSJ9rftIhsrRPJDimmW5NW0HIRoiDY1dK0Yc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d9E2odDVWWPe1W+lzc4eFBIsPuq6LEBTf/er5l1l20KasuxIetj3xTZR9mFZGH6y84frVy2CkaRjfy+lXQEk0YdNA4jBpWfhYhU05sL4/DuFsSCIKj0DhhPhdL6KEiCoCRv57IEZe+V9dSIip41XaRjT8rX9hXrRNX9HGgXQQlU= 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=LsYlHg9Y; 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="LsYlHg9Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768833224; 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=f3i9Zfy1TusGrkGCrHl6HZAZANNAsOmF+dD9gg6kSpw=; b=LsYlHg9Y/lKHYtro4Mrp2/wycR3I7lTYPN1A3Gon+mZ/C61bpwcgm8SGvz9FBU/yCcYx6D ahq14wZa5Mn0Vygo5CdaOtWTADdLBoxtm14e3oyxWf4iRn3iFw8LTESBF4/lMvTVxFXVD1 xtdhoNqbqD7TRB0Bt9FHD1saipavPYc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-600-WQGgtf7nMUmilmjflzxOVg-1; Mon, 19 Jan 2026 09:33:41 -0500 X-MC-Unique: WQGgtf7nMUmilmjflzxOVg-1 X-Mimecast-MFC-AGG-ID: WQGgtf7nMUmilmjflzxOVg_1768833220 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4C3901800350; Mon, 19 Jan 2026 14:33:40 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.33.172]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DE6541800577; Mon, 19 Jan 2026 14:33:36 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: virtualization@lists.linux.dev, Yongji Xie , Xuan Zhuo , Maxime Coquelin , Stefano Garzarella , jasowang@redhat.com, =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Laurent Vivier , Cindy Lu , linux-kernel@vger.kernel.org Subject: [PATCH v15 07/13] vduse: refactor vdpa_dev_add for goto err handling Date: Mon, 19 Jan 2026 15:33:00 +0100 Message-ID: <20260119143306.1818855-8-eperezma@redhat.com> In-Reply-To: <20260119143306.1818855-1-eperezma@redhat.com> References: <20260119143306.1818855-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 accommodated through gotos. Acked-by: Jason Wang Reviewed-by: Xie Yongji Signed-off-by: Eugenio P=C3=A9rez --- v12: Fix typo in patch message (MST). 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 68290c3d9d8f..43851b0711ac 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -2171,21 +2171,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