<div dir="ltr"><div><div><div>Hi all,<br><br></div>I checked for that update in the repo, but I couldn't find it, so based in that diff output I modified the file.c, recompiled with 'make' and tried again the mtouch test. It failed again with the same "Pre-dump failed" error. <br>
</div><br>I remade again the info files that Andrew asked the last time, there are some differences with the old ones (less errors but the same error at the end), find them attached. I also attached my files.c file (just in case you want to check if I modified it correctly).<br>
<br></div><div>Meanwhile I'm working on try the mtouch test on 3.13 kernel.<br><br></div><div>Thanks.<br></div><div><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">2014-03-31 9:23 GMT+02:00 Andrew Vagin <span dir="ltr"><<a href="mailto:avagin@parallels.com" target="_blank">avagin@parallels.com</a>></span>:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Sun, Mar 30, 2014 at 02:30:40PM +0400, Cyrill Gorcunov wrote:<br>
> On Sun, Mar 30, 2014 at 01:41:43PM +0400, Andrew Vagin wrote:<br>
> > On Sat, Mar 29, 2014 at 10:44:03PM +0400, Cyrill Gorcunov wrote:<br>
> > > From cd6596469161ea85ffb03b0f2ab576509e83a187 Mon Sep 17 00:00:00 2001<br>
> > > From: Cyrill Gorcunov <<a href="mailto:gorcunov@openvz.org">gorcunov@openvz.org</a>><br>
> > > Date: Sat, 29 Mar 2014 22:43:14 +0400<br>
> > > Subject: [PATCH] files: predump_one_fd -- Use direct read of pid's fd link<br>
><br>
> Attached<br>
<br>
</div></div>Acked-by: Andrew Vagin <<a href="mailto:avagin@parallels.com">avagin@parallels.com</a>><br>
<br>
> From e33563110d586d3e52ef4a5d438be0038d0c450f Mon Sep 17 00:00:00 2001<br>
<div class="">> From: Cyrill Gorcunov <<a href="mailto:gorcunov@openvz.org">gorcunov@openvz.org</a>><br>
> Date: Sat, 29 Mar 2014 22:43:14 +0400<br>
> Subject: [PATCH] files: predump_one_fd -- Use direct read of pid's fd link<br>
><br>
</div><div class="">> Using O_PATH known to be buggy on 3.11 kernel so use<br>
> direct link reading procedure here.<br>
><br>
> Signed-off-by: Cyrill Gorcunov <<a href="mailto:gorcunov@openvz.org">gorcunov@openvz.org</a>><br>
> ---<br>
> files.c | 34 ++++++++++------------------------<br>
> 1 file changed, 10 insertions(+), 24 deletions(-)<br>
><br>
> diff --git a/files.c b/files.c<br>
</div>> index 3cf5e470c5c0..9f0c69141a88 100644<br>
<div class="">> --- a/files.c<br>
> +++ b/files.c<br>
> @@ -405,33 +405,20 @@ err:<br>
><br>
> static int predump_one_fd(int pid, int fd)<br>
> {<br>
> - int lfd, ret = 0;<br>
> - struct statfs buf;<br>
> const struct fdtype_ops *ops;<br>
> - char link[32];<br>
> -<br>
> - /*<br>
> - * This should look like the dump_task_files_seized,<br>
> - * but since we pre-dump only *notify-s, we use the<br>
> - * enightened version without fds draining.<br>
> - */<br>
> -<br>
> - lfd = __open_proc(pid, O_PATH | O_RDONLY, "fd/%d", fd);<br>
> - if (lfd < 0)<br>
> - return 0; /* That's OK, it can be a socket */<br>
</div>> + char link[PATH_MAX], t[32];<br>
<div class="im HOEnZb">> + int ret = 0;<br>
><br>
> - if (fstatfs(lfd, &buf)) {<br>
> - pr_perror("Can't fstatfs file");<br>
> + snprintf(t, sizeof(t), "/proc/%d/fd/%d", pid, fd);<br>
> + ret = readlink(t, link, sizeof(link));<br>
> + if (ret < 0) {<br>
> + pr_perror("Can't read link of fd %d", fd);<br>
> + return -1;<br>
> + } else if ((size_t)ret == sizeof(link)) {<br>
> + pr_err("Buffer for read link of fd %d is too small\n", fd);<br>
> return -1;<br>
> }<br>
</div><div class="HOEnZb"><div class="h5">> -<br>
> - if (buf.f_type != ANON_INODE_FS_MAGIC)<br>
> - goto out;<br>
> -<br>
> - if (read_fd_link(lfd, link, sizeof(link)) < 0) {<br>
> - ret = -1;<br>
> - goto out;<br>
> - }<br>
> + link[ret] = 0;<br>
><br>
> if (is_inotify_link(link))<br>
> ops = &inotify_dump_ops;<br>
> @@ -443,7 +430,6 @@ static int predump_one_fd(int pid, int fd)<br>
> pr_debug("Pre-dumping %d's %d fd\n", pid, fd);<br>
> ret = ops->pre_dump(pid, fd);<br>
> out:<br>
> - close(lfd);<br>
> return ret;<br>
> }<br>
><br>
> --<br>
> 1.8.3.1<br>
><br>
<br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>Óscar Fernández<br>
</div>