Skip to content

Commit

Permalink
Supply unique (st_dev, st_ino) value pair for the fstat(2) done on th…
Browse files Browse the repository at this point in the history
…e pipes.

Reviewed by:	jhb, Peter Jeremy <peterjeremy acm org>
MFC after:	2 weeks
  • Loading branch information
kostikbel committed Oct 5, 2011
1 parent 12b63c7 commit 87f923a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
28 changes: 26 additions & 2 deletions sys/kern/sys_pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$");

#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
Expand Down Expand Up @@ -224,6 +225,8 @@ static int pipe_zone_init(void *mem, int size, int flags);
static void pipe_zone_fini(void *mem, int size);

static uma_zone_t pipe_zone;
static struct unrhdr *pipeino_unr;
static dev_t pipedev_ino;

SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_ANY, pipeinit, NULL);

Expand All @@ -235,6 +238,10 @@ pipeinit(void *dummy __unused)
pipe_zone_ctor, NULL, pipe_zone_init, pipe_zone_fini,
UMA_ALIGN_PTR, 0);
KASSERT(pipe_zone != NULL, ("pipe_zone not initialized"));
pipeino_unr = new_unrhdr(1, INT32_MAX, NULL);
KASSERT(pipeino_unr != NULL, ("pipe fake inodes not initialized"));
pipedev_ino = devfs_alloc_cdp_inode();
KASSERT(pipedev_ino > 0, ("pipe dev inode not initialized"));
}

static int
Expand Down Expand Up @@ -562,6 +569,12 @@ pipe_create(pipe, backing)
/* If we're not backing this pipe, no need to do anything. */
error = 0;
}
if (error == 0) {
pipe->pipe_ino = alloc_unr(pipeino_unr);
if (pipe->pipe_ino == -1)
/* pipeclose will clear allocated kva */
error = ENOMEM;
}
return (error);
}

Expand Down Expand Up @@ -1408,9 +1421,10 @@ pipe_stat(fp, ub, active_cred, td)
ub->st_ctim = pipe->pipe_ctime;
ub->st_uid = fp->f_cred->cr_uid;
ub->st_gid = fp->f_cred->cr_gid;
ub->st_dev = pipedev_ino;
ub->st_ino = pipe->pipe_ino;
/*
* Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
* XXX (st_dev, st_ino) should be unique.
* Left as 0: st_nlink, st_rdev, st_flags, st_gen.
*/
return (0);
}
Expand Down Expand Up @@ -1463,6 +1477,7 @@ pipeclose(cpipe)
{
struct pipepair *pp;
struct pipe *ppipe;
ino_t ino;

KASSERT(cpipe != NULL, ("pipeclose: cpipe == NULL"));

Expand Down Expand Up @@ -1520,6 +1535,12 @@ pipeclose(cpipe)
seldrain(&cpipe->pipe_sel);
knlist_destroy(&cpipe->pipe_sel.si_note);

/*
* Postpone the destroy of the fake inode number allocated for
* our end, until pipe mtx is unlocked.
*/
ino = cpipe->pipe_ino;

/*
* If both endpoints are now closed, release the memory for the
* pipe pair. If not, unlock.
Expand All @@ -1532,6 +1553,9 @@ pipeclose(cpipe)
uma_zfree(pipe_zone, cpipe->pipe_pair);
} else
PIPE_UNLOCK(cpipe);

if (ino > 0)
free_unr(pipeino_unr, cpipe->pipe_ino);
}

/*ARGSUSED*/
Expand Down
1 change: 1 addition & 0 deletions sys/sys/pipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ struct pipe {
u_int pipe_state; /* pipe status info */
int pipe_busy; /* busy flag, mostly to handle rundown sanely */
int pipe_present; /* still present? */
ino_t pipe_ino; /* fake inode for stat(2) */
};

/*
Expand Down

0 comments on commit 87f923a

Please sign in to comment.