diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-21 15:46:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-21 15:46:39 -0700 |
| commit | a1effab7a3a35a837dd9d2b974a1bc4939df1ad5 (patch) | |
| tree | ae539150e7ab0aae6b8ea335287807ea41bc6845 | |
| parent | Merge tag 'nfsd-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux (diff) | |
| parent | vfio/mlx5: Fix the report of dirty_bytes upon pre-copy (diff) | |
| download | linux-a1effab7a3a35a837dd9d2b974a1bc4939df1ad5.tar.xz linux-a1effab7a3a35a837dd9d2b974a1bc4939df1ad5.zip | |
Merge tag 'vfio-v6.3-rc4' of https://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson:
- Fix dirty size reporting for pre-copy in mlx5 variant driver (Yishai
Hadas)
* tag 'vfio-v6.3-rc4' of https://github.com/awilliam/linux-vfio:
vfio/mlx5: Fix the report of dirty_bytes upon pre-copy
| -rw-r--r-- | drivers/vfio/pci/mlx5/main.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/vfio/pci/mlx5/main.c b/drivers/vfio/pci/mlx5/main.c index e897537a9e8a..d95fd382814c 100644 --- a/drivers/vfio/pci/mlx5/main.c +++ b/drivers/vfio/pci/mlx5/main.c @@ -442,16 +442,10 @@ static long mlx5vf_precopy_ioctl(struct file *filp, unsigned int cmd, if (migf->pre_copy_initial_bytes > *pos) { info.initial_bytes = migf->pre_copy_initial_bytes - *pos; } else { - buf = mlx5vf_get_data_buff_from_pos(migf, *pos, &end_of_data); - if (buf) { - info.dirty_bytes = buf->start_pos + buf->length - *pos; - } else { - if (!end_of_data) { - ret = -EINVAL; - goto err_migf_unlock; - } - info.dirty_bytes = inc_length; - } + info.dirty_bytes = migf->max_pos - *pos; + if (!info.dirty_bytes) + end_of_data = true; + info.dirty_bytes += inc_length; } if (!end_of_data || !inc_length) { |