Commit a1effab7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a2eaf246 4928f67b

drivers/vfio/pci/mlx5/main.c

+4 −10
Original line number Diff line number Diff line
@@ -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) {