vdpa: reorder vhost_vdpa_net_cvq_cmd_page_len function
We need to call it from resource cleanup context, as munmap needs the size of the mappings. Signed-off-by: Eugenio Pérez <eperezma@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230602143854.1879091-3-eperezma@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
8bc0049ead
commit
915bf6ccd7
|
@ -120,6 +120,22 @@ VHostNetState *vhost_vdpa_get_vhost_net(NetClientState *nc)
|
||||||
return s->vhost_net;
|
return s->vhost_net;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static size_t vhost_vdpa_net_cvq_cmd_len(void)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* MAC_TABLE_SET is the ctrl command that produces the longer out buffer.
|
||||||
|
* In buffer is always 1 byte, so it should fit here
|
||||||
|
*/
|
||||||
|
return sizeof(struct virtio_net_ctrl_hdr) +
|
||||||
|
2 * sizeof(struct virtio_net_ctrl_mac) +
|
||||||
|
MAC_TABLE_ENTRIES * ETH_ALEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
static size_t vhost_vdpa_net_cvq_cmd_page_len(void)
|
||||||
|
{
|
||||||
|
return ROUND_UP(vhost_vdpa_net_cvq_cmd_len(), qemu_real_host_page_size());
|
||||||
|
}
|
||||||
|
|
||||||
static bool vhost_vdpa_net_valid_svq_features(uint64_t features, Error **errp)
|
static bool vhost_vdpa_net_valid_svq_features(uint64_t features, Error **errp)
|
||||||
{
|
{
|
||||||
uint64_t invalid_dev_features =
|
uint64_t invalid_dev_features =
|
||||||
|
@ -427,22 +443,6 @@ static void vhost_vdpa_cvq_unmap_buf(struct vhost_vdpa *v, void *addr)
|
||||||
vhost_iova_tree_remove(tree, *map);
|
vhost_iova_tree_remove(tree, *map);
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t vhost_vdpa_net_cvq_cmd_len(void)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* MAC_TABLE_SET is the ctrl command that produces the longer out buffer.
|
|
||||||
* In buffer is always 1 byte, so it should fit here
|
|
||||||
*/
|
|
||||||
return sizeof(struct virtio_net_ctrl_hdr) +
|
|
||||||
2 * sizeof(struct virtio_net_ctrl_mac) +
|
|
||||||
MAC_TABLE_ENTRIES * ETH_ALEN;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t vhost_vdpa_net_cvq_cmd_page_len(void)
|
|
||||||
{
|
|
||||||
return ROUND_UP(vhost_vdpa_net_cvq_cmd_len(), qemu_real_host_page_size());
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Map CVQ buffer. */
|
/** Map CVQ buffer. */
|
||||||
static int vhost_vdpa_cvq_map_buf(struct vhost_vdpa *v, void *buf, size_t size,
|
static int vhost_vdpa_cvq_map_buf(struct vhost_vdpa *v, void *buf, size_t size,
|
||||||
bool write)
|
bool write)
|
||||||
|
|
Loading…
Reference in a new issue