From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id CF06091AA for ; Thu, 12 Nov 2015 10:11:11 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 12 Nov 2015 01:11:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,281,1444719600"; d="scan'208";a="835329962" Received: from tan-s2600cw.sh.intel.com ([10.239.128.225]) by fmsmga001.fm.intel.com with ESMTP; 12 Nov 2015 01:11:07 -0800 From: Jianfeng Tan To: dev@dpdk.org Date: Thu, 12 Nov 2015 10:10:55 +0800 Message-Id: <1447294255-69446-1-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447287477-49292-1-git-send-email-jianfeng.tan@intel.com> References: <1447287477-49292-1-git-send-email-jianfeng.tan@intel.com> Subject: [dpdk-dev] [PATCH v2] mem: calculate space left in a hugetlbfs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2015 09:11:12 -0000 This patch enables calculating space left in a hugetlbfs. There are three sources to get the information: 1. from sysfs; 2. from option size specified when mount; 3. use statfs. We should use the minimum one of these three sizes. Signed-off-by: Jianfeng Tan --- Changes in v2: - reword title - fix compiler error of v1 lib/librte_eal/linuxapp/eal/eal_hugepage_info.c | 85 ++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c index 18858e2..8305a58 100644 --- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c +++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include #include @@ -189,6 +191,70 @@ get_hugepage_dir(uint64_t hugepage_sz) return retval; } +/* Caller to make sure this mnt_dir exist + */ +static uint64_t +get_hugetlbfs_mount_size(const char *mnt_dir) +{ + char *start, *end, *opt_size; + struct mntent *ent; + uint64_t size; + FILE *f; + int len; + + f = setmntent("/proc/mounts", "r"); + if (f == NULL) { + RTE_LOG(ERR, EAL, "setmntent() error: %s\n", + strerror(errno)); + return 0; + } + while (NULL != (ent = getmntent(f))) { + if (!strcmp(ent->mnt_dir, mnt_dir)) + break; + } + + start = hasmntopt(ent, "size"); + if (start == NULL) { + RTE_LOG(DEBUG, EAL, "option size not specified for %s\n", + mnt_dir); + size = 0; + goto end; + } + start += strlen("size="); + end = strstr(start, ","); + if (end != NULL) + len = end - start; + else + len = strlen(start); + opt_size = strndup(start, len); + size = rte_str_to_size(opt_size); + free(opt_size); + +end: + endmntent(f); + return size; +} + +/* Caller to make sure this mount has option size + * so that statfs is not zero. + */ +static uint64_t +get_hugetlbfs_free_size(const char *mnt_dir) +{ + int r; + struct statfs stats; + + r = statfs(mnt_dir, &stats); + if (r != 0) { + RTE_LOG(ERR, EAL, "statfs() error: %s\n", + strerror(errno)); + return 0; + } + + return stats.f_bfree * stats.f_bsize; +} + + /* * Clear the hugepage directory of whatever hugepage files * there are. Checks if the file is locked (i.e. @@ -329,9 +395,26 @@ eal_hugepage_info_init(void) if (clear_hugedir(hpi->hugedir) == -1) break; + /* there are three souces of how much space left in a + * hugetlbfs dir. + */ + uint64_t sz_left, sz_sysfs, sz_option, sz_statfs; + + sz_sysfs = get_num_hugepages(dirent->d_name) * + hpi->hugepage_sz; + sz_left = sz_sysfs; + sz_option = get_hugetlbfs_mount_size(hpi->hugedir); + if (sz_option) { + sz_statfs = get_hugetlbfs_free_size(hpi->hugedir); + sz_left = RTE_MIN(sz_sysfs, sz_statfs); + RTE_LOG(INFO, EAL, "sz_sysfs: %"PRIu64", sz_option: " + "%"PRIu64", sz_statfs: %"PRIu64"\n", + sz_sysfs, sz_option, sz_statfs); + } + /* for now, put all pages into socket 0, * later they will be sorted */ - hpi->num_pages[0] = get_num_hugepages(dirent->d_name); + hpi->num_pages[0] = sz_left / hpi->hugepage_sz; #ifndef RTE_ARCH_64 /* for 32-bit systems, limit number of hugepages to -- 2.1.4