Merge pull request #2763 from ghaerr/pmmeminfo

[kernel,cmds] Show physical memory address in meminfo for PM XMS allocations

Author: ghaerr

elks/arch/i86/mm/malloc.c

@@ -78,7 +78,8 @@ static segment_s * seg_split (segment_s * s1, SELEXT_T size0)
     if (size2 >= SEG_MIN_SIZE) {
 
         // TODO: use pool_alloc
-        segment_s * s2 = (segment_s *) heap_alloc (sizeof (segment_s), HEAP_TAG_SEG);
+        segment_s * s2 = (segment_s *) heap_alloc (sizeof (segment_s),
+            HEAP_TAG_SEG | HEAP_TAG_CLEAR);
         if (!s2)
             return 0;   // heap_alloc gives heap full message
 
@@ -287,6 +288,7 @@ void mm_get_usage (struct mem_usage *mu)
 {
     unsigned int free = 0;
     unsigned int used = 0;
+    unsigned long xmsused = 0;
 
     list_s * n = _seg_all.next;
 
@@ -296,11 +298,15 @@ void mm_get_usage (struct mem_usage *mu)
         /*if (used) printk ("seg %X: size %u used %u count %u\n",
             BASE(seg), seg->size, seg->flags, seg->ref_count);*/
 
-        if (seg->flags == SEG_FLAG_FREE)
-            free += seg->size;
-        else
-            used += seg->size;
-
+        if (seg->addr & 0xFFFF0000) {
+            if (seg->flags != SEG_FLAG_FREE)
+                xmsused += seg->size;
+        } else {
+            if (seg->flags == SEG_FLAG_FREE)
+                free += seg->size;
+            else
+                used += seg->size;
+        }
         n = seg->all.next;
     }
 
@@ -310,7 +316,7 @@ void mm_get_usage (struct mem_usage *mu)
     mu->main_free = ((free + 31) >> 6);
     mu->main_used = ((used + 31) >> 6);
 #ifdef CONFIG_FS_XMS
-    mu->xms_used = xms_alloc_ptr - KBYTES(XMS_START_ADDR);
+    mu->xms_used = xms_alloc_ptr - KBYTES(XMS_START_ADDR) + xmsused;
     mu->xms_free = SETUP_XMS_KBYTES - mu->xms_used;
 #else
     mu->xms_free = 0;
@@ -468,7 +474,8 @@ int seg_verify_area(pid_t pid, seg_t base, segoff_t offset)
 
 void INITPROC seg_add(SELEXT_T start, SELEXT_T end)
 {
-    segment_s * seg = (segment_s *) heap_alloc (sizeof (segment_s), HEAP_TAG_SEG);
+    segment_s * seg = (segment_s *) heap_alloc (sizeof (segment_s),
+        HEAP_TAG_SEG | HEAP_TAG_CLEAR);
     if(seg) {
         BASE(seg) = start;
         seg->size = end - start;

elks/include/linuxmt/mm.h

@@ -13,18 +13,17 @@
 #define SELEXT_T    segext_t    /* RM 16-bit paragraph address or count */
 #endif
 
-/* main memory management, also used with XMS memory in PM */
+/* main memory management, also used for XMS memory in PM */
 struct segment {
 	list_s    all;
 	list_s    free;
 	seg_t     base;             /* segment or selector used to access memory */
 	byte_t    flags;
 	byte_t    ref_count;
 	word_t    pid;
+	selext_t  addr;             /* mem paragraph address in PM (=0 in real mode kernel) */
+    /* following variable sized member must be last, or requires meminfo re-compilation */
 	SELEXT_T  size;             /* 16- or 32-bit size in paragraphs */
-#ifdef CONFIG_286_PMODE
-	selext_t  addr;             /* paragraph address of memory (=base in real mode) */
-#endif
 };
 
 typedef struct segment segment_s;

elks/init/main.c

@@ -223,13 +223,11 @@ static void INITPROC early_kernel_init(void)
 
     /* create near heap at end of kernel bss */
     heap_init();                    /* init near memory allocator */
-    heapofs = setup_arch();          /* sets membase and memend globals */
+    heapofs = setup_arch();         /* sets membase and memend globals */
     heap_add((void *)heapofs, heapsize);
-#ifdef CONFIG_286_PMODE
-    /* force 256K base system ram to force immediate usage of XMS allocations */
-    memend = 256 << 6;      // DEBUG REMOVE
-#endif
+    //memend = 256 << 6;            /* force early XMS allocations in PM */
     mm_init(membase, memend);       /* init far/main memory allocator */
+
 #ifdef CONFIG_BOOTOPTS
     struct umbseg *p;
     /* now able to add umb memory segments */
@@ -285,8 +283,8 @@ static void INITPROC kernel_init(void)
     selext_t xms_start = (XMS_START_ADDR >> 4) + (xms_alloc_ptr << 6);
     selext_t xms_end   = (XMS_START_ADDR >> 4) + ((addr_t)SETUP_XMS_KBYTES << 6);
     seg_add(xms_start, xms_end);            /* add remaining XMS memory paragraphs */
-    printk("mem: xms start %08lx end %08lx total %dK\n",
-        xms_start << 4, xms_end << 4, (xms_end - xms_start) >> 6);
+    printk("xms: %luK, start %06lx end %06lx\n",
+        (xms_end - xms_start) >> 6, xms_start << 4, xms_end << 4);
 #endif
 
     seg_t s = init_seg + (((word_t)(void *)__start_fartext_init + 15) >> 4);

elkscmd/sys_utils/meminfo.c

@@ -16,6 +16,7 @@
 #include <linuxmt/memory.h>
 #include <linuxmt/heap.h>
 #include <linuxmt/sched.h>
+#include <arch/segment.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -36,6 +37,7 @@ unsigned int heap_all;
 unsigned int seg_all;
 unsigned int taskoff;
 int maxtasks;
+int pmode;
 struct task_struct task_table;
 
 int memread(word_t off, word_t seg, void *buf, int size)
@@ -56,6 +58,15 @@ word_t getword(word_t off, word_t seg)
     return word;
 }
 
+addr_t getlong(word_t off, word_t seg)
+{
+    addr_t addr;
+
+    if (memread(off, seg, &addr, sizeof(addr)) != sizeof(addr))
+        return 0;
+    return addr;
+}
+
 void process_name(unsigned int off, unsigned int seg)
 {
     int argc, argv, n;
@@ -100,13 +111,24 @@ static char *segtype[] =
 void display_seg(word_t mem)
 {
     seg_t segbase = getword(mem + offsetof(segment_s, base), ds);
-    segext_t segsize = getword(mem + offsetof(segment_s, size), ds);
+    selext_t segsize = getword(mem + offsetof(segment_s, size), ds);
     word_t segflags = getword(mem + offsetof(segment_s, flags), ds) & SEG_FLAG_TYPE;
     byte_t ref_count = getword(mem + offsetof(segment_s, ref_count), ds);
     struct task_struct *t;
+    addr_t addr;
+    unsigned int segsize_hi;
+
+    if (pmode) {
+        addr = getlong(mem + offsetof(segment_s, addr), ds) << 4;
+
+        /* handle variable-sized 'size' field in protected mode */
+        segsize_hi = getword(mem + offsetof(segment_s, size)+2, ds);
+        segsize += (unsigned long)segsize_hi <<  16;
+    } else
+        addr = (unsigned long)segbase << 4;
 
-    printf("   %04x   %s %7ld %4d  ",
-        segbase, segtype[segflags], (long)segsize << 4, ref_count);
+    printf("   %06lx   %04x   %s %8lu %4d  ",
+        addr, segbase, segtype[segflags], segsize << 4, ref_count);
     if (segflags == SEG_FLAG_CSEG || segflags == SEG_FLAG_DSEG) {
         if ((t = find_process(mem)) != NULL) {
             process_name(t->t_begstack, t->t_regs.ss);
@@ -119,16 +141,19 @@ void display_seg(word_t mem)
 void dump_segs(void)
 {
     word_t n, mem, arena = 2;
-    seg_t segbase, oldbase = 0;
+    addr_t addr, oldaddr = 0;       /* paragraph addresses */
 
-    printf("    SEG   TYPE    SIZE  CNT  NAME\n");
+    printf("    ADDR    SEG   TYPE      SIZE  CNT  NAME\n");
     n = getword (seg_all + offsetof(list_s, next), ds);
     while (n != seg_all) {
         mem = n - offsetof(segment_s, all);
-        segbase = getword(mem + offsetof(segment_s, base), ds);
-        if (segbase < oldbase)
+        if (pmode)
+             addr = getlong(mem + offsetof(segment_s, addr), ds);
+        else
+            addr = getword(mem + offsetof(segment_s, base), ds);
+        if (addr < oldaddr || ((addr & 0x000F0000) && !(oldaddr & 0x000F0000)))
             printf("[Arena %d]\n", arena++);
-        oldbase = segbase;
+        oldaddr = addr;
         display_seg(mem);
         printf("\n");
 
@@ -145,8 +170,8 @@ void dump_heap(void)
         { "free", "MEM ", "DRVR", "TTY ", "TASK", "BUFH", "PIPE", "INOD", "FILE", "CACH"};
 
     /* split into two to save floppy space; linker will combine 2nd with above printf */
-    printf("  HEAP   TYPE  SIZE");
-    printf("    SEG   TYPE    SIZE  CNT  NAME\n");
+    printf("  HEAP   TYPE   SIZE");
+    printf("    ADDR    SEG   TYPE     SIZE  CNT  NAME\n");
 
     word_t n = getword (heap_all + offsetof(list_s, next), ds);
     while (n != heap_all) {
@@ -188,7 +213,9 @@ void dump_heap(void)
         n = getword(n + offsetof(list_s, next), ds);
     }
 
-    printf("  Heap/free   %5u/%5u Total mem %7ld\n", total_size, total_free, total_segsize);
+    printf("  Heap %d/%3dK used, %dK free\n", (total_size-total_free+523) >> 10,
+        (total_size+512) >> 10,
+        (total_free+512) >> 10);
 }
 
 void usage(void)
@@ -244,6 +271,7 @@ int main(int argc, char **argv)
           perror("meminfo");
           return 1;
     }
+    pmode = (ds == SEL_KDATA);
     if (memread(taskoff, ds, &task_table, sizeof(task_table)) != sizeof(task_table)) {
         perror("taskinfo");
     }
@@ -255,8 +283,9 @@ int main(int argc, char **argv)
         /* note MEM_GETUSAGE amounts are floors, so total may display less by 1k than actual*/
         printf("  Main %d/%dK used, %dK free, ",
             mu.main_used, mu.main_used + mu.main_free, mu.main_free);
-        printf("XMS %d/%dK used, %dK free\n",
+        printf("XMS %d/%dK used, %dK free, ",
             mu.xms_used, mu.xms_used + mu.xms_free, mu.xms_free);
+        printf("Total %dK\n", mu.main_used + mu.main_free + mu.xms_used + mu.xms_free);
     }
 
     return 0;

ibmpc-pmode.config

@@ -74,7 +74,7 @@ CONFIG_FS_NR_XMS_BUFFERS=500
 # Executable file formats
 #
 CONFIG_EXEC_COMPRESS=y
-# CONFIG_EXEC_OS2 is not set
+CONFIG_EXEC_OS2=y
 CONFIG_EXEC_MMODEL=y
 
 #