From nobody Mon Apr 29 09:35:36 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=1685708400; cv=none; d=zohomail.com; s=zohoarc; b=hs3AVTlyX9/wJdwID+qJkxV4E4SF0VNhvk2s3MPAK9ljqoWcaMYSvdPlgr/m18ecPVN9OU7W+AQ6Vrydbxsl7DdJQes/TteT2u7TWn3Myc3Fd4atg9tQSqH0F5ouzhmW8Rsagmm/TgZMPgxh3QxJomvhHniXPqTS+2VSUErxvfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685708400; 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=ThbOUsTAsNZ4pyUDNXkUbz3MNNn8R3IdsxJGkjRCjTQ=; b=GW8EwRmL8GPIpwjxYwbxDH36EBj3EV1ZWJbBcU+xV/3QFzfRgFCctT/ZP5hTLdsGV4U7nN7cJPbjblCnmv0j3GPeVJ9DTgjhQPjZd7zGy63Ypd9v0IToCpOwxjqy8hgrn1+9dIF0DAwEzZHTj3mtp7rrLqKqpjDcLm4kk9WxEvI= 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 168570839971311.80982228148639; Fri, 2 Jun 2023 05:19:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q53kq-0006fH-4k; Fri, 02 Jun 2023 08:19:41 -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 1q53kc-0006em-TV for qemu-devel@nongnu.org; Fri, 02 Jun 2023 08:19:27 -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 1q53ka-0001KS-UC for qemu-devel@nongnu.org; Fri, 02 Jun 2023 08:19:26 -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-323-5Sb3e87DOaa8ZPDDVSffcg-1; Fri, 02 Jun 2023 08:19:21 -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 06D2A3C0ED4C; Fri, 2 Jun 2023 12:19:21 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DAA9492B0A; Fri, 2 Jun 2023 12:19:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685708362; 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=ThbOUsTAsNZ4pyUDNXkUbz3MNNn8R3IdsxJGkjRCjTQ=; b=CmgJTsBwgOiFZNt4BiK6OWWvWnef5DGe0SCdDGRGpaVBpO1mpkP/7K0oHhA6FPNGRm6aFn OXmCmGjFFs+JV9lGp/XNDhdsJ8lBJH0LUqjr0xjGf72D3zhU8zNhspjPP59ugpXXh3BerP nVXqqRIEBom31cGpaY6DNXBYf3/X1po= X-MC-Unique: 5Sb3e87DOaa8ZPDDVSffcg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Jason Wang , Laurent Vivier , Hawkins Jiawei , Shannon Nelson , Zhu Lingshan , Lei Yang , Gautam Dawar , Dragos Tatulea , mst@redhat.com Subject: [PATCH] vdpa: do not block migration if device has cvq and x-svq=on Date: Fri, 2 Jun 2023 14:19:17 +0200 Message-Id: <20230602121917.1854805-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.129.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: 1685708402355100003 It was a mistake to forbid in all cases, as SVQ is already able to send all the CVQ messages before start forwarding data vqs. It actually caused a regression, making impossible to migrate device previously migratable. Fixes: 36e4647247f2 ("vdpa: add vhost_vdpa_net_valid_svq_features") Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 37cdc84562..c63456ff7c 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -837,13 +837,16 @@ static NetClientState *net_vhost_vdpa_init(NetClientS= tate *peer, s->vhost_vdpa.shadow_vq_ops_opaque =3D s; =20 /* - * TODO: We cannot migrate devices with CVQ as there is no way to = set - * the device state (MAC, MQ, etc) before starting the datapath. + * 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. */ - error_setg(&s->vhost_vdpa.migration_blocker, - "net vdpa cannot migrate with CVQ feature"); + 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.31.1