sadc/sar: New /proc/meminfo fields to memory statistics

Five new fields have been added to memory statistics displayed by sar.
These new fields are part of A_MEMORY activity and will be displayed
using option "-r ALL" with sar.
No layout format incompatible change with this patch: The datafile
created by this version of sar can still be read by a previous version
of sar (though the new fields won't be displayed of course as they are
unknown by this old version).
Various outputs from sadf (JSON, XML, etc.) have been updated to take
into account these new metrics.

Originally suggested by Peter Portante (@portante).

Signed-off-by: Sebastien GODARD <[email protected]>

Author: sysstat

activity.c

@@ -274,7 +274,7 @@ struct activity memory_act = {
 	.f_xml_print	= xml_print_memory_stats,
 	.f_json_print	= json_print_memory_stats,
 	.hdr_line	= "frmpg/s;bufpg/s;campg/s|"
-		          "kbmemfree;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty|"
+		          "kbmemfree;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty&kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused|"
 		          "kbswpfree;kbswpused;%swpused;kbswpcad;%swpcad",
 	.name		= "A_MEMORY",
 #endif

json_stats.c

@@ -495,6 +495,20 @@ __print_funct_t json_print_memory_stats(struct activity *a, int curr, int tab,
 		       smc->activekb,
 		       smc->inactkb,
 		       smc->dirtykb);
+
+		if (DISPLAY_MEM_ALL(a->opt_flags)) {
+			/* Display extended memory stats */
+			printf(", \"anonpg\": %lu, "
+			       "\"slab\": %lu, "
+			       "\"kstack\": %lu, "
+			       "\"pgtbl\": %lu, "
+			       "\"vmused\": %lu",
+			       smc->anonpgkb,
+			       smc->slabkb,
+			       smc->kstackkb,
+			       smc->pgtblkb,
+			       smc->vmusedkb);
+		}
 	}
 
 	if (DISPLAY_SWAP(a->opt_flags)) {

pr_stats.c

@@ -411,7 +411,12 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr,
 		avg_comkb    = 0,
 		avg_activekb = 0,
 		avg_inactkb  = 0,
-		avg_dirtykb  = 0;
+		avg_dirtykb  = 0,
+		avg_anonpgkb = 0,
+		avg_slabkb   = 0,
+		avg_kstackkb = 0,
+		avg_pgtblkb  = 0,
+		avg_vmusedkb = 0;
 	static unsigned long long
 		avg_frskb = 0,
 		avg_tlskb = 0,
@@ -432,12 +437,16 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr,
 	if (DISPLAY_MEM_AMT(a->opt_flags)) {
 		if (dis) {
 			printf("\n%-11s kbmemfree kbmemused  %%memused kbbuffers  kbcached"
-			       "  kbcommit   %%commit  kbactive   kbinact   kbdirty\n", timestamp[!curr]);
+			       "  kbcommit   %%commit  kbactive   kbinact   kbdirty", timestamp[!curr]);
+			if (DISPLAY_MEM_ALL(a->opt_flags)) {
+				printf("  kbanonpg    kbslab  kbkstack   kbpgtbl  kbvmused");
+			}
+			printf("\n");
 		}
 
 		if (!dispavg) {
 			/* Display instantaneous values */
-			printf("%-11s %9lu %9lu    %6.2f %9lu %9lu %9lu   %7.2f %9lu %9lu %9lu\n",
+			printf("%-11s %9lu %9lu    %6.2f %9lu %9lu %9lu   %7.2f %9lu %9lu %9lu",
 			       timestamp[curr],
 			       smc->frmkb,
 			       smc->tlmkb - smc->frmkb,
@@ -452,6 +461,18 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr,
 			       smc->inactkb,
 			       smc->dirtykb);
 
+			if (DISPLAY_MEM_ALL(a->opt_flags)) {
+				/* Display extended memory statistics */
+				printf(" %9lu %9lu %9lu %9lu %9lu",
+				       smc->anonpgkb,
+				       smc->slabkb,
+				       smc->kstackkb,
+				       smc->pgtblkb,
+				       smc->vmusedkb);
+			}
+
+			printf("\n");
+
 			/*
 			 * Will be used to compute the average.
 			 * We assume that the total amount of memory installed can not vary
@@ -464,10 +485,15 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr,
 			avg_activekb += smc->activekb;
 			avg_inactkb  += smc->inactkb;
 			avg_dirtykb  += smc->dirtykb;
+			avg_anonpgkb += smc->anonpgkb;
+			avg_slabkb   += smc->slabkb;
+			avg_kstackkb += smc->kstackkb;
+			avg_pgtblkb  += smc->pgtblkb;
+			avg_vmusedkb += smc->vmusedkb;
 		}
 		else {
 			/* Display average values */
-			printf("%-11s %9.0f %9.0f    %6.2f %9.0f %9.0f %9.0f   %7.2f %9.0f %9.0f %9.0f\n",
+			printf("%-11s %9.0f %9.0f    %6.2f %9.0f %9.0f %9.0f   %7.2f %9.0f %9.0f %9.0f",
 			       timestamp[curr],
 			       (double) avg_frmkb / avg_count,
 			       (double) smc->tlmkb - ((double) avg_frmkb / avg_count),
@@ -485,9 +511,22 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr,
 			       (double) avg_inactkb / avg_count,
 			       (double) avg_dirtykb / avg_count);
 
+			if (DISPLAY_MEM_ALL(a->opt_flags)) {
+				printf(" %9.0f %9.0f %9.0f %9.0f %9.0f",
+				       (double) avg_anonpgkb / avg_count,
+				       (double) avg_slabkb / avg_count,
+				       (double) avg_kstackkb / avg_count,
+				       (double) avg_pgtblkb / avg_count,
+				       (double) avg_vmusedkb / avg_count);
+			}
+
+			printf("\n");
+
 			/* Reset average counters */
 			avg_frmkb = avg_bufkb = avg_camkb = avg_comkb = 0;
 			avg_activekb = avg_inactkb = avg_dirtykb = 0;
+			avg_anonpgkb = avg_slabkb = avg_kstackkb = 0;
+			avg_pgtblkb = avg_vmusedkb = 0;
 		}
 	}
 

rd_stats.c

@@ -268,6 +268,26 @@ void read_meminfo(struct stats_memory *st_memory)
 			/* Read the amount of commited memory in kB */
 			sscanf(line + 13, "%lu", &st_memory->comkb);
 		}
+		else if (!strncmp(line, "AnonPages:", 10)) {
+			/* Read the amount of pages mapped into userspace page tables in kB */
+			sscanf(line + 10, "%lu", &st_memory->anonpgkb);
+		}
+		else if (!strncmp(line, "Slab:", 5)) {
+			/* Read the amount of in-kernel data structures cache in kB */
+			sscanf(line + 5, "%lu", &st_memory->slabkb);
+		}
+		else if (!strncmp(line, "KernelStack:", 12)) {
+			/* Read the kernel stack utilization in kB */
+			sscanf(line + 12, "%lu", &st_memory->kstackkb);
+		}
+		else if (!strncmp(line, "PageTables:", 11)) {
+			/* Read the amount of memory dedicated to the lowest level of page tables in kB */
+			sscanf(line + 11, "%lu", &st_memory->pgtblkb);
+		}
+		else if (!strncmp(line, "VmallocUsed:", 12)) {
+			/* Read the amount of vmalloc area which is used in kB */
+			sscanf(line + 12, "%lu", &st_memory->vmusedkb);
+		}
 	}
 
 	fclose(fp);

