lkml.org 
[lkml]   [2008]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RFC v8][PATCH 09/12] Dump open file descriptors
I'm still trying to figure out the cause of my BUG at dcache.c:666,
so as I walk through the code a few more nitpicks:

Quoting Oren Laadan (orenl@cs.columbia.edu):
> +int cr_scan_fds(struct files_struct *files, int **fdtable)
> +{
> + struct fdtable *fdt;
> + int *fds;
> + int i, n = 0;
> + int tot = CR_DEFAULT_FDTABLE;
> +
> + fds = kmalloc(tot * sizeof(*fds), GFP_KERNEL);
> + if (!fds)
> + return -ENOMEM;
> +
> + /*
> + * We assume that the target task is frozen (or that we checkpoint
> + * ourselves), so we can safely proceed after krealloc() from where
> + * we left off; in the worst cases restart will fail.
> + */
> +
> + spin_lock(&files->file_lock);
> + rcu_read_lock();
> + fdt = files_fdtable(files);
> + for (i = 0; i < fdt->max_fds; i++) {
> + if (!fcheck_files(files, i))
> + continue;
> + if (n == tot) {
> + /*
> + * fcheck_files() is safe with drop/re-acquire
> + * of the lock, because it tests: fd < max_fds
> + */
> + spin_unlock(&files->file_lock);
> + rcu_read_unlock();
> + tot *= 2; /* won't overflow: kmalloc will fail */
> + fds = krealloc(fds, tot * sizeof(*fds), GFP_KERNEL);
> + if (!fds) {
> + kfree(fds);

If !fds kfree(fds) :)

> + return -ENOMEM;
> + }
> + rcu_read_lock();
> + spin_lock(&files->file_lock);
> + }
> + fds[n++] = i;
> + }
> + rcu_read_unlock();
> + spin_unlock(&files->file_lock);
> +
> + *fdtable = fds;
> + return n;
> +}
> +static int
> +cr_write_fd_ent(struct cr_ctx *ctx, struct files_struct *files, int fd)
> +{
> + struct cr_hdr h;
> + struct cr_hdr_fd_ent *hh = cr_hbuf_get(ctx, sizeof(*hh));
> + struct file *file = NULL;
> + struct fdtable *fdt;
> + int objref, new, ret;
> + int coe = 0; /* avoid gcc warning */
> +
> + rcu_read_lock();
> + fdt = files_fdtable(files);
> + file = fcheck_files(files, fd);
> + if (file) {
> + coe = FD_ISSET(fd, fdt->close_on_exec);
> + get_file(file);
> + }
> + rcu_read_unlock();
> +
> + /* sanity check (although this shouldn't happen) */
> + if (!file) {
> + ret = -EBADF;

(As mentioned on irc - and probably already fixed in your v9 - you to an
fput(NULL) in this case which will bomb)

> + goto out;
> + }
> +
> + new = cr_obj_add_ptr(ctx, file, &objref, CR_OBJ_FILE, 0);
> + cr_debug("fd %d objref %d file %p c-o-e %d)\n", fd, objref, file, coe);
> +
> + if (new < 0) {
> + ret = new;
> + goto out;
> + }
> +
> + h.type = CR_HDR_FD_ENT;
> + h.len = sizeof(*hh);
> + h.parent = 0;
> +
> + hh->objref = objref;
> + hh->fd = fd;
> + hh->close_on_exec = coe;
> +
> + ret = cr_write_obj(ctx, &h, hh);
> + if (ret < 0)
> + goto out;
> +
> + /* new==1 if-and-only-if file was newly added to hash */
> + if (new)
> + ret = cr_write_fd_data(ctx, file, objref);
> +
> +out:
> + cr_hbuf_put(ctx, sizeof(*hh));
> + fput(file);
> + return ret;
> +}
> +
> +int cr_write_files(struct cr_ctx *ctx, struct task_struct *t)
> +{
> + struct cr_hdr h;
> + struct cr_hdr_files *hh = cr_hbuf_get(ctx, sizeof(*hh));
> + struct files_struct *files;
> + int *fdtable;
> + int nfds, n, ret;
> +
> + h.type = CR_HDR_FILES;
> + h.len = sizeof(*hh);
> + h.parent = task_pid_vnr(t);
> +
> + files = get_files_struct(t);
> +
> + nfds = cr_scan_fds(files, &fdtable);
> + if (nfds < 0) {
> + put_files_struct(files);

need a cr_hbuf_put()

> + return nfds;
> + }
> +

(Cause of my BUG() doesn't appear to be here :( )

thanks,
-serge


\
 
 \ /
  Last update: 2008-11-03 22:01    [W:0.099 / U:34.956 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site