DPDK patches and discussions
 help / color / mirror / Atom feed
From: John Levon <john.levon@nutanix.com>
To: levon@movementarian.org
Cc: anatoly.burakov@intel.com, dev@dpdk.org,
	John Levon <john.levon@nutanix.com>
Subject: [dpdk-dev] [PATCH] eal: allow hugetlbfs sub-directories
Date: Thu, 10 Jun 2021 22:05:21 +0100	[thread overview]
Message-ID: <20210610210521.830303-1-john.levon@nutanix.com> (raw)

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 <john.levon@nutanix.com>
---
 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


             reply	other threads:[~2021-06-10 21:07 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10 21:05 John Levon [this message]
2021-06-25 10:44 ` [dpdk-dev] [PATCH RESEND] " John Levon
2021-07-06  9:43   ` David Marchand
2021-07-07 20:06   ` Dmitry Kozlyuk
2021-07-07 21:58     ` John Levon
2021-07-08  9:36     ` [dpdk-dev] [PATCH] " John Levon
2021-07-08  9:36       ` John Levon
2021-07-08 10:59     ` [dpdk-dev] [PATCH v3] " John Levon
2021-07-15 22:37       ` Dmitry Kozlyuk
2021-07-22 20:29       ` David Marchand
2021-07-22 21:06         ` John Levon
2021-07-23  7:29           ` Thomas Monjalon
2021-08-09 11:24             ` [dpdk-dev] [PATCH] " John Levon
2021-08-09 13:45               ` Jerin Jacob
2021-08-17 20:05               ` John Levon
2021-10-12 12:38                 ` David Marchand
2021-10-12 16:05                   ` [dpdk-dev] [PATCH] eal/linux: " John Levon
2021-10-12 19:03                     ` David Marchand
2021-10-12 19:58                       ` John Levon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210610210521.830303-1-john.levon@nutanix.com \
    --to=john.levon@nutanix.com \
    --cc=anatoly.burakov@intel.com \
    --cc=dev@dpdk.org \
    --cc=levon@movementarian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).