From nobody Sat May 18 07:09:02 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=1692694510; cv=none; d=zohomail.com; s=zohoarc; b=DEY8rOfndwY3QcfQPmjSWGZx6+93EYfCuQrKxfsGqR7J+yU2djTP6WblAbqYmD9gK3z6aaf3pw2CJ/cqf/2+tQVs6oLlicjLmBhjrh//lfmL4BIzp/+j7FShnHdvU7F+RG5f7KoQ0wJIXGkzs0yBedD3jTh2K3D2op/fUtrU01c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692694510; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ewp0BEGfM6EEnx38F/+2D1JCX20zKuYl9VPnAZOhv5U=; b=d9syvtVl1HQwEfYTWwF11KL/HWMA7fwQ9rifS/0XOubgfP8YABU+4v4SXRyzwc4na6Pjw889BawHmYHoSFX2UmyqYIYe21gNpB5nt06L5xqJewCMmIfll+UJB8TZ3EvtdueKATaGn9FUXkOZ4Zpwi8MIunW015G5ce8b/cyh2uM= 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 1692694510866504.72716872791113; Tue, 22 Aug 2023 01:55:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYN90-0005EN-Fl; Tue, 22 Aug 2023 04:53:46 -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 1qYN8z-0005EF-M5 for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:45 -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 1qYN8w-0000dj-NH for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:45 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-550-g8YjKZ3kNdCezU7c-8KuSw-1; Tue, 22 Aug 2023 04:53:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1B43101A528; Tue, 22 Aug 2023 08:53:37 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8161A40BC71B; Tue, 22 Aug 2023 08:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692694422; 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=ewp0BEGfM6EEnx38F/+2D1JCX20zKuYl9VPnAZOhv5U=; b=BZR8x3JnvfmNkcXfMreiYtiWbtOBaEyTJilfRL9hL1xrjnPlCgPYb3FhKUA8/VlQOZlqr/ ro2XbuN1YdQA90Tk6rdXpvUBty7fHOdEmTLXrqAVQyuuUMkrFoDXOfuyPXAT5KWmtsrOnD +afhvtz0CLc1qXe2m7ciPYmpxXjHZEw= X-MC-Unique: g8YjKZ3kNdCezU7c-8KuSw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Harpreet Singh Anand , Shannon Nelson , Stefano Garzarella , Lei Yang , "Michael S. Tsirkin" , Hawkins Jiawei , Dragos Tatulea , Gautam Dawar , si-wei.liu@oracle.com, Zhu Lingshan , Jason Wang , Parav Pandit , Cindy Lu Subject: [PATCH v3 1/5] vdpa: use first queue SVQ state for CVQ default Date: Tue, 22 Aug 2023 10:53:26 +0200 Message-Id: <20230822085330.3978829-2-eperezma@redhat.com> In-Reply-To: <20230822085330.3978829-1-eperezma@redhat.com> References: <20230822085330.3978829-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.2 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: -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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692694511553100009 Previous to this patch the only way CVQ would be shadowed is if it does support to isolate CVQ group or if all vqs were shadowed from the beginning. The second condition was checked at the beginning, and no more configuration was done. After this series we need to check if data queues are shadowed because they are in the middle of the migration. As checking if they are shadowed already covers the previous case, let's just mimic it. 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 9795306742..a772540250 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -505,7 +505,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc) =20 s0 =3D vhost_vdpa_net_first_nc_vdpa(s); v->shadow_data =3D s0->vhost_vdpa.shadow_vqs_enabled; - v->shadow_vqs_enabled =3D s->always_svq; + v->shadow_vqs_enabled =3D s0->vhost_vdpa.shadow_vqs_enabled; s->vhost_vdpa.address_space_id =3D VHOST_VDPA_GUEST_PA_ASID; =20 if (s->vhost_vdpa.shadow_data) { --=20 2.39.3 From nobody Sat May 18 07:09:02 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=1692694509; cv=none; d=zohomail.com; s=zohoarc; b=f8gVSLWw6SALUfmTrCiyFX92V86YC5Lq3vMHeNhlPxSuiOLyi7R6ilp3Fe/I0KfIFJDVWtIN37KQKKvwqSQLYkgqFoM4IeUk2gSp06DqEbvyhOxNS4lKcO+1TsS3IKCA54uZ1auHvlYPGWuTh7n3nnRirJxrzLHyaGluh2acbJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692694509; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sN6hUcBG/m2dmC5bPzPlcPUfvywRtZL8/dZ0pwpfeoA=; b=agiXhwmyIYIYekn/JG/+T/aT7XeWOBbVpOMDCcDKtwzZzwC4O8puYvD6bDLLa/h5d4h91kfvwUJnATDlEswQPzYatHDh8RgJcJETZTDXnSju1/j8PqcAgzumxi2bU7wLdmWu7KYAL68IycSDEGrnnirJzkwYTwa+8n4IMlfHF0w= 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 1692694509206736.866668198816; Tue, 22 Aug 2023 01:55:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYN92-0005Er-WD; Tue, 22 Aug 2023 04:53:49 -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 1qYN91-0005Ej-VT for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:48 -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 1qYN8z-0000e7-O2 for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:47 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-271-m5UpCl4HPNC4KglrBeEJ3Q-1; Tue, 22 Aug 2023 04:53:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E08A1C0754C; Tue, 22 Aug 2023 08:53:40 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E32B40D2843; Tue, 22 Aug 2023 08:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692694425; 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=sN6hUcBG/m2dmC5bPzPlcPUfvywRtZL8/dZ0pwpfeoA=; b=PlWBqpk6cpZ2WzOaYRtBJhsU4LHzDMwh4qiYO5AsXMyxURtSZHTReqyZDUBuc9zhs6Xqwo wa0jsbrYS8B2LJMqjReP/buoJxOdUhW4a1K2v0BKmL9gILbM8CBSW7IKCWCVpvIkNspX7y 8BpYWM3i8/1HA9v6NWGSrXpPnoyaRxo= X-MC-Unique: m5UpCl4HPNC4KglrBeEJ3Q-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Harpreet Singh Anand , Shannon Nelson , Stefano Garzarella , Lei Yang , "Michael S. Tsirkin" , Hawkins Jiawei , Dragos Tatulea , Gautam Dawar , si-wei.liu@oracle.com, Zhu Lingshan , Jason Wang , Parav Pandit , Cindy Lu Subject: [PATCH v3 2/5] vdpa: export vhost_vdpa_set_vring_ready Date: Tue, 22 Aug 2023 10:53:27 +0200 Message-Id: <20230822085330.3978829-3-eperezma@redhat.com> In-Reply-To: <20230822085330.3978829-1-eperezma@redhat.com> References: <20230822085330.3978829-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.2 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.129.124; envelope-from=eperezma@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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692694509983100007 The vhost-vdpa net backend needs to enable vrings in a different order than default, so export it. No functional change intended except for tracing, that now includes the (virtio) index being enabled and the return value of the ioctl. Still ignoring return value of this function if called from vhost_vdpa_dev_start, as reorganize calling code around it is out of the scope of this series. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Tested-by: Lei Yang --- include/hw/virtio/vhost-vdpa.h | 1 + hw/virtio/vhost-vdpa.c | 25 +++++++++++++------------ hw/virtio/trace-events | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index e64bfc7f98..5407d54fd7 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -57,6 +57,7 @@ typedef struct vhost_vdpa { } VhostVDPA; =20 int vhost_vdpa_get_iova_range(int fd, struct vhost_vdpa_iova_range *iova_r= ange); +int vhost_vdpa_set_vring_ready(struct vhost_vdpa *v, unsigned idx); =20 int vhost_vdpa_dma_map(struct vhost_vdpa *v, uint32_t asid, hwaddr iova, hwaddr size, void *vaddr, bool readonly); diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 42f2a4bae9..0d9975b5b5 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -876,18 +876,17 @@ static int vhost_vdpa_get_vq_index(struct vhost_dev *= dev, int idx) return idx; } =20 -static int vhost_vdpa_set_vring_ready(struct vhost_dev *dev) +int vhost_vdpa_set_vring_ready(struct vhost_vdpa *v, unsigned idx) { - int i; - trace_vhost_vdpa_set_vring_ready(dev); - for (i =3D 0; i < dev->nvqs; ++i) { - struct vhost_vring_state state =3D { - .index =3D dev->vq_index + i, - .num =3D 1, - }; - vhost_vdpa_call(dev, VHOST_VDPA_SET_VRING_ENABLE, &state); - } - return 0; + struct vhost_dev *dev =3D v->dev; + struct vhost_vring_state state =3D { + .index =3D idx, + .num =3D 1, + }; + int r =3D vhost_vdpa_call(dev, VHOST_VDPA_SET_VRING_ENABLE, &state); + + trace_vhost_vdpa_set_vring_ready(dev, idx, r); + return r; } =20 static int vhost_vdpa_set_config_call(struct vhost_dev *dev, @@ -1298,7 +1297,9 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev= , bool started) if (unlikely(!ok)) { return -1; } - vhost_vdpa_set_vring_ready(dev); + for (int i =3D 0; i < dev->nvqs; ++i) { + vhost_vdpa_set_vring_ready(v, dev->vq_index + i); + } } else { vhost_vdpa_suspend(dev); vhost_vdpa_svqs_stop(dev); diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 7109cf1a3b..1cb9027d1e 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -48,7 +48,7 @@ vhost_vdpa_set_features(void *dev, uint64_t features) "de= v: %p features: 0x%"PRI vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "dev: %p device_id= %"PRIu32 vhost_vdpa_reset_device(void *dev) "dev: %p" vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d v= q idx: %d" -vhost_vdpa_set_vring_ready(void *dev) "dev: %p" +vhost_vdpa_set_vring_ready(void *dev, unsigned i, int r) "dev: %p, idx: %u= , r: %d" vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s" vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t = flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32 vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: = %p config: %p config_len: %"PRIu32 --=20 2.39.3 From nobody Sat May 18 07:09:02 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=1692694482; cv=none; d=zohomail.com; s=zohoarc; b=LPpP8s9FZoX+1KL3QpCBROAaRQEX/PlVkJe8wb6a5b8tMpUuHL4LlGhRqVyv+gXWV+rHjaGnm8oGaeBBgmO6ncIZEKdFS9bdURQ/lfGNcxmYEby9UAghUTcAmGsI9JWy1Bqyg4zYDGoK/vgIqCNC4JLdBgIhIY95vkzqdffLhZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692694482; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gfDQ2tI0ZC7+szCsKrwlOBQ2RFocR05VSdrNf+Fia7I=; b=JQ+Cdtedzdo2bHPt7QnVZNaBJIO5Axubx9o4UF/zaG9Hz5D/iB5XybnCVVXSrA95Q1xV1p37juUV93es9Rgn6OTcWJfi/Yp3u0Q03QncTYAHAfmNPn6P77SviGbE8uldBz8SwJ4AUNhzKTNsoldoSyBHySREU6kR0OG7u008YkA= 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 1692694482721338.0908480013262; Tue, 22 Aug 2023 01:54:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYN98-0005Fb-Je; Tue, 22 Aug 2023 04:53:54 -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 1qYN96-0005FE-5z for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:52 -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 1qYN93-0000ef-Fm for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-588-HZy_PUwiNq2Sr5mzxtxpBg-1; Tue, 22 Aug 2023 04:53:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0AEC0101A528; Tue, 22 Aug 2023 08:53:43 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD9AA40D2843; Tue, 22 Aug 2023 08:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692694428; 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=gfDQ2tI0ZC7+szCsKrwlOBQ2RFocR05VSdrNf+Fia7I=; b=FIlsX64/FunPt87DAzqBteDXD/EFqVWZLxdrd9lDYPBsL+kJnZWE2YiFwLBtAWgwlTEexW TdQHmsmgK6XIG7O1mCNVm59P3t2QFPR/vNVRl1AldB0pdSxHm80ZQCsn96O8lxvsvMZS6l 0y5spoE4ETIKE1lf79tr3mNP8fPfF4U= X-MC-Unique: HZy_PUwiNq2Sr5mzxtxpBg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Harpreet Singh Anand , Shannon Nelson , Stefano Garzarella , Lei Yang , "Michael S. Tsirkin" , Hawkins Jiawei , Dragos Tatulea , Gautam Dawar , si-wei.liu@oracle.com, Zhu Lingshan , Jason Wang , Parav Pandit , Cindy Lu Subject: [PATCH v3 3/5] vdpa: rename vhost_vdpa_net_load to vhost_vdpa_net_cvq_load Date: Tue, 22 Aug 2023 10:53:28 +0200 Message-Id: <20230822085330.3978829-4-eperezma@redhat.com> In-Reply-To: <20230822085330.3978829-1-eperezma@redhat.com> References: <20230822085330.3978829-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.2 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: -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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692694483458100003 Next patches will add the corresponding data load. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Tested-by: Lei Yang --- net/vhost-vdpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index a772540250..9251351b4b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -965,7 +965,7 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s, return 0; } =20 -static int vhost_vdpa_net_load(NetClientState *nc) +static int vhost_vdpa_net_cvq_load(NetClientState *nc) { VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); struct vhost_vdpa *v =3D &s->vhost_vdpa; @@ -1004,7 +1004,7 @@ static NetClientInfo net_vhost_vdpa_cvq_info =3D { .size =3D sizeof(VhostVDPAState), .receive =3D vhost_vdpa_receive, .start =3D vhost_vdpa_net_cvq_start, - .load =3D vhost_vdpa_net_load, + .load =3D vhost_vdpa_net_cvq_load, .stop =3D vhost_vdpa_net_cvq_stop, .cleanup =3D vhost_vdpa_cleanup, .has_vnet_hdr =3D vhost_vdpa_has_vnet_hdr, --=20 2.39.3 From nobody Sat May 18 07:09:02 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=1692694506; cv=none; d=zohomail.com; s=zohoarc; b=A/+JtPnbHDNUE1fJtl3RLc4+7WIF5gF1yozUzdXKZBlpKiMmx1o12T/szzC6N59fXsx+/3b0T6zuZjXVpZEqMOZi2+H1+5+7sIaGWVyH6zQ5DbNQTtLMEhOC6EcMA2bCBzGQ4InGNcGt8tPoUqeL1DTKk3lXlBANbqxKhR8hfFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692694506; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3MjM4WGTcqRAobIkJBfOpqs5hQu8bykmHxgeNVKjCaE=; b=K+MBxCY0YTz42HGIFTHNibslJziSc78D40pX36ZRqY+Ih8Lx+WzR5+T0PoY1HnNaPjg6Y8jdlihDVYLqdEGJmQ60b0UQ2QFcyRttTaOg/+i03BIsUGLh7jTnW5DuybfKJ8baEyaTS9+vSB9h1ee868V+OXVgZl7njwgXUr6HJG0= 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 169269450667520.640486347760884; Tue, 22 Aug 2023 01:55:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYN9A-0005Fq-UV; Tue, 22 Aug 2023 04:53:56 -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 1qYN98-0005Fc-Pf for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:55 -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 1qYN96-0000ev-G3 for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:54 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-451-BJY0Vi69MLSlwTkb6_nYNg-1; Tue, 22 Aug 2023 04:53:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A11768D40A1; Tue, 22 Aug 2023 08:53:45 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D18F40D2843; Tue, 22 Aug 2023 08:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692694431; 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=3MjM4WGTcqRAobIkJBfOpqs5hQu8bykmHxgeNVKjCaE=; b=G0cS8aRkCddca9kb9cEoEQT+2dlrnE/oVE2k0s3X78DW3ZgNmcmcuPb+OmlfR6hofW/2C5 OYPR24k5F0TXO0tPWz+0B0XEEl1o6WW2rgpHQepv6//wMKBdfrYPsKTeGxco3tIfx6yAQl ZBpqB65WA6knW1JF9GTAUjp9LI2R+Ds= X-MC-Unique: BJY0Vi69MLSlwTkb6_nYNg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Harpreet Singh Anand , Shannon Nelson , Stefano Garzarella , Lei Yang , "Michael S. Tsirkin" , Hawkins Jiawei , Dragos Tatulea , Gautam Dawar , si-wei.liu@oracle.com, Zhu Lingshan , Jason Wang , Parav Pandit , Cindy Lu Subject: [PATCH v3 4/5] vdpa: move vhost_vdpa_set_vring_ready to the caller Date: Tue, 22 Aug 2023 10:53:29 +0200 Message-Id: <20230822085330.3978829-5-eperezma@redhat.com> In-Reply-To: <20230822085330.3978829-1-eperezma@redhat.com> References: <20230822085330.3978829-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.2 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.129.124; envelope-from=eperezma@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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692694508006100003 Doing that way allows CVQ to be enabled before the dataplane vqs, restoring the state as MQ or MAC addresses properly in the case of a migration. The patch does it by defining a ->load NetClientInfo callback also for dataplane. Ideally, this should be done by an independent patch, but the function is already static so it would only add an empty vhost_vdpa_net_data_load stub. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Tested-by: Lei Yang --- v3: * Fix subject typo * Expand patch message so it explains why --- hw/virtio/vdpa-dev.c | 3 +++ hw/virtio/vhost-vdpa.c | 3 --- net/vhost-vdpa.c | 57 +++++++++++++++++++++++++++++------------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index 363b625243..f22d5d5bc0 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -255,6 +255,9 @@ static int vhost_vdpa_device_start(VirtIODevice *vdev, = Error **errp) error_setg_errno(errp, -ret, "Error starting vhost"); goto err_guest_notifiers; } + for (i =3D 0; i < s->dev.nvqs; ++i) { + vhost_vdpa_set_vring_ready(&s->vdpa, i); + } s->started =3D true; =20 /* diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 0d9975b5b5..8ca2e3800c 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1297,9 +1297,6 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev= , bool started) if (unlikely(!ok)) { return -1; } - for (int i =3D 0; i < dev->nvqs; ++i) { - vhost_vdpa_set_vring_ready(v, dev->vq_index + i); - } } else { vhost_vdpa_suspend(dev); vhost_vdpa_svqs_stop(dev); diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 9251351b4b..3bf60f9431 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -371,6 +371,22 @@ static int vhost_vdpa_net_data_start(NetClientState *n= c) return 0; } =20 +static int vhost_vdpa_net_data_load(NetClientState *nc) +{ + VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); + struct vhost_vdpa *v =3D &s->vhost_vdpa; + bool has_cvq =3D v->dev->vq_index_end % 2; + + if (has_cvq) { + return 0; + } + + for (int i =3D 0; i < v->dev->nvqs; ++i) { + vhost_vdpa_set_vring_ready(v, i + v->dev->vq_index); + } + return 0; +} + static void vhost_vdpa_net_client_stop(NetClientState *nc) { VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); @@ -393,6 +409,7 @@ static NetClientInfo net_vhost_vdpa_info =3D { .size =3D sizeof(VhostVDPAState), .receive =3D vhost_vdpa_receive, .start =3D vhost_vdpa_net_data_start, + .load =3D vhost_vdpa_net_data_load, .stop =3D vhost_vdpa_net_client_stop, .cleanup =3D vhost_vdpa_cleanup, .has_vnet_hdr =3D vhost_vdpa_has_vnet_hdr, @@ -974,26 +991,30 @@ static int vhost_vdpa_net_cvq_load(NetClientState *nc) =20 assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA); =20 - if (!v->shadow_vqs_enabled) { - return 0; - } + vhost_vdpa_set_vring_ready(v, v->dev->vq_index); =20 - n =3D VIRTIO_NET(v->dev->vdev); - r =3D vhost_vdpa_net_load_mac(s, n); - if (unlikely(r < 0)) { - return r; - } - r =3D vhost_vdpa_net_load_mq(s, n); - if (unlikely(r)) { - return r; - } - r =3D vhost_vdpa_net_load_offloads(s, n); - if (unlikely(r)) { - return r; + if (v->shadow_vqs_enabled) { + n =3D VIRTIO_NET(v->dev->vdev); + r =3D vhost_vdpa_net_load_mac(s, n); + if (unlikely(r < 0)) { + return r; + } + r =3D vhost_vdpa_net_load_mq(s, n); + if (unlikely(r)) { + return r; + } + r =3D vhost_vdpa_net_load_offloads(s, n); + if (unlikely(r)) { + return r; + } + r =3D vhost_vdpa_net_load_rx(s, n); + if (unlikely(r)) { + return r; + } } - r =3D vhost_vdpa_net_load_rx(s, n); - if (unlikely(r)) { - return r; + + for (int i =3D 0; i < v->dev->vq_index; ++i) { + vhost_vdpa_set_vring_ready(v, i); } =20 return 0; --=20 2.39.3 From nobody Sat May 18 07:09:02 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=1692694489; cv=none; d=zohomail.com; s=zohoarc; b=f7JT7KFPhm3GTXuZNajm6dym0JQewaqNUHTacxp9KCbn3yHBblejybpWD+Q82VHI0CxWQyguG8Cq0IIys+UIui2kJ6wFAT6Do1DX4y7rsRMcNa7onbR7lRj8vxtZxIEL6L1m7K+WO2PzCo65cv4QdT91Q5ni2/10YXU5q/aJHwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692694489; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UyN3w0TLnWkcIkvdm4joeK/KlatGzDZvrp4yHcuTHyc=; b=NgGDBVL0tF7z26QLkKLzJ+LAR7i803RvPSB7AGjv3NuPa88Eup5QaV4mraWPWRznAU3/nnm2X1fgMxqluxrBfzpDjwK61utzVLhawqAC9YkUCwKrgDDg+PAiywR5GEhUFLT0bb5MKmxyo0R6+F42X5Tf427ImS/Go0HUzBzUTdo= 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 1692694489197858.8327331511471; Tue, 22 Aug 2023 01:54:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYN9G-0005GR-MP; Tue, 22 Aug 2023 04:54:02 -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 1qYN9C-0005G8-Im for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:59 -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 1qYN9A-0000fR-Cb for qemu-devel@nongnu.org; Tue, 22 Aug 2023 04:53:58 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-91-px4NQ1QPPV24gHdY_lR0UA-1; Tue, 22 Aug 2023 04:53:48 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 419FA3827DF3; Tue, 22 Aug 2023 08:53:48 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id E10B340D2843; Tue, 22 Aug 2023 08:53:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692694435; 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=UyN3w0TLnWkcIkvdm4joeK/KlatGzDZvrp4yHcuTHyc=; b=dPJWw8wnNTrMhNWwbh9lGtkZ0dTzzMMjzI6KFioTAeKqnaXWoHZizBoI3W+0mHdOetFLBE GKehUFAlGru+6unnZqPoVoTEroM2InlEdid1gJYGCGufWbRy41SHrUKKVqgX/s0F5qDxBZ mGF7NW+f+sTkxkq5PPO+2v02evVQEN8= X-MC-Unique: px4NQ1QPPV24gHdY_lR0UA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Harpreet Singh Anand , Shannon Nelson , Stefano Garzarella , Lei Yang , "Michael S. Tsirkin" , Hawkins Jiawei , Dragos Tatulea , Gautam Dawar , si-wei.liu@oracle.com, Zhu Lingshan , Jason Wang , Parav Pandit , Cindy Lu Subject: [PATCH v3 5/5] vdpa: remove net cvq migration blocker Date: Tue, 22 Aug 2023 10:53:30 +0200 Message-Id: <20230822085330.3978829-6-eperezma@redhat.com> In-Reply-To: <20230822085330.3978829-1-eperezma@redhat.com> References: <20230822085330.3978829-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.2 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.129.124; envelope-from=eperezma@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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1692694489561100001 Now that we have add migration blockers if the device does not support all the needed features, remove the general blocker applied to all net devices with CVQ. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Tested-by: Lei Yang --- net/vhost-vdpa.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 3bf60f9431..6bb56f7d94 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -1413,18 +1413,6 @@ static NetClientState *net_vhost_vdpa_init(NetClient= State *peer, s->vhost_vdpa.shadow_vq_ops =3D &vhost_vdpa_net_svq_ops; s->vhost_vdpa.shadow_vq_ops_opaque =3D s; s->cvq_isolated =3D cvq_isolated; - - /* - * TODO: We cannot migrate devices with CVQ and no x-svq enabled as - * there is no way to set the device state (MAC, MQ, etc) before - * starting the datapath. - * - * Migration blocker ownership now belongs to s->vhost_vdpa. - */ - if (!svq) { - error_setg(&s->vhost_vdpa.migration_blocker, - "net vdpa cannot migrate with CVQ feature"); - } } ret =3D vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, n= vqs); if (ret) { --=20 2.39.3