From nobody Sun Feb 8 17:16:04 2026 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=1666253645; cv=none; d=zohomail.com; s=zohoarc; b=moX/7dF4wjDsFoohAT/4kABjfrGc32gOaMSkZ8usj9D4tEH6gUOZB+iEQZ41WqIGG6BVkq3OT5IZ+DeO0mlMv5QXtL9Z/b6+92k7e8UUA3immyduhvhQb5xI9SVxTUmgStYaze1agnXlwG2Z8bbKm8Z6R1mHNczwFmSjzjpE/xo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666253645; 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=DpSY5w1WUu2XB8+3NEAf1Jd7cO6jowWb7+PGrUCDW+M=; b=hqA13rdSCrJwjNEe0h1EP2pGiYfYw5NXnwjc6B/YUv8A2OMnWPMdoAtHo/QAHMLXj9R7BnJMUUeYcftKKQ2KtngDstZ6UIR2gYp02vJ7AEDFGfNCsmvohVb/twEZDkpDCSwyV7MTNKLReK26Ym0k2bB5cUTi98XOMZsyfv7YwGA= 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 166625364581282.58626089521113; Thu, 20 Oct 2022 01:14:05 -0700 (PDT) Received: from localhost ([::1]:54384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olQgi-0002Xv-Rf for importer@patchew.org; Thu, 20 Oct 2022 04:14:02 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olQgi-0008Np-IZ for importer@patchew.org; Thu, 20 Oct 2022 04:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olQVl-0004ZG-HH for qemu-devel@nongnu.org; Thu, 20 Oct 2022 04:02:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:55412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olQVi-0006gg-V7 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 04:02:41 -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-589-SC9gdXxDN6WSYkgJXveLtw-1; Thu, 20 Oct 2022 04:02:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9A81F864764 for ; Thu, 20 Oct 2022 08:02:33 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id D09E32027063; Thu, 20 Oct 2022 08:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666252958; 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=DpSY5w1WUu2XB8+3NEAf1Jd7cO6jowWb7+PGrUCDW+M=; b=LZYUa4BCilk7AFeILaG0lpYA1I4BwAN+sTCrffytrSVzhd9pux8kKlTvJRfjUiWUBncSOV bG3jPUo5GRVpKYAjWX8c0Zh2/O3X9bSqaH4n2jfF7uoXVW6kT9cLkl1Mol1b1RoREvPQ/t 0vMnyspjfdeO/FGTIGV43efyYHA29Hg= X-MC-Unique: SC9gdXxDN6WSYkgJXveLtw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: mst@redhat.com, Jason Wang Subject: [PATCH] vdpa: Remove shadow CVQ command check Date: Thu, 20 Oct 2022 10:02:30 +0200 Message-Id: <20221020080230.319130-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: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.256, 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_H2=-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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666253647334100001 The guest will see undefined behavior if it issue not negotiate commands, bit it is expected somehow. Simplify code deleting this check. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- net/vhost-vdpa.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index eebf29f5c1..6d64000202 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -461,48 +461,6 @@ static NetClientInfo net_vhost_vdpa_cvq_info =3D { .check_peer_type =3D vhost_vdpa_check_peer_type, }; =20 -/** - * Do not forward commands not supported by SVQ. Otherwise, the device cou= ld - * accept it and qemu would not know how to update the device model. - */ -static bool vhost_vdpa_net_cvq_validate_cmd(const void *out_buf, size_t le= n) -{ - struct virtio_net_ctrl_hdr ctrl; - - if (unlikely(len < sizeof(ctrl))) { - qemu_log_mask(LOG_GUEST_ERROR, - "%s: invalid legnth of out buffer %zu\n", __func__, = len); - return false; - } - - memcpy(&ctrl, out_buf, sizeof(ctrl)); - switch (ctrl.class) { - case VIRTIO_NET_CTRL_MAC: - switch (ctrl.cmd) { - case VIRTIO_NET_CTRL_MAC_ADDR_SET: - return true; - default: - qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid mac cmd %u\n", - __func__, ctrl.cmd); - }; - break; - case VIRTIO_NET_CTRL_MQ: - switch (ctrl.cmd) { - case VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET: - return true; - default: - qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid mq cmd %u\n", - __func__, ctrl.cmd); - }; - break; - default: - qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid control class %u\n", - __func__, ctrl.class); - }; - - return false; -} - /** * Validate and copy control virtqueue commands. * @@ -526,16 +484,10 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShad= owVirtqueue *svq, .iov_len =3D sizeof(status), }; ssize_t dev_written =3D -EINVAL; - bool ok; =20 out.iov_len =3D iov_to_buf(elem->out_sg, elem->out_num, 0, s->cvq_cmd_out_buffer, vhost_vdpa_net_cvq_cmd_len()); - ok =3D vhost_vdpa_net_cvq_validate_cmd(s->cvq_cmd_out_buffer, out.iov_= len); - if (unlikely(!ok)) { - goto out; - } - dev_written =3D vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(status)); if (unlikely(dev_written < 0)) { goto out; --=20 2.31.1