Add a new "file" to procfs: "rlimit" which shows the resource limits for

the process.

PR:		11342
Submitted by:	Adrian Chadd adrian@freebsd.org
Reviewed by:	phk

4 files changed, 188 insertions, 4 deletions

diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index d9b333b..0c2698a 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.22 1999/04/27 11:16:35 phk Exp $
+ *	$Id: procfs.h,v 1.23 1999/04/28 11:37:18 phk Exp $
  */
 
 /*
@@ -57,7 +57,8 @@ typedef enum {
 	Pnotepg,	/* process group notifier */
 	Pmap,		/* memory map */
 	Ptype,		/* executable type */
-	Pcmdline	/* command line */
+	Pcmdline,	/* command line */
+	Prlimit		/* resource limits */
 } pfstype;
 
 /*
@@ -156,6 +157,7 @@ int procfs_dostatus __P((struct proc *, struct proc *, struct pfsnode *pfsp, str
 int procfs_domap __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio));
 int procfs_dotype __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio));
 int procfs_docmdline __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio));
+int procfs_dorlimit __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio));
 
 /* Return 1 if process has special kernel digging privileges */
 int procfs_kmemaccess __P((struct proc *));
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
new file mode 100644
index 0000000..b211d0b
--- /dev/null
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 1999 Adrian Chadd
+ * Copyright (c) 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jan-Simon Pendry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
+ *
+ *	$Id: procfs_status.c,v 1.12 1999/01/05 03:53:06 peter Exp $
+ */
+
+/*
+ * To get resource.h to include our rlimit_ident[] array of rlimit identifiers
+ */
+
+#define _RLIMIT_IDENT
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+#include <sys/tty.h>
+#include <sys/resourcevar.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <miscfs/procfs/procfs.h>
+
+
+/*
+ * This converts a quad_t to a string, stored in fin
+ * It is here because there doesn't exist a quad_t entry in the kernel
+ * printf() library.
+ */
+
+static void quadtostring (char *fin, quad_t num)
+{
+	char str[128];
+	char *cp;
+	int i, n;
+
+	cp = str;
+	i = 0;
+  
+	/*
+	 * Create the number string.
+	 * The string will be in reverse from the original number.
+	 */
+
+	while (num) {
+		*(cp++) = (num % 10) + '0';
+		num /= 10;
+		i++;
+	}
+
+	/* Null terminate */
+	*cp = '\0';
+
+	/*
+	 * Now, swap the order 
+	 */ 
+
+	for (n = 0; n < i; n++) {
+  		fin[n] = str[(i-1)-n];
+	}
+
+	/* Null terminate */
+	fin[n] = '\0';
+
+	return;
+}
+
+
+
+int
+procfs_dorlimit(curp, p, pfs, uio)
+	struct proc *curp;
+	struct proc *p;
+	struct pfsnode *pfs;
+	struct uio *uio;
+{
+	char *ps;
+	int i;
+	int xlen;
+	int error;
+	char psbuf[512];		/* XXX - conservative */
+	char qstr[64];
+
+	if (uio->uio_rw != UIO_READ)
+		return (EOPNOTSUPP);
+
+
+	ps = psbuf;
+
+	for (i = 0; i < RLIM_NLIMITS; i++) {
+
+		/*
+		 * Add the rlimit ident
+		 */
+
+		ps += sprintf(ps, "%s ", rlimit_ident[i]);
+
+		/* 
+		 * Replace RLIM_INFINITY with -1 in the string
+		 */
+
+		/*
+		 * current limit
+		 */
+
+		if (p->p_rlimit[i].rlim_cur == RLIM_INFINITY) {
+			ps += sprintf(ps, "-1 ");
+		} else {
+			quadtostring(qstr, p->p_rlimit[i].rlim_cur);
+			ps += sprintf(ps, "%s ", qstr);
+		}
+
+		/*
+		 * maximum limit
+		 */
+
+		if (p->p_rlimit[i].rlim_max == RLIM_INFINITY) {
+			ps += sprintf(ps, "-1\n");
+		} else {
+			quadtostring(qstr, p->p_rlimit[i].rlim_max);
+			ps += sprintf(ps, "%s\n", qstr);
+		}
+	}
+
+	/*
+	 * This logic is rather tasty - but its from procfs_status.c, so
+	 * I guess I'll use it here.
+	 */
+
+	xlen = ps - psbuf;
+	xlen -= uio->uio_offset;
+	ps = psbuf + uio->uio_offset;
+	xlen = imin(xlen, uio->uio_resid);
+	if (xlen <= 0)
+		error = 0;
+	else
+		error = uiomove(ps, xlen, uio);
+
+	return (error);
+}
+
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index 98e3687..7b5e18c 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
- *	$Id: procfs_subr.c,v 1.22 1999/01/05 03:53:06 peter Exp $
+ *	$Id: procfs_subr.c,v 1.23 1999/01/27 22:42:07 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -182,6 +182,7 @@ loop:
 	case Pmap:
 	case Pstatus:
 	case Pcmdline:
+	case Prlimit:
 		pfs->pfs_mode = (VREAD) |
 				(VREAD >> 3) |
 				(VREAD >> 6);
@@ -287,6 +288,10 @@ procfs_rw(ap)
 		rtval = procfs_docmdline(curp, p, pfs, uio);
 		break;
 
+	case Prlimit:
+		rtval = procfs_dorlimit(curp, p, pfs, uio);
+		break;
+
 	default:
 		rtval = EOPNOTSUPP;
 		break;
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 4f0b8fe..f229a69 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.65 1999/04/27 11:16:39 phk Exp $
+ *	$Id: procfs_vnops.c,v 1.66 1999/04/28 11:37:21 phk Exp $
  */
 
 /*
@@ -102,6 +102,7 @@ static struct proc_target {
 	{ DT_REG, N("map"), 	Pmap,		procfs_validmap },
 	{ DT_REG, N("etype"),	Ptype,		procfs_validtype },
 	{ DT_REG, N("cmdline"),	Pcmdline,	NULL },
+	{ DT_REG, N("rlimit"),	Prlimit,	NULL },
 #undef N
 };
 static const int nproc_targets = sizeof(proc_targets) / sizeof(proc_targets[0]);
@@ -577,6 +578,7 @@ procfs_getattr(ap)
 	case Pnote:
 	case Pnotepg:
 	case Pcmdline:
+	case Prlimit:
 		vap->va_nlink = 1;
 		vap->va_uid = procp->p_ucred->cr_uid;
 		vap->va_gid = procp->p_ucred->cr_gid;