Changeset 3f03199 in mainline for kernel/test/mm/falloc1.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/test/mm/falloc1.c (modified) (3 diffs)

kernel/test/mm/falloc1.c

@@ -37 +37 @@
 #include <align.h>
 
-#define MAX_FRAMES  1024U
+#define MAX_FRAMES  1024
 #define MAX_ORDER   8
 #define TEST_RUNS   2
@@ -51 +51 @@
                 return "Unable to allocate frames";
         
-        unsigned int results[MAX_ORDER + 1];
+        unsigned int results[MAX_FRAMES + 1];
+        
         for (unsigned int run = 0; run < TEST_RUNS; run++) {
-                for (unsigned int order = 0; order <= MAX_ORDER; order++) {
-                        TPRINTF("Allocating %u frames blocks ... ", 1 << order);
+                for (size_t count = 1; count <= MAX_FRAMES; count++) {
+                        size_t bytes = FRAMES2SIZE(count);
+                        
+                        TPRINTF("Allocating %zu frames blocks (%zu bytes) ... ",
+                            count, bytes);
                         
                         unsigned int allocated = 0;
-                        for (unsigned int i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = (uintptr_t)
-                                    frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
-                                
-                                if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) !=
-                                    frames[allocated]) {
-                                        TPRINTF("Block at address %p (size %u) is not aligned\n",
-                                            (void *) frames[allocated], (FRAME_SIZE << order) >> 10);
-                                        return "Test failed";
-                                }
-                                
-                                if (frames[allocated])
+                        for (unsigned int i = 0; i < (MAX_FRAMES / count); i++) {
+                                frames[allocated] = frame_alloc(count, FRAME_ATOMIC, 0);
+                                if (frames[allocated]) {
                                         allocated++;
-                                else {
+                                } else {
                                         TPRINTF("done. ");
                                         break;
@@ -78 +73 @@
                         TPRINTF("%d blocks allocated.\n", allocated);
                         
-                        if (run) {
-                                if (results[order] != allocated)
+                        if (run > 0) {
+                                if (results[count] != allocated)
                                         return "Possible frame leak";
                         } else
-                                results[order] = allocated;
+                                results[count] = allocated;
                         
                         TPRINTF("Deallocating ... ");
                         
                         for (unsigned int i = 0; i < allocated; i++)
-                                frame_free(KA2PA(frames[i]));
+                                frame_free(frames[i], count);
                         
                         TPRINTF("done.\n");