You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/03/16 07:06:21 UTC
[GitHub] [incubator-nuttx] pussuw opened a new pull request #5753: Fix the initial idle tasks environment
pussuw opened a new pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753
- User mode allocator was used for setting up the environment. This
works in flat mode and probably in protected mode as well, as there
is always a a single user allocator present
- This does not work in kernel mode, where each user task has its own
heap allocator. Also, when the idle tasks environment is being set,
no allocator is ready and the system crashes at once.
Fix this by using the group allocators instead:
- Idle task is a kernel task, so its group is privileged
- Add group_realloc
- Use the group_malloc/realloc functions instead of kumm_malloc
## Summary
Fixes the initial environment, especially with CONFIG_BUILD_KERNEL
## Impact
## Testing
Tested with boards/risc-v/mpfs/icicle/configs/knsh/defconfig (CONFIG_BUILD_KERNEL=y) / not released yet
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pussuw commented on a change in pull request #5753: Fix the initial idle tasks environment
Posted by GitBox <gi...@apache.org>.
pussuw commented on a change in pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753#discussion_r827722281
##########
File path: sched/group/group_realloc.c
##########
@@ -0,0 +1,83 @@
+/****************************************************************************
+ * sched/group/group_realloc.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/types.h>
+
+#include <assert.h>
+
+#include <nuttx/sched.h>
+#include <nuttx/kmalloc.h>
+
+#include "sched/sched.h"
+#include "group/group.h"
+
+#ifdef CONFIG_MM_KERNEL_HEAP
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: group_realloc
+ *
+ * Description:
+ * Re-allocate memory appropriate for the group type. If the memory is
+ * part of a privileged group, then it should be allocated so that it
+ * is only accessible by privileged code; Otherwise, it is a user mode
+ * group and must be allocated so that it accessible by unprivileged
+ * code.
+ *
+ ****************************************************************************/
+
+FAR void *group_realloc(FAR struct task_group_s *group, FAR void *oldmem,
+ size_t newsize)
+{
+ /* A NULL group pointer means the current group */
+
+ if (!group)
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pussuw commented on a change in pull request #5753: Fix the initial idle tasks environment
Posted by GitBox <gi...@apache.org>.
pussuw commented on a change in pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753#discussion_r827722438
##########
File path: sched/init/nx_start.c
##########
@@ -558,7 +558,8 @@ void nx_start(void)
*/
group_initialize(&g_idletcb[i]);
- g_idletcb[i].cmn.group->tg_flags = GROUP_FLAG_NOCLDWAIT;
+ g_idletcb[i].cmn.group->tg_flags = (GROUP_FLAG_NOCLDWAIT |
+ GROUP_FLAG_PRIVILEGED);
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #5753: Fix the initial idle tasks environment
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pussuw commented on a change in pull request #5753: Fix the initial idle tasks environment
Posted by GitBox <gi...@apache.org>.
pussuw commented on a change in pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753#discussion_r827722135
##########
File path: sched/environ/env_setenv.c
##########
@@ -145,7 +145,7 @@ int setenv(FAR const char *name, FAR const char *value, int overwrite)
if (group->tg_envp)
{
newsize = group->tg_envsize + varlen;
- newenvp = (FAR char *)kumm_realloc(group->tg_envp, newsize);
+ newenvp = group_realloc(group, group->tg_envp, newsize);
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pkarashchenko commented on a change in pull request #5753: Fix the initial idle tasks environment
Posted by GitBox <gi...@apache.org>.
pkarashchenko commented on a change in pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753#discussion_r827718964
##########
File path: sched/group/group_realloc.c
##########
@@ -0,0 +1,83 @@
+/****************************************************************************
+ * sched/group/group_realloc.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <sys/types.h>
+
+#include <assert.h>
+
+#include <nuttx/sched.h>
+#include <nuttx/kmalloc.h>
+
+#include "sched/sched.h"
+#include "group/group.h"
+
+#ifdef CONFIG_MM_KERNEL_HEAP
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: group_realloc
+ *
+ * Description:
+ * Re-allocate memory appropriate for the group type. If the memory is
+ * part of a privileged group, then it should be allocated so that it
+ * is only accessible by privileged code; Otherwise, it is a user mode
+ * group and must be allocated so that it accessible by unprivileged
+ * code.
+ *
+ ****************************************************************************/
+
+FAR void *group_realloc(FAR struct task_group_s *group, FAR void *oldmem,
+ size_t newsize)
+{
+ /* A NULL group pointer means the current group */
+
+ if (!group)
Review comment:
```suggestion
if (group == NULL)
```
##########
File path: include/nuttx/kmalloc.h
##########
@@ -136,9 +141,10 @@ void group_free(FAR struct task_group_s *group, FAR void *mem);
* in privileges.
*/
-# define group_malloc(g,n) kumm_malloc(n)
-# define group_zalloc(g,n) kumm_zalloc(n)
-# define group_free(g,m) kumm_free(m)
+# define group_malloc(g,n) kumm_malloc(n)
+# define group_realloc(g, p, s) kumm_realloc(p, s)
Review comment:
```suggestion
# define group_realloc(g,p,s) kumm_realloc((p),(s))
```
##########
File path: sched/environ/env_setenv.c
##########
@@ -145,7 +145,7 @@ int setenv(FAR const char *name, FAR const char *value, int overwrite)
if (group->tg_envp)
{
newsize = group->tg_envsize + varlen;
- newenvp = (FAR char *)kumm_realloc(group->tg_envp, newsize);
+ newenvp = group_realloc(group, group->tg_envp, newsize);
Review comment:
```suggestion
newenvp = (FAR char *)group_realloc(group, group->tg_envp, newsize);
```
##########
File path: sched/init/nx_start.c
##########
@@ -558,7 +558,8 @@ void nx_start(void)
*/
group_initialize(&g_idletcb[i]);
- g_idletcb[i].cmn.group->tg_flags = GROUP_FLAG_NOCLDWAIT;
+ g_idletcb[i].cmn.group->tg_flags = (GROUP_FLAG_NOCLDWAIT |
+ GROUP_FLAG_PRIVILEGED);
Review comment:
```suggestion
g_idletcb[i].cmn.group->tg_flags = GROUP_FLAG_NOCLDWAIT |
GROUP_FLAG_PRIVILEGED;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] pussuw commented on a change in pull request #5753: Fix the initial idle tasks environment
Posted by GitBox <gi...@apache.org>.
pussuw commented on a change in pull request #5753:
URL: https://github.com/apache/incubator-nuttx/pull/5753#discussion_r827721932
##########
File path: include/nuttx/kmalloc.h
##########
@@ -136,9 +141,10 @@ void group_free(FAR struct task_group_s *group, FAR void *mem);
* in privileges.
*/
-# define group_malloc(g,n) kumm_malloc(n)
-# define group_zalloc(g,n) kumm_zalloc(n)
-# define group_free(g,m) kumm_free(m)
+# define group_malloc(g,n) kumm_malloc(n)
+# define group_realloc(g, p, s) kumm_realloc(p, s)
Review comment:
Yes, nice catch
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org