From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cohuck@redhat.com>,
Gautam Dawar <gdawar@xilinx.com>, Eli Cohen <eli@mellanox.com>,
Stefano Garzarella <sgarzare@redhat.com>,
Harpreet Singh Anand <hanand@xilinx.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>, Cindy Lu <lulu@redhat.com>,
Liuxiangdong <liuxiangdong5@huawei.com>,
"Gonglei (Arei)" <arei.gonglei@huawei.com>,
Jason Wang <jasowang@redhat.com>,
Parav Pandit <parav@mellanox.com>,
Si-Wei Liu <si-wei.liu@oracle.com>,
Zhu Lingshan <lingshan.zhu@intel.com>,
Laurent Vivier <lvivier@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
kvm@vger.kernel.org
Subject: [PATCH for 8.0 v7 04/10] vdpa: add vhost_vdpa_net_valid_svq_features
Date: Wed, 16 Nov 2022 16:05:50 +0100 [thread overview]
Message-ID: <20221116150556.1294049-5-eperezma@redhat.com> (raw)
In-Reply-To: <20221116150556.1294049-1-eperezma@redhat.com>
It will be reused at vdpa device start so let's extract in its own function
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
net/vhost-vdpa.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 6811089231..e98d5f5eac 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -106,6 +106,22 @@ VHostNetState *vhost_vdpa_get_vhost_net(NetClientState *nc)
return s->vhost_net;
}
+static bool vhost_vdpa_net_valid_svq_features(uint64_t features, Error **errp)
+{
+ uint64_t invalid_dev_features =
+ features & ~vdpa_svq_device_features &
+ /* Transport are all accepted at this point */
+ ~MAKE_64BIT_MASK(VIRTIO_TRANSPORT_F_START,
+ VIRTIO_TRANSPORT_F_END - VIRTIO_TRANSPORT_F_START);
+
+ if (invalid_dev_features) {
+ error_setg(errp, "vdpa svq does not work with features 0x%" PRIx64,
+ invalid_dev_features);
+ }
+
+ return !invalid_dev_features;
+}
+
static int vhost_vdpa_net_check_device_id(struct vhost_net *net)
{
uint32_t device_id;
@@ -675,15 +691,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
if (opts->x_svq) {
struct vhost_vdpa_iova_range iova_range;
- uint64_t invalid_dev_features =
- features & ~vdpa_svq_device_features &
- /* Transport are all accepted at this point */
- ~MAKE_64BIT_MASK(VIRTIO_TRANSPORT_F_START,
- VIRTIO_TRANSPORT_F_END - VIRTIO_TRANSPORT_F_START);
-
- if (invalid_dev_features) {
- error_setg(errp, "vdpa svq does not work with features 0x%" PRIx64,
- invalid_dev_features);
+ if (!vhost_vdpa_net_valid_svq_features(features, errp)) {
goto err_svq;
}
--
2.31.1
next prev parent reply other threads:[~2022-11-16 15:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 15:05 [PATCH for 8.0 v7 00/10] ASID support in vhost-vdpa net Eugenio Pérez
2022-11-16 15:05 ` [PATCH for 8.0 v7 01/10] vdpa: Use v->shadow_vqs_enabled in vhost_vdpa_svqs_start & stop Eugenio Pérez
2022-11-17 5:43 ` Jason Wang
2022-11-16 15:05 ` [PATCH for 8.0 v7 02/10] vhost: set SVQ device call handler at SVQ start Eugenio Pérez
2022-11-16 15:05 ` [PATCH for 8.0 v7 03/10] vhost: Allocate SVQ device file descriptors at device start Eugenio Pérez
2022-11-16 15:05 ` Eugenio Pérez [this message]
2022-11-16 15:05 ` [PATCH for 8.0 v7 05/10] vdpa: move SVQ vring features check to net/ Eugenio Pérez
2022-11-17 5:44 ` Jason Wang
2022-11-16 15:05 ` [PATCH for 8.0 v7 06/10] vdpa: Allocate SVQ unconditionally Eugenio Pérez
2022-11-17 5:44 ` Jason Wang
2022-11-16 15:05 ` [PATCH for 8.0 v7 07/10] vdpa: Add asid parameter to vhost_vdpa_dma_map/unmap Eugenio Pérez
2022-11-17 5:45 ` Jason Wang
2022-11-16 15:05 ` [PATCH for 8.0 v7 08/10] vdpa: Store x-svq parameter in VhostVDPAState Eugenio Pérez
2022-11-17 6:15 ` Jason Wang
2022-11-16 15:05 ` [PATCH for 8.0 v7 09/10] vdpa: Add shadow_data to vhost_vdpa Eugenio Pérez
2022-11-17 6:24 ` Jason Wang
2022-11-16 15:05 ` [PATCH for 8.0 v7 10/10] vdpa: Always start CVQ in SVQ mode if possible Eugenio Pérez
2022-11-17 6:51 ` Jason Wang
2022-11-17 7:43 ` Eugenio Perez Martin
2022-11-17 8:12 ` Eugenio Perez Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221116150556.1294049-5-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=cohuck@redhat.com \
--cc=eli@mellanox.com \
--cc=gdawar@xilinx.com \
--cc=hanand@xilinx.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lingshan.zhu@intel.com \
--cc=liuxiangdong5@huawei.com \
--cc=lulu@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@redhat.com \
--cc=si-wei.liu@oracle.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).