From nobody Thu May 2 16:18:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685727312; cv=none; d=zohomail.com; s=zohoarc; b=eevZRJJox+Kg0aQGk9yJJ4y4nFLFk08KOjypKrcyl7Kuw0vY2Lrm8zLIRNA97q33elkhG9Is2P18U3sEgDlPme2f3zAnGH2OCR1oW8SqaKQuePyMKpAnJpX3ERmhlzXTyRxr9WDtaZKqFPT9H9pUpTBAr/f2elvffyWo0KfaSuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685727312; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=dh/KeCFnpGk2r0y1B/GAIpXx/I5UH++QCdoPy+EO9io=; b=BGMxHc32GTzdmFai/OO0BUP8gCVSOPvGdwiesQHzq/3hl00c1V1ULeBp1XU3j9gnQLK98lI0Bmxqsc+KW+NRZYUoRh58I0h//pRwMe+SKlhaUVCm7SaKOKvZ4I6zh1WuSxSGv7t4Czh4Z3iJyzH19bjikXKlSY7YBwZev6TRqvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1685727312771101.99026989540039; Fri, 2 Jun 2023 10:35:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q58g6-0003wB-AP; Fri, 02 Jun 2023 13:35:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q58fz-0003hy-Sv for qemu-devel@nongnu.org; Fri, 02 Jun 2023 13:35:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q58fy-0001vx-HG for qemu-devel@nongnu.org; Fri, 02 Jun 2023 13:34:59 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-354-vkhuOdFaMWiygdUQF5uGqw-1; Fri, 02 Jun 2023 13:34:54 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 407941C05158; Fri, 2 Jun 2023 17:34:54 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F4BF492B0A; Fri, 2 Jun 2023 17:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685727298; 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; bh=dh/KeCFnpGk2r0y1B/GAIpXx/I5UH++QCdoPy+EO9io=; b=NnKGvaYzYP7s2xoFatAK7gFUEehgfGZbCZG3+yCt4USAMHHqOkw5gtIn8ky9ROAtw0QjCr oSMn9ztLGiThYxb5RRusn7lyOc336xEzhyr+gaqS6XO8DakQUOKHjvdcNeri+T7okv8jM0 TE7b3RnHiV0zVIJEU1evhcP8wElLPCo= X-MC-Unique: vkhuOdFaMWiygdUQF5uGqw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cindy Lu , "Michael S. Tsirkin" , Laurent Vivier , Lei Yang , Jason Wang , Hawkins Jiawei Subject: [PATCH] vdpa: fix not using CVQ buffer in case of error Date: Fri, 2 Jun 2023 19:34:51 +0200 Message-Id: <20230602173451.1917999-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685727314550100002 Bug introducing when refactoring. Otherway, the guest never received the used buffer. Fixes: be4278b65fc1 ("vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_= net_handle_ctrl_avail") Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Tested-by: Lei Yang --- net/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 16d47f7b3c..5360924ba0 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -807,7 +807,7 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadow= Virtqueue *svq, } =20 if (*s->status !=3D VIRTIO_NET_OK) { - return VIRTIO_NET_ERR; + goto out; } =20 status =3D VIRTIO_NET_ERR; --=20 2.31.1