PSARC 2006/496 Improved Zones/RM Integration

PSARC 2006/598 Swap resource control; locked memory RM improvements
PSARC 2006/660 rcapadm zone option
4754856 *prstat* prstat -atJTZ should count shared segments only once
4970603 RFE: should be able to persistently specify global zone's cpu shares
5026227 RFE: ability to rcap zones from global zone
5103071 RFE: local zones can run the global zone out of swap
6222025 RFE: simplify rctl syntax and improve cpu-shares/FSS interaction
6420985 rcapstat is broken on amd64
6421202 RFE: simplify and improve zones/pool integration
6442252 zonecfg's "unset" syntax is not documented and confusing
6490516 schedctl pages should not reserve swap
6490938 setproject can bind to the wrong pool
6498635 zone attach failure leaves zone in installed state
6500877 tmpfs syslogs incorrect path when non-global zone tmpfs mounts become full

1 files changed, 58 insertions, 3 deletions

diff --git a/usr/src/cmd/rcap/rcapadm/rcapadm.c b/usr/src/cmd/rcap/rcapadm/rcapadm.c
index cc9fd290a1..1951682283 100644
--- a/usr/src/cmd/rcap/rcapadm/rcapadm.c
+++ b/usr/src/cmd/rcap/rcapadm/rcapadm.c
@@ -39,6 +39,8 @@
 #include <libscf_priv.h>
 #include <libintl.h>
 #include <locale.h>
+#include <zone.h>
+#include <libzonecfg.h>
 
 #include "utils.h"
 #include "rcapd.h"
@@ -61,7 +63,9 @@ usage()
 	    "               [-c <percent>]                         "
 	    "# set memory cap\n"
 	    "                                                      "
-	    "# enforcement threshold\n"));
+	    "# enforcement threshold\n"
+	    "               [-z <zonename> -m <max-rss>]               "
+	    "# update zone memory cap\n"));
 	exit(E_USAGE);
 }
 
@@ -135,18 +139,54 @@ out:
 	scf_handle_destroy(h);
 }
 
+/*
+ * Update the in-kernel memory cap for the specified zone.
+ */
+static int
+update_zone_mcap(char *zonename, char *maxrss)
+{
+	zoneid_t zone_id;
+	uint64_t num;
+
+	if (getzoneid() != GLOBAL_ZONEID || zonecfg_in_alt_root())
+		return (E_SUCCESS);
+
+	/* get the running zone from the kernel */
+	if ((zone_id = getzoneidbyname(zonename)) == -1) {
+		(void) fprintf(stderr, gettext("zone '%s' must be running\n"),
+		    zonename);
+		return (E_ERROR);
+	}
+
+	if (zonecfg_str_to_bytes(maxrss, &num) == -1) {
+		(void) fprintf(stderr, gettext("invalid max-rss value\n"));
+		return (E_ERROR);
+	}
+
+	if (zone_setattr(zone_id, ZONE_ATTR_PHYS_MCAP, &num, 0) == -1) {
+		(void) fprintf(stderr, gettext("could not set memory "
+		    "cap for zone '%s'\n"), zonename);
+		return (E_ERROR);
+	}
+
+	return (E_SUCCESS);
+}
+
 int
 main(int argc, char *argv[])
 {
 	char *subopts, *optval;
 	int modified = 0;
+	boolean_t refresh = B_FALSE;
 	int opt;
+	char *zonename;
+	char *maxrss = NULL;
 
 	(void) setprogname("rcapadm");
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
 
-	while ((opt = getopt(argc, argv, "DEc:i:n")) != EOF) {
+	while ((opt = getopt(argc, argv, "DEc:i:m:nz:")) != EOF) {
 		switch (opt) {
 		case 'n':
 			no_starting_stopping = 1;
@@ -203,12 +243,24 @@ main(int argc, char *argv[])
 			}
 			modified++;
 			break;
+		case 'm':
+			maxrss = optarg;
+			break;
+		case 'z':
+			refresh = B_TRUE;
+			zonename = optarg;
+			break;
 		default:
 			usage();
 		}
 	}
 
-	if (argc > optind)
+	/* the -z & -m options must be used together */
+	if (argc > optind || (refresh && maxrss == NULL) ||
+	    (!refresh && maxrss != NULL))
+		usage();
+
+	if (refresh && (no_starting_stopping > 0 || modified))
 		usage();
 
 	if (rcfg_read(fname, -1, &conf, NULL) < 0) {
@@ -232,6 +284,9 @@ main(int argc, char *argv[])
 		}
 	}
 
+	if (refresh)
+		return (update_zone_mcap(zonename, maxrss));
+
 	if (modified) {
 		if (pressure >= 0)
 			conf.rcfg_memory_cap_enforcement_pressure = pressure;