From nobody Thu Dec 18 19:31:46 2025 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=1666936648; cv=none; d=zohomail.com; s=zohoarc; b=OQsqW9z6ETh7PwJ6q/zfRL0gWaUk9BzpMjZCt99ZTnuIx7R5gPVJpjaYwrTchhGVxTx8AAWugOBqOQ8JPg1YIS9pKUQoF8LELHHzPSk/ILdyy1+y9L9BlK5FZjrSks+W073ff26+dPrQk6wnquCiiCwx9sqdKe9+Sb0lfj3KBJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666936648; 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=C8S3xOwXFbS/Vxh1C9hImxitawWC5RgZsL+vHkuEbDU=; b=OYLrMeGwm9ftxcZVBM1W4ns7JQMozoo1Rz2M3ohRQXYlaRBWb1+/PVzlsAhJpAxGNEGCKN8wY6NU4pD0heszo8yNA5bUuS/5SeOzgwHY+x4LshA4pUjiv/Xbo99//y1h2MomP+M/qOZt5kJFyzwzvoPADDGWNYHXgVLOvKNxt9o= 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 1666936648535406.1872682440385; Thu, 27 Oct 2022 22:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooIFD-0007EJ-8f; Fri, 28 Oct 2022 01:49:27 -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 1ooIEj-0006x5-Kr for qemu-devel@nongnu.org; Fri, 28 Oct 2022 01:48:57 -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 1ooIEi-0007I2-22 for qemu-devel@nongnu.org; Fri, 28 Oct 2022 01:48:57 -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-107-MhbmaCVcOreDsuQXcvcOcA-1; Fri, 28 Oct 2022 01:48:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6D893800B23 for ; Fri, 28 Oct 2022 05:48:53 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-50.pek2.redhat.com [10.72.13.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04779C15BA8; Fri, 28 Oct 2022 05:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666936135; 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=C8S3xOwXFbS/Vxh1C9hImxitawWC5RgZsL+vHkuEbDU=; b=aTWfEa3togywz0WYK0beSG9bw1N6/3kafhQUXJQPUOf1ipesq222XjyFAm7JWuuMmeqKpY qq9f9WsNn2Pig75CxPQ2/qYfyTnxm+hObeJ5JdLcdYB5PRUsjKAehvQsYKze4Vgka0EQZi btG7M3M50oJbusX8UTeja3XRN9ix/3g= X-MC-Unique: MhbmaCVcOreDsuQXcvcOcA-1 From: Jason Wang To: stefanha@redhat.com, qemu-devel@nongnu.org Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Jason Wang Subject: [PULL 04/26] vdpa: Remove shadow CVQ command check Date: Fri, 28 Oct 2022 13:48:13 +0800 Message-Id: <20221028054835.29674-5-jasowang@redhat.com> In-Reply-To: <20221028054835.29674-1-jasowang@redhat.com> References: <20221028054835.29674-1-jasowang@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.8 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=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.515, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666936649620100003 From: Eugenio P=C3=A9rez 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 Signed-off-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 eebf29f..6d64000 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -462,48 +462,6 @@ static NetClientInfo net_vhost_vdpa_cvq_info =3D { }; =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. * * Following QEMU guidelines, we offer a copy of the buffers to the device= to @@ -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.7.4