diff mbox series

[18.11] eal: fix cleanup in no-shconf mode

Message ID 9119aac2903c82257a136b2cea3185a00232a203.1556119511.git.anatoly.burakov@intel.com (mailing list archive)
State Not Applicable, archived
Headers
Series [18.11] eal: fix cleanup in no-shconf mode |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Burakov, Anatoly April 24, 2019, 3:26 p.m. UTC 
  In no-shconf mode, there is no need to clean runtime directory
because it's not created in the first place.

Fixes: 0a529578f162 ("eal: clean up unused files on initialization")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ferruh Yigit May 9, 2019, 5:50 p.m. UTC | #1 
On 4/24/2019 4:26 PM, Anatoly Burakov wrote:
> In no-shconf mode, there is no need to clean runtime directory
> because it's not created in the first place.
> 
> Fixes: 0a529578f162 ("eal: clean up unused files on initialization")
> 
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>

Is this for 18.11.x LTS?
cc'ed the stable mail list assuming that is the case.

Is this valid for 19.05 too?

> ---
>  lib/librte_eal/linuxapp/eal/eal.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
> index 30138b638..59497d04a 100644
> --- a/lib/librte_eal/linuxapp/eal/eal.c
> +++ b/lib/librte_eal/linuxapp/eal/eal.c
> @@ -1214,8 +1214,11 @@ rte_eal_init(int argc, char **argv)
>  	 * whether we are primary or secondary process, but we cannot remove
>  	 * primary process' files because secondary should be able to run even
>  	 * if primary process is dead.
> +	 *
> +	 * In no_shconf mode, no runtime directory is created in the first
> +	 * place, so no cleanup needed.
>  	 */
> -	if (eal_clean_runtime_dir() < 0) {
> +	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
>  		rte_eal_init_alert("Cannot clear runtime directory\n");
>  		return -1;
>  	}
>
Ferruh Yigit May 9, 2019, 5:50 p.m. UTC | #2 
On 5/9/2019 6:50 PM, Ferruh Yigit wrote:
> On 4/24/2019 4:26 PM, Anatoly Burakov wrote:
>> In no-shconf mode, there is no need to clean runtime directory
>> because it's not created in the first place.
>>
>> Fixes: 0a529578f162 ("eal: clean up unused files on initialization")
>>
>> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> 
> Is this for 18.11.x LTS?
> cc'ed the stable mail list assuming that is the case.

+Kevin

> 
> Is this valid for 19.05 too?
> 
>> ---
>>  lib/librte_eal/linuxapp/eal/eal.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
>> index 30138b638..59497d04a 100644
>> --- a/lib/librte_eal/linuxapp/eal/eal.c
>> +++ b/lib/librte_eal/linuxapp/eal/eal.c
>> @@ -1214,8 +1214,11 @@ rte_eal_init(int argc, char **argv)
>>  	 * whether we are primary or secondary process, but we cannot remove
>>  	 * primary process' files because secondary should be able to run even
>>  	 * if primary process is dead.
>> +	 *
>> +	 * In no_shconf mode, no runtime directory is created in the first
>> +	 * place, so no cleanup needed.
>>  	 */
>> -	if (eal_clean_runtime_dir() < 0) {
>> +	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
>>  		rte_eal_init_alert("Cannot clear runtime directory\n");
>>  		return -1;
>>  	}
>>
>
Kevin Traynor May 9, 2019, 6:16 p.m. UTC | #3 
On 09/05/2019 18:50, Ferruh Yigit wrote:
> On 5/9/2019 6:50 PM, Ferruh Yigit wrote:
>> On 4/24/2019 4:26 PM, Anatoly Burakov wrote:
>>> In no-shconf mode, there is no need to clean runtime directory
>>> because it's not created in the first place.
>>>
>>> Fixes: 0a529578f162 ("eal: clean up unused files on initialization")
>>>
>>> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
>>
>> Is this for 18.11.x LTS?
>> cc'ed the stable mail list assuming that is the case.
> 
> +Kevin
> 
>>
>> Is this valid for 19.05 too?
>>

It's already applied on 18.11 branch. The same change is also in master
courtesy of the referenced upstream commit below, so this one not needed
for master. Thanks for checking.

commit 4c1ef6dff7230f08f90427355741f56d2faf5884
Author: Anatoly Burakov <anatoly.burakov@intel.com>
Date:   Wed Apr 24 16:26:10 2019 +0100

    eal: fix cleanup in no-shconf mode

    [ upstream commit 307315d4577462943d0fcb2e6b8c8f35f90698d7 ]

>>> ---
>>>  lib/librte_eal/linuxapp/eal/eal.c | 5 ++++-
>>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
>>> index 30138b638..59497d04a 100644
>>> --- a/lib/librte_eal/linuxapp/eal/eal.c
>>> +++ b/lib/librte_eal/linuxapp/eal/eal.c
>>> @@ -1214,8 +1214,11 @@ rte_eal_init(int argc, char **argv)
>>>  	 * whether we are primary or secondary process, but we cannot remove
>>>  	 * primary process' files because secondary should be able to run even
>>>  	 * if primary process is dead.
>>> +	 *
>>> +	 * In no_shconf mode, no runtime directory is created in the first
>>> +	 * place, so no cleanup needed.
>>>  	 */
>>> -	if (eal_clean_runtime_dir() < 0) {
>>> +	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
>>>  		rte_eal_init_alert("Cannot clear runtime directory\n");
>>>  		return -1;
>>>  	}
>>>
>>
>
Burakov, Anatoly May 10, 2019, 10:53 a.m. UTC | #4 
On 09-May-19 7:16 PM, Kevin Traynor wrote:
> On 09/05/2019 18:50, Ferruh Yigit wrote:
>> On 5/9/2019 6:50 PM, Ferruh Yigit wrote:
>>> On 4/24/2019 4:26 PM, Anatoly Burakov wrote:
>>>> In no-shconf mode, there is no need to clean runtime directory
>>>> because it's not created in the first place.
>>>>
>>>> Fixes: 0a529578f162 ("eal: clean up unused files on initialization")
>>>>
>>>> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
>>>
>>> Is this for 18.11.x LTS?
>>> cc'ed the stable mail list assuming that is the case.
>>
>> +Kevin
>>
>>>
>>> Is this valid for 19.05 too?
>>>
> 
> It's already applied on 18.11 branch. The same change is also in master
> courtesy of the referenced upstream commit below, so this one not needed
> for master. Thanks for checking.
> 
> commit 4c1ef6dff7230f08f90427355741f56d2faf5884
> Author: Anatoly Burakov <anatoly.burakov@intel.com>
> Date:   Wed Apr 24 16:26:10 2019 +0100
> 
>      eal: fix cleanup in no-shconf mode
> 
>      [ upstream commit 307315d4577462943d0fcb2e6b8c8f35f90698d7 ]
> 

Yes, this was already applied at master. It was rolled into another fix, 
which i admittedly shouldn't have done, i don't know what i was 
thinking. This is only for 18.11 stable.
diff mbox series

Patch

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 30138b638..59497d04a 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -1214,8 +1214,11 @@  rte_eal_init(int argc, char **argv)
 	 * whether we are primary or secondary process, but we cannot remove
 	 * primary process' files because secondary should be able to run even
 	 * if primary process is dead.
+	 *
+	 * In no_shconf mode, no runtime directory is created in the first
+	 * place, so no cleanup needed.
 	 */
-	if (eal_clean_runtime_dir() < 0) {
+	if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
 		rte_eal_init_alert("Cannot clear runtime directory\n");
 		return -1;
 	}