From patchwork Tue Oct 18 15:53:17 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: 13010799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06B8EC433FE for ; Tue, 18 Oct 2022 16:13:36 +0000 (UTC) Received: from localhost ([::1]:51182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okpDb-0004UG-Ay for qemu-devel@archiver.kernel.org; Tue, 18 Oct 2022 12:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okoul-0003ji-Fd for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okouj-0003zq-3J for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:53:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666108432; 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=mqZNLycroWZRRghflpj8b3f5PiIH+DRSFRJ6onyN3Hg=; b=URggfz9hPV8tMYqEwnenn073VtEYPC6nOgL7K3mxbBKySyFPJSQjbZi9otpP22hm8mn5e+ rIdJRPeiAsQH6UaIBiApS4DtXAqY7zNol1vrZGW/4J+TxXBc14OS+/Hejt30MdjNDsU1vu rA2rnr52C3wWYPmyyUDIsLwHW023Vao= 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-255-HumjDZSGM1KddkluOcWBTg-1; Tue, 18 Oct 2022 11:53:47 -0400 X-MC-Unique: HumjDZSGM1KddkluOcWBTg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BCA98185A7AF; Tue, 18 Oct 2022 15:53:39 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id D082B215CDD6; Tue, 18 Oct 2022 15:53:31 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Si-Wei Liu , Laurent Vivier , Eli Cohen , Gautam Dawar , "Michael S. Tsirkin" , Zhu Lingshan , Harpreet Singh Anand , Liuxiangdong , Cindy Lu , Parav Pandit , Stefano Garzarella , Jason Wang Subject: [RFC PATCH 1/5] vdpa: Save emulated features list in vhost_vdpa Date: Tue, 18 Oct 2022 17:53:17 +0200 Message-Id: <20221018155321.145135-2-eperezma@redhat.com> In-Reply-To: <20221018155321.145135-1-eperezma@redhat.com> References: <20221018155321.145135-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 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_LOW=-0.7, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" At this moment only _F_LOG is added there. However future patches add features that depend on the kind of device. In particular, only net devices can add VIRTIO_F_GUEST_ANNOUNCE. So let's allow vhost_vdpa creator to set custom emulated device features. Signed-off-by: Eugenio Pérez --- include/hw/virtio/vhost-vdpa.h | 2 ++ hw/virtio/vhost-vdpa.c | 8 ++++---- net/vhost-vdpa.c | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index 1111d85643..50083e1e3b 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -31,6 +31,8 @@ typedef struct vhost_vdpa { bool iotlb_batch_begin_sent; MemoryListener listener; struct vhost_vdpa_iova_range iova_range; + /* VirtIO device features that can be emulated by qemu */ + uint64_t added_features; uint64_t acked_features; bool shadow_vqs_enabled; /* IOVA mapping used by the Shadow Virtqueue */ diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 7468e44b87..ddb5e29288 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -660,8 +660,8 @@ static int vhost_vdpa_set_features(struct vhost_dev *dev, v->acked_features = features; - /* We must not ack _F_LOG if SVQ is enabled */ - features &= ~BIT_ULL(VHOST_F_LOG_ALL); + /* Do not ack features emulated by qemu */ + features &= ~v->added_features; } trace_vhost_vdpa_set_features(dev, features); @@ -1244,8 +1244,8 @@ static int vhost_vdpa_get_features(struct vhost_dev *dev, int ret = vhost_vdpa_get_dev_features(dev, features); if (ret == 0 && v->shadow_vqs_enabled) { - /* Add SVQ logging capabilities */ - *features |= BIT_ULL(VHOST_F_LOG_ALL); + /* Add emulated capabilities */ + *features |= v->added_features; } return ret; diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 4bc3fd01a8..787e34ed99 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -600,6 +600,10 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer, s->vhost_vdpa.index = queue_pair_index; s->vhost_vdpa.shadow_vqs_enabled = svq; s->vhost_vdpa.iova_tree = iova_tree; + if (svq) { + /* Add SVQ logging capabilities */ + s->vhost_vdpa.added_features |= BIT_ULL(VHOST_F_LOG_ALL); + } if (!is_datapath) { s->cvq_cmd_out_buffer = qemu_memalign(qemu_real_host_page_size(), vhost_vdpa_net_cvq_cmd_page_len()); From patchwork Tue Oct 18 15:53:18 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: 13010810 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 45A3CC4332F for ; Tue, 18 Oct 2022 16:35:34 +0000 (UTC) Received: from localhost ([::1]:60388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okpYy-0007Wu-Hl for qemu-devel@archiver.kernel.org; Tue, 18 Oct 2022 12:35:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okoux-0003vk-Q4 for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okouw-000427-5Q for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666108449; 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=mXis859p0BoNeJtVQIZYLXshTjNfDzbrjIopHJFAjnE=; b=Pf3GzIXdWSx+kMW0QP5RrRJKo+LTtQlT2NPfDp5rYkDCuV7xcxq15Q2wmPECb9F8wCZL1L /F6NnlQTAHN+WtnStvyKQG2jLOMVhWaeBR2PfBAubLSb1AIdA9y1QVjUSZy/gmtJSvjqEc vx5AmwynrmbbRGMWltwVQ8itAj1lGIY= 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-517-kfpI5DdIMhG6HNcOMR8JSw-1; Tue, 18 Oct 2022 11:54:03 -0400 X-MC-Unique: kfpI5DdIMhG6HNcOMR8JSw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 21F9A2999B49; Tue, 18 Oct 2022 15:53:58 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2C1D215CDDB; Tue, 18 Oct 2022 15:53:38 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Si-Wei Liu , Laurent Vivier , Eli Cohen , Gautam Dawar , "Michael S. Tsirkin" , Zhu Lingshan , Harpreet Singh Anand , Liuxiangdong , Cindy Lu , Parav Pandit , Stefano Garzarella , Jason Wang Subject: [RFC PATCH 2/5] vdpa: Remove shadow CVQ command check Date: Tue, 18 Oct 2022 17:53:18 +0200 Message-Id: <20221018155321.145135-3-eperezma@redhat.com> In-Reply-To: <20221018155321.145135-1-eperezma@redhat.com> References: <20221018155321.145135-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 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_LOW=-0.7, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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érez --- net/vhost-vdpa.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 787e34ed99..19d4dbe94a 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -462,48 +462,6 @@ static NetClientInfo net_vhost_vdpa_cvq_info = { .check_peer_type = vhost_vdpa_check_peer_type, }; -/** - * Do not forward commands not supported by SVQ. Otherwise, the device could - * 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 len) -{ - 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. * @@ -527,16 +485,10 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq, .iov_len = sizeof(status), }; ssize_t dev_written = -EINVAL; - bool ok; out.iov_len = iov_to_buf(elem->out_sg, elem->out_num, 0, s->cvq_cmd_out_buffer, vhost_vdpa_net_cvq_cmd_len()); - ok = vhost_vdpa_net_cvq_validate_cmd(s->cvq_cmd_out_buffer, out.iov_len); - if (unlikely(!ok)) { - goto out; - } - dev_written = vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(status)); if (unlikely(dev_written < 0)) { goto out; From patchwork Tue Oct 18 15:53:19 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: 13010798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EC47C4332F for ; Tue, 18 Oct 2022 16:13:14 +0000 (UTC) Received: from localhost ([::1]:40484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okpDN-0004AK-9T for qemu-devel@archiver.kernel.org; Tue, 18 Oct 2022 12:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okouz-0003yr-Uc for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:40998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okout-00041r-Vb for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666108447; 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=HPwQpVci9IU7QXwp1MCWX/Ouul7vSpTc4wb6OuBrmug=; b=CZRDitqlrwBMPObznbmFDi04jKeYgJfYL0Fa9MF/YHpFwy/Mnh1ObZZQ626nlV0OqgQXnH qvlSYN3f6fRcxZpPp7+2gJS3UeVflQn7AnU/cJpYWYrEDv52LIHJ3z0uyWyCLuxl4rNZJi zjnxlQmnmtoqtWWxWiCTiWaEJ7TeRLo= 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-389-9Q3LgzP8MzycUy5XOSurzg-1; Tue, 18 Oct 2022 11:54:04 -0400 X-MC-Unique: 9Q3LgzP8MzycUy5XOSurzg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5660A101A54E; Tue, 18 Oct 2022 15:53:53 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id B446B2157F26; Tue, 18 Oct 2022 15:53:48 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Si-Wei Liu , Laurent Vivier , Eli Cohen , Gautam Dawar , "Michael S. Tsirkin" , Zhu Lingshan , Harpreet Singh Anand , Liuxiangdong , Cindy Lu , Parav Pandit , Stefano Garzarella , Jason Wang Subject: [RFC PATCH 3/5] vdpa: handle VIRTIO_NET_CTRL_ANNOUNCE in vhost_vdpa_net_handle_ctrl_avail Date: Tue, 18 Oct 2022 17:53:19 +0200 Message-Id: <20221018155321.145135-4-eperezma@redhat.com> In-Reply-To: <20221018155321.145135-1-eperezma@redhat.com> References: <20221018155321.145135-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 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_LOW=-0.7, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since this capability is emulated by qemu shadowed CVQ cannot forward it to the device. Process all that command within qemu. Signed-off-by: Eugenio Pérez --- net/vhost-vdpa.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 19d4dbe94a..2a52672b44 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -489,9 +489,18 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq, out.iov_len = iov_to_buf(elem->out_sg, elem->out_num, 0, s->cvq_cmd_out_buffer, vhost_vdpa_net_cvq_cmd_len()); - dev_written = vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(status)); - if (unlikely(dev_written < 0)) { - goto out; + if (*(uint8_t *)s->cvq_cmd_out_buffer == VIRTIO_NET_CTRL_ANNOUNCE) { + /* + * Guest announce capability is emulated by qemu, so dont forward to + * the device. + */ + dev_written = sizeof(status); + *s->status = VIRTIO_NET_OK; + } else { + dev_written = vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(status)); + if (unlikely(dev_written < 0)) { + goto out; + } } if (unlikely(dev_written < sizeof(status))) { From patchwork Tue Oct 18 15:53:20 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: 13010800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E2A9BC4332F for ; Tue, 18 Oct 2022 16:13:53 +0000 (UTC) Received: from localhost ([::1]:51180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okpE0-0004UF-Fv for qemu-devel@archiver.kernel.org; Tue, 18 Oct 2022 12:13:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okov0-0003yt-Kv for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okoux-00042T-Em for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666108450; 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=u+nsA7fbJ3UVE7PKf+3TO5eQ8AmCw5MIwi9DZeLdXqE=; b=XtOIoIfVIwjxA7eAXGJQGsqYogSpKe94qRVJm81ZLCpRDnZKjcxLclPnApReeTa74TOt2j pRXT4ZSOgzMF02jEXsK/pSSOc+E/2pZipcAj2O55R7z9IkCZgm8Hcid1MxVBvjKqxBJ7bG LuAUFHn8q2DvbqY4/s8jMXmZRz45sMw= 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-260-Swd0_2YIM-OuYBlaL9j3Pg-1; Tue, 18 Oct 2022 11:54:07 -0400 X-MC-Unique: Swd0_2YIM-OuYBlaL9j3Pg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 86AC5811E67; Tue, 18 Oct 2022 15:54:06 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3230215CDCC; Tue, 18 Oct 2022 15:53:52 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Si-Wei Liu , Laurent Vivier , Eli Cohen , Gautam Dawar , "Michael S. Tsirkin" , Zhu Lingshan , Harpreet Singh Anand , Liuxiangdong , Cindy Lu , Parav Pandit , Stefano Garzarella , Jason Wang Subject: [RFC PATCH 4/5] vhost_net: return VIRTIO_NET_S_ANNOUNCE is device model has it set Date: Tue, 18 Oct 2022 17:53:20 +0200 Message-Id: <20221018155321.145135-5-eperezma@redhat.com> In-Reply-To: <20221018155321.145135-1-eperezma@redhat.com> References: <20221018155321.145135-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Temporal, as this affects other vhost backends and we must check status feature first. Signed-off-by: Eugenio Pérez --- hw/net/vhost_net.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index d28f8b974b..46da037aac 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -117,7 +117,35 @@ uint64_t vhost_net_get_features(struct vhost_net *net, uint64_t features) int vhost_net_get_config(struct vhost_net *net, uint8_t *config, uint32_t config_len) { - return vhost_dev_get_config(&net->dev, config, config_len, NULL); + VirtIODevice *vdev; + VirtIONet *n; + int r = vhost_dev_get_config(&net->dev, config, config_len, NULL); + + if (unlikely(r != 0)) { + return r; + } + + if (config_len < endof(struct virtio_net_config, status)) { + return 0; + } + + /* + * TODO: To check for VIRTIO_NET_F_STATUS too. + * TODO: Perform this only if vhost_vdpa. + */ + vdev = net->dev.vdev; + if (!vdev) { + /* Device is starting */ + return 0; + } + if (!(net->dev.acked_features & BIT_ULL(VIRTIO_NET_F_GUEST_ANNOUNCE))) { + return 0; + } + + n = VIRTIO_NET(vdev); + ((struct virtio_net_config *)config)->status |= + (n->status & VIRTIO_NET_S_ANNOUNCE); + return 0; } int vhost_net_set_config(struct vhost_net *net, const uint8_t *data, uint32_t offset, uint32_t size, uint32_t flags) From patchwork Tue Oct 18 15:53: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: 13010801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79306C433FE for ; Tue, 18 Oct 2022 16:13:59 +0000 (UTC) Received: from localhost ([::1]:55256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okpE6-0004wM-DS for qemu-devel@archiver.kernel.org; Tue, 18 Oct 2022 12:13:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okouz-0003ys-V1 for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okouu-00041p-4n for qemu-devel@nongnu.org; Tue, 18 Oct 2022 11:54:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666108447; 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=dZc8KECUWBNobBZc8CFJsMcY8vcdF9fEHV21KlVtVO8=; b=ZqRuLVXbp609mRBGPgBXSIoEoemKzICJaivT88OMR3havwSmOEIArWvvDsGUQZtX/HpURf kX2xBoBcCbHnLUPNVX3VmQpENHPLYqzkmkujw9ByfcBHAujOyqg29NckGpsSjfSSaBX2iM KWWqhKv0jJNrfDwAAFexJeibWlEoY1Y= 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-488-bwslpo9uNeetKGvz3sXEmw-1; Tue, 18 Oct 2022 11:54:05 -0400 X-MC-Unique: bwslpo9uNeetKGvz3sXEmw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06E8C3C3C975; Tue, 18 Oct 2022 15:54:05 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id BEF692157F21; Tue, 18 Oct 2022 15:54:00 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Si-Wei Liu , Laurent Vivier , Eli Cohen , Gautam Dawar , "Michael S. Tsirkin" , Zhu Lingshan , Harpreet Singh Anand , Liuxiangdong , Cindy Lu , Parav Pandit , Stefano Garzarella , Jason Wang Subject: [RFC PATCH 5/5] vdpa: Offer VIRTIO_NET_F_GUEST_ANNOUNCE feature if SVQ is enabled Date: Tue, 18 Oct 2022 17:53:21 +0200 Message-Id: <20221018155321.145135-6-eperezma@redhat.com> In-Reply-To: <20221018155321.145135-1-eperezma@redhat.com> References: <20221018155321.145135-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -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_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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Eugenio Pérez --- net/vhost-vdpa.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 2a52672b44..14a265e30a 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -564,6 +564,9 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer, if (svq) { /* Add SVQ logging capabilities */ s->vhost_vdpa.added_features |= BIT_ULL(VHOST_F_LOG_ALL); + + /* We can emulate guest announce shadowing CVQ */ + s->vhost_vdpa.added_features |= BIT_ULL(VIRTIO_NET_F_GUEST_ANNOUNCE); } if (!is_datapath) { s->cvq_cmd_out_buffer = qemu_memalign(qemu_real_host_page_size(),