From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ABDD3A0C4A; Thu, 8 Jul 2021 11:38:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BD95410DF; Thu, 8 Jul 2021 11:38:24 +0200 (CEST) Received: from sent.movementarian.org (unknown [88.98.93.30]) by mails.dpdk.org (Postfix) with ESMTP id DFA134069C for ; Thu, 8 Jul 2021 11:38:22 +0200 (CEST) Received: from jlevon by sent.movementarian.org with local (Exim 4.93) (envelope-from ) id 1m1QUA-0023qE-1I; Thu, 08 Jul 2021 10:38:22 +0100 From: John Levon To: dev@dpdk.org Cc: anatoly.burakov@intel.com, dmitry.kozliuk@gmail.com, John Levon Date: Thu, 8 Jul 2021 10:36:58 +0100 Message-Id: <20210708093657.491176-2-john.levon@nutanix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210708093657.491176-1-john.levon@nutanix.com> References: <20210707230605.58a79a47@sovereign> <20210708093657.491176-1-john.levon@nutanix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] eal: allow hugetlbfs sub-directories X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" get_hugepage_dir() was implemented in such a way that a --huge-dir option had to exactly match the mountpoint, but there's no reason for this restriction. Fix the implementation to allow a sub-directory within a suitable hugetlbfs mountpoint to be specified, preferring the closest match. Signed-off-by: John Levon --- lib/eal/linux/eal_hugepage_info.c | 74 +++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 23 deletions(-) diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c index d97792cad..b5f08e94d 100644 --- a/lib/eal/linux/eal_hugepage_info.c +++ b/lib/eal/linux/eal_hugepage_info.c @@ -213,8 +213,8 @@ get_hugepage_dir(uint64_t hugepage_sz, char *hugedir, int len) const size_t pagesize_opt_len = sizeof(pagesize_opt) - 1; const char split_tok = ' '; char *splitstr[_FIELDNAME_MAX]; + char found[PATH_MAX] = ""; char buf[BUFSIZ]; - int retval = -1; const struct internal_config *internal_conf = eal_get_internal_configuration(); @@ -226,42 +226,70 @@ get_hugepage_dir(uint64_t hugepage_sz, char *hugedir, int len) default_size = get_default_hp_size(); while (fgets(buf, sizeof(buf), fd)){ + const char *pagesz_str; + if (rte_strsplit(buf, sizeof(buf), splitstr, _FIELDNAME_MAX, split_tok) != _FIELDNAME_MAX) { RTE_LOG(ERR, EAL, "Error parsing %s\n", proc_mounts); break; /* return NULL */ } - /* we have a specified --huge-dir option, only examine that dir */ - if (internal_conf->hugepage_dir != NULL && - strcmp(splitstr[MOUNTPT], internal_conf->hugepage_dir) != 0) + if (strncmp(splitstr[FSTYPE], hugetlbfs_str, htlbfs_str_len) != 0) { continue; + } - if (strncmp(splitstr[FSTYPE], hugetlbfs_str, htlbfs_str_len) == 0){ - const char *pagesz_str = strstr(splitstr[OPTIONS], pagesize_opt); + pagesz_str = strstr(splitstr[OPTIONS], pagesize_opt); - /* if no explicit page size, the default page size is compared */ - if (pagesz_str == NULL){ - if (hugepage_sz == default_size){ - strlcpy(hugedir, splitstr[MOUNTPT], len); - retval = 0; - break; - } + /* if no explicit page size, the default page size is compared */ + if (pagesz_str == NULL) { + if (hugepage_sz != default_size) { + continue; } - /* there is an explicit page size, so check it */ - else { - uint64_t pagesz = rte_str_to_size(&pagesz_str[pagesize_opt_len]); - if (pagesz == hugepage_sz) { - strlcpy(hugedir, splitstr[MOUNTPT], len); - retval = 0; - break; - } + } + /* there is an explicit page size, so check it */ + else { + uint64_t pagesz = rte_str_to_size(&pagesz_str[pagesize_opt_len]); + if (pagesz != hugepage_sz) { + continue; } - } /* end if strncmp hugetlbfs */ + } + + /* + * If no --huge-dir option has been given, we're done. + */ + if (internal_conf->hugepage_dir == NULL) { + strlcpy(found, splitstr[MOUNTPT], len); + break; + } + + /* + * Ignore any mount that doesn't contain the --huge-dir + * directory. + */ + if (strncmp(internal_conf->hugepage_dir, splitstr[MOUNTPT], + strlen(splitstr[MOUNTPT])) != 0) { + continue; + } + + /* + * We found a match, but only prefer it if it's a longer match + * (so /mnt/1 is preferred over /mnt for matching /mnt/1/2)). + */ + if (strlen(splitstr[MOUNTPT]) > strlen(found)) { + strlcpy(found, splitstr[MOUNTPT], len); + } } /* end while fgets */ fclose(fd); - return retval; + + if (found[0] != '\0') { + /* If needed, return the requested dir, not the mount point. */ + strlcpy(hugedir, internal_conf->hugepage_dir != NULL ? + internal_conf->hugepage_dir : found, len); + return 0; + } + + return -1; } /* -- 2.25.1