[CRIU] [PATCH] lazy-pages: fork: fix duplication of IOV lists

Andrei Vagin avagin at virtuozzo.com
Tue May 8 00:27:34 MSK 2018


Applied, thanks!

On Mon, May 07, 2018 at 09:50:02PM +0300, Mike Rapoport wrote:
> Instead of merging unfinished requests with child's IOVs we queued them
> into parent's IOV list. Fix it.
> 
> Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
> ---
>  criu/uffd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/criu/uffd.c b/criu/uffd.c
> index 0b26c7d..21db369 100644
> --- a/criu/uffd.c
> +++ b/criu/uffd.c
> @@ -475,7 +475,7 @@ static int copy_iovs(struct lazy_pages_info *src, struct lazy_pages_info *dst)
>  	 * The IOVs aready in flight for the parent process need to be
>  	 * transferred again for the child process
>  	 */
> -	merge_iov_lists(&dst->reqs, &src->iovs);
> +	merge_iov_lists(&dst->reqs, &dst->iovs);
>  
>  	dst->buf_size = src->buf_size;
>  	if (posix_memalign(&dst->buf, PAGE_SIZE, dst->buf_size))
> -- 
> 2.7.4
> 


More information about the CRIU mailing list