From mboxrd@z Thu Jan 1 00:00:00 1970 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 639551519B4 for ; Sat, 10 Jan 2026 23:49:40 +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=1768088981; cv=none; b=UfaPux8ZceB3UUuXkjL5iylBprsnD3GrAcOq7Ur0wmht4KrX4HebEX49ag0IdsawCQL0Yam/GFRTRNqdtOsUTXwqE3jpjrZlkOK+p5kHN2oV4NhpSaZe2jJSWs1oVPUIUgtEsE9UZOI1tvoo0gqhd9ka6roHB+a814YItVUKlbQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768088981; c=relaxed/simple; bh=ywkmT19fvcODYWaHy+o4MdzSP0DRkGuaOlqiSNGtiiU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=TGDKOK9keANQJ1ikXwROH15iYguUdziyXRxIGDqTDSMkaMxDpOXZkwo8VgBdA0RMylAliMsDPbj3ZgiYk3Hpka29f3GUk/Q8sK715u1z8Jp+QYH/rZTRiwi+PPHXlVjtZfq37f43TiSVTjeOYtzmzZc2OMuIAgplm9zXpOVOf2s= 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=ft9MQg5a; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=SpA9tHoU; 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="ft9MQg5a"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="SpA9tHoU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768088979; 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=nksX34u+zq7KDVyqe7hemXG/aIx66LziluisrlBZomg=; b=ft9MQg5avKEFX4suFWCx46PBkLlPeKs5alNVN7m2+rA0wjKIMw3SrKeNE/qLtnLprCs55+ ceBk204jwFUnaWukI79xAVeITa3NpeBJubHi8E1cSRjxeDJjJb1fZQ4Yq2PREi7ZEqyttZ iKLt7BvPfHZJd/aqDnU3hS5OTcuQ+CE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-cnlq401CPGeO5LeAe00A8Q-1; Sat, 10 Jan 2026 18:49:38 -0500 X-MC-Unique: cnlq401CPGeO5LeAe00A8Q-1 X-Mimecast-MFC-AGG-ID: cnlq401CPGeO5LeAe00A8Q_1768088977 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4775f51ce36so48818645e9.1 for ; Sat, 10 Jan 2026 15:49:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768088977; x=1768693777; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=nksX34u+zq7KDVyqe7hemXG/aIx66LziluisrlBZomg=; b=SpA9tHoU/8FPj7ylLAyCyDUAXSC69kcVhlpiiQYq8WIJiJF1htDnJKwvjLVEsd02nO I3CDiYYyq8JQ3GcwL3bZ9K1Pwfb2oMej0Od4gHJNJ0XyFOJxBJYRUcMurigsE2Y1OC6M YjpbnVJkrys8ZVFeDo4g2AXe8aMyKo4psIMrykZlb4Lu78eIyBhwTQsYQtElocSexDEf g36Q7IMZglPV98r/hBUO7oqJcQ2m1fdBMdhMXELPG0HuIx4OR+B3UiVSsOVpfv0tKqaT 4zHQaf8Mumye2Gh8HUN2/+vWD9wWStdY3OMkhkKwnqIJgMpq3Yy1xgPbW/bVp9zgUi7i t11g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768088977; x=1768693777; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nksX34u+zq7KDVyqe7hemXG/aIx66LziluisrlBZomg=; b=G8srMUql9a4M8IXAR5tUQGHxUbGk3OX33MBZONR8bVZ9b70xNm/qMbxPeWtcw92ib7 beEn+JaFq9oTgsu3Uas/AHSvqyOw68e/rrAWxYgqU86aa6dzhaLzz2kl8g/MwrfiFLnP HHxw7gnt33FkKE7ePaXR/sSvtrE4Jbeb44NSk3/JA4EY/abY/XUjwx9yf3FM2G5a/N+m kmx74GY77fStATMxUxy0gTxYqlxV93V/36j3O8S+I0J51sz0L/+tB/8vU0ssj+MrWrg8 WZmGrvXe8x/tLERwGowm7HUn2W4JS9Rf7sENmD1QqlrfJV6FEEJRnRwWoQFF+2dRWX9u EXzA== X-Gm-Message-State: AOJu0YzN1Ysgn727794wzFjesqh4scFSvI3QAfss8vpHY+lGM0smWTd5 nkclY0zY5kCiEYlDn59rtqUOuYKtAeYYltuWgRku+f6cYJoR8KTpymcpvcoQgI+JcTE8iFIHh4u PWAA26r4ekCXcizZxRrsnfMLoMY/vZLfinkQR+TparocaBJq0uUtqWliXboB7T6VVsQ== X-Gm-Gg: AY/fxX57z33TAHYvEbJOm5gLa1e98NzKd8hDJYaQfBFlcPw60fZw34J9mp9FYt5giDg KdfuG75GEnu+3MbNHt4ip6zpawHMh/6XeFvSXgpkDezirMNVOiq3JkZVMhQOy8BPTVuXt6ssEi6 cHbMJrthHuZi+AiV/b/ObH6nhGjhM8ijLRE+jtX4/R8xkhXeEQyEWHtWccHgJ+DNbf3R63DUmkK 3qhfqMPy4TBL9GjF2OMMWhjUXqbF+P4b8wg8hKuplbrhuTWJ23be9AAe1NFG8Ums4MD/Mqk9RIs QwfAi2tGeA00chyvc8qvtIRU1S7uzGO2a8J1JHo/bqReZ1efFxVNEw4/qd+n/DPONksDnKEwY0s j85OdFeJQa3d+GlbwNAGimKiJEtkQ9lg= X-Received: by 2002:a05:6000:4301:b0:431:864:d48f with SMTP id ffacd0b85a97d-432c37746c9mr15169991f8f.27.1768088976941; Sat, 10 Jan 2026 15:49:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEF1xlqAdt2YFNNLBzxt86rJlusfYuOKpjkZGykzrrRj1y05yr5e6zjlirW1YfIneeou+Ak+g== X-Received: by 2002:a05:6000:4301:b0:431:864:d48f with SMTP id ffacd0b85a97d-432c37746c9mr15169978f8f.27.1768088976546; Sat, 10 Jan 2026 15:49:36 -0800 (PST) Received: from redhat.com (IGLD-80-230-35-22.inter.net.il. [80.230.35.22]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432bd0e199bsm29991360f8f.16.2026.01.10.15.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jan 2026 15:49:35 -0800 (PST) Date: Sat, 10 Jan 2026 18:49:32 -0500 From: "Michael S. Tsirkin" To: Eugenio =?iso-8859-1?Q?P=E9rez?= Cc: linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Maxime Coquelin , Laurent Vivier , Cindy Lu , jasowang@redhat.com, Xuan Zhuo , Stefano Garzarella , Yongji Xie Subject: Re: [PATCH v11 07/12] vduse: refactor vdpa_dev_add for goto err handling Message-ID: <20260110184915-mutt-send-email-mst@kernel.org> References: <20260109152430.512923-1-eperezma@redhat.com> <20260109152430.512923-8-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=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260109152430.512923-8-eperezma@redhat.com> On Fri, Jan 09, 2026 at 04:24:25PM +0100, Eugenio Pérez wrote: > Next patches introduce more error paths in this function. Refactor it > so they can be accomodated through gotos. accommodated > > Acked-by: Jason Wang > Reviewed-by: Xie Yongji > Signed-off-by: Eugenio Pérez > --- > 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 0386434577b5..f7a45f396cf8 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 = -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.52.0