eal/linux: rework loop in hugepage init

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_hugepage_info.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index 6dd8a0b..d602350 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -63,7 +63,7 @@ static const char sys_dir_path[] = "/sys/kernel/mm/hugepages";
 
 /* this function is only called from eal_hugepage_info_init which itself
  * is only called from a primary process */
-static int32_t
+static uint32_t
 get_num_hugepages(const char *subdir)
 {
        char path[PATH_MAX];
@@ -87,10 +87,17 @@ get_num_hugepages(const char *subdir)
                                subdir);
 
        /* adjust num_pages */
-       if (num_pages > 0)
+       if (num_pages >= resv_pages)
                num_pages -= resv_pages;
+       else if (resv_pages)
+               num_pages = 0;
 
-       return (int32_t)num_pages;
+       /* we want to return a uint32_t and more than this looks suspicious
+        * anyway ... */
+       if (num_pages > UINT32_MAX)
+               num_pages = UINT32_MAX;
+
+       return num_pages;
 }
 
 static uint64_t
@@ -272,43 +279,48 @@ eal_hugepage_info_init(void)
        const char dirent_start_text[] = "hugepages-";
        const size_t dirent_start_len = sizeof(dirent_start_text) - 1;
        unsigned i, num_sizes = 0;
+       DIR *dir;
+       struct dirent *dirent;
 
-       DIR *dir = opendir(sys_dir_path);
+       dir = opendir(sys_dir_path);
        if (dir == NULL)
-               rte_panic("Cannot open directory %s to read system hugepage info\n",
-                               sys_dir_path);
+               rte_panic("Cannot open directory %s to read system hugepage "
+                         "info\n", sys_dir_path);
 
-       struct dirent *dirent = readdir(dir);
-       while(dirent != NULL){
-               if (strncmp(dirent->d_name, dirent_start_text, dirent_start_len) == 0){
-                       struct hugepage_info *hpi = \
-                                       &internal_config.hugepage_info[num_sizes];
+       for (dirent = readdir(dir); dirent != NULL; dirent = readdir(dir)) {
+               struct hugepage_info *hpi;
+
+               if (strncmp(dirent->d_name, dirent_start_text,
+                           dirent_start_len) != 0)
+                       continue;
+
+                       hpi = &internal_config.hugepage_info[num_sizes];
                        hpi->hugepage_sz = rte_str_to_size(&dirent->d_name[dirent_start_len]);
                        hpi->hugedir = get_hugepage_dir(hpi->hugepage_sz);
 
                        /* first, check if we have a mountpoint */
-                       if (hpi->hugedir == NULL){
-                               int32_t num_pages;
-                               if ((num_pages = get_num_hugepages(dirent->d_name)) > 0)
-                                       RTE_LOG(INFO, EAL, "%u hugepages of size %llu reserved, "\
-                                                       "but no mounted hugetlbfs found for that size\n",
-                                                       (unsigned)num_pages,
-                                                       (unsigned long long)hpi->hugepage_sz);
-                       } else {
+                       if (hpi->hugedir == NULL) {
+                               uint32_t num_pages;
+
+                               num_pages = get_num_hugepages(dirent->d_name);
+                               if (num_pages > 0)
+                                       RTE_LOG(INFO, EAL, "%" PRIu32 " hugepages of size %" PRIu64 " reserved, "
+                                               "but no mounted hugetlbfs found for that size\n",
+                                               num_pages, hpi->hugepage_sz);
+                               continue;
+                       }
+
                                /* try to obtain a writelock */
                                hpi->lock_descriptor = open(hpi->hugedir, O_RDONLY);
 
                                /* if blocking lock failed */
                                if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
                                        RTE_LOG(CRIT, EAL, "Failed to lock hugepage directory!\n");
-                                       closedir(dir);
-                                       return -1;
+                                       break;
                                }
                                /* clear out the hugepages dir from unused pages */
-                               if (clear_hugedir(hpi->hugedir) == -1) {
-                                       closedir(dir);
-                                       return -1;
-                               }
+                               if (clear_hugedir(hpi->hugedir) == -1)
+                                       break;
 
                                /* for now, put all pages into socket 0,
                                 * later they will be sorted */
@@ -321,18 +333,20 @@ eal_hugepage_info_init(void)
 #endif
 
                                num_sizes++;
-                       }
-               }
-               dirent = readdir(dir);
        }
        closedir(dir);
+
+       /* something went wrong, and we broke from the for loop above */
+       if (dirent != NULL)
+               return -1;
+
        internal_config.num_hugepage_sizes = num_sizes;
 
        /* sort the page directory entries by size, largest to smallest */
-       for (i = 0; i < num_sizes; i++){
+       for (i = 0; i < num_sizes; i++) {
                unsigned j;
                for (j = i+1; j < num_sizes; j++)
-                       if (internal_config.hugepage_info[j-1].hugepage_sz < \
+                       if (internal_config.hugepage_info[j-1].hugepage_sz <
                                        internal_config.hugepage_info[j].hugepage_sz)
                                swap_hpi(&internal_config.hugepage_info[j-1],
                                                &internal_config.hugepage_info[j]);
@@ -341,7 +355,7 @@ eal_hugepage_info_init(void)
        /* now we have all info, check we have at least one valid size */
        for (i = 0; i < num_sizes; i++)
                if (internal_config.hugepage_info[i].hugedir != NULL &&
-                               internal_config.hugepage_info[i].num_pages[0] > 0)
+                   internal_config.hugepage_info[i].num_pages[0] > 0)
                        return 0;
 
        /* no valid hugepage mounts available, return error */