eal: create a runtime directory on windows
diff mbox series

Message ID 20201021202616.2732-1-pallavi.kadam@intel.com
State Superseded
Delegated to: Thomas Monjalon
Headers show
Series
  • eal: create a runtime directory on windows
Related show

Checks

Context Check Description
ci/travis-robot success Travis build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/checkpatch success coding style OK

Commit Message

Kadam, Pallavi Oct. 21, 2020, 8:26 p.m. UTC
Added eal_create_runtime_dir() function in order to run any application
as a user that does not have administrator access.
Currently, since there is no runtime directory set, the code tries to
create a file in C:\ which is only writable with administrator
privileges. As a result, if the user is not admin, the application will
fail.

Signed-off-by: Ranjit Menon <ranjit.menon@intel.com>
Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
---
 lib/librte_eal/windows/eal.c | 57 ++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

Comments

Ranjit Menon Oct. 22, 2020, 6:15 p.m. UTC | #1
On 10/21/2020 1:26 PM, Pallavi Kadam wrote:
> Added eal_create_runtime_dir() function in order to run any application
> as a user that does not have administrator access.
> Currently, since there is no runtime directory set, the code tries to
> create a file in C:\ which is only writable with administrator
> privileges. As a result, if the user is not admin, the application will
> fail.
>
> Signed-off-by: Ranjit Menon <ranjit.menon@intel.com>
> Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
> ---
>   lib/librte_eal/windows/eal.c | 57 ++++++++++++++++++++++++++++++++++++
>   1 file changed, 57 insertions(+)
>
> diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c
> index 6334aca03..b0f356405 100644
> --- a/lib/librte_eal/windows/eal.c
> +++ b/lib/librte_eal/windows/eal.c
> @@ -5,6 +5,7 @@
>   #include <fcntl.h>
>   #include <io.h>
>   #include <share.h>
> +#include <direct.h>
>   #include <sys/stat.h>
>   
>   #include <rte_debug.h>
> @@ -34,6 +35,55 @@ static int mem_cfg_fd = -1;
>   /* internal configuration (per-core) */
>   struct lcore_config lcore_config[RTE_MAX_LCORE];
>   
> +int
> +eal_create_runtime_dir(void)
> +{
> +	char temp_dir[PATH_MAX];
> +	char runtime_dir[PATH_MAX];
> +	int ret;
> +
> +	/* get user-writable temp path */
> +	if (GetTempPathA(sizeof(temp_dir), temp_dir) == 0) {
> +		RTE_LOG_WIN32_ERR("GetTempPath");
> +		return -1;
> +	}
> +
> +	/* create DPDK runtime subdirectory under temp dir */
> +	ret = strcat_s(temp_dir, sizeof(temp_dir), "dpdk");
> +	if (ret != 0) {
> +		RTE_LOG(ERR, EAL, "Error creating DPDK runtime path name\n");
> +		return -1;
> +	}
> +
> +	/* create prefix-specific subdirectory under DPDK runtime dir */
> +	ret = snprintf(runtime_dir, sizeof(runtime_dir), "%s\\%s",
> +		temp_dir, eal_get_hugefile_prefix());
> +	if (ret < 0 || ret == sizeof(runtime_dir)) {
> +		RTE_LOG(ERR, EAL, "Error creating prefix-specific runtime path\n");
> +		return -1;
> +	}
> +
> +	/* create the path if it doesn't exist - step by step */
> +	ret = _mkdir(temp_dir);
> +	if (ret < 0 && errno != EEXIST) {
> +		RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
> +			temp_dir, strerror(errno));
> +		return -1;
> +	}
> +
> +	ret = _mkdir(runtime_dir);
> +	if (ret < 0 && errno != EEXIST) {
> +		RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
> +			runtime_dir, strerror(errno));
> +		return -1;
> +	}
> +
> +	if (eal_set_runtime_dir(runtime_dir, sizeof(runtime_dir)))
> +		return -1;
> +
> +	return 0;
> +}
> +
>   /* Detect if we are a primary or a secondary process */
>   enum rte_proc_type_t
>   eal_proc_type_detect(void)
> @@ -181,6 +231,13 @@ eal_parse_args(int argc, char **argv)
>   		}
>   	}
>   
> +	/* create runtime data directory */
> +	if (internal_conf->no_shconf == 0 &&
> +			eal_create_runtime_dir() < 0) {
> +		RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
> +		return -1;
> +	}
> +
>   	if (eal_adjust_config(internal_conf) != 0)
>   		return -1;
>   

Thomas, Dmitry: If at all possible, I think we should try and get this 
fix into -rc2.

Without this fix, a non-admin user cannot run any application on Windows.


