Commit 2f7a7bbd authored by Pavel Emelyanov's avatar Pavel Emelyanov

mem: Use ctl's vpid, not the one from arguments

This saves some space on stack.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent fb9b0f50
...@@ -1419,7 +1419,7 @@ static int dump_one_task(struct pstree_item *item) ...@@ -1419,7 +1419,7 @@ static int dump_one_task(struct pstree_item *item)
goto err_cure_fdset; goto err_cure_fdset;
} }
item->pid.virt = misc.pid; parasite_ctl->pid.virt = item->pid.virt = misc.pid;
item->sid = misc.sid; item->sid = misc.sid;
item->pgid = misc.pgid; item->pgid = misc.pgid;
...@@ -1461,7 +1461,7 @@ static int dump_one_task(struct pstree_item *item) ...@@ -1461,7 +1461,7 @@ static int dump_one_task(struct pstree_item *item)
} }
} }
ret = parasite_dump_pages_seized(parasite_ctl, item->pid.virt, &vmas, cr_fdset); ret = parasite_dump_pages_seized(parasite_ctl, &vmas, cr_fdset);
if (ret) if (ret)
goto err_cure; goto err_cure;
......
...@@ -4,6 +4,6 @@ struct vm_area_list; ...@@ -4,6 +4,6 @@ struct vm_area_list;
unsigned int vmas_pagemap_size(struct vm_area_list *vmas); unsigned int vmas_pagemap_size(struct vm_area_list *vmas);
struct parasite_ctl; struct parasite_ctl;
struct cr_fdset; struct cr_fdset;
int parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid, int parasite_dump_pages_seized(struct parasite_ctl *ctl,
struct vm_area_list *vma_area_list, struct cr_fdset *cr_fdset); struct vm_area_list *vma_area_list, struct cr_fdset *cr_fdset);
#endif #endif
...@@ -40,7 +40,7 @@ struct vm_area_list; ...@@ -40,7 +40,7 @@ struct vm_area_list;
extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc); extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
struct _CredsEntry; struct _CredsEntry;
extern int parasite_dump_creds(struct parasite_ctl *ctl, struct _CredsEntry *ce); extern int parasite_dump_creds(struct parasite_ctl *ctl, struct _CredsEntry *ce);
extern int parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid, extern int parasite_dump_pages_seized(struct parasite_ctl *ctl,
struct vm_area_list *vma_area_list, struct vm_area_list *vma_area_list,
struct cr_fdset *cr_fdset); struct cr_fdset *cr_fdset);
struct parasite_dump_thread; struct parasite_dump_thread;
......
...@@ -98,7 +98,7 @@ static int parasite_mprotect_seized(struct parasite_ctl *ctl, struct vm_area_lis ...@@ -98,7 +98,7 @@ static int parasite_mprotect_seized(struct parasite_ctl *ctl, struct vm_area_lis
return parasite_execute(PARASITE_CMD_MPROTECT_VMAS, ctl); return parasite_execute(PARASITE_CMD_MPROTECT_VMAS, ctl);
} }
static int __parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid, static int __parasite_dump_pages_seized(struct parasite_ctl *ctl,
struct vm_area_list *vma_area_list, struct cr_fdset *cr_fdset) struct vm_area_list *vma_area_list, struct cr_fdset *cr_fdset)
{ {
struct parasite_dump_pages_args *args; struct parasite_dump_pages_args *args;
...@@ -159,7 +159,7 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid, ...@@ -159,7 +159,7 @@ static int __parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid,
args->off += args->nr; args->off += args->nr;
} }
ret = open_page_xfer(&xfer, CR_FD_PAGEMAP, vpid); ret = open_page_xfer(&xfer, CR_FD_PAGEMAP, ctl->pid.virt);
if (ret < 0) if (ret < 0)
goto out_pp; goto out_pp;
...@@ -177,7 +177,7 @@ out: ...@@ -177,7 +177,7 @@ out:
return ret; return ret;
} }
int parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid, int parasite_dump_pages_seized(struct parasite_ctl *ctl,
struct vm_area_list *vma_area_list, struct cr_fdset *cr_fdset) struct vm_area_list *vma_area_list, struct cr_fdset *cr_fdset)
{ {
int ret; int ret;
...@@ -188,7 +188,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid, ...@@ -188,7 +188,7 @@ int parasite_dump_pages_seized(struct parasite_ctl *ctl, int vpid,
return ret; return ret;
} }
ret = __parasite_dump_pages_seized(ctl, vpid, vma_area_list, cr_fdset); ret = __parasite_dump_pages_seized(ctl, vma_area_list, cr_fdset);
if (ret) if (ret)
pr_err("Can't dump page with parasite\n"); pr_err("Can't dump page with parasite\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment