Skip to content

Commit de91a4d

Browse files
jasowangmstsirkin
authored andcommitted
vdpasim: support batch updating
The vDPA simulator support both set_map() and dma_map()/dma_unmap() operations. But vhost-vdpa can only use one of them. So this patch introduce a module parameter (batch_mapping) that let vpda_sim to support only one of those dma operations. The batched mapping via set_map() is enabled by default. Signed-off-by: Jason Wang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 25abc06 commit de91a4d

File tree

1 file changed

+37
-3
lines changed

1 file changed

+37
-3
lines changed

drivers/vdpa/vdpa_sim/vdpa_sim.c

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
#define DRV_DESC "vDPA Device Simulator"
3535
#define DRV_LICENSE "GPL v2"
3636

37+
static int batch_mapping = 1;
38+
module_param(batch_mapping, int, 0444);
39+
MODULE_PARM_DESC(batch_mapping, "Batched mapping 1 -Enable; 0 - Disable");
40+
3741
struct vdpasim_virtqueue {
3842
struct vringh vring;
3943
struct vringh_kiov iov;
@@ -334,15 +338,21 @@ static const struct dma_map_ops vdpasim_dma_ops = {
334338
};
335339

336340
static const struct vdpa_config_ops vdpasim_net_config_ops;
341+
static const struct vdpa_config_ops vdpasim_net_batch_config_ops;
337342

338343
static struct vdpasim *vdpasim_create(void)
339344
{
345+
const struct vdpa_config_ops *ops;
340346
struct vdpasim *vdpasim;
341347
struct device *dev;
342348
int ret = -ENOMEM;
343349

344-
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL,
345-
&vdpasim_net_config_ops);
350+
if (batch_mapping)
351+
ops = &vdpasim_net_batch_config_ops;
352+
else
353+
ops = &vdpasim_net_config_ops;
354+
355+
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops);
346356
if (!vdpasim)
347357
goto err_alloc;
348358

@@ -643,12 +653,36 @@ static const struct vdpa_config_ops vdpasim_net_config_ops = {
643653
.get_config = vdpasim_get_config,
644654
.set_config = vdpasim_set_config,
645655
.get_generation = vdpasim_get_generation,
646-
.set_map = vdpasim_set_map,
647656
.dma_map = vdpasim_dma_map,
648657
.dma_unmap = vdpasim_dma_unmap,
649658
.free = vdpasim_free,
650659
};
651660

661+
static const struct vdpa_config_ops vdpasim_net_batch_config_ops = {
662+
.set_vq_address = vdpasim_set_vq_address,
663+
.set_vq_num = vdpasim_set_vq_num,
664+
.kick_vq = vdpasim_kick_vq,
665+
.set_vq_cb = vdpasim_set_vq_cb,
666+
.set_vq_ready = vdpasim_set_vq_ready,
667+
.get_vq_ready = vdpasim_get_vq_ready,
668+
.set_vq_state = vdpasim_set_vq_state,
669+
.get_vq_state = vdpasim_get_vq_state,
670+
.get_vq_align = vdpasim_get_vq_align,
671+
.get_features = vdpasim_get_features,
672+
.set_features = vdpasim_set_features,
673+
.set_config_cb = vdpasim_set_config_cb,
674+
.get_vq_num_max = vdpasim_get_vq_num_max,
675+
.get_device_id = vdpasim_get_device_id,
676+
.get_vendor_id = vdpasim_get_vendor_id,
677+
.get_status = vdpasim_get_status,
678+
.set_status = vdpasim_set_status,
679+
.get_config = vdpasim_get_config,
680+
.set_config = vdpasim_set_config,
681+
.get_generation = vdpasim_get_generation,
682+
.set_map = vdpasim_set_map,
683+
.free = vdpasim_free,
684+
};
685+
652686
static int __init vdpasim_dev_init(void)
653687
{
654688
vdpasim_dev = vdpasim_create();

0 commit comments

Comments
 (0)