ranjit m.
Dmitry Kozlyuk Oct. 22, 2020, 7:05 p.m. UTC | #2
>  /* Detect if we are a primary or a secondary process */
>  enum rte_proc_type_t
>  eal_proc_type_detect(void)
> @@ -181,6 +231,13 @@ eal_parse_args(int argc, char **argv)
>  		}
>  	}
>  
> +	/* create runtime data directory */
> +	if (internal_conf->no_shconf == 0 &&
> +			eal_create_runtime_dir() < 0) {
> +		RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
> +		return -1;
> +	}
> +
>  	if (eal_adjust_config(internal_conf) != 0)
>  		return -1;

Windows rte_eal_init() forces in-memory operation (internal_conf.in_memory=0)
with a warning message, because runtime directory and shared configuration is
only used for multi-process. Maybe do the same for no_shconf, as it's
essentially the same, but for legacy mode?
Kadam, Pallavi Oct. 26, 2020, 7:01 p.m. UTC | #3
Hi Dmitry,

On 10/22/2020 12:05 PM, Dmitry Kozlyuk wrote:
>>   /* Detect if we are a primary or a secondary process */
>>   enum rte_proc_type_t
>>   eal_proc_type_detect(void)
>> @@ -181,6 +231,13 @@ eal_parse_args(int argc, char **argv)
>>   		}
>>   	}
>>   
>> +	/* create runtime data directory */
>> +	if (internal_conf->no_shconf == 0 &&
>> +			eal_create_runtime_dir() < 0) {
>> +		RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
>> +		return -1;
>> +	}
>> +
>>   	if (eal_adjust_config(internal_conf) != 0)
>>   		return -1;
> Windows rte_eal_init() forces in-memory operation (internal_conf.in_memory=0)
> with a warning message, because runtime directory and shared configuration is
> only used for multi-process. Maybe do the same for no_shconf, as it's
> essentially the same, but for legacy mode?

Thank you for the suggestion.

We sent out v2, forcing no_shconf to 1 for now.

Patch
diff mbox series

diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c
index 6334aca03..b0f356405 100644
--- a/lib/librte_eal/windows/eal.c
+++ b/lib/librte_eal/windows/eal.c
@@ -5,6 +5,7 @@ 
 #include <fcntl.h>
 #include <io.h>
 #include <share.h>
+#include <direct.h>
 #include <sys/stat.h>
 
 #include <rte_debug.h>
@@ -34,6 +35,55 @@  static int mem_cfg_fd = -1;
 /* internal configuration (per-core) */
 struct lcore_config lcore_config[RTE_MAX_LCORE];
 
+int
+eal_create_runtime_dir(void)
+{
+	char temp_dir[PATH_MAX];
+	char runtime_dir[PATH_MAX];
+	int ret;
+
+	/* get user-writable temp path */
+	if (GetTempPathA(sizeof(temp_dir), temp_dir) == 0) {
+		RTE_LOG_WIN32_ERR("GetTempPath");
+		return -1;
+	}
+
+	/* create DPDK runtime subdirectory under temp dir */
+	ret = strcat_s(temp_dir, sizeof(temp_dir), "dpdk");
+	if (ret != 0) {
+		RTE_LOG(ERR, EAL, "Error creating DPDK runtime path name\n");
+		return -1;
+	}
+
+	/* create prefix-specific subdirectory under DPDK runtime dir */
+	ret = snprintf(runtime_dir, sizeof(runtime_dir), "%s\\%s",
+		temp_dir, eal_get_hugefile_prefix());
+	if (ret < 0 || ret == sizeof(runtime_dir)) {
+		RTE_LOG(ERR, EAL, "Error creating prefix-specific runtime path\n");
+		return -1;
+	}
+
+	/* create the path if it doesn't exist - step by step */
+	ret = _mkdir(temp_dir);
+	if (ret < 0 && errno != EEXIST) {
+		RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
+			temp_dir, strerror(errno));
+		return -1;
+	}
+
+	ret = _mkdir(runtime_dir);
+	if (ret < 0 && errno != EEXIST) {
+		RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
+			runtime_dir, strerror(errno));
+		return -1;
+	}
+
+	if (eal_set_runtime_dir(runtime_dir, sizeof(runtime_dir)))
+		return -1;
+
+	return 0;
+}
+
 /* Detect if we are a primary or a secondary process */
 enum rte_proc_type_t
 eal_proc_type_detect(void)
@@ -181,6 +231,13 @@  eal_parse_args(int argc, char **argv)
 		}
 	}
 
+	/* create runtime data directory */
+	if (internal_conf->no_shconf == 0 &&
+			eal_create_runtime_dir() < 0) {
+		RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
+		return -1;
+	}
+
 	if (eal_adjust_config(internal_conf) != 0)
 		return -1;