From nobody Thu May 16 03:09:57 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=1694797837; cv=none; d=zohomail.com; s=zohoarc; b=R8O1quHDYqqdRmM/neTMNFWmFQRiSlt56oc6q3hf6PQppL1tXBgtrRWuXUJOyBzioeEm3CmPmE7V0FM4cdcU2u8pPJ018h/p3/CB2BfWRVOaBwu5nE7qMaiVo7laeiQNFzDT9kANUDSj6ljY52XUpWLjsItkrUZ3Y5O4wYL4wnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694797837; 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=bON1w5PA3ln6pLbIGRUYpGI1D/HYvjSUJSjiXHbZkfo=; b=nrWiRGOLCgiSo8QN2CSqXtG4l9qc/D9odn/VXSyj6HFgM+8cUX2byi+kqvyBtBi8W+1eKEaSy5m8vEV+K4cD3aW1tm41KXIigHe2VsXwoQS7owCK80d6D2J2UoB28fhPTfnaPZB37UNFpUtcvVfZNc7gMBR86Cjhcta5fyVao3o= 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 1694797837436324.73644718739945; Fri, 15 Sep 2023 10:10:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhCJE-00077O-SH; Fri, 15 Sep 2023 13:08:48 -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 1qhCJD-00076L-Og for qemu-devel@nongnu.org; Fri, 15 Sep 2023 13:08:47 -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 1qhCJC-0001nV-FP for qemu-devel@nongnu.org; Fri, 15 Sep 2023 13:08:47 -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-691-HqFxPBZXPEGiGecgX9KjuQ-1; Fri, 15 Sep 2023 13:08:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 02258945938; Fri, 15 Sep 2023 17:08:41 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id B573C2026D4B; Fri, 15 Sep 2023 17:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694797725; 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=bON1w5PA3ln6pLbIGRUYpGI1D/HYvjSUJSjiXHbZkfo=; b=cZzaX01WAmyOIUF2YqoOKOen/uP0u4c7iC7nGUdXo7CSuk2rC/Wa9TU1uaF6QbF8wWxYbT Ga6vpbU3S3N0rYjKC3zpo9+3ISjKrPaMsa6ADxyMkkzTe7GoQFD6XnqunBGugLQ+iUkP+X wr30DINgG0DKXpDa7btxZf8Bmum+0kg= X-MC-Unique: HqFxPBZXPEGiGecgX9KjuQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Hawkins Jiawei , qemu-stable@nongnu.org, si-wei.liu@oracle.com, "Michael S. Tsirkin" , Lei Yang , Jason Wang Subject: [PATCH v2 1/3] vdpa net: fix error message setting virtio status Date: Fri, 15 Sep 2023 19:08:34 +0200 Message-Id: <20230915170836.3078172-2-eperezma@redhat.com> In-Reply-To: <20230915170836.3078172-1-eperezma@redhat.com> References: <20230915170836.3078172-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.4 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=unavailable 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: 1694797837909100001 It incorrectly prints "error setting features", probably because a copy paste miss. Fixes: 152128d646 ("vdpa: move CVQ isolation check to net_init_vhost_vdpa") Reported-by: Peter Maydell Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Philippe Mathieu-Daud=C3=A9 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 34202ca009..9845e2db9c 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -1293,7 +1293,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_= fd, uint64_t features, =20 r =3D ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status); if (unlikely(r)) { - error_setg_errno(errp, -r, "Cannot set device features"); + error_setg_errno(errp, -r, "Cannot set status"); goto out; } =20 --=20 2.39.3 From nobody Thu May 16 03:09:57 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=1694797738; cv=none; d=zohomail.com; s=zohoarc; b=Tj7WYXJ+OcaKuE1Uz56wN1YFUiGNubwLPNHf1tb92o843PN+gOJkj2u6cRjYWCBusNqTUrPnpG75oWi3u7uSkqyVJ0j18rPe4NzUVXdE4lZxT4rm/rfnshiTAtANoODJiZJhrD/kOTUdiUKWeWBNwHw06ABiZmZA/pdBbIoIcGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694797738; 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=Y6/TWVZNb46HVrJ7JdQHD8nhipsqo+5pDj4h5xUtPBk=; b=NBq6R3LMKOYmWtnFUPFHJ4RNwKxCHBQ2Ux8f4lLuqxBZNOxJsJH5ePTEZS8tGfEB0pziRkYrdNmU61wBO+2icKEHlj3VAdwx6X6d1fw0T/49QYn+Cu2MMsncUw5TOl2L8ggRM8WxTJdW6ph4XJB63ktOeEsuyBUeMSgJBXUbQOg= 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 1694797738802402.90356695924845; Fri, 15 Sep 2023 10:08:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhCJF-00077r-R6; Fri, 15 Sep 2023 13:08: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 1qhCJE-000773-KA for qemu-devel@nongnu.org; Fri, 15 Sep 2023 13:08: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 1qhCJD-0001nc-5x for qemu-devel@nongnu.org; Fri, 15 Sep 2023 13:08:48 -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-687-u1WX9bciPJuqJlTPY5OlBQ-1; Fri, 15 Sep 2023 13:08:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82D5494592A; Fri, 15 Sep 2023 17:08:42 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41BBD2026D4B; Fri, 15 Sep 2023 17:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694797726; 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=Y6/TWVZNb46HVrJ7JdQHD8nhipsqo+5pDj4h5xUtPBk=; b=Moxc+VEil1oSAtf2A+8wfYFcWBMLcjwNIziZG6Da5CfmAnTShqom3vxnltz8gsseukF6TF l81S7ZOogwXqJAhwoj0KLGMwa7N6rbpC26nEIKEtFDWFwNvLjtfEVfp6arJ3EeKNyfgflN VzaxZDyKi6RNcIZu41bLaVMvpqNAc/o= X-MC-Unique: u1WX9bciPJuqJlTPY5OlBQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Hawkins Jiawei , qemu-stable@nongnu.org, si-wei.liu@oracle.com, "Michael S. Tsirkin" , Lei Yang , Jason Wang Subject: [PATCH v2 2/3] vdpa net: stop probing if cannot set features Date: Fri, 15 Sep 2023 19:08:35 +0200 Message-Id: <20230915170836.3078172-3-eperezma@redhat.com> In-Reply-To: <20230915170836.3078172-1-eperezma@redhat.com> References: <20230915170836.3078172-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.4 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=unavailable 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: 1694797739303100003 Otherwise it continues the CVQ isolation probing. Fixes: 152128d646 ("vdpa: move CVQ isolation check to net_init_vhost_vdpa") Reported-by: Peter Maydell Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Lei Yang --- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 9845e2db9c..51d8144070 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -1289,6 +1289,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_= fd, uint64_t features, r =3D ioctl(device_fd, VHOST_SET_FEATURES, &features); if (unlikely(r)) { error_setg_errno(errp, errno, "Cannot set features"); + goto out; } =20 r =3D ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status); --=20 2.39.3 From nobody Thu May 16 03:09:57 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=1694797819; cv=none; d=zohomail.com; s=zohoarc; b=l3uH/08OrRg1WfggIiR21wqPASMLidmnzz+PinUtFdm0QFW8EmmFovL/x0TQ9Icq1yFqFKMiFg3uDTAdOT0x+lGTuLAixBtI0S4V777UQm6hLv6CT752jIT2d2q7Q9/hWQoAeOLCJsRSAK2RgapEOqoYuowJyWGBGLbFppf+jtw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694797819; 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=8RKJXcpA2mblb71AL3uNtpVV/ZRzqmgBylDJpExCPzw=; b=g8JpbPplG1bnCdvfuDe0n6fu+o8oWIIbdEx6kOGQmQtZCTVQDKjpc74NiSje6+PcwsH46EuTZleB1yMJnkajCubWnSf8ENZXTuDNad9OEdsQyepZmqa4nGvO2TRxtXhbE9LrZf/8wI2o3bzXeWvosmMbEsxPoG5TO8qo6zTo9iM= 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 1694797819270248.3300851677709; Fri, 15 Sep 2023 10:10:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhCJM-0007AG-F0; Fri, 15 Sep 2023 13:08: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 1qhCJL-0007A2-Ba for qemu-devel@nongnu.org; Fri, 15 Sep 2023 13:08: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 1qhCJJ-0001oH-9g for qemu-devel@nongnu.org; Fri, 15 Sep 2023 13:08:55 -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-173-Jdyb2Z4EPuibCRAxxipabw-1; Fri, 15 Sep 2023 13:08:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0FEDE858285; Fri, 15 Sep 2023 17:08:44 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id C285A2026D4B; Fri, 15 Sep 2023 17:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694797732; 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=8RKJXcpA2mblb71AL3uNtpVV/ZRzqmgBylDJpExCPzw=; b=W0ZsXFSbZ0Y7JijV0SqYl2Aw7SOWPO0oOgPW+KwH/5PjkuHIgUuycsZIVUnb6VbjAKOHp0 QGyXRVSf+tfBzEfHKcZjgqcDtKLcf5YsM3mZsSr410DS8vAa//NN+2L1PxCkHwrs2UfAjj 2fJ9MAI6WUit+Hl5RXA9MzU6Yhao2UI= X-MC-Unique: Jdyb2Z4EPuibCRAxxipabw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Hawkins Jiawei , qemu-stable@nongnu.org, si-wei.liu@oracle.com, "Michael S. Tsirkin" , Lei Yang , Jason Wang Subject: [PATCH v2 3/3] vdpa net: follow VirtIO initialization properly at cvq isolation probing Date: Fri, 15 Sep 2023 19:08:36 +0200 Message-Id: <20230915170836.3078172-4-eperezma@redhat.com> In-Reply-To: <20230915170836.3078172-1-eperezma@redhat.com> References: <20230915170836.3078172-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.4 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=unavailable 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: 1694797819877100001 This patch solves a few issues. The most obvious is that the feature set was done previous to ACKNOWLEDGE | DRIVER status bit set. Current vdpa devices are permissive with this, but it is better to follow the standard. Fixes: 152128d646 ("vdpa: move CVQ isolation check to net_init_vhost_vdpa") Signed-off-by: Eugenio P=C3=A9rez Tested-by: Lei Yang --- net/vhost-vdpa.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 51d8144070..4b30325977 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -1270,8 +1270,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_= fd, uint64_t features, uint64_t backend_features; int64_t cvq_group; uint8_t status =3D VIRTIO_CONFIG_S_ACKNOWLEDGE | - VIRTIO_CONFIG_S_DRIVER | - VIRTIO_CONFIG_S_FEATURES_OK; + VIRTIO_CONFIG_S_DRIVER; int r; =20 ERRP_GUARD(); @@ -1286,15 +1285,22 @@ static int vhost_vdpa_probe_cvq_isolation(int devic= e_fd, uint64_t features, return 0; } =20 + r =3D ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status); + if (unlikely(r)) { + error_setg_errno(errp, -r, "Cannot set device status"); + goto out; + } + r =3D ioctl(device_fd, VHOST_SET_FEATURES, &features); if (unlikely(r)) { - error_setg_errno(errp, errno, "Cannot set features"); + error_setg_errno(errp, -r, "Cannot set features"); goto out; } =20 + status |=3D VIRTIO_CONFIG_S_FEATURES_OK; r =3D ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status); if (unlikely(r)) { - error_setg_errno(errp, -r, "Cannot set status"); + error_setg_errno(errp, -r, "Cannot set device status"); goto out; } =20 --=20 2.39.3