rd_stats.h

@@ -166,6 +166,11 @@ struct stats_memory {
 	unsigned long activekb	__attribute__ ((aligned (8)));
 	unsigned long inactkb	__attribute__ ((aligned (8)));
 	unsigned long dirtykb	__attribute__ ((aligned (8)));
+	unsigned long anonpgkb	__attribute__ ((aligned (8)));
+	unsigned long slabkb	__attribute__ ((aligned (8)));
+	unsigned long kstackkb	__attribute__ ((aligned (8)));
+	unsigned long pgtblkb	__attribute__ ((aligned (8)));
+	unsigned long vmusedkb	__attribute__ ((aligned (8)));
 };
 
 #define STATS_MEMORY_SIZE	(sizeof(struct stats_memory))

rndr_stats.c

@@ -733,6 +733,7 @@ __print_funct_t render_memory_stats(struct activity *a, int isdb, char *pre,
 		*smp = (struct stats_memory *) a->buf[!curr];
 	int pt_newlin
 		= (DISPLAY_HORIZONTALLY(flags) ? PT_NOFLAG : PT_NEWLIN);
+	int ptn;
 
 	if (DISPLAY_MEMORY(a->opt_flags)) {
 
@@ -800,9 +801,32 @@ __print_funct_t render_memory_stats(struct activity *a, int isdb, char *pre,
 		       "-\tkbinact", NULL, NULL,
 		       smc->inactkb, DNOVAL, NULL);
 
-		render(isdb, pre, PT_USEINT | pt_newlin,
+		ptn = DISPLAY_MEM_ALL(a->opt_flags) ? 0 : pt_newlin;
+		render(isdb, pre, PT_USEINT | ptn,
 		       "-\tkbdirty", NULL, NULL,
 		       smc->dirtykb, DNOVAL, NULL);
+
+		if (DISPLAY_MEM_ALL(a->opt_flags)) {
+			render(isdb, pre, PT_USEINT,
+			       "-\tkbanonpg", NULL, NULL,
+			       smc->anonpgkb, DNOVAL, NULL);
+
+			render(isdb, pre, PT_USEINT,
+			       "-\tkbslab", NULL, NULL,
+			       smc->slabkb, DNOVAL, NULL);
+
+			render(isdb, pre, PT_USEINT,
+			       "-\tkbkstack", NULL, NULL,
+			       smc->kstackkb, DNOVAL, NULL);
+
+			render(isdb, pre, PT_USEINT,
+			       "-\tkbpgtbl", NULL, NULL,
+			       smc->pgtblkb, DNOVAL, NULL);
+
+			render(isdb, pre, PT_USEINT | pt_newlin,
+			       "-\tkbvmused", NULL, NULL,
+			       smc->vmusedkb, DNOVAL, NULL);
+		}
 	}
 
 	if (DISPLAY_SWAP(a->opt_flags)) {

sa.h

@@ -116,10 +116,13 @@
 #define AO_F_MEM_DIA		0x00000001
 #define AO_F_MEM_AMT		0x00000002
 #define AO_F_MEM_SWAP		0x00000004
+/* AO_F_MEM_ALL: See opt_flags in struct activity below */
+#define AO_F_MEM_ALL		(AO_F_MEM_AMT << 8)
 
 #define DISPLAY_MEMORY(m)	(((m) & AO_F_MEM_DIA)     == AO_F_MEM_DIA)
 #define DISPLAY_MEM_AMT(m)	(((m) & AO_F_MEM_AMT)     == AO_F_MEM_AMT)
 #define DISPLAY_SWAP(m)		(((m) & AO_F_MEM_SWAP)    == AO_F_MEM_SWAP)
+#define DISPLAY_MEM_ALL(m)	(((m) & AO_F_MEM_ALL)     == AO_F_MEM_ALL)
 
 /* Output flags for option -u [ ALL ] */
 #define AO_F_CPU_DEF		0x00000001
@@ -380,6 +383,10 @@ struct activity {
 	__print_funct_t (*f_json_print) (struct activity *, int, int, unsigned long long);
 	/*
 	 * Header string displayed by sadf -d/-D.
+	 * Header lines for each output (for activities with multiple outputs) are
+	 * separated with a '|' character.
+	 * For a given output, the first field corresponding to extended statistics
+	 * (eg. -r ALL) begins with a '&' character.
 	 */
 	char *hdr_line;
 	/*
@@ -427,6 +434,10 @@ struct activity {
 	/*
 	 * Optional flags for activity. This is eg. used when AO_MULTIPLE_OUTPUTS
 	 * option is set.
+	 * 0x0001 - 0x0080 : Multiple outputs (eg. AO_F_MEM_AMT, AO_F_MEM_SWAP...)
+	 * 0x0100 - 0x8000 : If bit set then display complete header (hdr_line) for
+	 *                   corresponding output
+	 * 0x010000+       : Optional flags
 	 */
 	unsigned int opt_flags;
 	/*

sa_common.c

@@ -957,8 +957,8 @@ int get_activity_nr(struct activity *act[], unsigned int option, int count_outpu
 		if ((act[i]->options & option) == option) {
 
 			if (HAS_MULTIPLE_OUTPUTS(act[i]->options) && count_outputs) {
-				for (msk = 1; msk < 0x10; msk <<= 1) {
-					if (act[i]->opt_flags & msk) {
+				for (msk = 1; msk < 0x100; msk <<= 1) {
+					if ((act[i]->opt_flags & 0xff) & msk) {
 						n++;
 					}
 				}
@@ -1520,17 +1520,21 @@ int parse_sar_opt(char *argv[], int *opt, struct activity *act[],
 	int i, p;
 
 	for (i = 1; *(argv[*opt] + i); i++) {
+		/*
+		 * Note: argv[*opt] contains something like "-BruW"
+		 *     *(argv[*opt] + i) will contain 'B', 'r', etc.
+		 */
 
 		switch (*(argv[*opt] + i)) {
 
 		case 'A':
 			select_all_activities(act);
 
-			/* Force '-P ALL -I XALL' */
+			/* Force '-P ALL -I XALL -r ALL -u ALL' */
 
 			p = get_activity_position(act, A_MEMORY);
 			act[p]->opt_flags |= AO_F_MEM_AMT + AO_F_MEM_DIA +
-					     AO_F_MEM_SWAP;
+					     AO_F_MEM_SWAP + AO_F_MEM_ALL;
 
 			p = get_activity_position(act, A_IRQ);
 			set_bitmap(act[p]->bitmap->b_array, ~0,
@@ -1604,6 +1608,11 @@ int parse_sar_opt(char *argv[], int *opt, struct activity *act[],
 			p = get_activity_position(act, A_MEMORY);
 			act[p]->options   |= AO_SELECTED;
 			act[p]->opt_flags |= AO_F_MEM_AMT;
+			if (!*(argv[*opt] + i + 1) && argv[*opt + 1] && !strcmp(argv[*opt + 1], K_ALL)) {
+				(*opt)++;
+				act[p]->opt_flags |= AO_F_MEM_ALL;
+				return 0;
+			}
 			break;
 
 		case 'R':

sadf.c

@@ -434,7 +434,7 @@ void write_textual_comments(int curr, int use_tm_start, int use_tm_end, int tab,
  */
 void list_fields(unsigned int act_id)
 {
-	int i;
+	int i, j;
 	unsigned int msk;
 	char *hl;
 	char hline[HEADER_LINE_LEN];
@@ -457,8 +457,24 @@ void list_fields(unsigned int act_id)
 				msk = 1;
 				strcpy(hline, act[i]->hdr_line);
 				for (hl = strtok(hline, "|"); hl; hl = strtok(NULL, "|"), msk <<= 1) {
-					if ((hl != NULL) && (act[i]->opt_flags & msk)) {
-						printf(";%s", hl);
+					if ((hl != NULL) && ((act[i]->opt_flags & 0xff) & msk)) {
+						if (strchr(hl, '&')) {
+							j = strcspn(hl, "&");
+							if ((act[i]->opt_flags & 0xff00) & (msk << 8)) {
+								/* Display whole header line */
+								*(hl + j) = ';';
+								printf(";%s", hl);
+							}
+							else {
+								/* Display only the first part of the header line */
+								*(hl + j) = '\0';
+								printf(";%s", hl);
+							}
+							*(hl + j) = '&';
+						}
+						else {
+							printf(";%s", hl);
+						}
 						if ((act[i]->nr > 1) && DISPLAY_HORIZONTALLY(flags)) {
 							printf("[...]");
 						}
@@ -1379,9 +1395,9 @@ void main_display_loop(int ifd, struct file_activity *file_actlst, __nr_t cpu_nr
 
 					optf = act[p]->opt_flags;
 
-					for (msk = 1; msk < 0x10; msk <<= 1) {
-						if (act[p]->opt_flags & msk) {
-							act[p]->opt_flags &= msk;
+					for (msk = 1; msk < 0x100; msk <<= 1) {
+						if ((act[p]->opt_flags & 0xff) & msk) {
+							act[p]->opt_flags &= (0xffffff00 + msk);
 
 							rw_curr_act_stats(ifd, fpos, &curr, &cnt, &eosaf,
 									  act[p]->id, &reset, file_actlst,

sar.c

@@ -108,7 +108,8 @@ void usage(char *progname)
 	print_usage_title(stderr, progname);
 	fprintf(stderr, _("Options are:\n"
 			  "[ -A ] [ -B ] [ -b ] [ -C ] [ -D ] [ -d ] [ -F ] [ -H ] [ -h ] [ -p ] [ -q ]\n"
-			  "[ -R ] [ -r ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ] [ -v ] [ -W ] [ -w ] [ -y ]\n"
+			  "[ -R ] [ -r [ ALL ] ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -V ] [ -v ] [ -W ]\n"
+			  "[ -w ] [ -y ]\n"
 			  "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
 			  "[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 			  "[ -j { ID | LABEL | PATH | UUID | ... } ]\n"
@@ -168,7 +169,8 @@ void display_help(char *progname)
 		 "\t\tUDP6\tUDP traffic\t(v6)\n"));
 	printf(_("\t-q\tQueue length and load average statistics\n"));
 	printf(_("\t-R\tMemory statistics\n"));
-	printf(_("\t-r\tMemory utilization statistics\n"));
+	printf(_("\t-r [ ALL ]\n"
+		 "\tMemory utilization statistics\n"));
 	printf(_("\t-S\tSwap space utilization statistics\n"));
 	printf(_("\t-u [ ALL ]\n"
 		 "\t\tCPU utilization statistics\n"));
@@ -1007,9 +1009,9 @@ void read_stats_from_file(char from_file[])
 
 				optf = act[p]->opt_flags;
 
-				for (msk = 1; msk < 0x10; msk <<= 1) {
-					if (act[p]->opt_flags & msk) {
-						act[p]->opt_flags &= msk;
+				for (msk = 1; msk < 0x100; msk <<= 1) {
+					if ((act[p]->opt_flags & 0xff) & msk) {
+						act[p]->opt_flags &= (0xffffff00 + msk);
 
 						handle_curr_act_stats(ifd, fpos, &curr, &cnt,
 								      &eosaf, rows, act[p]->id,