From patchwork Tue Jul 2 20:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 13720213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 66F05C3065C for ; Tue, 2 Jul 2024 20:16:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOjuT-0004yb-8i; Tue, 02 Jul 2024 16:15:29 -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 1sOjuQ-0004lm-7w for qemu-devel@nongnu.org; Tue, 02 Jul 2024 16:15:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOjuN-0007oR-UP for qemu-devel@nongnu.org; Tue, 02 Jul 2024 16:15:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719951323; 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=ZMYpex8C2s46cF0GfMcoGvUcCxmqXFvGY/Nt+8TTLHo=; b=IaUlz+CsFxjCagO54Es7WaDja3uXrtzylBzxaKoS2iRySS3pdibD7EjN78Ust1gbhwVHvp USAlZTykW+5RkSOMx9e680rV7Xose7/Z/48+o4omo/hIxaUWZ9mqRZWCBcka8KZjcgc48V PMTajJo0bDWS8KyUPYth3HP/rcT8zVs= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-jpqhGV1kM-isQc4lIhYPxw-1; Tue, 02 Jul 2024 16:15:21 -0400 X-MC-Unique: jpqhGV1kM-isQc4lIhYPxw-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-425657ac234so31655615e9.1 for ; Tue, 02 Jul 2024 13:15:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719951319; x=1720556119; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZMYpex8C2s46cF0GfMcoGvUcCxmqXFvGY/Nt+8TTLHo=; b=XfxqxrKfHcoU31pp0TMML185xEGFhZqGQZ2JA9nZ3Z7Lpc+A4g+CpsMbhM8j4L9tHP ANUqu4OULBS6EVCnZLQYKNiTltCdSnJ2yOFYjdqAtNKrPLnqrNQbWZRYMmqq/7x2ZM9u BeRmK0dq1EU9UDtfzGOM/huoU7Q/qBCgE1zofjBc4GKLt62OZnBh/pqErpv6E8oAaCe7 g2WztnB33XDJFKZbQ0ykYmX3C8Fa+Ew1TQCCkgbX17MjZnwkHNfI0qSalRG5bB6FIH0I hc6VU+81iOl7N5TXfVCFt6OLKQ3hIlfWAZfDOHio8ljr9rTPz/Lwx2AYjI9EZRNPugTK Y+4Q== X-Gm-Message-State: AOJu0Yy3aOsHha7lbCBQiKIkL26ansVq8Yfh4EyHzixcjcP2JF7KNvaI 9oJl49x1WCv3oTdPcnVs7afuc51LAp5YmQc1mW6g77uQffkc/J5/tNsM4L4J0UttkffxQzNGXx0 yjSX4w5w5Xi4UZ/CtzEzaKGRC1wWgsvApfk5EVVr3zJf5zlqsRe+oleZZT1OwvKTj2qZ6weVZ0e YbmpJYVVpyJHFIxheqRJy3/kDCHg1qdQ== X-Received: by 2002:a05:600c:ac6:b0:425:6b33:d2a7 with SMTP id 5b1f17b1804b1-4257a088f8bmr73950475e9.37.1719951319256; Tue, 02 Jul 2024 13:15:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvib1e7m8Ne+DjiaqgkxinhEQjLiyFfiHEegGWWhvUSy4v0iyi6ZVriguZ64aSpRG/toEhfA== X-Received: by 2002:a05:600c:ac6:b0:425:6b33:d2a7 with SMTP id 5b1f17b1804b1-4257a088f8bmr73950095e9.37.1719951318237; Tue, 02 Jul 2024 13:15:18 -0700 (PDT) Received: from redhat.com ([2a02:14f:1f5:eadd:8c31:db01:9d01:7604]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b06377dsm212042075e9.28.2024.07.02.13.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 13:15:17 -0700 (PDT) Date: Tue, 2 Jul 2024 16:15:14 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Garzarella , Eugenio =?utf-8?b?UMOpcmV6?= , Jason Wang , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= Subject: [PULL v2 03/88] vhost-vdpa: check vhost_vdpa_set_vring_ready() return value Message-ID: <9d5a807c4cb56837f11be9a9250f854fab951290.1719951168.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stefano Garzarella vhost_vdpa_set_vring_ready() could already fail, but if Linux's patch [1] will be merged, it may fail with more chance if userspace does not activate virtqueues before DRIVER_OK when VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK is not negotiated. So better check its return value anyway. [1] https://lore.kernel.org/virtualization/20240206145154.118044-1-sgarzare@redhat.com/T/#u Acked-by: Eugenio Pérez Acked-by: Jason Wang Signed-off-by: Stefano Garzarella Message-Id: <20240322092315.31885-1-sgarzare@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- net/vhost-vdpa.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 85e73dd6a7..eda714d1a4 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -399,7 +399,10 @@ static int vhost_vdpa_net_data_load(NetClientState *nc) } for (int i = 0; i < v->dev->nvqs; ++i) { - vhost_vdpa_set_vring_ready(v, i + v->dev->vq_index); + int ret = vhost_vdpa_set_vring_ready(v, i + v->dev->vq_index); + if (ret < 0) { + return ret; + } } return 0; } @@ -1238,7 +1241,10 @@ static int vhost_vdpa_net_cvq_load(NetClientState *nc) assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA); - vhost_vdpa_set_vring_ready(v, v->dev->vq_index); + r = vhost_vdpa_set_vring_ready(v, v->dev->vq_index); + if (unlikely(r < 0)) { + return r; + } if (v->shadow_vqs_enabled) { n = VIRTIO_NET(v->dev->vdev); @@ -1277,7 +1283,10 @@ static int vhost_vdpa_net_cvq_load(NetClientState *nc) } for (int i = 0; i < v->dev->vq_index; ++i) { - vhost_vdpa_set_vring_ready(v, i); + r = vhost_vdpa_set_vring_ready(v, i); + if (unlikely(r < 0)) { + return r; + } } return 0;