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 E3F4BA0C47; Thu, 10 Jun 2021 23:07:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A3734067C; Thu, 10 Jun 2021 23:07:49 +0200 (CEST) Received: from sent.movementarian.org (unknown [88.98.93.30]) by mails.dpdk.org (Postfix) with ESMTP id F3F094003C for ; Thu, 10 Jun 2021 23:07:47 +0200 (CEST) Received: from jlevon by sent.movementarian.org with local (Exim 4.93) (envelope-from ) id 1lrRtr-003U2R-1C; Thu, 10 Jun 2021 22:07:39 +0100 From: John Levon To: levon@movementarian.org Cc: anatoly.burakov@intel.com, dev@dpdk.org, John Levon Date: Thu, 10 Jun 2021 22:05:21 +0100 Message-Id: <20210610210521.830303-1-john.levon@nutanix.com> X-Mailer: git-send-email 2.25.1 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. Signed-off-by: John Levon --- lib/eal/linux/eal_hugepage_info.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/eal/linux/eal_hugepage_info.c b/lib/eal/linux/eal_hugepage_info.c index d97792cad..d7e9918f8 100644 --- a/lib/eal/linux/eal_hugepage_info.c +++ b/lib/eal/linux/eal_hugepage_info.c @@ -226,16 +226,29 @@ 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 *dir; + 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) - continue; + dir = splitstr[MOUNTPT]; + + /* + * If a --huge-dir option has been specified, only examine + * mounts that contain that directory, and make sure to return + * the directory, not the mount. + */ + if (internal_conf->hugepage_dir != NULL) { + if (strncmp(internal_conf->hugepage_dir, + splitstr[MOUNTPT], + strlen(splitstr[MOUNTPT])) != 0) + continue; + + dir = internal_conf->hugepage_dir; + } if (strncmp(splitstr[FSTYPE], hugetlbfs_str, htlbfs_str_len) == 0){ const char *pagesz_str = strstr(splitstr[OPTIONS], pagesize_opt); @@ -243,7 +256,7 @@ get_hugepage_dir(uint64_t hugepage_sz, char *hugedir, int len) /* 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); + strlcpy(hugedir, dir, len); retval = 0; break; } @@ -252,7 +265,7 @@ get_hugepage_dir(uint64_t hugepage_sz, char *hugedir, int len) else { uint64_t pagesz = rte_str_to_size(&pagesz_str[pagesize_opt_len]); if (pagesz == hugepage_sz) { - strlcpy(hugedir, splitstr[MOUNTPT], len); + strlcpy(hugedir, dir, len); retval = 0; break; } -- 2.25.1