From patchwork Tue Sep 6 16:36:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 1674975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hg1viELJ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMWMW51Yfz1yhR for ; Wed, 7 Sep 2022 02:40:06 +1000 (AEST) Received: from localhost ([::1]:33472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVbcI-0000ii-Ss for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2022 12:40:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVbZ6-0004Kl-2R for qemu-devel@nongnu.org; Tue, 06 Sep 2022 12:36:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVbZ4-0001AB-JO for qemu-devel@nongnu.org; Tue, 06 Sep 2022 12:36:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662482202; 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=uAG5vvx0dc4U+p0OlwxEIJp96aLvStB6XTeITvPepQU=; b=hg1viELJj9QMF2rjONWt/1o1qVRDfhEoDLwGmvk5H1DVeqQU7LUwBNV+EfsYmX7/9NbIpW L9he17J63qc5c4J+QgqxWmTWaO3elw5xA+GhpGXMsuFdgytf6hvShpaps/TDQGH0Czs/jD ON80k6Di14ECm5rsb9unyglVInw6hjM= 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-672-pqvaccugMMCSSElmSIgxyA-1; Tue, 06 Sep 2022 12:36:37 -0400 X-MC-Unique: pqvaccugMMCSSElmSIgxyA-1 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 712A13C0ED49; Tue, 6 Sep 2022 16:36:37 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.195.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A9A6403349; Tue, 6 Sep 2022 16:36:34 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Harpreet Singh Anand , Cindy Lu , Liuxiangdong , Stefano Garzarella , "Michael S. Tsirkin" , Zhu Lingshan , Gautam Dawar , Si-Wei Liu , Eli Cohen , "Gonglei (Arei)" , Laurent Vivier , Cornelia Huck , Stefan Hajnoczi , Parav Pandit , Jason Wang Subject: [PATCH 3/3] vdpa: Support VLAN on nic control shadow virtqueue Date: Tue, 6 Sep 2022 18:36:21 +0200 Message-Id: <20220906163621.1144675-4-eperezma@redhat.com> In-Reply-To: <20220906163621.1144675-1-eperezma@redhat.com> References: <20220906163621.1144675-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Update the virtio-net device model with each guest's update of vlan through control virtqueue, and accept creating a SVQ with a device exposing vlan feature bit. Done in the same commit since a malicious guest could send vlan commands otherwise. Signed-off-by: Eugenio Pérez --- net/vhost-vdpa.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index ecbfd08eb9..40f7c60399 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -94,6 +94,7 @@ static const uint64_t vdpa_svq_device_features = BIT_ULL(VIRTIO_NET_F_MRG_RXBUF) | BIT_ULL(VIRTIO_NET_F_STATUS) | BIT_ULL(VIRTIO_NET_F_CTRL_VQ) | + BIT_ULL(VIRTIO_NET_F_CTRL_VLAN) | BIT_ULL(VIRTIO_NET_F_MQ) | BIT_ULL(VIRTIO_F_ANY_LAYOUT) | BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) | @@ -538,6 +539,16 @@ static bool vhost_vdpa_net_cvq_validate_cmd(const void *out_buf, size_t len) __func__, ctrl.cmd); }; break; + case VIRTIO_NET_CTRL_VLAN: + switch (ctrl->cmd) { + case VIRTIO_NET_CTRL_VLAN_ADD: + case VIRTIO_NET_CTRL_VLAN_DEL: + return true; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid vlan cmd %u\n", + __func__, ctrl->cmd); + }; + break; default: qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid control class %u\n", __func__, ctrl.class);